Index: uspace/app/edit/edit.c
===================================================================
--- uspace/app/edit/edit.c	(revision 0e7c3d945e5577b7d3eb35ce33778dfb21249380)
+++ uspace/app/edit/edit.c	(revision 7ee7e6a46a8c5572893213586024c72f56b3db7f)
@@ -38,5 +38,6 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdbool.h>
 #include <vfs/vfs.h>
 #include <io/console.h>
@@ -47,5 +48,5 @@
 #include <macros.h>
 #include <clipboard.h>
-#include <stdbool.h>
+#include <libarch/types.h>
 
 #include "sheet.h"
Index: uspace/app/edit/sheet.h
===================================================================
--- uspace/app/edit/sheet.h	(revision 0e7c3d945e5577b7d3eb35ce33778dfb21249380)
+++ uspace/app/edit/sheet.h	(revision 7ee7e6a46a8c5572893213586024c72f56b3db7f)
@@ -38,6 +38,6 @@
 
 #include <adt/list.h>
-#include <sys/types.h>
 #include <stdbool.h>
+#include <stddef.h>
 
 /** Direction (in linear space) */
Index: uspace/drv/bus/usb/ehci/ehci_regs.h
===================================================================
--- uspace/drv/bus/usb/ehci/ehci_regs.h	(revision 0e7c3d945e5577b7d3eb35ce33778dfb21249380)
+++ uspace/drv/bus/usb/ehci/ehci_regs.h	(revision 7ee7e6a46a8c5572893213586024c72f56b3db7f)
@@ -35,5 +35,4 @@
 #define DRV_EHCI_EHCI_REGS_H
 
-#include <sys/types.h>
 #include <byteorder.h>
 #include <macros.h>
Index: uspace/drv/bus/usb/ohci/ohci_regs.h
===================================================================
--- uspace/drv/bus/usb/ohci/ohci_regs.h	(revision 0e7c3d945e5577b7d3eb35ce33778dfb21249380)
+++ uspace/drv/bus/usb/ohci/ohci_regs.h	(revision 7ee7e6a46a8c5572893213586024c72f56b3db7f)
@@ -38,5 +38,4 @@
 
 #include <ddi.h>
-#include <sys/types.h>
 #include <byteorder.h>
 
Index: uspace/drv/bus/usb/uhci/hc.h
===================================================================
--- uspace/drv/bus/usb/uhci/hc.h	(revision 0e7c3d945e5577b7d3eb35ce33778dfb21249380)
+++ uspace/drv/bus/usb/uhci/hc.h	(revision 7ee7e6a46a8c5572893213586024c72f56b3db7f)
@@ -41,5 +41,5 @@
 #include <macros.h>
 #include <stdbool.h>
-#include <sys/types.h>
+#include <ddi.h>
 #include <usb/host/hcd.h>
 #include <usb/host/usb_transfer_batch.h>
Index: uspace/drv/bus/usb/uhci/uhci_rh.h
===================================================================
--- uspace/drv/bus/usb/uhci/uhci_rh.h	(revision 0e7c3d945e5577b7d3eb35ce33778dfb21249380)
+++ uspace/drv/bus/usb/uhci/uhci_rh.h	(revision 7ee7e6a46a8c5572893213586024c72f56b3db7f)
@@ -41,5 +41,5 @@
 
 #include <stdbool.h>
-#include <sys/types.h>
+#include <ddi.h>
 
 /** Endpoint number for status change pipe. */
Index: uspace/drv/char/i8042/i8042.h
===================================================================
--- uspace/drv/char/i8042/i8042.h	(revision 0e7c3d945e5577b7d3eb35ce33778dfb21249380)
+++ uspace/drv/char/i8042/i8042.h	(revision 7ee7e6a46a8c5572893213586024c72f56b3db7f)
@@ -41,5 +41,5 @@
 
 #include <io/chardev_srv.h>
-#include <sys/types.h>
+#include <ddi.h>
 #include <fibril_synch.h>
 #include <ddf/driver.h>
