Index: init/init.c
===================================================================
--- init/init.c	(revision 7ee6affdecac3b628077c014c4bf06aaa720f1b9)
+++ init/init.c	(revision 38edb9622315f7bb81afc4ea702304633aadb317)
@@ -28,10 +28,10 @@
 
 #include "version.h"
-#include <ipc.h>
-#include <services.h>
+#include <ipc/ipc.h>
+#include <ipc/services.h>
+#include <ipc/ns.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
-#include <ns.h>
 #include <thread.h>
 #include <task.h>
Index: kbd/arch/ia32/src/kbd.c
===================================================================
--- kbd/arch/ia32/src/kbd.c	(revision 7ee6affdecac3b628077c014c4bf06aaa720f1b9)
+++ kbd/arch/ia32/src/kbd.c	(revision 38edb9622315f7bb81afc4ea702304633aadb317)
@@ -30,5 +30,5 @@
 #include <arch/kbd.h>
 #include <key_buffer.h>
-#include <ipc.h>
+#include <ipc/ipc.h>
 
 #define SPECIAL		'?'
Index: kbd/arch/mips32/src/kbd.c
===================================================================
--- kbd/arch/mips32/src/kbd.c	(revision 7ee6affdecac3b628077c014c4bf06aaa720f1b9)
+++ kbd/arch/mips32/src/kbd.c	(revision 38edb9622315f7bb81afc4ea702304633aadb317)
@@ -28,5 +28,5 @@
 
 #include <arch/kbd.h>
-#include <ipc.h>
+#include <ipc/ipc.h>
 #include <key_buffer.h>
 
Index: ns/ns.c
===================================================================
--- ns/ns.c	(revision 7ee6affdecac3b628077c014c4bf06aaa720f1b9)
+++ ns/ns.c	(revision 38edb9622315f7bb81afc4ea702304633aadb317)
@@ -32,9 +32,9 @@
  */
 
-#include <ipc.h>
+#include <ipc/ipc.h>
+#include <ipc/ns.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
-#include <ns.h>
 #include <errno.h>
 #include <assert.h>
Index: pci/pci.c
===================================================================
--- pci/pci.c	(revision 7ee6affdecac3b628077c014c4bf06aaa720f1b9)
+++ pci/pci.c	(revision 38edb9622315f7bb81afc4ea702304633aadb317)
@@ -14,6 +14,6 @@
 #include <task.h>
 #include <stdlib.h>
-#include <ipc.h>
-#include <services.h>
+#include <ipc/ipc.h>
+#include <ipc/services.h>
 #include <errno.h>