diff --git a/Makefile.ngc b/Makefile.ngc
index c2fc82a9eb..93b8213b19 100644
--- a/Makefile.ngc
+++ b/Makefile.ngc
@@ -6,6 +6,7 @@
 DEBUG			= 0
 HAVE_LOGGER		= 1
 HAVE_FILE_LOGGER	= 0
+PERF_TEST		= 0
 
 PC_DEVELOPMENT_IP_ADDRESS	= "192.168.1.7"
 PC_DEVELOPMENT_UDP_PORT		= 3490
@@ -39,6 +40,10 @@ LIBS := -lfat -lretro_ngc -logc
 
 OBJ = console/griffin/griffin.o console/font.binobj console/rzlib/rzlib.o
 
+ifeq ($(PERF_TEST), 1)
+   CFLAGS += -DPERF_TEST
+endif
+
 ifeq ($(HAVE_LOGGER), 1)
 CFLAGS		+= -DHAVE_LOGGER
 CFLAGS          += -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)
diff --git a/Makefile.ps3 b/Makefile.ps3
index f1ab774d7d..284aacc587 100644
--- a/Makefile.ps3
+++ b/Makefile.ps3
@@ -12,6 +12,7 @@ STRIPPING_ENABLE	= 0
 HAVE_RGL		= 1
 HAVE_LOGGER		= 0
 HAVE_FREETYPE		= 0
+PERF_TEST		= 0
 
 CONTENT_ID_FULL		= UP0001-SSNE10000_00-0000000000000001
 CONTENT_ID		= SSNE10000
@@ -59,8 +60,12 @@ endif
 
 PPU_SRCS		= ps3/frontend/main.c
 
+ifeq ($(PERF_TEST), 1)
+   DEFINES += -DPERF_TEST
+endif
+
 ifeq ($(HAVE_RGL), 1)
-DEFINES			= -DHAVE_RGL
+DEFINES			+= -DHAVE_RGL
 GL_LIBS			:= -L. -lrgl_ps3
 else
 GL_LIBS			:= -L$(CELL_SDK)/target/ppu/lib/PSGL/RSX/ultra-opt -lPSGL -lPSGLcgc
diff --git a/Makefile.ps3.retroarch b/Makefile.ps3.retroarch
index 3ccf521fc2..92ff9fa598 100644
--- a/Makefile.ps3.retroarch
+++ b/Makefile.ps3.retroarch
@@ -10,6 +10,7 @@ DEBUG			= 0
 HAVE_RGL		= 1
 HAVE_LOGGER		= 0
 HAVE_FREETYPE		= 0
+PERF_TEST		= 0
 
 PC_DEVELOPMENT_IP_ADDRESS	= "192.168.1.7"
 PC_DEVELOPMENT_UDP_PORT		= 3490
@@ -28,6 +29,10 @@ else ifneq ($(findstring MINGW,$(shell uname -a)),)
    system_platform = win
 endif
 
+ifeq ($(PERF_TEST), 1)
+   DEFINES += -DPERF_TEST
+endif
+
 PPU_LIB_TARGET		= libretroarch_ps3.a
 
 LDDIRS = -L. -L$(CELL_SDK)/target/ppu/lib/PSGL/RSX/ultra-opt
@@ -36,7 +41,7 @@ INCDIRS = -I. -Ips3 -Icommon
 PPU_SRCS		= console/griffin/griffin.c console/rzlib/rzlib.c
 
 ifeq ($(HAVE_RGL), 1)
-DEFINES			= -DHAVE_RGL
+DEFINES			+= -DHAVE_RGL
 endif
 
 ifeq ($(HAVE_FREETYPE), 1)
diff --git a/Makefile.wii b/Makefile.wii
index dd666d3705..6965ea3512 100644
--- a/Makefile.wii
+++ b/Makefile.wii
@@ -6,6 +6,7 @@
 DEBUG			= 0
 HAVE_LOGGER		= 0
 HAVE_FILE_LOGGER	= 0
+PERF_TEST		= 0
 
 PC_DEVELOPMENT_IP_ADDRESS	= "192.168.1.7"
 PC_DEVELOPMENT_UDP_PORT		= 3490
@@ -41,6 +42,10 @@ APP_BOOTER_DIR = wii/app_booter
 
 OBJ = console/griffin/griffin.o console/font.binobj console/rzlib/rzlib.o $(APP_BOOTER_DIR)/app_booter.binobj
 
+ifeq ($(PERF_TEST), 1)
+   CFLAGS += -DPERF_TEST
+endif
+
 ifeq ($(HAVE_LOGGER), 1)
 CFLAGS		+= -DHAVE_LOGGER
 CFLAGS          += -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)
diff --git a/benchmark.c b/benchmark.c
index dcf5618eb6..42e68b0a7d 100644
--- a/benchmark.c
+++ b/benchmark.c
@@ -36,7 +36,7 @@ rarch_perf_tick_t rarch_get_perf_counter(void)
    __asm	mov	time_tmp.HighPart, edx;
    time = time_tmp.QuadPart;
 
-#elif defined(__GNUC__)
+#elif defined(__GNUC__) && !defined(RARCH_CONSOLE)
 
 #if defined(__i386__) || defined(__i486__)
    asm volatile ("rdtsc" : "=A" (time));
diff --git a/console/griffin/griffin.c b/console/griffin/griffin.c
index da2d60ba68..de52cc18e0 100644
--- a/console/griffin/griffin.c
+++ b/console/griffin/griffin.c
@@ -42,7 +42,7 @@ CONSOLE EXTENSIONS
 #include "../rarch_console_exec.c"
 #endif
 
-#if defined(__CELLOS_LV2__) || defined(GEKKO) || defined(_XBOX)
+#ifdef PERF_TEST
 #include "../../benchmark.c"
 #endif