htl: clean GLIBC_PRIVATE symbols

diff --git a/htl/Versions b/htl/Versions
index 6b77fe21..4cc553ae 100644
--- a/htl/Versions
+++ b/htl/Versions
@@ -301,22 +301,10 @@  libc {
   GLIBC_PRIVATE {
     __libc_alloca_cutoff;
     __pthread_total;
-    ___pthread_self;
-    __pthread_alloc;
-    __pthread_block;
-    __pthread_block_intr;
     __pthread_create;
-    __pthread_init_thread;
-    __pthread_default_attr;
     __pthread_attr_init;
-    __pthread_attr_getstacksize;
-    __pthread_attr_getstackaddr;
     __pthread_attr_getstack;
     __pthread_attr_setstacksize;
-    __pthread_attr_setstackaddr;
-    __pthread_attr_setstack;
-    __pthread_dealloc;
-    __pthread_dealloc_finish;
     __pthread_setcancelstate;
     __pthread_enable_asynccancel;
     __pthread_disable_asynccancel;
@@ -327,16 +315,11 @@  libc {
     __pthread_cond_signal;
     __pthread_cond_timedwait;
     __pthread_cond_wait;
-    __pthread_condattr_init;
-    __pthread_default_condattr;
-    __pthread_destroy_specific;
     __pthread_exit;
     __pthread_getspecific;
     __pthread_initialize_minimal;
     __pthread_join;
     __pthread_key_delete;
-    __pthread_max_threads;
-    __pthread_mutex_checklocked;
     __pthread_mutex_destroy;
     __pthread_mutex_init;
     __pthread_mutex_lock;
@@ -348,21 +331,7 @@  libc {
     __pthread_mutexattr_settype;
     __pthread_once;
     __pthread_setspecific;
-    __pthread_setup;
-    __pthread_sigstate_init;
-    __pthread_sigstate;
-    __pthread_sigstate_destroy;
     __pthread_sigmask;
-    __pthread_stack_alloc;
-    __pthread_startup;
-    __pthread_testcancel;
-    __pthread_timedblock;
-    __pthread_timedblock_intr;
-    __pthread_thread_alloc;
-    __pthread_thread_start;
-    __pthread_thread_terminate;
-    __pthread_wakeup;
-    __thread_set_pcsptp;
   }
 }
 
diff --git a/htl/pt-alloc.c b/htl/pt-alloc.c
index f23d9d3e..afc8840d 100644
--- a/htl/pt-alloc.c
+++ b/htl/pt-alloc.c
@@ -31,7 +31,6 @@ 
 
 /* The size of the thread ID lookup table.  */
 int __pthread_max_threads;
-libc_hidden_data_def (__pthread_max_threads)
 
 /* List of thread structures corresponding to free thread IDs.  */
 struct __pthread *__pthread_free_threads;
@@ -203,4 +202,3 @@  retry:
   *pthread = new;
   return 0;
 }
-libc_hidden_def (__pthread_alloc)
diff --git a/htl/pt-dealloc.c b/htl/pt-dealloc.c
index 21861c83..f7a83020 100644
--- a/htl/pt-dealloc.c
+++ b/htl/pt-dealloc.c
@@ -56,7 +56,6 @@  __pthread_dealloc (struct __pthread *pthread)
   __pthread_enqueue (&__pthread_free_threads, pthread);
   __pthread_mutex_unlock (&__pthread_free_threads_lock);
 }
-libc_hidden_def (__pthread_dealloc)
 
 /* Confirm deallocation of the thread structure for PTHREAD.  */
 void
@@ -71,4 +70,3 @@  __pthread_dealloc_finish (struct __pthread *pthread)
      which reads this variable.  */
   pthread->terminated = TRUE;
 }
-libc_hidden_def (__pthread_dealloc_finish)
diff --git a/htl/pt-testcancel.c b/htl/pt-testcancel.c
index a8c17ef4..44e8f436 100644
--- a/htl/pt-testcancel.c
+++ b/htl/pt-testcancel.c
@@ -39,7 +39,6 @@  __pthread_testcancel (void)
     __pthread_exit (PTHREAD_CANCELED);
 }
 
