Index: uspace/lib/c/arch/abs32le/include/libarch/ddi.h
===================================================================
--- uspace/lib/c/arch/abs32le/include/libarch/ddi.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
+++ uspace/lib/c/arch/abs32le/include/libarch/ddi.h	(revision 3ec2acc5fe46d047e352ebba9dfc534ee35a9ca4)
@@ -33,6 +33,5 @@
 #define LIBC_abs32le_DDI_H_
 
-#include <sys/types.h>
-#include <libarch/types.h>
+#include <ddi.h>
 
 static inline void arch_pio_write_8(ioport8_t *port, uint8_t v)
Index: uspace/lib/c/arch/arm32/include/libarch/ddi.h
===================================================================
--- uspace/lib/c/arch/arm32/include/libarch/ddi.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
+++ uspace/lib/c/arch/arm32/include/libarch/ddi.h	(revision 3ec2acc5fe46d047e352ebba9dfc534ee35a9ca4)
@@ -34,6 +34,5 @@
 #define LIBC_arm32_DDI_H_
 
-#include <sys/types.h>
-#include <libarch/types.h>
+#include <ddi.h>
 
 static inline void arch_pio_write_8(ioport8_t *port, uint8_t v)
Index: uspace/lib/c/arch/ia32/include/libarch/ddi.h
===================================================================
--- uspace/lib/c/arch/ia32/include/libarch/ddi.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
+++ uspace/lib/c/arch/ia32/include/libarch/ddi.h	(revision 3ec2acc5fe46d047e352ebba9dfc534ee35a9ca4)
@@ -34,6 +34,5 @@
 #define LIBC_ia32_DDI_H_
 
-#include <sys/types.h>
-#include <libarch/types.h>
+#include <ddi.h>
 
 #define IO_SPACE_BOUNDARY  ((void *) (64 * 1024))
Index: uspace/lib/c/arch/ia64/include/libarch/ddi.h
===================================================================
--- uspace/lib/c/arch/ia64/include/libarch/ddi.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
+++ uspace/lib/c/arch/ia64/include/libarch/ddi.h	(revision 3ec2acc5fe46d047e352ebba9dfc534ee35a9ca4)
@@ -36,6 +36,5 @@
 #define LIBC_ia64_DDI_H_
 
-#include <sys/types.h>
-#include <libarch/types.h>
+#include <ddi.h>
 
 #define IO_SPACE_BOUNDARY	((void *) (64 * 1024))
Index: uspace/lib/c/arch/mips32/include/libarch/ddi.h
===================================================================
--- uspace/lib/c/arch/mips32/include/libarch/ddi.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
+++ uspace/lib/c/arch/mips32/include/libarch/ddi.h	(revision 3ec2acc5fe46d047e352ebba9dfc534ee35a9ca4)
@@ -34,6 +34,5 @@
 #define LIBC_mips32_DDI_H_
 
-#include <sys/types.h>
-#include <libarch/types.h>
+#include <ddi.h>
 
 static inline void arch_pio_write_8(ioport8_t *port, uint8_t v)
Index: uspace/lib/c/arch/ppc32/include/libarch/ddi.h
===================================================================
--- uspace/lib/c/arch/ppc32/include/libarch/ddi.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
+++ uspace/lib/c/arch/ppc32/include/libarch/ddi.h	(revision 3ec2acc5fe46d047e352ebba9dfc534ee35a9ca4)
@@ -34,6 +34,5 @@
 #define LIBC_ppc32_DDI_H_
 
-#include <sys/types.h>
-#include <libarch/types.h>
+#include <ddi.h>
 
 static inline void arch_pio_write_8(ioport8_t *port, uint8_t v)
Index: uspace/lib/c/arch/riscv64/include/libarch/ddi.h
===================================================================
--- uspace/lib/c/arch/riscv64/include/libarch/ddi.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
+++ uspace/lib/c/arch/riscv64/include/libarch/ddi.h	(revision 3ec2acc5fe46d047e352ebba9dfc534ee35a9ca4)
@@ -33,6 +33,5 @@
 #define LIBC_riscv64_DDI_H_
 
-#include <sys/types.h>
-#include <libarch/types.h>
+#include <ddi.h>
 
 static inline void arch_pio_write_8(ioport8_t *port, uint8_t v)
Index: uspace/lib/c/arch/sparc64/include/libarch/ddi.h
===================================================================
--- uspace/lib/c/arch/sparc64/include/libarch/ddi.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
+++ uspace/lib/c/arch/sparc64/include/libarch/ddi.h	(revision 3ec2acc5fe46d047e352ebba9dfc534ee35a9ca4)
@@ -34,6 +34,5 @@
 #define LIBC_sparc64_DDI_H_
 
-#include <sys/types.h>
-#include <libarch/types.h>
+#include <ddi.h>
 
 static inline void memory_barrier(void)