diff --git a/file_path_special.c b/file_path_special.c
index 78007d0738..3effe5bb27 100644
--- a/file_path_special.c
+++ b/file_path_special.c
@@ -16,11 +16,9 @@
 
 /* Assume W-functions do not work below Win2K and Xbox platforms */
 #if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0500 || defined(_XBOX)
-
 #ifndef LEGACY_WIN32
 #define LEGACY_WIN32
 #endif
-
 #endif
 
 #ifdef _WIN32
diff --git a/gfx/common/win32_common.c b/gfx/common/win32_common.c
index d49d271ae6..916672b1d0 100644
--- a/gfx/common/win32_common.c
+++ b/gfx/common/win32_common.c
@@ -70,11 +70,9 @@
 
 /* Assume W-functions do not work below Win2K and Xbox platforms */
 #if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0500 || defined(_XBOX)
-
 #ifndef LEGACY_WIN32
 #define LEGACY_WIN32
 #endif
-
 #endif
 
 /* For some reason this is missing from mingw winuser.h */
diff --git a/retroarch.c b/retroarch.c
index bbacf8e237..d4e8208a08 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -38,12 +38,6 @@
 #include <signal.h>
 #endif
 
-#if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0500 || defined(_XBOX)
-#ifndef LEGACY_WIN32
-#define LEGACY_WIN32
-#endif
-#endif
-
 #if defined(_WIN32) && !defined(_XBOX) && !defined(__WINRT__)
 #include <objbase.h>
 #include <process.h>
diff --git a/runahead.c b/runahead.c
index a3dd75be53..39b4a09702 100644
--- a/runahead.c
+++ b/runahead.c
@@ -22,6 +22,12 @@
 #include "config.h"
 #endif
 
+#if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0500 || defined(_XBOX)
+#ifndef LEGACY_WIN32
+#define LEGACY_WIN32
+#endif
+#endif
+
 #include <encodings/utf.h>
 #include <string/stdstring.h>
 #include <streams/file_stream.h>
diff --git a/runloop.c b/runloop.c
index c2343ff28d..e60c93722f 100644
--- a/runloop.c
+++ b/runloop.c
@@ -40,12 +40,6 @@
 #include <signal.h>
 #endif
 
-#if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0500 || defined(_XBOX)
-#ifndef LEGACY_WIN32
-#define LEGACY_WIN32
-#endif
-#endif
-
 #if defined(_WIN32) && !defined(_XBOX) && !defined(__WINRT__)
 #include <objbase.h>
 #include <process.h>
diff --git a/ui/drivers/ui_win32.c b/ui/drivers/ui_win32.c
index 1b832e00fc..94fc8e1142 100644
--- a/ui/drivers/ui_win32.c
+++ b/ui/drivers/ui_win32.c
@@ -127,7 +127,7 @@ static void ui_window_win32_set_title(void *data, char *buf)
 
 void ui_window_win32_set_droppable(void *data, bool droppable)
 {
-   /* Minimum supported client: Windows XP, 
+   /* Minimum supported client: Windows XP,
     * minimum supported server: Windows 2000 Server */
    ui_window_win32_t *window = (ui_window_win32_t*)data;
    if (DragAcceptFiles_func)
@@ -264,8 +264,8 @@ static bool ui_browser_window_win32_core(
    ofn.nMaxFileTitle     = 0;
    ofn.lpstrInitialDir   = state->startdir;
    ofn.lpstrTitle        = state->title;
-   ofn.Flags             =   OFN_FILEMUSTEXIST 
-                           | OFN_HIDEREADONLY 
+   ofn.Flags             =   OFN_FILEMUSTEXIST
+                           | OFN_HIDEREADONLY
                            | OFN_NOCHANGEDIR;
    ofn.nFileOffset       = 0;
    ofn.nFileExtension    = 0;
@@ -319,7 +319,7 @@ static ui_browser_window_t ui_browser_window_win32 = {
    "win32"
 };
 
-static void ui_companion_win32_deinit(void *data) { } 
+static void ui_companion_win32_deinit(void *data) { }
 static void *ui_companion_win32_init(void) { return (void*)-1; }
 static void ui_companion_win32_toggle(void *data, bool force) { }
 static void ui_companion_win32_event_command(