-libc_hidden_def (__pthread_testcancel)
 versioned_symbol (libc, __pthread_testcancel, pthread_testcancel, GLIBC_2_43);
 
 #if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_43)
diff --git a/sysdeps/htl/pt-attr-getstackaddr.c b/sysdeps/htl/pt-attr-getstackaddr.c
index 2e6515a3..0c569980 100644
--- a/sysdeps/htl/pt-attr-getstackaddr.c
+++ b/sysdeps/htl/pt-attr-getstackaddr.c
@@ -26,7 +26,6 @@  __pthread_attr_getstackaddr (const pthread_attr_t *attr, void **stackaddr)
   *stackaddr = attr->__stackaddr;
   return 0;
 }
-libc_hidden_def (__pthread_attr_getstackaddr)
 versioned_symbol (libc, __pthread_attr_getstackaddr, pthread_attr_getstackaddr, GLIBC_2_41);
 
 #if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_41)
diff --git a/sysdeps/htl/pt-attr-getstacksize.c b/sysdeps/htl/pt-attr-getstacksize.c
index 1ed9343f..643eb37d 100644
--- a/sysdeps/htl/pt-attr-getstacksize.c
+++ b/sysdeps/htl/pt-attr-getstacksize.c
@@ -26,7 +26,6 @@  __pthread_attr_getstacksize (const pthread_attr_t *attr, size_t * stacksize)
   *stacksize = attr->__stacksize;
   return 0;
 }
-libc_hidden_def (__pthread_attr_getstacksize)
 versioned_symbol (libc, __pthread_attr_getstacksize, pthread_attr_getstacksize, GLIBC_2_41);
 
 #if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_41)
diff --git a/sysdeps/htl/pt-attr-setstack.c b/sysdeps/htl/pt-attr-setstack.c
index 0596bcbd..836bcc29 100644
--- a/sysdeps/htl/pt-attr-setstack.c
+++ b/sysdeps/htl/pt-attr-setstack.c
@@ -47,7 +47,6 @@  __pthread_attr_setstack (pthread_attr_t *attr, void *stackaddr, size_t stacksize
 
   return 0;
 }
-libc_hidden_def (__pthread_attr_setstack)
 versioned_symbol (libc, __pthread_attr_setstack, pthread_attr_setstack, GLIBC_2_41);
 
 #if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_41)
diff --git a/sysdeps/htl/pt-attr-setstackaddr.c b/sysdeps/htl/pt-attr-setstackaddr.c
index 2abc2d61..9c2d4258 100644
--- a/sysdeps/htl/pt-attr-setstackaddr.c
+++ b/sysdeps/htl/pt-attr-setstackaddr.c
@@ -26,7 +26,6 @@  __pthread_attr_setstackaddr (pthread_attr_t *attr, void *stackaddr)
   attr->__stackaddr = stackaddr;
   return 0;
 }
-libc_hidden_def (__pthread_attr_setstackaddr)
 versioned_symbol (libc, __pthread_attr_setstackaddr, pthread_attr_setstackaddr, GLIBC_2_41);
 
 #if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_41)
diff --git a/sysdeps/htl/pt-attr.c b/sysdeps/htl/pt-attr.c
index 0fd71cd9..e66edb3d 100644
--- a/sysdeps/htl/pt-attr.c
+++ b/sysdeps/htl/pt-attr.c
@@ -37,4 +37,3 @@  struct __pthread_attr __pthread_default_attr = {
   __contentionscope: PTHREAD_SCOPE_SYSTEM,
   __schedpolicy: SCHED_OTHER
 };
-libc_hidden_data_def (__pthread_default_attr)
diff --git a/sysdeps/htl/pt-cond.c b/sysdeps/htl/pt-cond.c
index 722c273c..de1543a4 100644
--- a/sysdeps/htl/pt-cond.c
+++ b/sysdeps/htl/pt-cond.c
@@ -25,4 +25,3 @@  const struct __pthread_condattr __pthread_default_condattr = {
   __pshared: PTHREAD_PROCESS_PRIVATE,
   __clock: CLOCK_REALTIME
 };
