Index: uspace/drv/bus/isa/i8237.c
===================================================================
--- uspace/drv/bus/isa/i8237.c	(revision 0f323d30795a087aa2dc11c185f6ebcc4a4dc506)
+++ uspace/drv/bus/isa/i8237.c	(revision aac1c41761e0243b82c3356b90847ec9e1d7df84)
@@ -40,5 +40,4 @@
 #include <fibril_synch.h>
 #include <ddi.h>
-#include <libarch/ddi.h>
 #include <ddf/log.h>
 #include "i8237.h"
Index: uspace/drv/bus/pci/pciintel/pci.c
===================================================================
--- uspace/drv/bus/pci/pciintel/pci.c	(revision 0f323d30795a087aa2dc11c185f6ebcc4a4dc506)
+++ uspace/drv/bus/pci/pciintel/pci.c	(revision aac1c41761e0243b82c3356b90847ec9e1d7df84)
@@ -58,5 +58,4 @@
 #include <device/hw_res.h>
 #include <ddi.h>
-#include <libarch/ddi.h>
 #include <pci_dev_iface.h>
 
Index: uspace/drv/bus/usb/uhci/hc.c
===================================================================
--- uspace/drv/bus/usb/uhci/hc.c	(revision 0f323d30795a087aa2dc11c185f6ebcc4a4dc506)
+++ uspace/drv/bus/usb/uhci/hc.c	(revision aac1c41761e0243b82c3356b90847ec9e1d7df84)
@@ -35,5 +35,5 @@
 #include <str_error.h>
 #include <adt/list.h>
-#include <libarch/ddi.h>
+#include <ddi.h>
 
 #include <usb/debug.h>
Index: uspace/drv/bus/usb/uhci/hc.h
===================================================================
--- uspace/drv/bus/usb/uhci/hc.h	(revision 0f323d30795a087aa2dc11c185f6ebcc4a4dc506)
+++ uspace/drv/bus/usb/uhci/hc.h	(revision aac1c41761e0243b82c3356b90847ec9e1d7df84)
@@ -37,6 +37,4 @@
 
 #include <fibril.h>
-#include <ddi.h>
-
 #include <usb/host/hcd.h>
 
Index: uspace/drv/bus/usb/uhcirh/port.c
===================================================================
--- uspace/drv/bus/usb/uhcirh/port.c	(revision 0f323d30795a087aa2dc11c185f6ebcc4a4dc506)
+++ uspace/drv/bus/usb/uhcirh/port.c	(revision aac1c41761e0243b82c3356b90847ec9e1d7df84)
@@ -33,5 +33,4 @@
  */
 #include <ddi.h>
-#include <libarch/ddi.h>  /* pio_read and pio_write */
 #include <fibril_synch.h> /* async_usleep */
 #include <errno.h>
Index: uspace/drv/char/i8042/i8042.c
===================================================================
--- uspace/drv/char/i8042/i8042.c	(revision 0f323d30795a087aa2dc11c185f6ebcc4a4dc506)
+++ uspace/drv/char/i8042/i8042.c	(revision aac1c41761e0243b82c3356b90847ec9e1d7df84)
@@ -41,5 +41,4 @@
 #include <device/hw_res.h>
 #include <ddi.h>
-#include <libarch/ddi.h>
 #include <errno.h>
 #include <str_error.h>
Index: uspace/drv/char/ns8250/ns8250.c
===================================================================
--- uspace/drv/char/ns8250/ns8250.c	(revision 0f323d30795a087aa2dc11c185f6ebcc4a4dc506)
+++ uspace/drv/char/ns8250/ns8250.c	(revision aac1c41761e0243b82c3356b90847ec9e1d7df84)
@@ -51,5 +51,4 @@
 #include <sys/stat.h>
 #include <ddi.h>
-#include <libarch/ddi.h>
 
 #include <ddf/driver.h>
Index: uspace/drv/nic/e1k/e1k.c
===================================================================
--- uspace/drv/nic/e1k/e1k.c	(revision 0f323d30795a087aa2dc11c185f6ebcc4a4dc506)
+++ uspace/drv/nic/e1k/e1k.c	(revision aac1c41761e0243b82c3356b90847ec9e1d7df84)
@@ -45,5 +45,5 @@
 #include <ipc/irc.h>
 #include <ipc/ns.h>
-#include <libarch/ddi.h>
+#include <ddi.h>
 #include <as.h>
 #include <ddf/log.h>
Index: uspace/drv/nic/ne2k/dp8390.c
===================================================================
--- uspace/drv/nic/ne2k/dp8390.c	(revision 0f323d30795a087aa2dc11c185f6ebcc4a4dc506)
+++ uspace/drv/nic/ne2k/dp8390.c	(revision aac1c41761e0243b82c3356b90847ec9e1d7df84)
@@ -58,5 +58,5 @@
 #include <errno.h>
 #include <stdio.h>
-#include <libarch/ddi.h>
+#include <ddi.h>
 #include "dp8390.h"
 
Index: uspace/drv/nic/rtl8139/defs.h
===================================================================
--- uspace/drv/nic/rtl8139/defs.h	(revision 0f323d30795a087aa2dc11c185f6ebcc4a4dc506)
+++ uspace/drv/nic/rtl8139/defs.h	(revision aac1c41761e0243b82c3356b90847ec9e1d7df84)
@@ -38,5 +38,4 @@
 #include <sys/types.h>
 #include <ddi.h>
-#include <libarch/ddi.h>
 
 /** Size of RTL8139 registers address space */
Index: uspace/drv/nic/rtl8139/driver.c
===================================================================
--- uspace/drv/nic/rtl8139/driver.c	(revision 0f323d30795a087aa2dc11c185f6ebcc4a4dc506)
+++ uspace/drv/nic/rtl8139/driver.c	(revision aac1c41761e0243b82c3356b90847ec9e1d7df84)
@@ -34,5 +34,4 @@
 #include <align.h>
 #include <byteorder.h>
-#include <libarch/ddi.h>
 #include <libarch/barrier.h>
 
Index: uspace/drv/time/cmos-rtc/cmos-rtc.c
===================================================================
--- uspace/drv/time/cmos-rtc/cmos-rtc.c	(revision 0f323d30795a087aa2dc11c185f6ebcc4a4dc506)
+++ uspace/drv/time/cmos-rtc/cmos-rtc.c	(revision aac1c41761e0243b82c3356b90847ec9e1d7df84)
@@ -40,5 +40,4 @@
 #include <as.h>
 #include <sysinfo.h>
-#include <libarch/ddi.h>
 #include <libarch/barrier.h>
 #include <stdio.h>