Revert "reordering the #include lets you build this file with latest mingw headers (nw)"

This reverts commit c3b10caf4e.

src/lib/util/unicode.cpp

@@ -8,7 +8,10 @@
 
 ***************************************************************************/
 
+#include "unicode.h"
+
 #ifdef _WIN32
+#include "strconv.h"
 #define UTF8PROC_DLLEXPORT
 #endif
 
@@ -17,12 +20,6 @@
 #include <codecvt>
 #include <locale>
 
-#include "unicode.h"
-
-#ifdef _WIN32
-#include "strconv.h"
-#endif
-
 
 //-------------------------------------------------
 //  uchar_isvalid - return true if a given

src/osd/osdsync.cpp

@@ -5,11 +5,6 @@
 //  osdsync.c - OSD core work item functions
 //
 //============================================================
-#include <mutex>
-#include <atomic>
-#include <thread>
-#include <vector>
-#include <algorithm>
 #if defined(OSD_WINDOWS) || defined(SDLMAME_WIN32)
 // standard windows headers
 #include <windows.h>
@@ -21,6 +16,11 @@
 #include <stdint.h>
 #endif
 #endif
+#include <mutex>
+#include <atomic>
+#include <thread>
+#include <vector>
+#include <algorithm>
 // MAME headers
 #include "osdcore.h"
 #include "osdsync.h"