diff --git a/gfx/drivers_context/wgl_ctx.cpp b/gfx/drivers_context/wgl_ctx.cpp
index b1d4a149d2..83cf7b9b74 100644
--- a/gfx/drivers_context/wgl_ctx.cpp
+++ b/gfx/drivers_context/wgl_ctx.cpp
@@ -1,7 +1,7 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
  *  Copyright (C) 2011-2016 - Daniel De Matteis
- * 
+ *
  *  RetroArch is free software: you can redistribute it and/or modify it under the terms
  *  of the GNU General Public License as published by the Free Software Found-
  *  ation, either version 3 of the License, or (at your option) any later version.
@@ -23,10 +23,7 @@
 #define _WIN32_WINNT 0x0500 //_WIN32_WINNT_WIN2K
 #endif
 
-#define UNICODE
-#include <tchar.h>
-#include <wchar.h>
-
+#include <encodings/win32.h>
 #include <string.h>
 #include <math.h>
 
@@ -185,7 +182,7 @@ static void create_gl_context(HWND hwnd, bool *quit)
          *aptr++ = win32_minor;
 
          /* Technically, we don't have core/compat until 3.2.
-          * Version 3.1 is either compat or not depending 
+          * Version 3.1 is either compat or not depending
           * on GL_ARB_compatibility.
           */
          if ((win32_major * 1000 + win32_minor) >= 3002)
@@ -434,7 +431,7 @@ static void *gfx_ctx_wgl_init(void *video_driver)
 
    if (g_inited)
       return NULL;
-   
+
    win32_window_reset();
    win32_monitor_init();
 
@@ -596,7 +593,7 @@ static gfx_ctx_proc_t gfx_ctx_wgl_get_proc_address(const char *symbol)
 }
 
 static bool gfx_ctx_wgl_get_metrics(void *data,
-	enum display_metric_types type, float *value)
+        enum display_metric_types type, float *value)
 {
    return win32_get_metrics(data, type, value);
 }