Index: uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.h
===================================================================
--- uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.h	(revision 0e7c3d945e5577b7d3eb35ce33778dfb21249380)
+++ uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.h	(revision 7ee7e6a46a8c5572893213586024c72f56b3db7f)
@@ -40,4 +40,5 @@
 #include <abi/fb/visuals.h>
 #include <pixconv.h>
+#include <ddi.h>
 
 #include "amdm37x_dispc_regs.h"
Index: uspace/drv/platform/amdm37x/cm/clock_control.h
===================================================================
--- uspace/drv/platform/amdm37x/cm/clock_control.h	(revision 0e7c3d945e5577b7d3eb35ce33778dfb21249380)
+++ uspace/drv/platform/amdm37x/cm/clock_control.h	(revision 7ee7e6a46a8c5572893213586024c72f56b3db7f)
@@ -35,5 +35,6 @@
 #ifndef AMDM37x_CLOCK_CONTROL_CM_H
 #define AMDM37x_CLOCK_CONTROL_CM_H
-#include <sys/types.h>
+
+#include <ddi.h>
 #include <macros.h>
 
Index: uspace/drv/platform/amdm37x/cm/core.h
===================================================================
--- uspace/drv/platform/amdm37x/cm/core.h	(revision 0e7c3d945e5577b7d3eb35ce33778dfb21249380)
+++ uspace/drv/platform/amdm37x/cm/core.h	(revision 7ee7e6a46a8c5572893213586024c72f56b3db7f)
@@ -35,5 +35,6 @@
 #ifndef AMDM37x_CORE_CM_H
 #define AMDM37x_CORE_CM_H
-#include <sys/types.h>
+
+#include <ddi.h>
 #include <macros.h>
 
Index: uspace/drv/platform/amdm37x/cm/iva2.h
===================================================================
--- uspace/drv/platform/amdm37x/cm/iva2.h	(revision 0e7c3d945e5577b7d3eb35ce33778dfb21249380)
+++ uspace/drv/platform/amdm37x/cm/iva2.h	(revision 7ee7e6a46a8c5572893213586024c72f56b3db7f)
@@ -35,5 +35,6 @@
 #ifndef AMDM37x_IVA2_CM_H
 #define AMDM37x_IVA2_CM_H
-#include <sys/types.h>
+
+#include <ddi.h>
 #include <macros.h>
 
Index: uspace/drv/platform/amdm37x/cm/mpu.h
===================================================================
--- uspace/drv/platform/amdm37x/cm/mpu.h	(revision 0e7c3d945e5577b7d3eb35ce33778dfb21249380)
+++ uspace/drv/platform/amdm37x/cm/mpu.h	(revision 7ee7e6a46a8c5572893213586024c72f56b3db7f)
@@ -35,5 +35,6 @@
 #ifndef AMDM37x_MPU_CM_H
 #define AMDM37x_MPU_CM_H
-#include <sys/types.h>
+
+#include <ddi.h>
 #include <macros.h>
 
Index: uspace/drv/platform/amdm37x/cm/usbhost.h
===================================================================
--- uspace/drv/platform/amdm37x/cm/usbhost.h	(revision 0e7c3d945e5577b7d3eb35ce33778dfb21249380)
+++ uspace/drv/platform/amdm37x/cm/usbhost.h	(revision 7ee7e6a46a8c5572893213586024c72f56b3db7f)
@@ -35,6 +35,7 @@
 #ifndef AMDM37x_USBHOST_CM_H
 #define AMDM37x_USBHOST_CM_H
+
 #include <macros.h>
-#include <sys/types.h>
+#include <ddi.h>
 
 /* AM/DM37x TRM p.447 */
Index: uspace/drv/platform/amdm37x/prm/clock_control.h
===================================================================
--- uspace/drv/platform/amdm37x/prm/clock_control.h	(revision 0e7c3d945e5577b7d3eb35ce33778dfb21249380)
+++ uspace/drv/platform/amdm37x/prm/clock_control.h	(revision 7ee7e6a46a8c5572893213586024c72f56b3db7f)
@@ -35,5 +35,6 @@
 #ifndef AMDM37X_PRM_CLOCK_CONTROL_H
 #define AMDM37X_PRM_CLOCK_CONTROL_H
