Index: uspace/libc/include/as.h
===================================================================
--- uspace/libc/include/as.h	(revision e7b7be3ff072782e570cb6ee64b50b1625a3fd89)
+++ uspace/libc/include/as.h	(revision 1004b37bdb66a590cdd0d1374967646565e61622)
@@ -38,5 +38,4 @@
 #include <types.h>
 #include <task.h>
-#include <kernel/arch/mm/as.h>
 #include <kernel/mm/as.h>
 #include <libarch/config.h>
Index: uspace/libc/include/ipc/ipc.h
===================================================================
--- uspace/libc/include/ipc/ipc.h	(revision e7b7be3ff072782e570cb6ee64b50b1625a3fd89)
+++ uspace/libc/include/ipc/ipc.h	(revision 1004b37bdb66a590cdd0d1374967646565e61622)
@@ -37,5 +37,5 @@
 
 #include <kernel/ipc/ipc.h>
-#include <kernel/ipc/irq.h>
+#include <kernel/ddi/irq.h>
 #include <libc.h>
 #include <types.h>
@@ -46,5 +46,5 @@
 	ipcarg_t args[IPC_CALL_LEN];
 	ipcarg_t in_phone_hash;
-} ipc_call_t ;
+} ipc_call_t;
 typedef sysarg_t ipc_callid_t;