diff --git a/driver.c b/driver.c
index 983f11a2df..915553b2dd 100644
--- a/driver.c
+++ b/driver.c
@@ -167,7 +167,6 @@ void uninit_drivers(void)
 #ifdef HAVE_DYLIB
 static void init_dsp_plugin(void)
 {
-#ifdef HAVE_DYLIB
    if (!(*g_settings.audio.dsp_plugin))
       return;
 
@@ -220,18 +219,15 @@ error:
       dylib_close(g_extern.audio_data.dsp_lib);
    g_extern.audio_data.dsp_plugin = NULL;
    g_extern.audio_data.dsp_lib = NULL;
-#endif
 }
 
 static void deinit_dsp_plugin(void)
 {
-#ifdef HAVE_DYLIB
    if (g_extern.audio_data.dsp_lib && g_extern.audio_data.dsp_plugin)
    {
       g_extern.audio_data.dsp_plugin->free(g_extern.audio_data.dsp_handle);
       dylib_close(g_extern.audio_data.dsp_lib);
    }
-#endif
 }
 #endif
 
diff --git a/ps3/ps3_video_psgl.c b/ps3/ps3_video_psgl.c
index cd63771632..0969b28018 100644
--- a/ps3/ps3_video_psgl.c
+++ b/ps3/ps3_video_psgl.c
@@ -1362,6 +1362,9 @@ static void *gl_init(const video_info_t *video, const input_driver_t **input, vo
       return NULL;
    }
 
+   *input = NULL;
+   *input_data = NULL;
+
    return gl;
 }