-#include <sys/types.h>
+
+#include <ddi.h>
 #include <macros.h>
 
Index: uspace/drv/platform/amdm37x/prm/global_reg.h
===================================================================
--- uspace/drv/platform/amdm37x/prm/global_reg.h	(revision 0e7c3d945e5577b7d3eb35ce33778dfb21249380)
+++ uspace/drv/platform/amdm37x/prm/global_reg.h	(revision 7ee7e6a46a8c5572893213586024c72f56b3db7f)
@@ -35,5 +35,6 @@
 #ifndef AMDM37X_PRM_GLOBAL_REG_H
 #define AMDM37X_PRM_GLOBAL_REG_H
-#include <sys/types.h>
+
+#include <ddi.h>
 #include <macros.h>
 
Index: uspace/drv/platform/amdm37x/prm/usbhost.h
===================================================================
--- uspace/drv/platform/amdm37x/prm/usbhost.h	(revision 0e7c3d945e5577b7d3eb35ce33778dfb21249380)
+++ uspace/drv/platform/amdm37x/prm/usbhost.h	(revision 7ee7e6a46a8c5572893213586024c72f56b3db7f)
@@ -35,5 +35,6 @@
 #ifndef AMDM37X_PRM_CLOCK_CONTROL_H
 #define AMDM37X_PRM_CLOCK_CONTROL_H
-#include <sys/types.h>
+
+#include <ddi.h>
 #include <macros.h>
 
Index: uspace/drv/platform/amdm37x/uhh.h
===================================================================
--- uspace/drv/platform/amdm37x/uhh.h	(revision 0e7c3d945e5577b7d3eb35ce33778dfb21249380)
+++ uspace/drv/platform/amdm37x/uhh.h	(revision 7ee7e6a46a8c5572893213586024c72f56b3db7f)
@@ -35,6 +35,7 @@
 #ifndef AMDM37x_UHH_H
 #define AMDM37x_UHH_H
+
 #include <macros.h>
-#include <sys/types.h>
+#include <ddi.h>
 
 #define AMDM37x_UHH_BASE_ADDRESS  0x48064000
Index: uspace/drv/platform/amdm37x/usbtll.h
===================================================================
--- uspace/drv/platform/amdm37x/usbtll.h	(revision 0e7c3d945e5577b7d3eb35ce33778dfb21249380)
+++ uspace/drv/platform/amdm37x/usbtll.h	(revision 7ee7e6a46a8c5572893213586024c72f56b3db7f)
@@ -35,6 +35,7 @@
 #ifndef AMDM37x_USBTLL_H
 #define AMDM37x_USBTLL_H
+
 #include <macros.h>
-#include <sys/types.h>
+#include <ddi.h>
 
 #define AMDM37x_USBTLL_BASE_ADDRESS  0x48062000
