Fix includes: various

67 files changed, 74 insertions, 127 deletions

diff --git a/include/common/kernel/dmacmgr.h b/include/common/kernel/dmacmgr.h
index 5b4a431..17b92bb 100644
--- a/include/common/kernel/dmacmgr.h
+++ b/include/common/kernel/dmacmgr.h
@@ -2,7 +2,7 @@
 #define _VDSUITE_COMMON_KERNEL_DMACMGR_H
 
 #include <cdefs.h>
-#include <kernel/types.h>
+#include <scetypes.h>
 
 SCE_CDECL_BEGIN
 
diff --git a/include/common/kernel/iofilemgr.h b/include/common/kernel/iofilemgr.h
index d007959..a7c0efb 100644
--- a/include/common/kernel/iofilemgr.h
+++ b/include/common/kernel/iofilemgr.h
@@ -3,6 +3,8 @@
 
 #include_next <kernel/iofilemgr.h>
 
+#include <kernel/iofilemgr_async.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/common/kernel/iofilemgr_async.h b/include/common/kernel/iofilemgr_async.h
index 537600e..886e523 100644
--- a/include/common/kernel/iofilemgr_async.h
+++ b/include/common/kernel/iofilemgr_async.h
@@ -1,6 +1,8 @@
 #ifndef _DOLCESDK_PSP2COMMON_KERNEL_IOFILEMGR_ASYNC_H_
 #define _DOLCESDK_PSP2COMMON_KERNEL_IOFILEMGR_ASYNC_H_
 
+#include <stddef.h>
+#include <kernel/iofilemgr.h>
 #include <kernel/threadmgr.h>
 
 #ifdef __cplusplus
diff --git a/include/kernel/appmgr.h b/include/kernel/appmgr.h
index 8bec551..15617f6 100644
--- a/include/kernel/appmgr.h
+++ b/include/kernel/appmgr.h
@@ -1,7 +1,7 @@
 #ifndef _PSP2_KERNEL_APPMGR_H_
 #define _PSP2_KERNEL_APPMGR_H_
 
-#include <psp2common/appmgr.h>
+#include_next <appmgr.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/kernel/bt.h b/include/kernel/bt.h
index a95a2e3..41c83b0 100644
--- a/include/kernel/bt.h
+++ b/include/kernel/bt.h
@@ -1,7 +1,8 @@
 #ifndef _PSP2_KERNEL_BT_H_
 #define _PSP2_KERNEL_BT_H_
 
-#include <psp2kern/types.h>
+#include <stdint.h>
+#include <scetypes.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/kernel/display.h b/include/kernel/display.h
index d8d92f0..0bd75d6 100644
--- a/include/kernel/display.h
+++ b/include/kernel/display.h
@@ -1,7 +1,8 @@
 #ifndef _PSP2_KERNEL_DISPLAY_H_
 #define _PSP2_KERNEL_DISPLAY_H_
 
-#include <psp2kern/types.h>
+#include <stdint.h>
+#include <scetypes.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/kernel/fios2.h b/include/kernel/fios2.h
index 6c9c15e..1f9edb2 100644
--- a/include/kernel/fios2.h
+++ b/include/kernel/fios2.h
@@ -1,7 +1,8 @@
 #ifndef _PSP2_KERNEL_FIOS2KERNEL_H_
 #define _PSP2_KERNEL_FIOS2KERNEL_H_
 
-#include <psp2kern/types.h>
+#include <stdint.h>
+#include <scetypes.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/kernel/idstorage.h b/include/kernel/idstorage.h
index 5c98e66..2946526 100644
--- a/include/kernel/idstorage.h
+++ b/include/kernel/idstorage.h
@@ -1,7 +1,7 @@
 #ifndef _PSP2_KERNEL_IDSTORAGE_H_
 #define _PSP2_KERNEL_IDSTORAGE_H_
 
-#include <psp2kern/types.h>
+#include <scetypes.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/kernel/kernel/intrmgr.h b/include/kernel/kernel/intrmgr.h
index 91c6337..f0d7a44 100644
--- a/include/kernel/kernel/intrmgr.h
+++ b/include/kernel/kernel/intrmgr.h
@@ -1,7 +1,7 @@
 #ifndef _PSP2_KERNEL_INTRMGR_H_
 #define _PSP2_KERNEL_INTRMGR_H_
 
