diff --git a/src_rebuild/PsyX/src/gte/PsyX_GTE.c b/src_rebuild/PsyX/src/gte/PsyX_GTE.c
index af444095..40c4aeba 100644
--- a/src_rebuild/PsyX/src/gte/PsyX_GTE.c
+++ b/src_rebuild/PsyX/src/gte/PsyX_GTE.c
@@ -1,6 +1,6 @@
 #include "PsyX_GTE.h"
-#include "gtereg.h"
-#include "libgte.h"
+#include "psx/gtereg.h"
+#include "psx/libgte.h"
 
 #include <math.h>
 
diff --git a/src_rebuild/PsyX/src/gte/half_float.cpp b/src_rebuild/PsyX/src/gte/half_float.cpp
index a90d13d6..6045b603 100644
--- a/src_rebuild/PsyX/src/gte/half_float.cpp
+++ b/src_rebuild/PsyX/src/gte/half_float.cpp
@@ -1,5 +1,5 @@
 #include "PsyX/common/half_float.h"
-#include "types.h"
+#include "psx/types.h"
 
 // see https://gist.github.com/rygorous/2156668
 
diff --git a/src_rebuild/PsyX/src/psx/ABS.C b/src_rebuild/PsyX/src/psx/ABS.C
index 305b28a0..547d5b32 100644
--- a/src_rebuild/PsyX/src/psx/ABS.C
+++ b/src_rebuild/PsyX/src/psx/ABS.C
@@ -1,4 +1,4 @@
-#include "abs.h"
+#include "psx/abs.h"
 
 // this is definitely NOT in psx runtime libs
 int fst_abs(int x)
diff --git a/src_rebuild/PsyX/src/psx/INLINE_C.C b/src_rebuild/PsyX/src/psx/INLINE_C.C
index 2e3c909c..a2c97bd1 100644
--- a/src_rebuild/PsyX/src/psx/INLINE_C.C
+++ b/src_rebuild/PsyX/src/psx/INLINE_C.C
@@ -1,6 +1,6 @@
-#include "inline_c.h"
-#include "libgte.h"
-#include "gtereg.h"
+#include "psx/inline_c.h"
+#include "psx/libgte.h"
+#include "psx/gtereg.h"
 #include "../gte/PsyX_GTE.h"
 
 unsigned int MFC2(int reg)
diff --git a/src_rebuild/PsyX/src/psx/LIBAPI.C b/src_rebuild/PsyX/src/psx/LIBAPI.C
index 91b18bd8..245d5191 100644
--- a/src_rebuild/PsyX/src/psx/LIBAPI.C
+++ b/src_rebuild/PsyX/src/psx/LIBAPI.C
@@ -1,4 +1,4 @@
-#include "libapi.h"
+#include "psx/libapi.h"
 
 #include <stdio.h>
 #include "../PsyX_setup.h"
diff --git a/src_rebuild/PsyX/src/psx/LIBCD.C b/src_rebuild/PsyX/src/psx/LIBCD.C
index 19184200..ae3e26c4 100644
--- a/src_rebuild/PsyX/src/psx/LIBCD.C
+++ b/src_rebuild/PsyX/src/psx/LIBCD.C
@@ -1,4 +1,4 @@
-#include "libcd.h"
+#include "psx/libcd.h"
 
 #include "../PsyX_setup.h"
 #include "../iso9660.h"
diff --git a/src_rebuild/PsyX/src/psx/LIBETC.C b/src_rebuild/PsyX/src/psx/LIBETC.C
index d5b3f2a7..ead6256f 100644
--- a/src_rebuild/PsyX/src/psx/LIBETC.C
+++ b/src_rebuild/PsyX/src/psx/LIBETC.C
@@ -1,4 +1,4 @@
-#include "libetc.h"
+#include "psx/libetc.h"
 
 #include "../PsyX_setup.h"
 #include "PsyX/PsyX_public.h"
diff --git a/src_rebuild/PsyX/src/psx/LIBMCRD.C b/src_rebuild/PsyX/src/psx/LIBMCRD.C
index 33848733..956b7170 100644
--- a/src_rebuild/PsyX/src/psx/LIBMCRD.C
+++ b/src_rebuild/PsyX/src/psx/LIBMCRD.C
@@ -1,5 +1,5 @@
 #include "../PsyX_setup.h"
-#include "libmcrd.h"
+#include "psx/libmcrd.h"
 #include <stdio.h>
 #include <string.h>
 
diff --git a/src_rebuild/PsyX/src/psx/LIBPAD.C b/src_rebuild/PsyX/src/psx/LIBPAD.C
index 8903a233..c5a4ee6d 100644
--- a/src_rebuild/PsyX/src/psx/LIBPAD.C
+++ b/src_rebuild/PsyX/src/psx/LIBPAD.C
@@ -1,5 +1,5 @@
-#include "libpad.h"
-#include "libetc.h"
+#include "psx/libpad.h"
+#include "psx/libetc.h"
 
 #include "../PsyX_setup.h"
 #include "PsyX/PsyX_public.h"
diff --git a/src_rebuild/PsyX/src/psx/LIBSN.C b/src_rebuild/PsyX/src/psx/LIBSN.C
index 8b6c4a06..1f02448c 100644
--- a/src_rebuild/PsyX/src/psx/LIBSN.C
+++ b/src_rebuild/PsyX/src/psx/LIBSN.C
@@ -1,5 +1,5 @@
 
-#include "libsn.h"
+#include "psx/libsn.h"
 #include <stdio.h>
 
 uintptr_t fileHandle = 0;