diff --git a/Makefile.psl1ght b/Makefile.psl1ght
index a2528a3fc9..cef8228414 100644
--- a/Makefile.psl1ght
+++ b/Makefile.psl1ght
@@ -73,6 +73,7 @@ endif
 SHARED_FLAGS :=
 
 SHARED_FLAGS += -DHAVE_VIDEO_LAYOUT
+SHARED_FLAGS += -DHAVE_GCM
 SHARED_FLAGS += -DHAVE_MENU \
 		-DHAVE_CONFIGFILE \
 		-DHAVE_PATCH \
diff --git a/Makefile.psl1ght.salamander b/Makefile.psl1ght.salamander
index e0fa5907df..0c883febbc 100644
--- a/Makefile.psl1ght.salamander
+++ b/Makefile.psl1ght.salamander
@@ -86,7 +86,7 @@ endif
 SHARED_FLAGS :=
 
 SHARED_FLAGS += -DHAVE_VIDEO_LAYOUT
-SHARED_FLAGS += -DHAVE_MENU -DHAVE_CONFIGFILE -DRARCH_CONSOLE -DHAVE_OVERLAY -DHAVE_HEADSET -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_GCMGL -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_MOUSE  -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_GRIFFIN=1 -DHAVE_NETWORKING=1 -DHAVE_SOCKET_LEGACY=1 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -Wno-char-subscripts -DHAVE_CC_RESAMPLER -DHAVE_MULTIMAN -DHAVE_RGUI -DIS_SALAMANDER
+SHARED_FLAGS += -DHAVE_MENU -DHAVE_CONFIGFILE -DRARCH_CONSOLE -DHAVE_OVERLAY -DHAVE_HEADSET -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_MOUSE  -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_GRIFFIN=1 -DHAVE_NETWORKING=1 -DHAVE_SOCKET_LEGACY=1 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -Wno-char-subscripts -DHAVE_CC_RESAMPLER -DHAVE_MULTIMAN -DHAVE_RGUI -DIS_SALAMANDER -DHAVE_GCM
 CFLAGS += -std=gnu99 $(SHARED_FLAGS)
 CXXFLAGS += $(SHARED_FLAGS)
 
diff --git a/gfx/font_driver.c b/gfx/font_driver.c
index d451b248cf..213c23c65c 100644
--- a/gfx/font_driver.c
+++ b/gfx/font_driver.c
@@ -466,7 +466,7 @@ static bool wiiu_font_init_first(
 }
 #endif
 
-#ifdef __PSL1GHT__
+#ifdef HAVE_GCM
 static bool rsx_font_init_first(
       const void **font_driver, void **font_handle,
       void *video_data, const char *font_path,
@@ -580,7 +580,7 @@ static bool font_init_first(
          return switch_font_init_first(font_driver, font_handle,
                video_data, font_path, font_size, is_threaded);
 #endif
-#ifdef __PSL1GHT__
+#ifdef HAVE_GCM
       case FONT_DRIVER_RENDER_RSX:
          return rsx_font_init_first(font_driver, font_handle,
                video_data, font_path, font_size, is_threaded);
diff --git a/gfx/gfx_display.c b/gfx/gfx_display.c
index fc8e7324c3..6feb6c04c6 100644
--- a/gfx/gfx_display.c
+++ b/gfx/gfx_display.c
@@ -111,7 +111,7 @@ static gfx_display_ctx_driver_t *gfx_display_ctx_drivers[] = {
 #ifdef WIIU
    &gfx_display_ctx_wiiu,
 #endif
-#ifdef __PSL1GHT__
+#ifdef HAVE_GCM
    &gfx_display_ctx_rsx,
 #endif
 #if defined(_WIN32) && !defined(_XBOX) && !defined(__WINRT__)
diff --git a/gfx/video_driver.c b/gfx/video_driver.c
index 47d95ee88b..2a1040b103 100644
--- a/gfx/video_driver.c
+++ b/gfx/video_driver.c
@@ -267,7 +267,7 @@ video_driver_t video_null = {
 };
 
 const video_driver_t *video_drivers[] = {
-#ifdef __PSL1GHT__
+#ifdef HAVE_GCM
    &video_gcm,
 #endif
 #ifdef HAVE_VITA2D
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 59b90addb8..ef684eca01 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -535,7 +535,7 @@ VIDEO DRIVER
 #include "../gfx/drivers/xvideo.c"
 #endif
 
-#if defined(__PSL1GHT__)
+#if defined(HAVE_GCM)
 #include "../gfx/drivers/rsx_gfx.c"
 #include "../gfx/drivers_display/gfx_display_rsx.c"
 #elif defined(GEKKO)
@@ -642,7 +642,7 @@ FONTS
 #include "../gfx/drivers_font/wiiu_font.c"
 #endif
 
-#if defined(__PSL1GHT__)
+#if defined(HAVE_GCM)
 #include "../gfx/drivers_font/rsx_font.c"
 #endif