diff --git a/frontend/platform/platform_psp.c b/frontend/platform/platform_psp.c
index a9c17046d5..20af854f45 100644
--- a/frontend/platform/platform_psp.c
+++ b/frontend/platform/platform_psp.c
@@ -25,7 +25,7 @@
 #include <stddef.h>
 #include <string.h>
 
-#include "../../psp/sdk_defines.h"
+#include "../../gfx/psp/sdk_defines.h"
 #include "../../file.h"
 #include "../../general.h"
 
diff --git a/gfx/psp1_gfx.c b/gfx/psp/psp1_gfx.c
similarity index 99%
rename from gfx/psp1_gfx.c
rename to gfx/psp/psp1_gfx.c
index 30c9a238d5..3148bbe982 100644
--- a/gfx/psp1_gfx.c
+++ b/gfx/psp/psp1_gfx.c
@@ -21,10 +21,10 @@
 #include <pspgum.h>
 #include <psprtc.h>
 
-#include "../psp/sdk_defines.h"
-#include "../general.h"
-#include "../driver.h"
-#include "../gfx/gfx_common.h"
+#include "sdk_defines.h"
+#include "../../general.h"
+#include "../../driver.h"
+#include "../gfx_common.h"
 
 #ifndef SCEGU_SCR_WIDTH
 #define SCEGU_SCR_WIDTH 480
diff --git a/gfx/psp1_gfx.h b/gfx/psp/psp1_gfx.h
similarity index 100%
rename from gfx/psp1_gfx.h
rename to gfx/psp/psp1_gfx.h
diff --git a/psp/sdk_defines.h b/gfx/psp/sdk_defines.h
similarity index 100%
rename from psp/sdk_defines.h
rename to gfx/psp/sdk_defines.h
diff --git a/griffin/griffin.c b/griffin/griffin.c
index c405317737..685e55b229 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -230,7 +230,7 @@ VIDEO DRIVER
 #if defined(GEKKO)
 #include "../gfx/gx/gx_gfx.c"
 #elif defined(PSP)
-#include "../gfx/psp1_gfx.c"
+#include "../gfx/psp/psp1_gfx.c"
 #elif defined(XENON)
 #include "../gfx/xenon360_gfx.c"
 #endif
diff --git a/input/psp_input.c b/input/psp_input.c
index ca48903c9a..11b03f6601 100644
--- a/input/psp_input.c
+++ b/input/psp_input.c
@@ -25,7 +25,7 @@
 #include <pspctrl.h>
 #endif
 
-#include "../psp/sdk_defines.h"
+#include "../gfx/psp/sdk_defines.h"
 
 #include "../driver.h"
 #include "../libretro.h"