9 files changed, 50 insertions, 4 deletions
diff --git a/sysdeps/hurd/include/hurd.h b/sysdeps/hurd/include/hurd.h
new file mode 100644
index 0000000..f740e9d
--- /dev/null
+++ b/sysdeps/hurd/include/hurd.h
@@ -0,0 +1,5 @@
+#ifndef	_HURD_H
+#include_next <hurd.h>
+libc_hidden_proto (_hurd_exec_paths)
+libc_hidden_proto (_hurd_init)
+#endif
diff --git a/sysdeps/hurd/include/hurd/fd.h b/sysdeps/hurd/include/hurd/fd.h
new file mode 100644
index 0000000..b22f0c5
--- /dev/null
+++ b/sysdeps/hurd/include/hurd/fd.h
@@ -0,0 +1,4 @@
+#ifndef	_HURD_FD_H
+#include_next <hurd/fd.h>
+libc_hidden_proto (_hurd_intern_fd)
+#endif
diff --git a/sysdeps/hurd/include/hurd/signal.h b/sysdeps/hurd/include/hurd/signal.h
new file mode 100644
index 0000000..fbd01bb
--- /dev/null
+++ b/sysdeps/hurd/include/hurd/signal.h
@@ -0,0 +1,6 @@
+#ifndef	_HURD_SIGNAL_H
+#include_next <hurd/signal.h>
+libc_hidden_proto (_hurd_exception2signal)
+libc_hidden_proto (_hurd_intr_rpc_mach_msg)
+libc_hidden_proto (_hurd_thread_sigstate)
+#endif
diff --git a/sysdeps/mach/hurd/getcwd.c b/sysdeps/mach/hurd/getcwd.c
index f6ca3dd..c30b7c5 100644
--- a/sysdeps/mach/hurd/getcwd.c
+++ b/sysdeps/mach/hurd/getcwd.c
@@ -37,7 +37,7 @@
    a slash to indicate that it is relative to some unknown root directory.  */
 
 char *
-_hurd_canonicalize_directory_name_internal (file_t thisdir,
+__hurd_canonicalize_directory_name_internal (file_t thisdir,
 					    char *buf,
 					    size_t size)
 {
@@ -282,6 +282,7 @@ _hurd_canonicalize_directory_name_internal (file_t thisdir,
   cleanup ();
   return NULL;
 }
+strong_alias (__hurd_canonicalize_directory_name_internal, _hurd_canonicalize_directory_name_internal)
 
 char *
 __canonicalize_directory_name_internal (const char *thisdir, char *buf,
@@ -291,7 +292,7 @@ __canonicalize_directory_name_internal (const char *thisdir, char *buf,
   file_t port = __file_name_lookup (thisdir, 0, 0);
   if (port == MACH_PORT_NULL)
     return NULL;
-  result = _hurd_canonicalize_directory_name_internal (port, buf, size);
+  result = __hurd_canonicalize_directory_name_internal (port, buf, size);
   __mach_port_deallocate (__mach_task_self (), port);
   return result;
 }
@@ -306,8 +307,8 @@ __getcwd (char *buf, size_t size)
 {
   char *cwd =
     __USEPORT (CWDIR,
-	       _hurd_canonicalize_directory_name_internal (port,
-							   buf, size));
+	       __hurd_canonicalize_directory_name_internal (port,
+							    buf, size));
   if (cwd && cwd[0] != '/')
     {
       /* `cwd' is an unknown root directory.  */
diff --git a/sysdeps/mach/hurd/mig-reply.c b/sysdeps/mach/hurd/mig-reply.c
index ddad12e..8350354 100644
--- a/sysdeps/mach/hurd/mig-reply.c
+++ b/sysdeps/mach/hurd/mig-reply.c
@@ -16,6 +16,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <mach.h>
+#include <mach/mig_support.h>
 #include <hurd/threadvar.h>
 
 /* These functions are called by MiG-generated code.  */
@@ -34,6 +35,7 @@ __mig_get_reply_port (void)
   return __hurd_local_reply_port;
 }
 weak_alias (__mig_get_reply_port, mig_get_reply_port)
+libc_hidden_def (__mig_get_reply_port)
 
 /* Called by MiG to deallocate the reply port.  */
 void
@@ -47,6 +49,7 @@ __mig_dealloc_reply_port (mach_port_t arg)
 			  MACH_PORT_RIGHT_RECEIVE, -1);
 }
 weak_alias (__mig_dealloc_reply_port, mig_dealloc_reply_port)
+libc_hidden_def (__mig_dealloc_reply_port)
 
 /* Called by mig interfaces when done with a port.  Used to provide the
    same interface as needed when a custom allocator is used.  */
@@ -66,3 +69,4 @@ __mig_init (void *stack)
   /* Do nothing.  */
 }
 weak_alias (__mig_init, mig_init)
+libc_hidden_def (__mig_init)
diff --git a/sysdeps/mach/include/lock-intern.h b/sysdeps/mach/include/lock-intern.h
new file mode 100644
index 0000000..d0767ab
--- /dev/null
+++ b/sysdeps/mach/include/lock-intern.h
@@ -0,0 +1,12 @@
+#ifndef _LOCK_INTERN_H
+#include <mach/lock-intern.h>
+libc_hidden_proto (__spin_lock_locked)
+libc_hidden_proto (__spin_lock)
+libc_hidden_proto (__spin_lock_solid)
+libc_hidden_proto (__spin_unlock)
+libc_hidden_proto (__spin_try_lock)
+libc_hidden_proto (__mutex_init)
+libc_hidden_proto (__mutex_lock)
+libc_hidden_proto (__mutex_unlock)
+libc_hidden_proto (__mutex_trylock)
+#endif
diff --git a/sysdeps/mach/include/mach.h b/sysdeps/mach/include/mach.h
new file mode 100644
index 0000000..1f77100
--- /dev/null
+++ b/sysdeps/mach/include/mach.h
@@ -0,0 +1,4 @@
+#ifndef	_MACH_H
+#include_next <mach.h>
+libc_hidden_proto (__mach_msg_destroy)
+#endif
diff --git a/sysdeps/mach/include/mach/mig_support.h b/sysdeps/mach/include/mach/mig_support.h
new file mode 100644
index 0000000..7b9015d
--- /dev/null
+++ b/sysdeps/mach/include/mach/mig_support.h
@@ -0,0 +1,6 @@
+#ifndef _MACH_MIG_SUPPORT_H
+#include_next <mach/mig_support.h>
+libc_hidden_proto (__mig_get_reply_port)
+libc_hidden_proto (__mig_dealloc_reply_port)
+libc_hidden_proto (__mig_init)
+#endif
diff --git a/sysdeps/mach/include/mach_error.h b/sysdeps/mach/include/mach_error.h
new file mode 100644
index 0000000..91463eb
--- /dev/null
+++ b/sysdeps/mach/include/mach_error.h
@@ -0,0 +1,4 @@
+#ifndef	_MACH_ERROR_
+#include_next <mach_error.h>
+libc_hidden_proto (mach_error_type)
+#endif