Index: uspace/lib/drv/include/driver.h
===================================================================
--- uspace/lib/drv/include/driver.h	(revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88)
+++ 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 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88)
+++ 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 {