diff --git a/gfx/drivers/gdi_gfx.c b/gfx/drivers/gdi_gfx.c
index 09cf97d867..2d735b6630 100644
--- a/gfx/drivers/gdi_gfx.c
+++ b/gfx/drivers/gdi_gfx.c
@@ -136,10 +136,9 @@ static bool gfx_ctx_gdi_set_video_mode(
 static void gfx_ctx_gdi_input_driver(
       input_driver_t **input, void **input_data)
 {
+   settings_t *settings = config_get_ptr();
 #if _WIN32_WINNT >= 0x0501
 #ifdef HAVE_WINRAWINPUT
-   settings_t *settings = config_get_ptr();
-
    /* winraw only available since XP */
    if (string_is_equal(settings->arrays.input_driver, "raw"))
    {
diff --git a/gfx/drivers_context/wgl_ctx.c b/gfx/drivers_context/wgl_ctx.c
index 78c71d2fd9..3456a95fe9 100644
--- a/gfx/drivers_context/wgl_ctx.c
+++ b/gfx/drivers_context/wgl_ctx.c
@@ -184,13 +184,14 @@ static void create_gl_context(HWND hwnd, bool *quit)
 {
    struct retro_hw_render_callback *hwr = video_driver_get_hw_context();
    bool core_context                    = (win32_major * 1000 + win32_minor) >= 3001;
-   win32_hdc                            = GetDC(hwnd);
 #ifdef GL_DEBUG
    bool debug                           = true;
 #else
    bool debug                           = hwr->debug_context;
 #endif
 
+   win32_hdc                            = GetDC(hwnd);
+
    win32_setup_pixel_format(win32_hdc, true);
 
    if (win32_hrc)