From 173d3a60ebdce6d4b0876cc88c55267e3d32af66 Mon Sep 17 00:00:00 2001
From: Wouter Wijsman <wouter@gridscale.io>
Date: Fri, 4 Apr 2025 11:00:20 +0200
Subject: [PATCH 1/2] Fix SceSize declaration missing in pspdmac.h

---
 src/dmac/pspdmac.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/dmac/pspdmac.h b/src/dmac/pspdmac.h
index 328e1a802c..bc956d443b 100644
--- a/src/dmac/pspdmac.h
+++ b/src/dmac/pspdmac.h
@@ -12,6 +12,7 @@
 #define __DMAC_H__
 
 #include <psptypes.h>
+#include <pspkerneltypes.h>
 
 #ifdef __cplusplus
 extern "C" {

From ae4731159b272ec03157b14fe9ca4ad58687aa3e Mon Sep 17 00:00:00 2001
From: Wouter Wijsman <wwijsman@live.nl>
Date: Fri, 4 Apr 2025 23:06:59 +0200
Subject: [PATCH 2/2] Move SceSize to psptypes.h

---
 src/base/psptypes.h                           |  1 +
 src/dmac/pspdmac.h                            |  1 -
 src/kernel/psploadexec_kernel.h               |  1 +
 src/kernel/pspmodulemgr_kernel.h              |  1 +
 src/kernel/pspsysmem_kernel.h                 |  1 +
 src/kernel/pspthreadman_kernel.h              |  1 +
 src/nand/pspnand_driver.h                     |  1 +
 src/net/psphttp.h                             |  1 +
 src/net/pspnet_resolver.h                     |  1 +
 src/registry/pspreg.h                         |  2 ++
 src/samples/audio/polyphonic/main.c           |  1 +
 src/samples/audio/wavegen/main.c              |  1 +
 src/samples/controller/basic/main.c           |  1 +
 src/samples/debug/debugkb/main.c              |  1 +
 src/samples/debug/exception/main.c            |  1 +
 src/samples/debug/gdb/main.c                  |  1 +
 src/samples/debug/kprintf/main.c              |  1 +
 src/samples/debug/profiler/main.c             |  1 +
 src/samples/debug/prxdecrypt/main.c           |  1 +
 src/samples/gu/clut/clut.c                    |  1 +
 src/samples/gu/common/callbacks.c             |  1 +
 src/samples/gu/morph/morph.c                  |  1 +
 src/samples/gu/morphskin/morphskin.c          |  1 +
 src/samples/gu/reflection/reflection.c        |  1 +
 src/samples/gu/rendertarget/rendertarget.c    |  1 +
 .../gu/shadowprojection/shadowprojection.c    |  1 +
 src/samples/gu/signals/signals.c              |  1 +
 src/samples/gu/skinning/skinning.c            |  1 +
 src/samples/gu/spharm/cube.c                  |  1 +
 src/samples/gu/text/main.c                    |  1 +
 src/samples/gu/timing/timing.c                | 21 ++++++++++---------
 src/samples/ir/irda/main.c                    |  1 +
 src/samples/ir/sircs/main.c                   |  1 +
 src/samples/kernel/fileio/main.c              |  1 +
 src/samples/kernel/idstorage/main.c           |  1 +
 src/samples/kernel/kdumper/main.c             |  1 +
 src/samples/kernel/loadmodule/main.c          |  1 +
 src/samples/kernel/messagebox/main.c          |  1 +
 src/samples/kernel/regenum/main.c             |  1 +
 src/samples/kernel/threadstatus/main.c        |  1 +
 src/samples/mp3/main.c                        |  1 +
 src/samples/nand/dumpipl/main.c               |  1 +
 src/samples/net/resolver/main.c               |  1 +
 src/samples/net/simple/main.c                 |  1 +
 src/samples/net/simple_prx/main.c             |  1 +
 src/samples/net/wlanscan_elf/main.c           |  1 +
 src/samples/power/main.c                      |  1 +
 src/samples/savedata/utility/main.c           |  1 +
 src/samples/template/kprx_template/main.c     |  1 +
 src/samples/usb/storage/main.c                |  1 +
 src/samples/utility/msgdialog/main.c          |  1 +
 src/samples/utility/netconf/main.c            |  1 +
 src/samples/utility/netdialog/main.c          |  1 +
 src/samples/utility/osk/main.c                |  1 +
 src/samples/utility/systemparam/main.c        |  1 +
 src/samples/wlan/main.c                       |  1 +
 src/sdk/memory.c                              |  1 +
 src/sdk/pspsdk.h                              |  1 +
 src/sdk/threadutils.c                         |  1 +
 src/startup/crt0.c                            |  1 +
 src/startup/crt0_prx.c                        |  1 +
 src/usb/pspusbcam.h                           |  2 ++
 src/user/pspiofilemgr.h                       |  1 +
 src/user/psploadexec.h                        |  2 ++
 src/user/pspmodulemgr.h                       |  1 +
 src/user/pspsysmem.h                          |  1 +
 66 files changed, 78 insertions(+), 11 deletions(-)

diff --git a/src/base/psptypes.h b/src/base/psptypes.h
index fb93b8ef01..1a9807cd8b 100644
--- a/src/base/psptypes.h
+++ b/src/base/psptypes.h
@@ -100,6 +100,7 @@ typedef int SceBool;
 typedef void SceVoid;
 typedef void * ScePVoid;
 
+typedef unsigned int SceSize;
 
 /* PSP types. */
 
diff --git a/src/dmac/pspdmac.h b/src/dmac/pspdmac.h
index bc956d443b..328e1a802c 100644
--- a/src/dmac/pspdmac.h
+++ b/src/dmac/pspdmac.h
@@ -12,7 +12,6 @@
 #define __DMAC_H__
 
 #include <psptypes.h>
-#include <pspkerneltypes.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/kernel/psploadexec_kernel.h b/src/kernel/psploadexec_kernel.h
index ba2ba65472..db5b8377b8 100644
--- a/src/kernel/psploadexec_kernel.h
+++ b/src/kernel/psploadexec_kernel.h
@@ -13,6 +13,7 @@
 #define PSPLOADEXEC_KERNEL_H
 
 #include <pspkerneltypes.h>
+#include <psptypes.h>
 #include <psploadexec.h>
 
 /** @defgroup LoadExecKernel Interface to the LoadExecForKernel library.
diff --git a/src/kernel/pspmodulemgr_kernel.h b/src/kernel/pspmodulemgr_kernel.h
index 14f496fa0f..e031b0f88b 100644
--- a/src/kernel/pspmodulemgr_kernel.h
+++ b/src/kernel/pspmodulemgr_kernel.h
@@ -15,6 +15,7 @@
 #define __MODMGRKERNEL_H__
 
 #include <pspkerneltypes.h>
+#include <psptypes.h>
 #include <pspmodulemgr.h>
 
 /** @defgroup ModuleMgrKern Kernel Module Manager Library
diff --git a/src/kernel/pspsysmem_kernel.h b/src/kernel/pspsysmem_kernel.h
index 8dd60a6006..9f7de9b12e 100644
--- a/src/kernel/pspsysmem_kernel.h
+++ b/src/kernel/pspsysmem_kernel.h
@@ -17,6 +17,7 @@
 #define PSPSYSMEMKERNEL_H
 
 #include <pspkerneltypes.h>
+#include <psptypes.h>
 #include <pspsysmem.h>
 
 /** @defgroup SysMemKern System Memory Manager Kernel
diff --git a/src/kernel/pspthreadman_kernel.h b/src/kernel/pspthreadman_kernel.h
index e13741fc7f..687bd5bb32 100644
--- a/src/kernel/pspthreadman_kernel.h
+++ b/src/kernel/pspthreadman_kernel.h
@@ -13,6 +13,7 @@
 #define PSPTHREADMANKERNEL_H
 
 #include <pspkerneltypes.h>
+#include <psptypes.h>
 #include <pspthreadman.h>
 
 /** @defgroup ThreadmanKern Thread Manager kernel functions
diff --git a/src/nand/pspnand_driver.h b/src/nand/pspnand_driver.h
index de8b13e23a..9e4d3eee81 100644
--- a/src/nand/pspnand_driver.h
+++ b/src/nand/pspnand_driver.h
@@ -13,6 +13,7 @@
 #define PSPNAND_DRIVER_H
 
 #include <pspkerneltypes.h>
+#include <psptypes.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/net/psphttp.h b/src/net/psphttp.h
index af9a067fd8..621c6bc707 100644
--- a/src/net/psphttp.h
+++ b/src/net/psphttp.h
@@ -14,6 +14,7 @@
 #define __PSPHTTP_H__
 
 #include <pspkerneltypes.h>
+#include <psptypes.h>
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/src/net/pspnet_resolver.h b/src/net/pspnet_resolver.h
index d2e5a2244b..ad6090567e 100644
--- a/src/net/pspnet_resolver.h
+++ b/src/net/pspnet_resolver.h
@@ -20,6 +20,7 @@ extern "C" {
 
 #include <netinet/in.h>
 #include <pspkerneltypes.h>
+#include <psptypes.h>
 
 /**
  * Inititalise the resolver library
diff --git a/src/registry/pspreg.h b/src/registry/pspreg.h
index 5624bf8225..d175f43363 100644
--- a/src/registry/pspreg.h
+++ b/src/registry/pspreg.h
@@ -16,6 +16,8 @@
 extern "C" {
 #endif
 
+#include <psptypes.h>
+
 /** @addtogroup Reg Registry Kernel Library */
 /**@{*/
 
diff --git a/src/samples/audio/polyphonic/main.c b/src/samples/audio/polyphonic/main.c
index 35d39eecb2..33c0dc0cc2 100644
--- a/src/samples/audio/polyphonic/main.c
+++ b/src/samples/audio/polyphonic/main.c
@@ -11,6 +11,7 @@
 #include <pspkernel.h>
 #include <pspdebug.h>
 #include <pspaudiolib.h>
+#include <psptypes.h>
 #include <stdlib.h>
 #include <math.h>
 #include <string.h>
diff --git a/src/samples/audio/wavegen/main.c b/src/samples/audio/wavegen/main.c
index 27c3aeff1c..39bf5bf930 100644
--- a/src/samples/audio/wavegen/main.c
+++ b/src/samples/audio/wavegen/main.c
@@ -12,6 +12,7 @@
 #include <pspaudio.h>
 #include <pspdisplay.h>
 #include <pspctrl.h>
+#include <psptypes.h>
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/samples/controller/basic/main.c b/src/samples/controller/basic/main.c
index 8e2f1666af..1ea8f72fb8 100644
--- a/src/samples/controller/basic/main.c
+++ b/src/samples/controller/basic/main.c
@@ -17,6 +17,7 @@
 #include <pspctrl.h>
 #include <stdlib.h>
 #include <string.h>
+#include <psptypes.h>
 
 /* Define the module info section */
 PSP_MODULE_INFO("CONTROLTEST", 0, 1, 1);
diff --git a/src/samples/debug/debugkb/main.c b/src/samples/debug/debugkb/main.c
index 1145c0ff28..58b24c4b3a 100644
--- a/src/samples/debug/debugkb/main.c
+++ b/src/samples/debug/debugkb/main.c
@@ -16,6 +16,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <pspdebugkb.h>
+#include <psptypes.h>
 
 /* Define the module info section */
 PSP_MODULE_INFO("Debug Screen Text Input", 0, 1, 1);
diff --git a/src/samples/debug/exception/main.c b/src/samples/debug/exception/main.c
index 29b1743ce0..a22a09311d 100644
--- a/src/samples/debug/exception/main.c
+++ b/src/samples/debug/exception/main.c
@@ -14,6 +14,7 @@
 #include <pspdebug.h>
 #include <pspctrl.h>
 #include <pspdisplay.h>
+#include <psptypes.h>
 
 PSP_MODULE_INFO("EXTEST", 0x1000, 1, 1);
 /* Define the main thread's attribute value (optional) */
diff --git a/src/samples/debug/gdb/main.c b/src/samples/debug/gdb/main.c
index 92cdea4780..49abe0a7f5 100644
--- a/src/samples/debug/gdb/main.c
+++ b/src/samples/debug/gdb/main.c
@@ -15,6 +15,7 @@
 #include <pspctrl.h>
 #include <pspdisplay.h>
 #include <stdio.h>
+#include <psptypes.h>
 
 PSP_MODULE_INFO("EXTEST", 0x1000, 1, 1);
 /* Define the main thread's attribute value (optional) */
diff --git a/src/samples/debug/kprintf/main.c b/src/samples/debug/kprintf/main.c
index 7d7e1510ad..289d3f678f 100644
--- a/src/samples/debug/kprintf/main.c
+++ b/src/samples/debug/kprintf/main.c
@@ -12,6 +12,7 @@
  */
 #include <pspkernel.h>
 #include <pspdebug.h>
+#include <psptypes.h>
 
 PSP_MODULE_INFO("KPTEST", 0x1000, 1, 1);
 /* Define the main thread's attribute value (optional) */
diff --git a/src/samples/debug/profiler/main.c b/src/samples/debug/profiler/main.c
index 7ff5e6fe1c..85df8ad235 100644
--- a/src/samples/debug/profiler/main.c
+++ b/src/samples/debug/profiler/main.c
@@ -13,6 +13,7 @@
 #include <pspkernel.h>
 #include <pspdebug.h>
 #include <pspdisplay.h>
+#include <psptypes.h>
 #include <string.h>
 
 PSP_MODULE_INFO("PROFILER", 0x1000, 1, 1);
diff --git a/src/samples/debug/prxdecrypt/main.c b/src/samples/debug/prxdecrypt/main.c
index 8925a41fa9..2b24bdfbb3 100644
--- a/src/samples/debug/prxdecrypt/main.c
+++ b/src/samples/debug/prxdecrypt/main.c
@@ -12,6 +12,7 @@
  */
 #include <pspkernel.h>
 #include <pspdebug.h>
+#include <psptypes.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/src/samples/gu/clut/clut.c b/src/samples/gu/clut/clut.c
index 813d091f08..e0b7476a24 100644
--- a/src/samples/gu/clut/clut.c
+++ b/src/samples/gu/clut/clut.c
@@ -9,6 +9,7 @@
 #include <pspkernel.h>
 #include <pspdisplay.h>
 #include <pspdebug.h>
+#include <psptypes.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
diff --git a/src/samples/gu/common/callbacks.c b/src/samples/gu/common/callbacks.c
index c1edf36366..ec4f2542b3 100644
--- a/src/samples/gu/common/callbacks.c
+++ b/src/samples/gu/common/callbacks.c
@@ -9,6 +9,7 @@
 #include <pspkernel.h>
 #include <pspdisplay.h>
 #include <pspdebug.h>
+#include <psptypes.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
diff --git a/src/samples/gu/morph/morph.c b/src/samples/gu/morph/morph.c
index 78d862f377..ec59bdb83a 100644
--- a/src/samples/gu/morph/morph.c
+++ b/src/samples/gu/morph/morph.c
@@ -9,6 +9,7 @@
 #include <pspkernel.h>
 #include <pspdisplay.h>
 #include <pspdebug.h>
+#include <psptypes.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
diff --git a/src/samples/gu/morphskin/morphskin.c b/src/samples/gu/morphskin/morphskin.c
index 538f29c5a1..ba6a82455c 100644
--- a/src/samples/gu/morphskin/morphskin.c
+++ b/src/samples/gu/morphskin/morphskin.c
@@ -13,6 +13,7 @@
 #include <pspkernel.h>
 #include <pspdisplay.h>
 #include <pspdebug.h>
+#include <psptypes.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
diff --git a/src/samples/gu/reflection/reflection.c b/src/samples/gu/reflection/reflection.c
index a8e73085d9..9f7561f647 100644
--- a/src/samples/gu/reflection/reflection.c
+++ b/src/samples/gu/reflection/reflection.c
@@ -10,6 +10,7 @@
 #include <pspkernel.h>
 #include <pspdisplay.h>
 #include <pspdebug.h>
+#include <psptypes.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
diff --git a/src/samples/gu/rendertarget/rendertarget.c b/src/samples/gu/rendertarget/rendertarget.c
index 7dec6b2bdc..604c0fefe8 100644
--- a/src/samples/gu/rendertarget/rendertarget.c
+++ b/src/samples/gu/rendertarget/rendertarget.c
@@ -13,6 +13,7 @@
 #include <pspkernel.h>
 #include <pspdisplay.h>
 #include <pspdebug.h>
+#include <psptypes.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
diff --git a/src/samples/gu/shadowprojection/shadowprojection.c b/src/samples/gu/shadowprojection/shadowprojection.c
index 6882b17d21..74aca4e86c 100644
--- a/src/samples/gu/shadowprojection/shadowprojection.c
+++ b/src/samples/gu/shadowprojection/shadowprojection.c
@@ -13,6 +13,7 @@
 #include <pspkernel.h>
 #include <pspdisplay.h>
 #include <pspdebug.h>
+#include <psptypes.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
diff --git a/src/samples/gu/signals/signals.c b/src/samples/gu/signals/signals.c
index fc61aca186..6219492a41 100644
--- a/src/samples/gu/signals/signals.c
+++ b/src/samples/gu/signals/signals.c
@@ -22,6 +22,7 @@
 #include <pspkernel.h>
 #include <pspdisplay.h>
 #include <pspdebug.h>
+#include <psptypes.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
diff --git a/src/samples/gu/skinning/skinning.c b/src/samples/gu/skinning/skinning.c
index 8b5d064b43..7e8e81c885 100644
--- a/src/samples/gu/skinning/skinning.c
+++ b/src/samples/gu/skinning/skinning.c
@@ -12,6 +12,7 @@
 #include <pspkernel.h>
 #include <pspdisplay.h>
 #include <pspdebug.h>
+#include <psptypes.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
diff --git a/src/samples/gu/spharm/cube.c b/src/samples/gu/spharm/cube.c
index 1c3a56532e..e92758638b 100644
--- a/src/samples/gu/spharm/cube.c
+++ b/src/samples/gu/spharm/cube.c
@@ -2,6 +2,7 @@
 #include <pspdisplay.h>
 #include <pspdebug.h>
 #include <pspctrl.h>
+#include <psptypes.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
diff --git a/src/samples/gu/text/main.c b/src/samples/gu/text/main.c
index 592dc72fe7..aed8aa57dc 100644
--- a/src/samples/gu/text/main.c
+++ b/src/samples/gu/text/main.c
@@ -13,6 +13,7 @@
 #include <pspgu.h>
 #include <pspgum.h>
 #include <pspdisplay.h>
+#include <psptypes.h>
 
 #include <string.h>
 #include <math.h>
diff --git a/src/samples/gu/timing/timing.c b/src/samples/gu/timing/timing.c
index ebc36d2b74..05422af2ba 100644
--- a/src/samples/gu/timing/timing.c
+++ b/src/samples/gu/timing/timing.c
@@ -21,6 +21,7 @@
 #include <pspgu.h>
 #include <pspgum.h>
 #include <pspctrl.h>
+#include <psptypes.h>
 
 PSP_MODULE_INFO("Timing Sample", 0, 1, 1);
 PSP_MAIN_THREAD_ATTR(THREAD_ATTR_USER);
@@ -206,8 +207,8 @@ int main(int argc, char** argv) {
 	int mode = 0;
 	int val = 0;
 
-	SceCtrlData pad;
-    sceCtrlSetSamplingCycle(0);
+	SceCtrlData pad;
+    sceCtrlSetSamplingCycle(0);
     sceCtrlSetSamplingMode(PSP_CTRL_MODE_DIGITAL);
 	unsigned int old = 0;
 
@@ -278,7 +279,7 @@ int main(int argc, char** argv) {
 		sceGuFinish();
 		sceGuSync(0, 0);
 
-		pspDebugScreenSetOffset((int)frameBuffer);
+		pspDebugScreenSetOffset((int)frameBuffer);
 		pspDebugScreenSetXY(0,0);
 		pspDebugScreenPrintf("%s: %1d.%03d ms", modenames[mode], (end - start)/1000, (end - start)%1000);
 
@@ -287,13 +288,13 @@ int main(int argc, char** argv) {
 
 		val++;
 
-		sceCtrlReadBufferPositive(&pad, 1);
-		if(old != pad.Buttons) {
-			if(pad.Buttons & (PSP_CTRL_CROSS | PSP_CTRL_CIRCLE)) {
-				mode+=1;
-				mode%=6;
-			}
-		}
+		sceCtrlReadBufferPositive(&pad, 1);
+		if(old != pad.Buttons) {
+			if(pad.Buttons & (PSP_CTRL_CROSS | PSP_CTRL_CIRCLE)) {
+				mode+=1;
+				mode%=6;
+			}
+		}
 		old = pad.Buttons;
 	}
 
diff --git a/src/samples/ir/irda/main.c b/src/samples/ir/irda/main.c
index 4548b38ba7..b44ac9ac93 100644
--- a/src/samples/ir/irda/main.c
+++ b/src/samples/ir/irda/main.c
@@ -13,6 +13,7 @@
 #include <pspdisplay.h>
 #include <pspctrl.h>
 #include <pspsircs.h>
+#include <psptypes.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/src/samples/ir/sircs/main.c b/src/samples/ir/sircs/main.c
index c9b069ecc3..c9332860d6 100644
--- a/src/samples/ir/sircs/main.c
+++ b/src/samples/ir/sircs/main.c
@@ -17,6 +17,7 @@
 #include <pspdisplay.h>
 #include <pspctrl.h>
 #include <pspsircs.h>
+#include <psptypes.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/src/samples/kernel/fileio/main.c b/src/samples/kernel/fileio/main.c
index e60cdd3a98..b15de3ca94 100644
--- a/src/samples/kernel/fileio/main.c
+++ b/src/samples/kernel/fileio/main.c
@@ -14,6 +14,7 @@
 #include <pspctrl.h>
 #include <pspdebug.h>
 #include <pspdisplay.h>
+#include <psptypes.h>
 #include <pspumd.h>
 
 #include <string.h>
diff --git a/src/samples/kernel/idstorage/main.c b/src/samples/kernel/idstorage/main.c
index 31dd61e4a6..1e6c836273 100644
--- a/src/samples/kernel/idstorage/main.c
+++ b/src/samples/kernel/idstorage/main.c
@@ -10,6 +10,7 @@
  */
 #include <pspkernel.h>
 #include <pspdebug.h>
+#include <psptypes.h>
 #include <pspidstorage.h>
 
 /* Start in kernel mode */
diff --git a/src/samples/kernel/kdumper/main.c b/src/samples/kernel/kdumper/main.c
index 33363f6c7c..87998733af 100644
--- a/src/samples/kernel/kdumper/main.c
+++ b/src/samples/kernel/kdumper/main.c
@@ -12,6 +12,7 @@
  */
 #include <pspkernel.h>
 #include <pspdebug.h>
+#include <psptypes.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/src/samples/kernel/loadmodule/main.c b/src/samples/kernel/loadmodule/main.c
index 589c963c47..cbfd1263dd 100644
--- a/src/samples/kernel/loadmodule/main.c
+++ b/src/samples/kernel/loadmodule/main.c
@@ -16,6 +16,7 @@
 #include <pspuser.h>
 #include <pspdebug.h>
 #include <pspsdk.h>
+#include <psptypes.h>
 #include <string.h>
 
 /* Define the module info section, note the 0x1000 flag to enable start in kernel mode */
diff --git a/src/samples/kernel/messagebox/main.c b/src/samples/kernel/messagebox/main.c
index e212c7184f..caabbbf1ce 100644
--- a/src/samples/kernel/messagebox/main.c
+++ b/src/samples/kernel/messagebox/main.c
@@ -11,6 +11,7 @@
 #include <pspkernel.h>
 #include <pspdebug.h>
 #include <pspthreadman.h>
+#include <psptypes.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/src/samples/kernel/regenum/main.c b/src/samples/kernel/regenum/main.c
index 7f8d86bf9e..67cc6a9c47 100644
--- a/src/samples/kernel/regenum/main.c
+++ b/src/samples/kernel/regenum/main.c
@@ -13,6 +13,7 @@
 #include <pspreg.h>
 #include <pspctrl.h>
 #include <pspdisplay.h>
+#include <psptypes.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/samples/kernel/threadstatus/main.c b/src/samples/kernel/threadstatus/main.c
index 47ff97ea55..6770d049dc 100644
--- a/src/samples/kernel/threadstatus/main.c
+++ b/src/samples/kernel/threadstatus/main.c
@@ -12,6 +12,7 @@
  */
 #include <pspkernel.h>
 #include <pspdebug.h>
+#include <psptypes.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/src/samples/mp3/main.c b/src/samples/mp3/main.c
index 8e4c992a3d..6c566192a4 100644
--- a/src/samples/mp3/main.c
+++ b/src/samples/mp3/main.c
@@ -16,6 +16,7 @@
 #include <pspaudio.h>
 #include <pspmp3.h>
 #include <psputility.h>
+#include <psptypes.h>
 
 
 /* Define the module info section */
diff --git a/src/samples/nand/dumpipl/main.c b/src/samples/nand/dumpipl/main.c
index 757efea33a..baee5de447 100644
--- a/src/samples/nand/dumpipl/main.c
+++ b/src/samples/nand/dumpipl/main.c
@@ -26,6 +26,7 @@
 #include <pspuser.h>
 #include <pspdebug.h>
 #include <pspnand_driver.h>
+#include <psptypes.h>
 
 /* Define the module info section */
 PSP_MODULE_INFO("dumpipl", 0x1000, 1, 1);
diff --git a/src/samples/net/resolver/main.c b/src/samples/net/resolver/main.c
index ccd1ff1a3c..c411420f43 100644
--- a/src/samples/net/resolver/main.c
+++ b/src/samples/net/resolver/main.c
@@ -19,6 +19,7 @@
 #include <pspnet_inet.h>
 #include <pspnet_apctl.h>
 #include <pspnet_resolver.h>
+#include <psptypes.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/select.h>
diff --git a/src/samples/net/simple/main.c b/src/samples/net/simple/main.c
index 0d79c80c25..22e0b15bed 100644
--- a/src/samples/net/simple/main.c
+++ b/src/samples/net/simple/main.c
@@ -15,6 +15,7 @@
 #include <pspnet_apctl.h>
 #include <pspsdk.h>
 #include <psputility.h>
+#include <psptypes.h>
 #include <string.h>
 #include <unistd.h>
 
diff --git a/src/samples/net/simple_prx/main.c b/src/samples/net/simple_prx/main.c
index e042d4cb0b..28259a283a 100644
--- a/src/samples/net/simple_prx/main.c
+++ b/src/samples/net/simple_prx/main.c
@@ -21,6 +21,7 @@
 #include <pspnet_inet.h>
 #include <pspnet_apctl.h>
 #include <pspnet_resolver.h>
+#include <psptypes.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/select.h>
diff --git a/src/samples/net/wlanscan_elf/main.c b/src/samples/net/wlanscan_elf/main.c
index d840a5edb2..4a4ff976cd 100644
--- a/src/samples/net/wlanscan_elf/main.c
+++ b/src/samples/net/wlanscan_elf/main.c
@@ -19,6 +19,7 @@
 #include <pspwlan.h>
 #include <pspctrl.h>
 #include <pspdisplay.h>
+#include <psptypes.h>
 
 #define printf pspDebugScreenPrintf
 
diff --git a/src/samples/power/main.c b/src/samples/power/main.c
index 47d4b0c1fe..bfaf3f9c61 100644
--- a/src/samples/power/main.c
+++ b/src/samples/power/main.c
@@ -15,6 +15,7 @@
 #include <stdio.h>
 #include <pspmoduleinfo.h>
 #include <psppower.h>
+#include <psptypes.h>
 
 /* Define the module info section */
 PSP_MODULE_INFO("PowerTest", 0, 0, 71);
diff --git a/src/samples/savedata/utility/main.c b/src/samples/savedata/utility/main.c
index 47397a0ddf..e082d3d173 100644
--- a/src/samples/savedata/utility/main.c
+++ b/src/samples/savedata/utility/main.c
@@ -22,6 +22,7 @@
 #include <pspgum.h>
 #include <psputility.h>
 #include <pspctrl.h>
+#include <psptypes.h>
 
 #include "data.h"
 
diff --git a/src/samples/template/kprx_template/main.c b/src/samples/template/kprx_template/main.c
index aa7bca9805..5288b43844 100644
--- a/src/samples/template/kprx_template/main.c
+++ b/src/samples/template/kprx_template/main.c
@@ -11,6 +11,7 @@
  *
  */
 #include <pspkernel.h>
+#include <psptypes.h>
 #include <stdio.h>
 
 PSP_MODULE_INFO("template", PSP_MODULE_KERNEL, 1, 1);
diff --git a/src/samples/usb/storage/main.c b/src/samples/usb/storage/main.c
index dc12a040be..99c1b4bc87 100644
--- a/src/samples/usb/storage/main.c
+++ b/src/samples/usb/storage/main.c
@@ -21,6 +21,7 @@
 #include <pspthreadman.h>
 #include <pspctrl.h>
 #include <pspsdk.h>
+#include <psptypes.h>
 
 /**
  * Define the module info section
diff --git a/src/samples/utility/msgdialog/main.c b/src/samples/utility/msgdialog/main.c
index b830c3ba08..2ea28c7e70 100644
--- a/src/samples/utility/msgdialog/main.c
+++ b/src/samples/utility/msgdialog/main.c
@@ -19,6 +19,7 @@
 #include <psputility.h>
 #include <pspgu.h>
 #include <pspgum.h>
+#include <psptypes.h>
 
 /* Define the module info section */
 PSP_MODULE_INFO("MsgDialog Sample", 0, 1, 0);
diff --git a/src/samples/utility/netconf/main.c b/src/samples/utility/netconf/main.c
index fdf0e56539..41d03f4a25 100644
--- a/src/samples/utility/netconf/main.c
+++ b/src/samples/utility/netconf/main.c
@@ -16,6 +16,7 @@
 #include <pspmoduleinfo.h>
 #include <psputility.h>
 #include <pspctrl.h>
+#include <psptypes.h>
 
 /* Define the module info section */
 PSP_MODULE_INFO("NetParam Sample", 0, 1, 00);
diff --git a/src/samples/utility/netdialog/main.c b/src/samples/utility/netdialog/main.c
index b50ccfe147..4a21ce34be 100644
--- a/src/samples/utility/netdialog/main.c
+++ b/src/samples/utility/netdialog/main.c
@@ -22,6 +22,7 @@
 #include <pspnet.h>
 #include <pspnet_inet.h>
 #include <pspnet_apctl.h>
+#include <psptypes.h>
 
 #if defined(_PSP_FW_VERSION) && _PSP_FW_VERSION >= 200
 PSP_MODULE_INFO("Net Dialog Sample", 0, 1, 1);
diff --git a/src/samples/utility/osk/main.c b/src/samples/utility/osk/main.c
index c7b961a632..52928e88a6 100644
--- a/src/samples/utility/osk/main.c
+++ b/src/samples/utility/osk/main.c
@@ -4,6 +4,7 @@
 #include <pspgu.h>
 #include <string.h>
 #include <psputility.h>
+#include <psptypes.h>
 
 PSP_MODULE_INFO("OSK Sample", 0, 1, 1);
 PSP_MAIN_THREAD_ATTR(THREAD_ATTR_USER);
diff --git a/src/samples/utility/systemparam/main.c b/src/samples/utility/systemparam/main.c
index 2fa3d481da..4321dac6e6 100644
--- a/src/samples/utility/systemparam/main.c
+++ b/src/samples/utility/systemparam/main.c
@@ -15,6 +15,7 @@
 #include <string.h>
 #include <pspmoduleinfo.h>
 #include <psputility.h>
+#include <psptypes.h>
 
 /* Define the module info section */
 PSP_MODULE_INFO("SystemParam Sample", 0, 1, 0);
diff --git a/src/samples/wlan/main.c b/src/samples/wlan/main.c
index d68c30e39e..272934ed6c 100644
--- a/src/samples/wlan/main.c
+++ b/src/samples/wlan/main.c
@@ -11,6 +11,7 @@
 #include <pspkernel.h>
 #include <pspdebug.h>
 #include <pspdisplay.h>
+#include <psptypes.h>
 #include <stdio.h>
 #include <string.h>
 //#include <pspmoduleinfo.h>
diff --git a/src/sdk/memory.c b/src/sdk/memory.c
index 00b3a69459..a27bf6e541 100644
--- a/src/sdk/memory.c
+++ b/src/sdk/memory.c
@@ -12,6 +12,7 @@
 #include <stdlib.h>
 #include <stddef.h>
 #include <pspsdk.h>
+#include <psptypes.h>
 
 static u32 _pspSdkGetMaxLineareMemorySize(void)
 {
diff --git a/src/sdk/pspsdk.h b/src/sdk/pspsdk.h
index b70029becd..4657579d63 100644
--- a/src/sdk/pspsdk.h
+++ b/src/sdk/pspsdk.h
@@ -15,6 +15,7 @@
 #define PSPSDK_H
 
 #include <pspkerneltypes.h>
+#include <psptypes.h>
 #include <pspmodulemgr.h>
 #include <pspmoduleinfo.h>
 #include <pspthreadman.h>
diff --git a/src/sdk/threadutils.c b/src/sdk/threadutils.c
index cd1a27b0fd..2d74d754c3 100644
--- a/src/sdk/threadutils.c
+++ b/src/sdk/threadutils.c
@@ -13,6 +13,7 @@
 
 #include "pspthreadman.h"
 #include "pspsdk.h"
+#include "psptypes.h"
 
 #define MAX_UIDS 256
 
diff --git a/src/startup/crt0.c b/src/startup/crt0.c
index 53eb00c37e..d141a0bc66 100644
--- a/src/startup/crt0.c
+++ b/src/startup/crt0.c
@@ -13,6 +13,7 @@
 #include <string.h>
 
 #include <pspkerneltypes.h>
+#include <psptypes.h>
 #include <pspmoduleinfo.h>
 #include <pspthreadman.h>
 #include <psploadexec.h>
diff --git a/src/startup/crt0_prx.c b/src/startup/crt0_prx.c
index 4e7437e807..7892580378 100644
--- a/src/startup/crt0_prx.c
+++ b/src/startup/crt0_prx.c
@@ -13,6 +13,7 @@
 #include <string.h>
 
 #include <pspkerneltypes.h>
+#include <psptypes.h>
 #include <pspmoduleinfo.h>
 #include <pspthreadman.h>
 #include <psploadexec.h>
diff --git a/src/usb/pspusbcam.h b/src/usb/pspusbcam.h
index c834ce88c4..06232339f2 100644
--- a/src/usb/pspusbcam.h
+++ b/src/usb/pspusbcam.h
@@ -15,6 +15,8 @@
 extern "C" {
 #endif
 
+#include <psptypes.h>
+
 #define PSP_USBCAM_PID				    (0x282)
 #define PSP_USBCAM_DRIVERNAME		  "USBCamDriver"
 #define PSP_USBCAMMIC_DRIVERNAME	"USBCamMicDriver"
diff --git a/src/user/pspiofilemgr.h b/src/user/pspiofilemgr.h
index 6f1b7177ad..ab19d263e8 100644
--- a/src/user/pspiofilemgr.h
+++ b/src/user/pspiofilemgr.h
@@ -14,6 +14,7 @@
 #define __FILEIO_H__
 
 #include <pspkerneltypes.h>
+#include <psptypes.h>
 #include <pspiofilemgr_fcntl.h>
 #include <pspiofilemgr_stat.h>
 #include <pspiofilemgr_dirent.h>
diff --git a/src/user/psploadexec.h b/src/user/psploadexec.h
index 8113ac19fa..ff7c2eeb44 100644
--- a/src/user/psploadexec.h
+++ b/src/user/psploadexec.h
@@ -24,6 +24,8 @@
 extern "C" {
 #endif
 
+#include <psptypes.h>
+
 /** @addtogroup LoadExec */
 
 /**@{*/
diff --git a/src/user/pspmodulemgr.h b/src/user/pspmodulemgr.h
index 527b7ef77f..1869e56a56 100644
--- a/src/user/pspmodulemgr.h
+++ b/src/user/pspmodulemgr.h
@@ -19,6 +19,7 @@
 #define __MODLOAD_H__
 
 #include <pspkerneltypes.h>
+#include <psptypes.h>
 
 /** @defgroup ModuleMgr Module Manager Library
   * This module contains the imports for the kernel's module management routines.
diff --git a/src/user/pspsysmem.h b/src/user/pspsysmem.h
index cb08fcdf12..4eb1ca41e0 100644
--- a/src/user/pspsysmem.h
+++ b/src/user/pspsysmem.h
@@ -17,6 +17,7 @@
 #define PSPSYSMEM_H
 
 #include <pspkerneltypes.h>
+#include <psptypes.h>
 
 /** @defgroup SysMem System Memory Manager
   * This module contains routines to manage heaps of memory.