diff --git a/src_rebuild/PsyX/include/PsyX/PsyX_render.h b/src_rebuild/PsyX/include/PsyX/PsyX_render.h
index 8853dd00..b36ddac1 100644
--- a/src_rebuild/PsyX/include/PsyX/PsyX_render.h
+++ b/src_rebuild/PsyX/include/PsyX/PsyX_render.h
@@ -34,7 +34,7 @@
 #if defined (RENDERER_OGL)
 
 #   define GL_GLEXT_PROTOTYPES
-#   include "COMMON/glad.h"
+#   include "common/glad.h"
 
 #elif defined (RENDERER_OGLES)
 
@@ -62,11 +62,11 @@
 #   define TEXTURE_FORMAT GL_UNSIGNED_SHORT_5_5_5_1
 #endif
 
-#include "TYPES.H"
+#include "types.h"
 
-#include "COMMON/PGXP_DEFS.H"
-#include "LIBGTE.H"
-#include "LIBGPU.H"
+#include "common/pgxp_defs.h"
+#include "libgte.h"
+#include "libgpu.h"
 
 #include <stdio.h>
 #include <stddef.h>
diff --git a/src_rebuild/PsyX/src/gpu/PsyX_GPU.c b/src_rebuild/PsyX/src/gpu/PsyX_GPU.c
index 79b29619..a98e48e9 100644
--- a/src_rebuild/PsyX/src/gpu/PsyX_GPU.c
+++ b/src_rebuild/PsyX/src/gpu/PsyX_GPU.c
@@ -1,10 +1,10 @@
-#include "PsyX_GPU.H"
+#include "PsyX_GPU.h"
 
 #include "PsyX/PsyX_public.h"
 #include "PsyX/PsyX_globals.h"
 #include "PsyX/PsyX_render.h"
 
-#include "../PSYX_SETUP.H"
+#include "../PsyX_setup.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/src_rebuild/PsyX/src/platform.h b/src_rebuild/PsyX/src/platform.h
index 1f95aff0..3f16bbe1 100644
--- a/src_rebuild/PsyX/src/platform.h
+++ b/src_rebuild/PsyX/src/platform.h
@@ -27,7 +27,7 @@
 #define FUNCNAME __func__
 #endif
 
-#include "PsyX/PsyX_globals.H"
+#include "PsyX/PsyX_globals.h"
 
 #if defined(__ANDROID__)
 #   include <android/log.h>
diff --git a/src_rebuild/PsyX/src/psx/INLINE_C.C b/src_rebuild/PsyX/src/psx/INLINE_C.C
index 1aef6706..2e3c909c 100644
--- a/src_rebuild/PsyX/src/psx/INLINE_C.C
+++ b/src_rebuild/PsyX/src/psx/INLINE_C.C
@@ -1,7 +1,7 @@
 #include "inline_c.h"
 #include "libgte.h"
 #include "gtereg.h"
-#include "../GTE/PsyX_GTE.h"
+#include "../gte/PsyX_GTE.h"
 
 unsigned int MFC2(int reg)
 {
diff --git a/src_rebuild/PsyX/src/psx/LIBGPU.C b/src_rebuild/PsyX/src/psx/LIBGPU.C
index 834228a8..912d9322 100644
--- a/src_rebuild/PsyX/src/psx/LIBGPU.C
+++ b/src_rebuild/PsyX/src/psx/LIBGPU.C
@@ -1,7 +1,7 @@
 #include "libgte.h"
 #include "libgpu.h"
 
-#include "../GPU/PsyX_GPU.H"
+#include "../gpu/PsyX_GPU.h"
 #include "PsyX/PsyX_render.h"
 #include "PsyX/PsyX_public.h"
 
@@ -16,7 +16,7 @@
 
 #include "PsyX/PsyX_globals.h"
 #include "../PsyX_setup.h"
-//#include "../GPU/FONT.H"
+//#include "../gpu/font.h"
 
 //#define DEBUG_POLY_COUNT
 
diff --git a/src_rebuild/PsyX/src/psx/LIBGTE.C b/src_rebuild/PsyX/src/psx/LIBGTE.C
index 967a262d..ed527380 100644
--- a/src_rebuild/PsyX/src/psx/LIBGTE.C
+++ b/src_rebuild/PsyX/src/psx/LIBGTE.C
@@ -9,10 +9,10 @@
 #include "gtemac.h"
 #include "gtereg.h"
 
-#include "../GTE/PsyX_GTE.h"
-#include "../GTE/rcossin_tbl.h"
-#include "../GTE/ratan_tbl.h"
-#include "../GTE/sqrt_tbl.h"
+#include "../gte/PsyX_GTE.h"
+#include "../gte/rcossin_tbl.h"
+#include "../gte/ratan_tbl.h"
+#include "../gte/sqrt_tbl.h"
 
 #define ONE_BITS			12
 #define ONE					(1 << 12)
diff --git a/src_rebuild/PsyX/src/psx/LIBSPU.C b/src_rebuild/PsyX/src/psx/LIBSPU.C
index 4732db40..6e8e8a95 100644
--- a/src_rebuild/PsyX/src/psx/LIBSPU.C
+++ b/src_rebuild/PsyX/src/psx/LIBSPU.C
@@ -4,7 +4,7 @@
 #include "libetc.h"
 #include <stdio.h>
 
-#include "../PSYX_SETUP.H"
+#include "../PsyX_setup.h"
 #include "libmath.h"