-libc_hidden_data_def (__pthread_default_condattr)
diff --git a/sysdeps/htl/pt-condattr-init.c b/sysdeps/htl/pt-condattr-init.c
index d2d11767..8287d3c5 100644
--- a/sysdeps/htl/pt-condattr-init.c
+++ b/sysdeps/htl/pt-condattr-init.c
@@ -28,7 +28,6 @@  __pthread_condattr_init (pthread_condattr_t *attr)
   *attr = __pthread_default_condattr;
   return 0;
 }
-libc_hidden_def (__pthread_condattr_init)
 versioned_symbol (libc, __pthread_condattr_init, pthread_condattr_init, GLIBC_2_21);
 
 #if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_21)
diff --git a/sysdeps/htl/pt-destroy-specific.c b/sysdeps/htl/pt-destroy-specific.c
index 4b26bf3b..c81b6a58 100644
--- a/sysdeps/htl/pt-destroy-specific.c
+++ b/sysdeps/htl/pt-destroy-specific.c
@@ -101,4 +101,3 @@  __pthread_destroy_specific (struct __pthread *thread)
   memset (&thread->static_thread_specifics, 0,
 	  sizeof (thread->static_thread_specifics));
 }
-libc_hidden_def (__pthread_destroy_specific)
diff --git a/sysdeps/htl/pt-internal.h b/sysdeps/htl/pt-internal.h
index e662a8d9..db3db576 100644
--- a/sysdeps/htl/pt-internal.h
+++ b/sysdeps/htl/pt-internal.h
@@ -174,7 +174,6 @@  extern int __pthread_concurrency;
 
 /* The size of the thread ID lookup table.  */
 extern int __pthread_max_threads;
