Index: uspace/srv/hid/fb/ega.c
===================================================================
--- uspace/srv/hid/fb/ega.c	(revision f5d51de74cf5ceb308bf3defa9fe55855681e4ec)
+++ uspace/srv/hid/fb/ega.c	(revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9)
@@ -56,5 +56,5 @@
 
 // FIXME: remove this header
-#include <kernel/ipc/ipc_methods.h>
+#include <abi/ipc/methods.h>
 
 #define MAX_SAVED_SCREENS  256
Index: uspace/srv/hid/fb/fb.c
===================================================================
--- uspace/srv/hid/fb/fb.c	(revision f5d51de74cf5ceb308bf3defa9fe55855681e4ec)
+++ uspace/srv/hid/fb/fb.c	(revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9)
@@ -49,6 +49,6 @@
 #include <ipc/ns.h>
 #include <ipc/services.h>
-#include <kernel/errno.h>
-#include <kernel/genarch/fb/visuals.h>
+#include <errno.h>
+#include <abi/fb/visuals.h>
 #include <io/color.h>
 #include <io/style.h>
@@ -67,5 +67,5 @@
 
 // FIXME: remove this header
-#include <kernel/ipc/ipc_methods.h>
+#include <abi/ipc/methods.h>
 
 #define DEFAULT_BGCOLOR  0xf0f0f0
Index: uspace/srv/hid/fb/serial_console.c
===================================================================
--- uspace/srv/hid/fb/serial_console.c	(revision f5d51de74cf5ceb308bf3defa9fe55855681e4ec)
+++ uspace/srv/hid/fb/serial_console.c	(revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9)
@@ -53,5 +53,5 @@
 
 // FIXME: remove this header
-#include <kernel/ipc/ipc_methods.h>
+#include <abi/ipc/methods.h>
 
 #define MAX_CONTROL 20
Index: uspace/srv/hid/input/generic/input.c
===================================================================
--- uspace/srv/hid/input/generic/input.c	(revision f5d51de74cf5ceb308bf3defa9fe55855681e4ec)
+++ uspace/srv/hid/input/generic/input.c	(revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9)
@@ -63,5 +63,5 @@
 
 // FIXME: remove this header
-#include <kernel/ipc/ipc_methods.h>
+#include <abi/ipc/methods.h>
 
 /* In microseconds */
Index: uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c
===================================================================
--- uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c	(revision f5d51de74cf5ceb308bf3defa9fe55855681e4ec)
+++ uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c	(revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9)
@@ -54,5 +54,5 @@
 
 // FIXME: remove this header
-#include <kernel/ipc/ipc_methods.h>
+#include <abi/ipc/methods.h>
 
 #define NAME "s3c24ser"
Index: uspace/srv/hw/bus/cuda_adb/cuda_adb.c
===================================================================
--- uspace/srv/hw/bus/cuda_adb/cuda_adb.c	(revision f5d51de74cf5ceb308bf3defa9fe55855681e4ec)
+++ uspace/srv/hw/bus/cuda_adb/cuda_adb.c	(revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9)
@@ -53,5 +53,5 @@
 
 // FIXME: remove this header
-#include <kernel/ipc/ipc_methods.h>
+#include <abi/ipc/methods.h>
 
 #define NAME "cuda_adb"
Index: uspace/srv/hw/char/i8042/i8042.c
===================================================================
--- uspace/srv/hw/char/i8042/i8042.c	(revision f5d51de74cf5ceb308bf3defa9fe55855681e4ec)
+++ uspace/srv/hw/char/i8042/i8042.c	(revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9)
@@ -50,5 +50,5 @@
 
 // FIXME: remove this header
-#include <kernel/ipc/ipc_methods.h>
+#include <abi/ipc/methods.h>
 
 #define NAME "i8042"
Index: uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c
===================================================================
--- uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c	(revision f5d51de74cf5ceb308bf3defa9fe55855681e4ec)
+++ uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c	(revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9)
@@ -52,5 +52,5 @@
 
 // FIXME: remove this header
-#include <kernel/ipc/ipc_methods.h>
+#include <abi/ipc/methods.h>
 
 #define NAME "s3c24ser"