Index: uspace/lib/c/generic/async.c
===================================================================
--- uspace/lib/c/generic/async.c	(revision aa865eefade0c09ca3f576af9195700b0ba9bf57)
+++ uspace/lib/c/generic/async.c	(revision 3751a0819eb30b332bb28f44b7bd735ab88d23dc)
@@ -107,5 +107,5 @@
 #include <errno.h>
 #include <sys/time.h>
-#include <arch/barrier.h>
+#include <libarch/barrier.h>
 #include <bool.h>
 #include <malloc.h>
Index: uspace/lib/c/generic/ddi.c
===================================================================
--- uspace/lib/c/generic/ddi.c	(revision aa865eefade0c09ca3f576af9195700b0ba9bf57)
+++ uspace/lib/c/generic/ddi.c	(revision 3751a0819eb30b332bb28f44b7bd735ab88d23dc)
@@ -31,6 +31,8 @@
  */
 /** @file
- */ 
+ */
 
+#include <sys/types.h>
+#include <abi/ddi/arg.h>
 #include <ddi.h>
 #include <libarch/ddi.h>
@@ -40,5 +42,4 @@
 #include <align.h>
 #include <libarch/config.h>
-#include <kernel/ddi/ddi_arg.h>
 
 /** Return unique device number.
Index: uspace/lib/c/generic/event.c
===================================================================
--- uspace/lib/c/generic/event.c	(revision aa865eefade0c09ca3f576af9195700b0ba9bf57)
+++ uspace/lib/c/generic/event.c	(revision 3751a0819eb30b332bb28f44b7bd735ab88d23dc)
@@ -39,5 +39,4 @@
 #include <libc.h>
 #include <event.h>
-#include <kernel/ipc/event_types.h>
 
 /** Subscribe event notifications.
Index: uspace/lib/c/generic/fibril.c
===================================================================
--- uspace/lib/c/generic/fibril.c	(revision aa865eefade0c09ca3f576af9195700b0ba9bf57)
+++ uspace/lib/c/generic/fibril.c	(revision 3751a0819eb30b332bb28f44b7bd735ab88d23dc)
@@ -41,5 +41,5 @@
 #include <unistd.h>
 #include <stdio.h>
-#include <arch/barrier.h>
+#include <libarch/barrier.h>
 #include <libarch/faddr.h>
 #include <futex.h>
Index: uspace/lib/c/generic/ns_obsolete.c
===================================================================
--- uspace/lib/c/generic/ns_obsolete.c	(revision aa865eefade0c09ca3f576af9195700b0ba9bf57)
+++ uspace/lib/c/generic/ns_obsolete.c	(revision 3751a0819eb30b332bb28f44b7bd735ab88d23dc)
@@ -36,5 +36,5 @@
 #include <async_obsolete.h>
 #include <ns_obsolete.h>
-#include <kernel/ipc/ipc_methods.h>
+#include <abi/ipc/methods.h>
 
 int service_obsolete_connect(sysarg_t service, sysarg_t arg2, sysarg_t arg3)
Index: uspace/lib/c/generic/private/thread.h
===================================================================
--- uspace/lib/c/generic/private/thread.h	(revision aa865eefade0c09ca3f576af9195700b0ba9bf57)
+++ uspace/lib/c/generic/private/thread.h	(revision 3751a0819eb30b332bb28f44b7bd735ab88d23dc)
@@ -36,5 +36,5 @@
 #define LIBC_PRIVATE_THREAD_H_
 
-#include <kernel/proc/uarg.h>
+#include <abi/proc/uarg.h>
 
 extern void __thread_entry(void);
Index: uspace/lib/c/generic/thread.c
===================================================================
--- uspace/lib/c/generic/thread.c	(revision aa865eefade0c09ca3f576af9195700b0ba9bf57)
+++ uspace/lib/c/generic/thread.c	(revision 3751a0819eb30b332bb28f44b7bd735ab88d23dc)
@@ -37,5 +37,5 @@
 #include <stdlib.h>
 #include <libarch/faddr.h>
-#include <kernel/proc/uarg.h>
+#include <abi/proc/uarg.h>
 #include <fibril.h>
 #include <str.h>
Index: uspace/lib/c/generic/time.c
===================================================================
--- uspace/lib/c/generic/time.c	(revision aa865eefade0c09ca3f576af9195700b0ba9bf57)
+++ uspace/lib/c/generic/time.c	(revision 3751a0819eb30b332bb28f44b7bd735ab88d23dc)
@@ -36,5 +36,5 @@
 #include <time.h>
 #include <bool.h>
-#include <arch/barrier.h>
+#include <libarch/barrier.h>
 #include <macros.h>
 #include <errno.h>
Index: uspace/lib/c/generic/udebug.c
===================================================================
--- uspace/lib/c/generic/udebug.c	(revision aa865eefade0c09ca3f576af9195700b0ba9bf57)
+++ uspace/lib/c/generic/udebug.c	(revision 3751a0819eb30b332bb28f44b7bd735ab88d23dc)
@@ -35,5 +35,5 @@
 #include <udebug.h>
 #include <sys/types.h>
-#include <kernel/ipc/ipc_methods.h>
+#include <abi/ipc/methods.h>
 #include <async.h>