diff --git a/Makefile.wii b/Makefile.wii
index cf2e34cd2e..d2fd59b5d8 100644
--- a/Makefile.wii
+++ b/Makefile.wii
@@ -26,7 +26,7 @@ CXXFLAGS += -Wall -std=gnu99 $(MACHDEP) $(INCLUDE)
 LDFLAGS := $(MACHDEP)
 LIBS := -lfat -lretro -lwiiuse -logc -lbte -lfreetype
 
-OBJ = wii/main.o fifo_buffer.o ssnes.o driver.o gfx/fonts.o file.o file_path.o settings.o message.o rewind.o movie.o patch.o compat/compat.o screenshot.o audio/hermite.o dynamic.o audio/utils.o conf/config_file.o wii/audio.o wii/input.o wii/video.o console/sgui/sgui.o console/sgui/list.o console/font.bmpobj console/console_ext.o console/szlib/szlib.o
+OBJ = console/griffin/griffin.o console/font.bmpobj console/szlib/szlib.o
 
 ifeq ($(HAVE_LOGGER), 1)
 CFLAGS		+= -DHAVE_LOGGER
@@ -37,7 +37,7 @@ ifeq ($(HAVE_FILE_LOGGER), 1)
 CFLAGS		+= -DHAVE_FILE_LOGGER
 endif
 
-CFLAGS += -std=gnu99 -DSSNES_CONSOLE -DHAVE_CONFIGFILE=1 -DGEKKO -DHW_RVL -DHAVE_ZLIB -DHAVE_SSNES_MAIN_WRAP -DHAVE_FREETYPE -DPACKAGE_VERSION=\"0.9.5\" -Dmain=ssnes_main -Wno-char-subscripts -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)
+CFLAGS += -std=gnu99 -DSSNES_CONSOLE -DHAVE_CONFIGFILE=1 -DGEKKO -DHW_RVL -DHAVE_ZLIB -DHAVE_SSNES_MAIN_WRAP -DHAVE_FREETYPE -DHAVE_GRIFFIN=1 -DPACKAGE_VERSION=\"0.9.5\" -Dmain=ssnes_main -Wno-char-subscripts -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)
 
 ifeq ($(DEBUG), 1)
    CFLAGS += -O0 -g
diff --git a/console/griffin/griffin.c b/console/griffin/griffin.c
index 03dda35562..842993c674 100644
--- a/console/griffin/griffin.c
+++ b/console/griffin/griffin.c
@@ -57,7 +57,6 @@ VIDEO
 #include "../../360/fonts.cpp"
 #elif defined(GEKKO)
 #include "../../gfx/fonts.c"
-#include "../font.bmp"
 #endif
 
 /*============================================================
@@ -168,12 +167,16 @@ SSNES
 /*============================================================
 THREAD
 ============================================================ */
+#ifndef GEKKO
 #include "../../thread.c"
+#endif
 
 /*============================================================
 NETPLAY
 ============================================================ */
+#ifndef GEKKO
 #include "../../netplay.c"
+#endif
 
 /*============================================================
 MENU
diff --git a/console/griffin/hook.h b/console/griffin/hook.h
index 303180dc36..3172c2d1c1 100644
--- a/console/griffin/hook.h
+++ b/console/griffin/hook.h
@@ -86,7 +86,7 @@
 #define video_focus_func()                      wii_focus(driver.video_data)
 #define video_xml_shader_func(path)             driver.video->xml_shader(driver.video_data, path)
 #define video_free_func()                       wii_free(driver.video_data)
-#define video_set_rotation_func(orientation)	wii_set_orientation(driver.video_data, orientation)
+#define video_set_rotation_func(orientation)	wii_set_rotation(driver.video_data, orientation)
 #define video_set_aspect_ratio_func(aspectratio_idx) wii_set_aspect_ratio(driver.video_data, aspectratio_idx)
 
 #define input_init_func()                       wii_input_initialize()