Replacing includes of windows headers with base/platform.h.

src/xenia/base/debugging_win.cc

@@ -8,9 +8,9 @@
  */
 
 #include "xenia/base/debugging.h"
-#include "xenia/base/string_buffer.h"
 
-#include <Windows.h>
+#include "xenia/base/platform.h"
+#include "xenia/base/string_buffer.h"
 
 namespace xe {
 namespace debugging {

src/xenia/base/filesystem_win.cc

@@ -9,8 +9,6 @@
 
 #include "xenia/base/filesystem.h"
 
-#include <shellapi.h>
-
 #include <string>
 
 #include "xenia/base/platform.h"

src/xenia/base/main_win.cc

@@ -10,10 +10,9 @@
 #include "xenia/base/main.h"
 
 #include <fcntl.h>
-#include <io.h>
-#include <shellapi.h>
-
 #include <gflags/gflags.h>
+#include <io.h>
+
 #include "xenia/base/string.h"
 
 namespace xe {

src/xenia/base/mapped_memory_win.cc

@@ -9,14 +9,13 @@
 
 #include "xenia/base/mapped_memory.h"
 
-#include <Windows.h>
-
 #include <memory>
 #include <mutex>
 #include <vector>
 
 #include "xenia/base/logging.h"
 #include "xenia/base/math.h"
+#include "xenia/base/platform.h"
 
 namespace xe {
 

src/xenia/base/platform.h

@@ -45,11 +45,16 @@
 #ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
 #endif
+#define NOMINMAX
 #include <SDKDDKVer.h>
 #include <windows.h>
 #include <ObjBase.h>
-#undef min
-#undef max
+#include <shellapi.h>
+#include <shlwapi.h>
+#include <shobjidl.h>
+#include <dwmapi.h>
+#include <tpcshrd.h>
+#include <windowsx.h>
 #define strdup _strdup
 #define strcasecmp _stricmp
 #define strncasecmp _strnicmp

src/xenia/base/platform_win.cc

@@ -9,8 +9,6 @@
 
 #include "xenia/base/platform.h"
 
-#include <shellapi.h>
-
 namespace xe {
 
 void LaunchBrowser(const char* url) {