-#include <psp2kern/types.h>
+#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/kernel/kernel/iofilemgr.h b/include/kernel/kernel/iofilemgr.h
index 771dd3d..f656ad5 100644
--- a/include/kernel/kernel/iofilemgr.h
+++ b/include/kernel/kernel/iofilemgr.h
@@ -3,8 +3,6 @@
 
 #include_next <kernel/iofilemgr.h>
 
-#include <kernel/iofilemgr_async.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/kernel/kernel/proc_event.h b/include/kernel/kernel/proc_event.h
index 37af5f9..58b6b04 100644
--- a/include/kernel/kernel/proc_event.h
+++ b/include/kernel/kernel/proc_event.h
@@ -1,7 +1,7 @@
 #ifndef _PSP2_KERNEL_PROC_EVENT_H_
 #define _PSP2_KERNEL_PROC_EVENT_H_
 
-#include <psp2kern/types.h>
+#include <scetypes.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/kernel/kernel/processmgr.h b/include/kernel/kernel/processmgr.h
index 0452235..d292b24 100644
--- a/include/kernel/kernel/processmgr.h
+++ b/include/kernel/kernel/processmgr.h
@@ -3,6 +3,8 @@
 
 #include_next <kernel/processmgr.h>
 
+#include <stdint.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/kernel/kernel/suspend.h b/include/kernel/kernel/suspend.h
index a1429c9..9a4d78a 100644
--- a/include/kernel/kernel/suspend.h
+++ b/include/kernel/kernel/suspend.h
@@ -1,26 +1,12 @@
 #ifndef _PSP2_KERNEL_SUSPEND_H_
 #define _PSP2_KERNEL_SUSPEND_H_
 
-#include <psp2kern/types.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 typedef int (* SceSysEventHandler)(int resume, int eventid, void *args, void *opt);
 
