diff --git a/benchmark.c b/benchmark.c
index 551d8b7c7b..3a7a6628c0 100644
--- a/benchmark.c
+++ b/benchmark.c
@@ -16,13 +16,15 @@
 
 #include <stdio.h>
 
-#if defined(__CELLOS_LV2__)
+#if defined(__CELLOS_LV2__) || defined(GEKKO)
+#ifndef _PPU_INTRINSICS_H
 #include <ppu_intrinsics.h>
 #endif
+#endif
 
 unsigned long long rarch_get_performance_counter(void)
 {
-#if defined(__CELLOS_LV2__)
+#if defined(__CELLOS_LV2__) || defined(GEKKO)
    unsigned long long time = __mftb();
 #endif
    return time;
diff --git a/benchmark.h b/benchmark.h
index b61333699a..7979966297 100644
--- a/benchmark.h
+++ b/benchmark.h
@@ -28,6 +28,11 @@ unsigned long long rarch_get_performance_counter(void);
 #define RARCH_PERFORMANCE_INIT(X)  performance_counter_t (X)
 #define RARCH_PERFORMANCE_START(X) ((X).start = rarch_get_performance_counter())
 #define RARCH_PERFORMANCE_STOP(X)  ((X).stop  = rarch_get_performance_counter() - (X).start)
+
+#ifdef _WIN32
+#define RARCH_PERFORMANCE_LOG(functionname, X)   RARCH_LOG("Time taken (%s): %I64u.\n", functionname, (X).stop)
+#else
 #define RARCH_PERFORMANCE_LOG(functionname, X)   RARCH_LOG("Time taken (%s): %llu.\n", functionname, (X).stop)
+#endif
 
 #endif
diff --git a/console/griffin/griffin.c b/console/griffin/griffin.c
index 1c44eea479..463da8bcc4 100644
--- a/console/griffin/griffin.c
+++ b/console/griffin/griffin.c
@@ -22,9 +22,6 @@
 
 default_paths_t default_paths;
 
-#if defined(__CELLOS_LV2__)
-#include "../../benchmark.c"
-#endif
 
 /*============================================================
 CONSOLE EXTENSIONS
@@ -45,6 +42,10 @@ CONSOLE EXTENSIONS
 #include "../rarch_console_exec.c"
 #endif
 
+#if defined(__CELLOS_LV2__) || defined(GEKKO)
+#include "../../benchmark.c"
+#endif
+
 #ifdef HAVE_RSOUND
 #include "../rarch_console_rsound.c"
 #endif