-libc_hidden_proto (__pthread_max_threads)
 
 #define __pthread_getid(thread) \
   ({ struct __pthread *__t = NULL;                                           \
@@ -206,7 +205,6 @@  extern int __pthread_create_internal (struct __pthread **__restrict pthread,
 /* Allocate a new thread structure and a pthread thread ID (but not a
    kernel thread or a stack).  THREAD has one reference.  */
 extern int __pthread_alloc (struct __pthread **thread);
-libc_hidden_proto (__pthread_alloc)
 
 /* Deallocate the content of the thread structure.  This is the dual of
    __pthread_alloc (N.B. it does not call __pthread_stack_dealloc nor
@@ -215,17 +213,14 @@  libc_hidden_proto (__pthread_alloc)
    to call __pthread_dealloc_finish when it is really finished with using
    THREAD.  */
 extern void __pthread_dealloc (struct __pthread *thread);
-libc_hidden_proto (__pthread_dealloc)
 
 /* Confirm deallocating the thread structure.  Before calling this
    the structure will not be reused yet.  */
 extern void __pthread_dealloc_finish (struct __pthread *pthread);
-libc_hidden_proto (__pthread_dealloc_finish)
 
 /* Allocate a stack of size STACKSIZE.  The stack base shall be
    returned in *STACKADDR.  */
 extern int __pthread_stack_alloc (void **stackaddr, size_t stacksize);
-libc_hidden_proto (__pthread_stack_alloc)
 
 /* Deallocate the stack STACKADDR of size STACKSIZE.  */
 extern void __pthread_stack_dealloc (void *stackaddr, size_t stacksize);
@@ -238,16 +233,13 @@  extern int __pthread_setup (struct __pthread *__restrict thread,
 						 void *),
 			    void *(*start_routine) (void *),
 			    void *__restrict arg);
-libc_hidden_proto (__pthread_setup)
 
 /* Allocate a kernel thread (and any miscellaneous system dependent
    resources) for THREAD; it must not be placed on the run queue.  */
 extern int __pthread_thread_alloc (struct __pthread *thread);
-libc_hidden_proto (__pthread_thread_alloc)
 
 /* Start THREAD making it eligible to run.  */
 extern int __pthread_thread_start (struct __pthread *thread);
-libc_hidden_proto (__pthread_thread_start)
 
 /* Terminate the kernel thread associated with THREAD, and deallocate its
    stack as well as any other kernel resource associated with it.
@@ -261,34 +253,27 @@  libc_hidden_proto (__pthread_thread_start)
    has started, no other thread can terminate it, so that thread-local
    variables created by that thread are correctly released.  */
 extern void __pthread_thread_terminate (struct __pthread *thread);
-libc_hidden_proto (__pthread_thread_terminate)
 
 /* Called by a thread just before it calls the provided start
    routine.  */
 extern void __pthread_startup (void);
-libc_hidden_proto (__pthread_startup)
 
 /* Block THREAD.  */
 extern void __pthread_block (struct __pthread *thread);
-libc_hidden_proto (__pthread_block)
 
 /* Block THREAD until *ABSTIME is reached.  */
 extern error_t __pthread_timedblock (struct __pthread *__restrict thread,
 				     const struct timespec *__restrict abstime,
 				     clockid_t clock_id);
-libc_hidden_proto (__pthread_timedblock)
 /* Block THREAD with interrupts.  */
 extern error_t __pthread_block_intr (struct __pthread *thread);
-libc_hidden_proto (__pthread_block_intr)
 
 /* Block THREAD until *ABSTIME is reached, with interrupts.  */
 extern error_t __pthread_timedblock_intr (struct __pthread *__restrict thread,
 					  const struct timespec *__restrict abstime,
 					  clockid_t clock_id);
-libc_hidden_proto (__pthread_timedblock_intr)
 /* Wakeup THREAD.  */
 extern void __pthread_wakeup (struct __pthread *thread);
-libc_hidden_proto (__pthread_wakeup)
 
 /* Perform a cancelation.  The CANCEL_LOCK member of the given thread must
    be locked before calling this function, which must unlock it.  */
@@ -302,34 +287,28 @@  extern error_t __pthread_init_specific (struct __pthread *thread);
 /* Call the destructors on all of the thread specific data in THREAD.
    THREAD must be the calling thread.  */
 extern void __pthread_destroy_specific (struct __pthread *thread);
-libc_hidden_proto (__pthread_destroy_specific)
 
 
 /* Initialize newly create thread *THREAD's signal state data
    structures.  */
 extern error_t __pthread_sigstate_init (struct __pthread *thread);
-libc_hidden_proto (__pthread_sigstate_init)
 
 /* Destroy the signal state data structures associated with thread
    *THREAD.  */
 extern void __pthread_sigstate_destroy (struct __pthread *thread);
-libc_hidden_proto (__pthread_sigstate_destroy)
 
 /* Modify thread *THREAD's signal state.  */
 extern error_t __pthread_sigstate (struct __pthread *__restrict thread, int how,
 				   const sigset_t *__restrict set,
 				   sigset_t *__restrict oset,
 				   int clear_pending);
-libc_hidden_proto (__pthread_sigstate)
 
 /* If supported, check that MUTEX is locked by the caller.  */
 extern int __pthread_mutex_checklocked (pthread_mutex_t *mtx);
-libc_hidden_proto (__pthread_mutex_checklocked)
 
 
 /* Default thread attributes.  */
 extern struct __pthread_attr __pthread_default_attr;
-libc_hidden_proto (__pthread_default_attr)
 
 /* Default barrier attributes.  */
 extern const struct __pthread_barrierattr __pthread_default_barrierattr;
@@ -339,7 +318,6 @@  extern const struct __pthread_rwlockattr __pthread_default_rwlockattr;
 
 /* Default condition attributes.  */
 extern const struct __pthread_condattr __pthread_default_condattr;
-libc_hidden_proto (__pthread_default_condattr)
 
 /* Semaphore encoding.
    See nptl implementation for the details.  */
diff --git a/sysdeps/htl/pt-startup.c b/sysdeps/htl/pt-startup.c
index 494df58e..6373790f 100644
--- a/sysdeps/htl/pt-startup.c
+++ b/sysdeps/htl/pt-startup.c
@@ -22,4 +22,3 @@  void
 __pthread_startup (void)
 {
 }
-libc_hidden_def (__pthread_startup)
diff --git a/sysdeps/htl/pthreadP.h b/sysdeps/htl/pthreadP.h
index a8058dfa..7f404236 100644
--- a/sysdeps/htl/pthreadP.h
+++ b/sysdeps/htl/pthreadP.h
@@ -202,21 +202,16 @@  int __pthread_attr_setdetachstate (pthread_attr_t *attr,
 				   int detachstate);
 int __pthread_attr_getstackaddr (const pthread_attr_t *__restrict __attr,
 				 void **__restrict __stackaddr);
-libc_hidden_proto (__pthread_attr_getstackaddr)
 int __pthread_attr_setstackaddr (pthread_attr_t *__attr, void *__stackaddr);
-libc_hidden_proto (__pthread_attr_setstackaddr)
 int __pthread_attr_getstacksize (const pthread_attr_t *__restrict __attr,
 				 size_t *__restrict __stacksize);
-libc_hidden_proto (__pthread_attr_getstacksize)
 int __pthread_attr_setstacksize (pthread_attr_t *__attr, size_t __stacksize);
 libc_hidden_proto (__pthread_attr_setstacksize)
 int __pthread_attr_setstack (pthread_attr_t *__attr, void *__stackaddr,
 			     size_t __stacksize);
-libc_hidden_proto (__pthread_attr_setstack)
 int __pthread_attr_getstack (const pthread_attr_t *, void **, size_t *);
 libc_hidden_proto (__pthread_attr_getstack)
 void __pthread_testcancel (void);
-libc_hidden_proto (__pthread_testcancel)
 int __pthread_attr_init (pthread_attr_t *attr);
 int __pthread_condattr_init (pthread_condattr_t *attr);
 int __pthread_getschedparam (pthread_t thread_id, int *policy,
@@ -248,7 +243,7 @@  libc_hidden_proto (__pthread_spin_unlock)
 
 libc_hidden_proto (__pthread_self)
 libc_hidden_proto (__pthread_attr_init)
-libc_hidden_proto (__pthread_condattr_init)
+
 libc_hidden_proto (__pthread_get_cleanup_stack)
 
 libc_hidden_proto (__pthread_create)
diff --git a/sysdeps/mach/htl/pt-block.c b/sysdeps/mach/htl/pt-block.c
index efc58059..ecae2230 100644
--- a/sysdeps/mach/htl/pt-block.c
+++ b/sysdeps/mach/htl/pt-block.c
@@ -51,4 +51,3 @@  __pthread_block (struct __pthread *thread)
   assert_perror (err);
   RETURN(0);
 }
-libc_hidden_def (__pthread_block)
diff --git a/sysdeps/mach/htl/pt-stack-alloc.c b/sysdeps/mach/htl/pt-stack-alloc.c
index e8a68f28..d1c7849e 100644
--- a/sysdeps/mach/htl/pt-stack-alloc.c
+++ b/sysdeps/mach/htl/pt-stack-alloc.c
@@ -45,4 +45,3 @@  __pthread_stack_alloc (void **stackaddr, size_t stacksize)
     err = EAGAIN;
   return err;
 }
-libc_hidden_def (__pthread_stack_alloc)
diff --git a/sysdeps/mach/htl/pt-thread-alloc.c b/sysdeps/mach/htl/pt-thread-alloc.c
index 2ec523e1..0dc8bb90 100644
--- a/sysdeps/mach/htl/pt-thread-alloc.c
+++ b/sysdeps/mach/htl/pt-thread-alloc.c
@@ -92,4 +92,3 @@  __pthread_thread_alloc (struct __pthread *thread)
 
   return 0;
 }