-typedef enum SceKernelPowerTickType {
-	/** Cancel all timers */
-	SCE_KERNEL_POWER_TICK_DEFAULT			= 0,
-	/** Cancel automatic suspension timer */
-	SCE_KERNEL_POWER_TICK_DISABLE_AUTO_SUSPEND	= 1,
-	/** Cancel OLED-off timer */
-	SCE_KERNEL_POWER_TICK_DISABLE_OLED_OFF		= 4,
-	/** Cancel OLED dimming timer */
-	SCE_KERNEL_POWER_TICK_DISABLE_OLED_DIMMING	= 6
-} SceKernelPowerTickType;
-
-
 /**
  * Cancel specified idle timers to prevent entering in power save processing.
  *
diff --git a/include/kernel/kernel/sysclib.h b/include/kernel/kernel/sysclib.h
index 6efdb81..c80b2f1 100644
--- a/include/kernel/kernel/sysclib.h
+++ b/include/kernel/kernel/sysclib.h
@@ -1,7 +1,7 @@
 #ifndef _DOLCESDK_PSP2KERN_KERNEL_SYSCLIB_H_
 #define _DOLCESDK_PSP2KERN_KERNEL_SYSCLIB_H_
 
-#include <psp2/types.h>
+#include <stddef.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/kernel/kernel/threadmgr.h b/include/kernel/kernel/threadmgr.h
index 47fc6a3..7902188 100644
--- a/include/kernel/kernel/threadmgr.h
+++ b/include/kernel/kernel/threadmgr.h
@@ -3,6 +3,8 @@
 
 #include_next <kernel/threadmgr.h>
 
+#include <stdint.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/kernel/kernel/utils.h b/include/kernel/kernel/utils.h
index fc1e6f5..438097d 100644
--- a/include/kernel/kernel/utils.h
+++ b/include/kernel/kernel/utils.h
@@ -1,7 +1,8 @@
 #ifndef _PSP2_KERNEL_UTILS_H_
 #define _PSP2_KERNEL_UTILS_H_
 
-#include <psp2kern/types.h>
+#include <stdint.h>
+#include <scetypes.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/kernel/lowio/dsi.h b/include/kernel/lowio/dsi.h
index 4400a68..68f3d57 100644
--- a/include/kernel/lowio/dsi.h
+++ b/include/kernel/lowio/dsi.h
@@ -1,8 +1,6 @@
 #ifndef _PSP2_KERN_LOWIO_DSI_H_
 #define _PSP2_KERN_LOWIO_DSI_H_
 
-#include <psp2kern/types.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/kernel/lowio/gpio.h b/include/kernel/lowio/gpio.h
index 5705ddf..7149d1e 100644
--- a/include/kernel/lowio/gpio.h
+++ b/include/kernel/lowio/gpio.h
@@ -1,8 +1,6 @@
 #ifndef _PSP2_KERN_LOWIO_GPIO_H_
 #define _PSP2_KERN_LOWIO_GPIO_H_
 
-#include <psp2kern/types.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/kernel/lowio/i2c.h b/include/kernel/lowio/i2c.h
index 4ca3178..3776169 100644
--- a/include/kernel/lowio/i2c.h
+++ b/include/kernel/lowio/i2c.h
@@ -1,8 +1,6 @@
 #ifndef _PSP2_KERN_LOWIO_I2C_H_
 #define _PSP2_KERN_LOWIO_I2C_H_
 
-#include <psp2kern/types.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/kernel/lowio/iftu.h b/include/kernel/lowio/iftu.h
index 9580219..27efd9f 100644
--- a/include/kernel/lowio/iftu.h
+++ b/include/kernel/lowio/iftu.h
@@ -1,8 +1,6 @@
 #ifndef _PSP2_KERN_LOWIO_IFTU_H_
 #define _PSP2_KERN_LOWIO_IFTU_H_
 
-#include <psp2kern/types.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/kernel/lowio/pervasive.h b/include/kernel/lowio/pervasive.h
index 51bb72b..8103157 100644
--- a/include/kernel/lowio/pervasive.h
+++ b/include/kernel/lowio/pervasive.h
@@ -1,8 +1,6 @@
 #ifndef _PSP2_KERN_LOWIO_PERVASIVE_H_
 #define _PSP2_KERN_LOWIO_PERVASIVE_H_
 
-#include <psp2kern/types.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/kernel/power.h b/include/kernel/power.h
index ed1bf7e..d10207b 100644
--- a/include/kernel/power.h
+++ b/include/kernel/power.h
@@ -1,7 +1,7 @@
 #ifndef _PSP2_KERN_POWER_H_
 #define _PSP2_KERN_POWER_H_
 
-#include <psp2kern/types.h>
+#include <scetypes.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/kernel/registrymgr.h b/include/kernel/registrymgr.h
index 166fc3d..2a5ae9a 100644
--- a/include/kernel/registrymgr.h
+++ b/include/kernel/registrymgr.h
@@ -1,7 +1,7 @@
 #ifndef _PSP2_REGISTRYMGR_H_
 #define _PSP2_REGISTRYMGR_H_
 
-#include <psp2kern/types.h>
+#include <scetypes.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/kernel/sblacmgr.h b/include/kernel/sblacmgr.h
index 04a182c..df7be6c 100644
--- a/include/kernel/sblacmgr.h
+++ b/include/kernel/sblacmgr.h
@@ -1,7 +1,7 @@
 #ifndef _PSP2_KERNEL_SBLACMGR_H_
 #define _PSP2_KERNEL_SBLACMGR_H_
 
-#include <psp2kern/types.h>
+#include <scetypes.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/kernel/sblaimgr.h b/include/kernel/sblaimgr.h
index 36939ee..a691c12 100644
--- a/include/kernel/sblaimgr.h
+++ b/include/kernel/sblaimgr.h
@@ -1,8 +1,6 @@
 #ifndef _PSP2_KERNEL_SBLACMGR_H_
 #define _PSP2_KERNEL_SBLACMGR_H_
 
-#include <psp2kern/types.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/kernel/sblauthmgr.h b/include/kernel/sblauthmgr.h
index 43b7fd2..f8dad9c 100644
--- a/include/kernel/sblauthmgr.h
+++ b/include/kernel/sblauthmgr.h
@@ -1,7 +1,7 @@
 #ifndef _PSP2_KERNEL_SBLAUTHMGR_H_
 #define _PSP2_KERNEL_SBLAUTHMGR_H_
 
-#include <psp2kern/types.h>
+#include <scetypes.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/kernel/syscon.h b/include/kernel/syscon.h
index 27bc0d6..59491e2 100644
--- a/include/kernel/syscon.h
+++ b/include/kernel/syscon.h
@@ -1,7 +1,7 @@
 #ifndef _PSP2_KERN_SYSCON_H_
 #define _PSP2_KERN_SYSCON_H_
 
-#include <psp2kern/types.h>
+#include <scetypes.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/kernel/uart.h b/include/kernel/uart.h
index 97eebfd..34d21a4 100644
--- a/include/kernel/uart.h
+++ b/include/kernel/uart.h
@@ -1,8 +1,6 @@
 #ifndef _PSP2_KERN_UART_H_
 #define _PSP2_KERN_UART_H_
 
-#include <psp2kern/types.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/kernel/udcd.h b/include/kernel/udcd.h
index ff88e69..3b22e16 100644
--- a/include/kernel/udcd.h
+++ b/include/kernel/udcd.h
@@ -1,9 +1,6 @@
 #ifndef _PSP2_KERNEL_UDCD_H_
 #define _PSP2_KERNEL_UDCD_H_
 
-#include <psp2kern/types.h>
-#include <dolcesdk/align.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -211,7 +208,7 @@ typedef struct SceUdcdStringDescriptor {
 
 /**  USB device descriptor
  */
