Index: uspace/lib/drv/generic/remote_char.c
===================================================================
--- uspace/lib/drv/generic/remote_char.c	(revision 228e490270cec3d6a6de666f61839f0d9ed5f193)
+++ uspace/lib/drv/generic/remote_char.c	(revision ce79069b92de331e039d57e0c8a3d64e644321a5)
@@ -46,5 +46,5 @@
 
 /** Remote character interface operations. */
-static remote_iface_func_ptr_t remote_char_iface_ops [] = {
+static remote_iface_func_ptr_t remote_char_iface_ops[] = {
 	&remote_char_read,
 	&remote_char_write
@@ -74,5 +74,5 @@
 remote_char_read(device_t *dev, void *iface, ipc_callid_t callid,
     ipc_call_t *call)
-{	
+{
 	char_iface_t *char_iface = (char_iface_t *) iface;
 	ipc_callid_t cid;
@@ -136,5 +136,5 @@
 		ipc_answer_0(callid, ENOTSUP);
 		return;
-	}	
+	}
 	
 	if (len > MAX_CHAR_RW_COUNT)
Index: uspace/lib/drv/include/driver.h
===================================================================
--- uspace/lib/drv/include/driver.h	(revision 228e490270cec3d6a6de666f61839f0d9ed5f193)
+++ uspace/lib/drv/include/driver.h	(revision ce79069b92de331e039d57e0c8a3d64e644321a5)
@@ -41,6 +41,4 @@
 #include <ipc/devman.h>
 #include <ipc/dev_iface.h>
-#include <device/hw_res.h>
-#include <device/char.h>
 #include <assert.h>
 #include <ddi.h>
Index: uspace/lib/drv/include/resource.h
===================================================================
--- uspace/lib/drv/include/resource.h	(revision 228e490270cec3d6a6de666f61839f0d9ed5f193)
+++ uspace/lib/drv/include/resource.h	(revision ce79069b92de331e039d57e0c8a3d64e644321a5)
@@ -36,5 +36,6 @@
 #define LIBDRV_RESOURCE_H_
 
-#include "driver.h"
+#include <device/hw_res.h>
+#include <sys/types.h>
 
 typedef struct resource_iface {