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

src/xenia/ui/gl/blitter.h

@@ -12,8 +12,7 @@
 
 #include <memory>
 
-#include "third_party/GL/glew.h"
-#include "third_party/GL/wglew.h"
+#include "xenia/ui/gl/gl.h"
 
 namespace xe {
 namespace ui {

src/xenia/ui/gl/circular_buffer.h

@@ -12,7 +12,7 @@
 
 #include <unordered_map>
 
-#include "xenia/ui/gl/gl_context.h"
+#include "xenia/ui/gl/gl.h"
 
 namespace xe {
 namespace ui {

src/xenia/ui/gl/gl.h

@@ -0,0 +1,21 @@
+/**
+******************************************************************************
+* Xenia : Xbox 360 Emulator Research Project                                 *
+******************************************************************************
+* Copyright 2015 Ben Vanik. All rights reserved.                             *
+* Released under the BSD license - see LICENSE in the root for more details. *
+******************************************************************************
+*/
+
+#ifndef XENIA_UI_GL_GL_H_
+#define XENIA_UI_GL_GL_H_
+
+#include "xenia/base/platform.h"
+
+#include "third_party/GL/glew.h"
+#include "third_party/GL/wglew.h"
+
+extern "C" GLEWContext* glewGetContext();
+extern "C" WGLEWContext* wglewGetContext();
+
+#endif  // XENIA_UI_GL_GL_H_

src/xenia/ui/gl/gl_context.h

@@ -14,15 +14,11 @@
 
 #include <memory>
 
-#include "third_party/GL/glew.h"
-#include "third_party/GL/wglew.h"
 #include "xenia/ui/gl/blitter.h"
+#include "xenia/ui/gl/gl.h"
 
 DECLARE_bool(thread_safe_gl);
 
-extern "C" GLEWContext* glewGetContext();
-extern "C" WGLEWContext* wglewGetContext();
-
 namespace xe {
 namespace ui {
 namespace gl {

src/xenia/ui/win32/win32_control.h

@@ -10,9 +10,7 @@
 #ifndef XENIA_UI_WIN32_WIN32_CONTROL_H_
 #define XENIA_UI_WIN32_WIN32_CONTROL_H_
 
-#include <windows.h>
-#include <windowsx.h>
-
+#include "xenia/base/platform.h"
 #include "xenia/ui/control.h"
 
 namespace xe {

src/xenia/ui/win32/win32_file_picker.cc

@@ -9,12 +9,7 @@
 
 #include "xenia/ui/win32/win32_file_picker.h"
 
-#include <windows.h>
-#include <windowsx.h>
-#include <shellapi.h>
-#include <shlwapi.h>
-#include <shobjidl.h>
-
+#include "xenia/base/platform.h"
 #include "xenia/base/assert.h"
 
 namespace xe {

src/xenia/ui/win32/win32_loop.h

@@ -10,14 +10,12 @@
 #ifndef XENIA_UI_WIN32_WIN32_LOOP_H_
 #define XENIA_UI_WIN32_WIN32_LOOP_H_
 
-#include <windows.h>
-#include <windowsx.h>
-
 #include <atomic>
 #include <condition_variable>
 #include <mutex>
 #include <thread>
 
+#include "xenia/base/platform.h"
 #include "xenia/base/threading.h"
 #include "xenia/ui/loop.h"
 

src/xenia/ui/win32/win32_menu_item.h

@@ -10,9 +10,7 @@
 #ifndef XENIA_UI_WIN32_WIN32_MENU_ITEM_H_
 #define XENIA_UI_WIN32_WIN32_MENU_ITEM_H_
 
-#include <windows.h>
-#include <windowsx.h>
-
+#include "xenia/base/platform.h"
 #include "xenia/ui/menu_item.h"
 
 namespace xe {

src/xenia/ui/win32/win32_window.cc

@@ -10,9 +10,6 @@
 #include "xenia/ui/win32/win32_window.h"
 
 #include <cstring>
-#include <dwmapi.h>
-#include <tpcshrd.h>
-#include <windowsx.h>
 
 #include "xenia/base/logging.h"