-typedef struct SCE_ALIGN(4) SceUdcdDeviceDescriptor {
+typedef struct __attribute__((__aligned__(4))) SceUdcdDeviceDescriptor {
 	unsigned char  bLength;
 	unsigned char  bDescriptorType;
 	unsigned short bcdUSB;
@@ -230,7 +227,7 @@ typedef struct SCE_ALIGN(4) SceUdcdDeviceDescriptor {
 
 /**  USB device qualifier descriptor
  */
-typedef struct SCE_ALIGN(4) SceUdcdDeviceQualifierDescriptor {
+typedef struct __attribute__((__aligned__(4))) SceUdcdDeviceQualifierDescriptor {
 	unsigned char  bLength;
 	unsigned char  bDescriptorType;
 	unsigned short bcdUSB;
@@ -376,7 +373,7 @@ typedef struct SceUdcdDeviceRequest {
 
 /**  USB driver name
  */
-typedef struct SCE_ALIGN(16) SceUdcdDriverName {
+typedef struct __attribute__((__aligned__(16))) SceUdcdDriverName {
 	int  size;
 	char name[32];
 	int  flags;
diff --git a/include/kernel/usbd.h b/include/kernel/usbd.h
index c96d4b6..c40093c 100644
--- a/include/kernel/usbd.h
+++ b/include/kernel/usbd.h
@@ -1,8 +1,6 @@
 #ifndef _PSP2_KERNEL_USBD_H_
 #define _PSP2_KERNEL_USBD_H_
 
-#include <psp2kern/kernel/threadmgr.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/user/audiocodec.h b/include/user/audiocodec.h
index 3884039..1c8d898 100644
--- a/include/user/audiocodec.h
+++ b/include/user/audiocodec.h
@@ -1,7 +1,7 @@
 #ifndef _DOLCESDK_PSP2_AUDIOCODEC_H_
 #define _DOLCESDK_PSP2_AUDIOCODEC_H_
 
-#include <psp2/audiodec.h>
+#include <audiodec.h>
 
 /* Error definition */
 #define SCE_AUDIOCODEC_ERROR_API_FAIL                     (0x8000 + SCE_AUDIODEC_ERROR_API_FAIL)
diff --git a/include/user/avcdec.h b/include/user/avcdec.h
index 20c386b..3a21626 100644
--- a/include/user/avcdec.h
+++ b/include/user/avcdec.h
@@ -1,6 +1,7 @@
 #ifndef _DOLCESDK_PSP2_AVCDEC_H_
 #define _DOLCESDK_PSP2_AVCDEC_H_
 
+#include <videodec.h>
 #include_next <avcdec.h>
 
 #if defined(_LANGUAGE_C_PLUS_PLUS)||defined(__cplusplus)||defined(c_plusplus)
diff --git a/include/user/avconfig.h b/include/user/avconfig.h
index 7d28bd6..82029cb 100644
--- a/include/user/avconfig.h
+++ b/include/user/avconfig.h
@@ -1,7 +1,7 @@
 #ifndef _PSP2_AVCONFIG_H_
 #define _PSP2_AVCONFIG_H_
 
-#include <psp2/types.h>
+#include <scetypes.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/user/compat.h b/include/user/compat.h
index 8112c46..3548e6b 100644
--- a/include/user/compat.h
+++ b/include/user/compat.h
@@ -1,10 +1,9 @@
 #ifndef _PSP2_COMPAT_H_
 #define _PSP2_COMPAT_H_
 
-#include <psp2/kernel/iofilemgr.h>
-#include <psp2/rtc.h>
-#include <psp2/types.h>
-#include <stdint.h>
+#include <kernel/iofilemgr.h>
+#include <rtc.h>
+#include <scetypes.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/user/gim.h b/include/user/gim.h
index 2d83431..f4da13b 100644
--- a/include/user/gim.h
+++ b/include/user/gim.h
@@ -5,12 +5,10 @@
 extern "C" {
 #endif
 
-#include <stdbool.h>
-#include <psp2/gxm.h>
-#include <psp2/scebase.h>
-
-#include <psp2/kernel/clib.h>
-#include <psp2/kernel/sysmem.h>
+#include <stddef.h>
+#include <gxm.h>
+#include <kernel/libkernel.h>
+#include <kernel/sysmem/memblock.h>
 
 #define SCE_GIM_TAG        0x2E47494DUL    /* 'GIM.' */
 #define SCE_GIM_VERSION    0x312E3030UL    /* '1.00' */
diff --git a/include/user/gxm.h b/include/user/gxm.h
deleted file mode 100644
index 60f3e11..0000000
--- a/include/user/gxm.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef _DOLCESDK_PSP2_GXM_INTERNAL_H_
-#define _DOLCESDK_PSP2_GXM_INTERNAL_H_
-
-/** @file
-
-  	Helper include file that includes all public headers.
-*/
-
-#include <psp2/gxm.h>
-
-#include <psp2/gxm/context_internal.h>
-#include <psp2/gxm/init_internal.h>
-#include <psp2/gxm/memory_internal.h>
-#include <psp2/gxm/render_target_internal.h>
-#include <psp2/gxm/shader_patcher_internal.h>
-#include <psp2/gxm/sync_object_internal.h>
-
-#endif /* _DOLCESDK_PSP2_GXM_INTERNAL_H_ */
diff --git a/include/user/gxm/context.h b/include/user/gxm/context.h
index 3897677..e644610 100644
--- a/include/user/gxm/context.h
+++ b/include/user/gxm/context.h
@@ -4,7 +4,7 @@
 /** @file
 */
 
-#include <psp2/gxm/context.h>
+#include_next <gxm/context.h>
 
 #ifdef	__cplusplus
 extern "C" {
diff --git a/include/user/gxm/init.h b/include/user/gxm/init.h
index 8f27a79..76841d4 100644
--- a/include/user/gxm/init.h
+++ b/include/user/gxm/init.h
@@ -4,7 +4,7 @@
 /** @file
 */
 
-#include <psp2/gxm/init.h>
+#include_next <gxm/init.h>
 
 #ifdef	__cplusplus
 extern "C" {
diff --git a/include/user/gxm/memory.h b/include/user/gxm/memory.h
index cc4125a..889c57c 100644
--- a/include/user/gxm/memory.h
+++ b/include/user/gxm/memory.h
@@ -6,7 +6,7 @@
   	Memory mapping API for the GPU.
 */
 
-#include <psp2/gxm/memory.h>
+#include_next <gxm/memory.h>
 
 #ifdef	__cplusplus
 extern "C" {
diff --git a/include/user/gxm/render_target.h b/include/user/gxm/render_target.h
index 44a38a3..e129bf0 100644
--- a/include/user/gxm/render_target.h
+++ b/include/user/gxm/render_target.h
@@ -4,7 +4,7 @@
 /** @file
 */
 
-#include <psp2/gxm/render_target.h>
+#include_next <gxm/render_target.h>
 
 #ifdef	__cplusplus
 extern "C" {
diff --git a/include/user/gxm/shader_patcher.h b/include/user/gxm/shader_patcher.h
index 7ae47dd..a5adfd9 100644
--- a/include/user/gxm/shader_patcher.h
+++ b/include/user/gxm/shader_patcher.h
@@ -4,7 +4,7 @@
 /** @file
 */
 
-#include <psp2/gxm/shader_patcher.h>
+#include_next <gxm/shader_patcher.h>
 
 #ifdef	__cplusplus
 extern "C" {
diff --git a/include/user/gxm/sync_object.h b/include/user/gxm/sync_object.h
index 811560c..a78d992 100644
--- a/include/user/gxm/sync_object.h
+++ b/include/user/gxm/sync_object.h
@@ -4,7 +4,7 @@
 /** @file
 */
 
-#include <psp2/gxm/sync_object.h>
+#include_next <gxm/sync_object.h>
 
 #ifdef	__cplusplus
 extern "C" {
diff --git a/include/user/hid.h b/include/user/hid.h
index 1fe133b..eb8d55b 100644
--- a/include/user/hid.h
+++ b/include/user/hid.h
@@ -5,7 +5,7 @@
 extern "C" {
 #endif
 
-#include <psp2/types.h>
+#include <scetypes.h>
 
 typedef struct SceHidKeyboardReport {
 	SceUInt8 reserved;
diff --git a/include/user/incoming_dialog.h b/include/user/incoming_dialog.h
index da4c4f3..9d37b50 100644
--- a/include/user/incoming_dialog.h
+++ b/include/user/incoming_dialog.h
@@ -1,9 +1,9 @@
 #ifndef _DOLCESDK_PSP2_INCOMING_DIALOG_H_
 #define _DOLCESDK_PSP2_INCOMING_DIALOG_H_
 
-#include <psp2/kernel/clib.h>
-#include <psp2/scebase.h>
-#include <psp2/types.h>
+#include <kernel/libkernel.h>
+#include <scetypes.h>
+#include <sdk_version.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/user/ini_file_processor.h b/include/user/ini_file_processor.h
index cd8c6a1..8bc7d80 100644
--- a/include/user/ini_file_processor.h
+++ b/include/user/ini_file_processor.h
@@ -11,7 +11,7 @@
 
 #ifdef __cplusplus
 
-#include <cstddef>
+#include <stddef.h>
 
 namespace sce {
 namespace Ini {
diff --git a/include/user/jpegarm.h b/include/user/jpegarm.h
index 6a5f5c7..868476f 100644
--- a/include/user/jpegarm.h
+++ b/include/user/jpegarm.h
@@ -1,8 +1,7 @@
 #ifndef _DOLCESDK_PSP2_JPEGARM_H_
 #define _DOLCESDK_PSP2_JPEGARM_H_
 
-#include <psp2/types.h>
-#include <psp2/jpeg.h>
+#include <scejpeg.h>
 
 #if defined(_LANGUAGE_C_PLUS_PLUS)||defined(__cplusplus)||defined(c_plusplus)
 extern "C" {
diff --git a/include/user/kernel/iofilemgr.h b/include/user/kernel/iofilemgr.h
index ce8561f..1533ef5 100644
--- a/include/user/kernel/iofilemgr.h
+++ b/include/user/kernel/iofilemgr.h
@@ -3,8 +3,6 @@
 
 #include_next <kernel/iofilemgr.h>
 
-#include <kernel/iofilemgr_async.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/user/kernel/iofilemgr_syscall.h b/include/user/kernel/iofilemgr_syscall.h
index 331dc16..65535bb 100644
--- a/include/user/kernel/iofilemgr_syscall.h
+++ b/include/user/kernel/iofilemgr_syscall.h
@@ -1,7 +1,7 @@
 #ifndef _DOLCESDK_PSP2_KERNEL_IOFILEMGR_SYSCALL_H_
 #define _DOLCESDK_PSP2_KERNEL_IOFILEMGR_SYSCALL_H_
 
-#include <scetypes.h>
+#include <kernel/types.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/user/kernel/libkernel.h b/include/user/kernel/libkernel.h
index 2e8e015..9c9c77c 100644
--- a/include/user/kernel/libkernel.h
+++ b/include/user/kernel/libkernel.h
@@ -3,6 +3,8 @@
 
 #include_next <kernel/libkernel.h>
 
+#include <stdarg.h>
+
 SCE_CDECL_BEGIN
 
 /**
diff --git a/include/user/kernel/rng.h b/include/user/kernel/rng.h
index af302f1..6a13cc5 100644
--- a/include/user/kernel/rng.h
+++ b/include/user/kernel/rng.h
@@ -1,7 +1,7 @@
 #ifndef _PSP2_KERNEL_RNG_H_
 #define _PSP2_KERNEL_RNG_H_
 
-#include <psp2/types.h>
+#include <scetypes.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/user/net/net_syscalls.h b/include/user/net/net_syscalls.h
index 9752be9..61b580c 100644
--- a/include/user/net/net_syscalls.h
+++ b/include/user/net/net_syscalls.h
@@ -1,7 +1,7 @@
 #ifndef _PSP2_NET_NET_SYSCALLS_H_
 #define _PSP2_NET_NET_SYSCALLS_H_
 
-#include <psp2/net/net.h>
+#include <net.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/user/notification_util.h b/include/user/notification_util.h
index 2f4bd9e..ef527bd 100644
--- a/include/user/notification_util.h
+++ b/include/user/notification_util.h
@@ -1,7 +1,7 @@
 #ifndef _DOLCESDK_PSP2_NOTIFICATION_UTIL_H_
 #define _DOLCESDK_PSP2_NOTIFICATION_UTIL_H_
 
-#include <psp2/types.h>
+#include <scetypes.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/user/npdrm.h b/include/user/npdrm.h
index 83a0c03..3d66cdb 100644
--- a/include/user/npdrm.h
+++ b/include/user/npdrm.h
@@ -1,7 +1,6 @@
 #ifndef _PSP2_NPDRM_H_
 #define _PSP2_NPDRM_H_
 
-#include <psp2/types.h>
 #include <stdint.h>
 
 #ifdef __cplusplus
diff --git a/include/user/npdrmpackage.h b/include/user/npdrmpackage.h
index ffa5124..07a293a 100644
--- a/include/user/npdrmpackage.h
+++ b/include/user/npdrmpackage.h
@@ -1,7 +1,7 @@
 #ifndef _PSP2_NPDRMPACKAGE_H_
 #define _PSP2_NPDRMPACKAGE_H_
 
-#include <psp2/types.h>
+#include <scetypes.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/user/paf.h b/include/user/paf.h
index 2cf7444..2cd421b 100644
--- a/include/user/paf.h
+++ b/include/user/paf.h
@@ -3,8 +3,7 @@
 
 #include <stdarg.h>
 #include <wchar.h>
-#include <psp2/types.h>
-#include <psp2/ces/error.h>
+#include <scetypes.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/user/promoterutil.h b/include/user/promoterutil.h
index 2526712..eae4577 100644
--- a/include/user/promoterutil.h
+++ b/include/user/promoterutil.h
@@ -1,7 +1,7 @@
 #ifndef _PSP2_PROMOTERUTIL_H_
 #define _PSP2_PROMOTERUTIL_H_
 
-#include <psp2/types.h>
+#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/user/pss.h b/include/user/pss.h
index 1330a6d..2a4f37f 100644
--- a/include/user/pss.h
+++ b/include/user/pss.h
@@ -1,12 +1,13 @@
 #ifndef _PSP2_PSS_H_
 #define _PSP2_PSS_H_
 
-#include <psp2/types.h>
+#include <stdint.h>
+#include <scetypes.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
-  
+
 typedef struct ScePssCryptoHandle {
   SceUID fd;
   uint32_t unk1;
diff --git a/include/user/registrymgr.h b/include/user/registrymgr.h
index a85a56b..f294422 100644
--- a/include/user/registrymgr.h
+++ b/include/user/registrymgr.h
@@ -1,7 +1,7 @@
 #ifndef _PSP2_REGISTRYMGR_H_
 #define _PSP2_REGISTRYMGR_H_
 
-#include <psp2/types.h>
+#include <scetypes.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/user/sblacmgr.h b/include/user/sblacmgr.h
index 17a14f5..2d6e2e6 100644
--- a/include/user/sblacmgr.h
+++ b/include/user/sblacmgr.h
@@ -1,8 +1,6 @@
 #ifndef _PSP2_SBLACMGR_H_
 #define _PSP2_SBLACMGR_H_
 
-#include <psp2/types.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/user/shacccg.h b/include/user/shacccg.h
index cf5a088..ea763ca 100644
--- a/include/user/shacccg.h
+++ b/include/user/shacccg.h
@@ -1,8 +1,8 @@
 #ifndef _DOLCESDK_PSP2_SHACCCG_H_
 #define _DOLCESDK_PSP2_SHACCCG_H_
 
-#include <psp2/shacccg/types.h>
-#include <psp2/shacccg/paramquery.h>
+#include <shacccg/types.h>
+#include <shacccg/paramquery.h>
 
 /** @file	shacccg.h
 
diff --git a/include/user/shellsvc.h b/include/user/shellsvc.h
index 462fa13..5720dba 100644
--- a/include/user/shellsvc.h
+++ b/include/user/shellsvc.h
@@ -1,7 +1,7 @@
 #ifndef _DOLCESDK_PSP2_SHELLSVC_H_
 #define _DOLCESDK_PSP2_SHELLSVC_H_
 
-#include <psp2/types.h>
+#include <scetypes.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/user/trigger_util.h b/include/user/trigger_util.h
index 30eaa06..227c310 100644
--- a/include/user/trigger_util.h
+++ b/include/user/trigger_util.h
@@ -1,9 +1,8 @@
 #ifndef _DOLCESDK_PSP2_TRIGGER_UTIL_H_
 #define _DOLCESDK_PSP2_TRIGGER_UTIL_H_
 
-#include <psp2/kernel/clib.h>
-#include <psp2/rtc.h>
-#include <psp2/types.h>
+#include <rtc.h>
+#include <scetypes.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/user/udcd.h b/include/user/udcd.h
index eec370f..93bd38d 100644
--- a/include/user/udcd.h
+++ b/include/user/udcd.h
@@ -1,7 +1,8 @@
 #ifndef _PSP2_UDCD_H_
 #define _PSP2_UDCD_H_
 
-#include <psp2/types.h>
+#include <stdint.h>
+#include <scetypes.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/user/usbd.h b/include/user/usbd.h
index 1b40d14..ece2514 100644
--- a/include/user/usbd.h
+++ b/include/user/usbd.h
@@ -1,7 +1,7 @@
 #ifndef _PSP2_USBD_H_
 #define _PSP2_USBD_H_
 
-#include <psp2/kernel/threadmgr.h>
+#include <scetypes.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/user/usbserial.h b/include/user/usbserial.h
index e510a63..f510367 100644
--- a/include/user/usbserial.h
+++ b/include/user/usbserial.h
@@ -1,8 +1,6 @@
 #ifndef _PSP2_USBSERIAL_H_
 #define _PSP2_USBSERIAL_H_
 
-#include <psp2/types.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/user/videoexport.h b/include/user/videoexport.h
index a002dde..a552db1 100644
--- a/include/user/videoexport.h
+++ b/include/user/videoexport.h
@@ -1,9 +1,6 @@
 #ifndef _PSP2_VIDEO_EXPORT_H_
 #define _PSP2_VIDEO_EXPORT_H_
 
-#include <psp2/types.h>
-#include <stdint.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/user/vshbridge.h b/include/user/vshbridge.h
index 09f256b..1f39e27 100644
--- a/include/user/vshbridge.h
+++ b/include/user/vshbridge.h
@@ -1,8 +1,7 @@
 #ifndef _PSP2_VSHBRIDGE_H_
 #define _PSP2_VSHBRIDGE_H_
 
-#include <psp2/types.h>
-#include <psp2/kernel/modulemgr.h>
+#include <kernel/modulemgr.h>
 
 #ifdef __cplusplus
 extern "C" {