Index: uspace/lib/c/arch/abs32le/include/libarch/ddi.h
===================================================================
--- uspace/lib/c/arch/abs32le/include/libarch/ddi.h	(revision 0e7c3d945e5577b7d3eb35ce33778dfb21249380)
+++ uspace/lib/c/arch/abs32le/include/libarch/ddi.h	(revision 7ee7e6a46a8c5572893213586024c72f56b3db7f)
@@ -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 0e7c3d945e5577b7d3eb35ce33778dfb21249380)
+++ uspace/lib/c/arch/arm32/include/libarch/ddi.h	(revision 7ee7e6a46a8c5572893213586024c72f56b3db7f)
@@ -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 0e7c3d945e5577b7d3eb35ce33778dfb21249380)
+++ uspace/lib/c/arch/ia32/include/libarch/ddi.h	(revision 7ee7e6a46a8c5572893213586024c72f56b3db7f)
@@ -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 0e7c3d945e5577b7d3eb35ce33778dfb21249380)
+++ uspace/lib/c/arch/ia64/include/libarch/ddi.h	(revision 7ee7e6a46a8c5572893213586024c72f56b3db7f)
@@ -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 0e7c3d945e5577b7d3eb35ce33778dfb21249380)
+++ uspace/lib/c/arch/mips32/include/libarch/ddi.h	(revision 7ee7e6a46a8c5572893213586024c72f56b3db7f)
@@ -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 0e7c3d945e5577b7d3eb35ce33778dfb21249380)
+++ uspace/lib/c/arch/ppc32/include/libarch/ddi.h	(revision 7ee7e6a46a8c5572893213586024c72f56b3db7f)
@@ -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 0e7c3d945e5577b7d3eb35ce33778dfb21249380)
+++ uspace/lib/c/arch/riscv64/include/libarch/ddi.h	(revision 7ee7e6a46a8c5572893213586024c72f56b3db7f)
@@ -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 0e7c3d945e5577b7d3eb35ce33778dfb21249380)
+++ uspace/lib/c/arch/sparc64/include/libarch/ddi.h	(revision 7ee7e6a46a8c5572893213586024c72f56b3db7f)
@@ -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)
Index: uspace/lib/c/generic/ddi.c
===================================================================
--- uspace/lib/c/generic/ddi.c	(revision 0e7c3d945e5577b7d3eb35ce33778dfb21249380)
+++ uspace/lib/c/generic/ddi.c	(revision 7ee7e6a46a8c5572893213586024c72f56b3db7f)
@@ -37,5 +37,4 @@
 #include <stdio.h>
 #include <errno.h>
-#include <sys/types.h>
 #include <abi/ddi/arg.h>
 #include <ddi.h>
Index: uspace/lib/c/include/ddi.h
===================================================================
--- uspace/lib/c/include/ddi.h	(revision 0e7c3d945e5577b7d3eb35ce33778dfb21249380)
+++ uspace/lib/c/include/ddi.h	(revision 7ee7e6a46a8c5572893213586024c72f56b3db7f)
@@ -37,5 +37,6 @@
 
 #include <stdbool.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <sys/time.h>
 #include <abi/ddi/irq.h>
@@ -47,4 +48,8 @@
 #define DMAMEM_16MiB  ((uintptr_t) UINT64_C(0xffffffffff000000))
 #define DMAMEM_4GiB   ((uintptr_t) UINT64_C(0xffffffff00000000))
+
+typedef volatile uint8_t ioport8_t;
+typedef volatile uint16_t ioport16_t;
+typedef volatile uint32_t ioport32_t;
 
 extern int device_assign_devno(void);
Index: uspace/lib/c/include/sys/types.h
===================================================================
--- uspace/lib/c/include/sys/types.h	(revision 0e7c3d945e5577b7d3eb35ce33778dfb21249380)
+++ uspace/lib/c/include/sys/types.h	(revision 7ee7e6a46a8c5572893213586024c72f56b3db7f)
@@ -46,8 +46,4 @@
 typedef uint32_t fourcc_t;
 
-typedef volatile uint8_t ioport8_t;
-typedef volatile uint16_t ioport16_t;
-typedef volatile uint32_t ioport32_t;
-
 typedef int16_t unaligned_int16_t __attribute__ ((aligned(1)));
 typedef int32_t unaligned_int32_t __attribute__ ((aligned(1)));
Index: uspace/srv/hid/output/port/ega.c
===================================================================
--- uspace/srv/hid/output/port/ega.c	(revision 0e7c3d945e5577b7d3eb35ce33778dfb21249380)
+++ uspace/srv/hid/output/port/ega.c	(revision 7ee7e6a46a8c5572893213586024c72f56b3db7f)
@@ -30,5 +30,4 @@
  */
 
-#include <sys/types.h>
 #include <errno.h>
 #include <sysinfo.h>
Index: uspace/srv/hw/irc/icp-ic/icp-ic_hw.h
===================================================================
--- uspace/srv/hw/irc/icp-ic/icp-ic_hw.h	(revision 0e7c3d945e5577b7d3eb35ce33778dfb21249380)
+++ uspace/srv/hw/irc/icp-ic/icp-ic_hw.h	(revision 7ee7e6a46a8c5572893213586024c72f56b3db7f)
@@ -37,5 +37,4 @@
 
 #include <ddi.h>
-#include <sys/types.h>
 
 typedef struct {