Index: hurd-debian/libmachdev/trivfs_server.c
===================================================================
--- hurd-debian.orig/libmachdev/trivfs_server.c
+++ hurd-debian/libmachdev/trivfs_server.c
@@ -38,7 +38,7 @@
 #include "libdiskfs/diskfs.h"
 #include "startup_notify_S.h"
 #include "device_S.h"
-#include "notify_S.h"
+#include "libports/notify_S.h"
 #include "fsys_S.h"
 #include "mach_i386_S.h"
 
Index: hurd-debian/libmachdev/ds_routines.c
===================================================================
--- hurd-debian.orig/libmachdev/ds_routines.c
+++ hurd-debian/libmachdev/ds_routines.c
@@ -68,7 +68,7 @@
 #include <device/device.h> /* fallback to kernel device */
 
 #include "device_S.h"
-#include "notify_S.h"
+#include "libports/notify_S.h"
 #include "machdev-dev_hdr.h"
 #include "machdev.h"
 #include "mach_device.h"
@@ -330,7 +330,7 @@ demuxer (mach_msg_header_t *inp, mach_ms
 {
   mig_routine_t routine;
   if ((routine = device_server_routine (inp)) ||
-      (routine = notify_server_routine (inp)))
+      (routine = ports_notify_server_routine (inp)))
     {
       (*routine) (inp, outp);
       return TRUE;