-libc_hidden_def (__pthread_thread_alloc)
diff --git a/sysdeps/mach/htl/pt-thread-start.c b/sysdeps/mach/htl/pt-thread-start.c
index 30033a47..e98c435a 100644
--- a/sysdeps/mach/htl/pt-thread-start.c
+++ b/sysdeps/mach/htl/pt-thread-start.c
@@ -51,4 +51,3 @@  __pthread_thread_start (struct __pthread *thread)
 
   return 0;
 }
-libc_hidden_def (__pthread_thread_start)
diff --git a/sysdeps/mach/htl/pt-thread-terminate.c b/sysdeps/mach/htl/pt-thread-terminate.c
index cf3ecc3f..c53c9752 100644
--- a/sysdeps/mach/htl/pt-thread-terminate.c
+++ b/sysdeps/mach/htl/pt-thread-terminate.c
@@ -91,4 +91,3 @@  __pthread_thread_terminate (struct __pthread *thread)
   /* We are out of luck.  */
   assert_perror (err);
 }
-libc_hidden_def (__pthread_thread_terminate)
diff --git a/sysdeps/mach/htl/pt-timedblock.c b/sysdeps/mach/htl/pt-timedblock.c
index 06244bde..c0ff7150 100644
--- a/sysdeps/mach/htl/pt-timedblock.c
+++ b/sysdeps/mach/htl/pt-timedblock.c
@@ -69,4 +69,3 @@  __pthread_timedblock (struct __pthread *thread,
   assert_perror (err);
   return 0;
 }
