diff --git a/audio/drivers/gx_audio.c b/audio/drivers/gx_audio.c
@@ -28,7 +28,7 @@
 #include <cafe/ai.h>
 #endif
 
-#include "../../gfx/drivers/gx_sdk_defines.h"
+#include "../../defines/gx_defines.h"
 
 #define CHUNK_FRAMES 64
 #define CHUNK_SIZE (CHUNK_FRAMES * sizeof(uint32_t))

diff --git a/audio/drivers/ps3_audio.c b/audio/drivers/ps3_audio.c
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <queues/fifo_buffer.h>
 
-#include "../ps3/sdk_defines.h"
+#include "../../defines/ps3_defines.h"
 
 #define AUDIO_BLOCKS 8
 #define AUDIO_CHANNELS 2

diff --git a/gfx/drivers/gx_sdk_defines.h → defines/gx_defines.h b/gfx/drivers/gx_sdk_defines.h → defines/gx_defines.h
@@ -1,5 +1,5 @@
-#ifndef _GX_SDK_DEFINES_H
-#define _GX_SDK_DEFINES_H
+#ifndef _GX_DEFINES_H
+#define _GX_DEFINES_H
 
 #ifdef GEKKO
 

diff --git a/ps3/sdk_defines.h → defines/ps3_defines.h b/ps3/sdk_defines.h → defines/ps3_defines.h
@@ -14,8 +14,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _PS3_SDK_DEFINES_H
-#define _PS3_SDK_DEFINES_H
+#ifndef _PS3_DEFINES_H
+#define _PS3_DEFINES_H
 
 #include <sdk_version.h>
 

diff --git a/gfx/drivers/psp_sdk_defines.h → defines/psp_defines.h b/gfx/drivers/psp_sdk_defines.h → defines/psp_defines.h
@@ -14,8 +14,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _PSP_SDK_DEFINES_H
-#define _PSP_SDK_DEFINES_H
+#ifndef _PSP_DEFINES_H
+#define _PSP_DEFINES_H
 
 /*============================================================
 	ERROR PROTOTYPES

diff --git a/frontend/drivers/platform_gx.c b/frontend/drivers/platform_gx.c
@@ -43,7 +43,7 @@
 #include "../../driver.h"
 #include "../../general.h"
 #include "../../libretro_private.h"
-#include "../../gfx/drivers/gx_sdk_defines.h"
+#include "../../defines/gx_defines.h"
 
 #ifdef HW_RVL
 #include <ogc/ios.h>

diff --git a/frontend/drivers/platform_ps3.c b/frontend/drivers/platform_ps3.c
@@ -33,7 +33,7 @@
 #include <file/file_list.h>
 #endif
 
-#include "../../ps3/sdk_defines.h"
+#include "../../defines/ps3_defines.h"
 #include "../../general.h"
 
 #define EMULATOR_CONTENT_DIR "SSNE10000"

diff --git a/frontend/drivers/platform_psp.c b/frontend/drivers/platform_psp.c
@@ -30,7 +30,7 @@
 #include <file/file_list.h>
 #endif
 
-#include "../../gfx/drivers/psp_sdk_defines.h"
+#include "../../defines/psp_defines.h"
 #include "../../general.h"
 
 #if defined(HAVE_KERNEL_PRX) || defined(IS_SALAMANDER)

diff --git a/gfx/drivers/gx_gfx.c b/gfx/drivers/gx_gfx.c
@@ -35,7 +35,7 @@
 
 #include "ppc_asm.h"
 #include "gx_gfx_inl.h"
-#include "gx_sdk_defines.h"
+#include "../../defines/gx_defines.h"
 
 struct gx_overlay_data
 {

diff --git a/gfx/drivers/psp1_gfx.c b/gfx/drivers/psp1_gfx.c
@@ -22,7 +22,7 @@
 #include <psprtc.h>
 
 #include <retro_inline.h>
-#include "psp_sdk_defines.h"
+#include "../../defines/psp_defines.h"
 #include "../../general.h"
 #include "../../driver.h"
 #include "../video_viewport.h"

diff --git a/gfx/drivers_context/ps3_ctx.c b/gfx/drivers_context/ps3_ctx.c
@@ -16,7 +16,7 @@
 
 #include "../../driver.h"
 #include "../../runloop.h"
-#include "../../ps3/sdk_defines.h"
+#include "../../defines/ps3_defines.h"
 
 #ifdef HAVE_LIBDBGFONT
 #ifndef __PSL1GHT__

diff --git a/gfx/image/image.c b/gfx/image/image.c
@@ -36,7 +36,7 @@
 #include "../../general.h"
 
 #if defined(__CELLOS_LV2__) || defined(__PSLIGHT__)
-#include "../../ps3/sdk_defines.h"
+#include "../../defines/ps3_defines.h"
 
 #ifdef __PSL1GHT__
 #include <ppu-asm.h>

diff --git a/input/drivers/ps3_input.c b/input/drivers/ps3_input.c
@@ -21,7 +21,7 @@
 
 #include <sdk_version.h>
 
-#include "../../ps3/sdk_defines.h"
+#include "../../defines/ps3_defines.h"
 
 #include "../../driver.h"
 #include "../../libretro.h"

diff --git a/input/drivers/psp_input.c b/input/drivers/psp_input.c
@@ -29,7 +29,7 @@
 #include <pspctrl.h>
 #endif
 
-#include "../../gfx/drivers/psp_sdk_defines.h"
+#include "../../defines/psp_defines.h"
 
 #include "../../driver.h"
 #include "../../libretro.h"

diff --git a/logger/netlogger/logger.c b/logger/netlogger/logger.c
@@ -15,7 +15,7 @@
  */
 
 #if defined(__CELLOS_LV2__)
-#include "../../ps3/sdk_defines.h"
+#include "../../defines/ps3_defines.h"
 #ifndef __PSL1GHT__
 #include <netex/net.h>
 #include <cell/sysmodule.h>