diff --git a/Makefile.griffin b/Makefile.griffin
index 669e11291a..f0053255cf 100644
--- a/Makefile.griffin
+++ b/Makefile.griffin
@@ -133,10 +133,18 @@ else ifeq ($(platform), psp1)
   INCLUDE += -I$(PSPSDK)/psp/sdk/include
   EXT_TARGET := $(TARGET_NAME)_psp1.elf
   EXT_INTER_TARGET := $(TARGET_NAME)_psp1.elf
-  PLATCFLAGS := -DPSP -D_PSP_FW_VERSION=150 -G0
+  PLATCFLAGS := -DPSP -D_PSP_FW_VERSION=150 -G0 \
+	  -D_MIPS_ARCH_ALLEGREX
+  LIBS += $(WHOLE_START) -lretro_psp1 $(WHOLE_END) \
+			 -lpspgu -lpspgum -lm -lpspaudio -lpspfpu \
+			 -lpsppower -lpsprtc
+
+  LIBDIRS += -L.
+  LDFLAGS +=  -Wl,-q
 
   HAVE_LIBRETRO_MANAGEMENT := 1
   HAVE_RPNG                := 1
+  HAVE_KERNEL_PRX          := 1
 else ifeq ($(platform), vita)
   CC = arm-vita-eabi-gcc$(EXE_EXT)
   CXX = arm-vita-eabi-g++$(EXE_EXT)
@@ -145,7 +153,7 @@ else ifeq ($(platform), vita)
   EXT_INTER_TARGET := $(TARGET_NAME).elf
   MACHDEP := -DVITA
   PLATCFLAGS := -O3
-  LIBS += -lretro_vita \
+  LIBS += $(WHOLE_START) -lretro_vita $(WHOLE_END) \
         -lSceKernel_stub -lSceDisplay_stub -lSceGxm_stub -lSceNet_stub \
 	-lSceSysmodule_stub -lSceCtrl_stub -lSceAudio_stub \
 	-lScePower_stub -lSceRtc_stub -lz -lm -lc
@@ -162,6 +170,7 @@ else ifeq ($(platform), vita)
   HAVE_VITA2D              := 1
 endif
 
+
 CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(PLATCFLAGS) $(INCLUDE)
 
 OBJ = griffin/griffin.o  $(PLATOBJS)
@@ -186,6 +195,10 @@ ifeq ($(HAVE_LIBRETRO_MANAGEMENT), 1)
 CFLAGS		+= -DHAVE_LIBRETRO_MANAGEMENT
 endif
 
+ifeq ($(HAVE_KERNEL_PRX), 1)
+CFLAGS      += -DHAVE_KERNEL_PRX
+endif
+
 ifeq ($(HAVE_LIBSICKSAXIS), 1)
 CFLAGS		+= -DHAVE_LIBSICKSAXIS
 endif
@@ -202,6 +215,10 @@ ifeq ($(HAVE_LIBRETRODB), 1)
 CFLAGS		+= -DHAVE_LIBRETRODB
 endif
 
+ifeq ($(BIG_STACK),1)
+CFLAGS		+= -DBIG_STACK
+endif
+
 ifeq ($(HAVE_RPNG), 1)
 CFLAGS      += -DWANT_RPNG
 endif
diff --git a/gfx/drivers/psp1_gfx.c b/gfx/drivers/psp1_gfx.c
index f38bf8d80a..80ba494c93 100644
--- a/gfx/drivers/psp1_gfx.c
+++ b/gfx/drivers/psp1_gfx.c
@@ -455,9 +455,6 @@ static void *psp_init(const video_info_t *video,
    psp->hw_render          = false;
 
    return psp;
-error:
-   RARCH_ERR("PSP1 video could not be initialized.\n");
-   return (void*)-1;
 }
 
 //#define DISPLAY_FPS
diff --git a/gfx/video_driver.c b/gfx/video_driver.c
index 4c57252df0..8f0499958c 100644
--- a/gfx/video_driver.c
+++ b/gfx/video_driver.c
@@ -241,9 +241,10 @@ void find_video_driver(void)
 void *video_driver_get_ptr(const video_driver_t **drv)
 {
    driver_t *driver     = driver_get_ptr();
-   settings_t *settings = config_get_ptr();
 
 #ifdef HAVE_THREADS
+   settings_t *settings = config_get_ptr();
+
    if (settings->video.threaded
          && !video_state.hw_render_callback.context_type)
       return rarch_threaded_video_get_ptr(drv);
diff --git a/gfx/video_filter.c b/gfx/video_filter.c
index c9c3f5d774..a7229291be 100644
--- a/gfx/video_filter.c
+++ b/gfx/video_filter.c
@@ -129,6 +129,8 @@ static bool create_softfilter_graph(rarch_softfilter_t *filt,
    char key[64]  = {0};
    char name[64] = {0};
 
+   (void)i;
+
    snprintf(key, sizeof(key), "filter");
 
    if (!config_get_array(filt->conf, key, name, sizeof(name)))
diff --git a/libretro_version_1.c b/libretro_version_1.c
index 813c8a02fb..bc8723c7db 100644
--- a/libretro_version_1.c
+++ b/libretro_version_1.c
@@ -209,6 +209,8 @@ static void input_poll(void)
    const input_driver_t *input     = driver ? 
       (const input_driver_t*)driver->input : NULL;
 
+   (void)settings;
+
    input->poll(driver->input_data);
 
 #ifdef HAVE_OVERLAY
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 987c732c73..2b264400eb 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -2284,6 +2284,7 @@ static void settings_data_list_current_add_flags(
    setting_add_special_callbacks(list, list_info, values);
 }
 
+#ifdef HAVE_OVERLAY
 static void overlay_enable_toggle_change_handler(void *data)
 {
    settings_t *settings  = config_get_ptr();
@@ -2303,6 +2304,7 @@ static void overlay_enable_toggle_change_handler(void *data)
    else
       event_command(EVENT_CMD_OVERLAY_DEINIT);
 }
+#endif
 
 static bool setting_append_list_main_menu_options(
       rarch_setting_t **list,