-libc_hidden_def (__pthread_timedblock)
diff --git a/sysdeps/mach/htl/pt-wakeup.c b/sysdeps/mach/htl/pt-wakeup.c
index 03b690b7..bcd743a0 100644
--- a/sysdeps/mach/htl/pt-wakeup.c
+++ b/sysdeps/mach/htl/pt-wakeup.c
@@ -35,4 +35,3 @@  __pthread_wakeup (struct __pthread *thread)
 		    0, MACH_PORT_NULL);
   assert_perror (err);
 }
-libc_hidden_def (__pthread_wakeup)
diff --git a/sysdeps/mach/hurd/htl/pt-mutex-checklocked.c b/sysdeps/mach/hurd/htl/pt-mutex-checklocked.c
index 68b75284..15cbd230 100644
--- a/sysdeps/mach/hurd/htl/pt-mutex-checklocked.c
+++ b/sysdeps/mach/hurd/htl/pt-mutex-checklocked.c
@@ -50,4 +50,3 @@  __pthread_mutex_checklocked (pthread_mutex_t *mtxp)
 
   return ret;
 }
-libc_hidden_def (__pthread_mutex_checklocked)
diff --git a/sysdeps/mach/hurd/htl/pt-pthread_self.c b/sysdeps/mach/hurd/htl/pt-pthread_self.c
index 03e594c7..08b18e6b 100644
--- a/sysdeps/mach/hurd/htl/pt-pthread_self.c
+++ b/sysdeps/mach/hurd/htl/pt-pthread_self.c
@@ -24,7 +24,5 @@ 
 struct __pthread __pthread_init_thread = {
 	.thread = 1,
 };
-libc_hidden_def (__pthread_init_thread)
 
 __thread struct __pthread *___pthread_self = &__pthread_init_thread;
-libc_hidden_tls_def (___pthread_self)
diff --git a/sysdeps/mach/hurd/htl/pt-sigstate-destroy.c b/sysdeps/mach/hurd/htl/pt-sigstate-destroy.c
index c0153278..87bceac6 100644
--- a/sysdeps/mach/hurd/htl/pt-sigstate-destroy.c
+++ b/sysdeps/mach/hurd/htl/pt-sigstate-destroy.c
@@ -26,4 +26,3 @@  __pthread_sigstate_destroy (struct __pthread *thread)
 {
   _hurd_sigstate_delete (thread->kernel_thread);
 }
-libc_hidden_def (__pthread_sigstate_destroy)
diff --git a/sysdeps/mach/hurd/htl/pt-sigstate-init.c b/sysdeps/mach/hurd/htl/pt-sigstate-init.c
index 6538c601..c66fdbf2 100644
--- a/sysdeps/mach/hurd/htl/pt-sigstate-init.c
+++ b/sysdeps/mach/hurd/htl/pt-sigstate-init.c
@@ -43,5 +43,3 @@  __pthread_sigstate_init (struct __pthread *thread)
 
   return 0;
 }
