diff --git a/gfx/common/win32_common.cpp b/gfx/common/win32_common.cpp
index db33f887fa..a9b122f777 100644
--- a/gfx/common/win32_common.cpp
+++ b/gfx/common/win32_common.cpp
@@ -245,14 +245,9 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
    return DefWindowProc(hwnd, message, wparam, lparam);
 }
 
-bool win32_window_init(void *data, bool fullscreen)
+bool win32_window_init(WNDCLASSEX *wndclass, bool fullscreen)
 {
 #ifndef _XBOX
-   WNDCLASSEX *wndclass    = (WNDCLASSEX*)data;
-
-   if (!wndclass)
-      return false;
-
    wndclass->cbSize        = sizeof(WNDCLASSEX);
    wndclass->style         = CS_HREDRAW | CS_VREDRAW | CS_OWNDC;
    wndclass->lpfnWndProc   = WndProc;
diff --git a/gfx/common/win32_common.h b/gfx/common/win32_common.h
index e2915c8731..d549e4c04c 100644
--- a/gfx/common/win32_common.h
+++ b/gfx/common/win32_common.h
@@ -29,6 +29,7 @@
 #include "../video_context_driver.h"
 
 #ifndef _XBOX
+#include "../../defines/xdk_defines.h"
 #include "../drivers_wm/win32_resource.h"
 
 extern unsigned g_resize_width;
@@ -59,7 +60,7 @@ bool win32_set_video_mode(void *data,
 bool win32_monitor_set_fullscreen(unsigned width,
       unsigned height, unsigned refresh, char *dev_name);
 
-bool win32_window_init(void *wndclass, bool fullscreen);
+bool win32_window_init(WNDCLASSEX *wndclass, bool fullscreen);
 
 bool win32_window_create(void *data, unsigned style,
       RECT *mon_rect, unsigned width,
diff --git a/runloop_data.c b/runloop_data.c
index 2c11e31a71..63d4749297 100644
--- a/runloop_data.c
+++ b/runloop_data.c
@@ -68,7 +68,9 @@ static void data_runloop_thread_deinit(void)
 
       slock_free(g_data_runloop.lock);
       slock_free(g_data_runloop.cond_lock);
+#ifdef HAVE_OVERLAY
       rarch_main_data_overlay_thread_uninit();
+#endif
       scond_free(g_data_runloop.cond);
    }
 }
diff --git a/tasks/task_file_transfer.c b/tasks/task_file_transfer.c
index d3b27acc86..7a5798f6ca 100644
--- a/tasks/task_file_transfer.c
+++ b/tasks/task_file_transfer.c
@@ -545,6 +545,8 @@ static int rarch_main_data_nbio_iterate_poll(nbio_handle_t *nbio)
          nbio->cb = &cb_nbio_image_menu_boxart;
          break;
 #endif
+      default:
+         break;
    }
 
    nbio_begin_read(handle);