-
-libc_hidden_def (__pthread_sigstate_init)
diff --git a/sysdeps/mach/hurd/htl/pt-sigstate.c b/sysdeps/mach/hurd/htl/pt-sigstate.c
index 456874f5..c3e0b5d1 100644
--- a/sysdeps/mach/hurd/htl/pt-sigstate.c
+++ b/sysdeps/mach/hurd/htl/pt-sigstate.c
@@ -31,4 +31,3 @@  __pthread_sigstate (struct __pthread *thread, int how,
   return __sigthreadmask (_hurd_thread_sigstate (thread->kernel_thread),
 			  how, set, oset, clear_pending);
 }
-libc_hidden_def (__pthread_sigstate)
diff --git a/sysdeps/mach/hurd/htl/pt-sysdep.h b/sysdeps/mach/hurd/htl/pt-sysdep.h
index da370213..c6b62e12 100644
--- a/sysdeps/mach/hurd/htl/pt-sysdep.h
+++ b/sysdeps/mach/hurd/htl/pt-sysdep.h
@@ -33,9 +33,7 @@ 
   mach_msg_header_t wakeupmsg;
 
 extern __thread struct __pthread *___pthread_self;
-libc_hidden_tls_proto (___pthread_self)
 extern struct __pthread __pthread_init_thread;
-libc_hidden_proto (__pthread_init_thread)
 
 #ifdef DEBUG
 #define _pthread_self()                                            \
@@ -69,6 +67,5 @@  __pthread_stack_dealloc (void *stackaddr, size_t stacksize)
 extern int __thread_set_pcsptp (thread_t thread,
 				int set_pc, void *pc,
 				int set_sp, void *sp, int set_tp, void *tp);
-libc_hidden_proto (__thread_set_pcsptp)
 
 #endif /* pt-sysdep.h */
diff --git a/sysdeps/mach/hurd/i386/htl/pt-machdep.c b/sysdeps/mach/hurd/i386/htl/pt-machdep.c
index 85cfe7b5..141b7c90 100644
--- a/sysdeps/mach/hurd/i386/htl/pt-machdep.c
+++ b/sysdeps/mach/hurd/i386/htl/pt-machdep.c
@@ -81,4 +81,3 @@  __thread_set_pcsptp (thread_t thread,
 
   return 0;
 }
-libc_hidden_def (__thread_set_pcsptp)
diff --git a/sysdeps/mach/hurd/i386/htl/pt-setup.c b/sysdeps/mach/hurd/i386/htl/pt-setup.c
index 3473881a..0895b9ef 100644
--- a/sysdeps/mach/hurd/i386/htl/pt-setup.c
+++ b/sysdeps/mach/hurd/i386/htl/pt-setup.c
@@ -98,4 +98,3 @@  __pthread_setup (struct __pthread *thread,
 
   return 0;
 }
-libc_hidden_def (__pthread_setup)
diff --git a/sysdeps/mach/hurd/x86_64/htl/pt-machdep.c b/sysdeps/mach/hurd/x86_64/htl/pt-machdep.c
index e11a1f99..51a35ffc 100644
--- a/sysdeps/mach/hurd/x86_64/htl/pt-machdep.c
+++ b/sysdeps/mach/hurd/x86_64/htl/pt-machdep.c
@@ -77,4 +77,3 @@  __thread_set_pcsptp (thread_t thread,
 
   return 0;
 }
-libc_hidden_def (__thread_set_pcsptp)
diff --git a/sysdeps/mach/hurd/x86_64/htl/pt-setup.c b/sysdeps/mach/hurd/x86_64/htl/pt-setup.c
index 5ef72410..f7c9a6b8 100644
--- a/sysdeps/mach/hurd/x86_64/htl/pt-setup.c
+++ b/sysdeps/mach/hurd/x86_64/htl/pt-setup.c
@@ -91,4 +91,3 @@  __pthread_setup (struct __pthread *thread,
 
   return 0;
 }
-libc_hidden_def (__pthread_setup)