From da8bbde11d52991cdeb03051ce17c9108fb652c6 Mon Sep 17 00:00:00 2001
From: twinaphex <autechre1024@hotmail.com>
Date: Thu, 11 Apr 2013 22:35:15 +0200
Subject: [PATCH] Simplify some _WIN32 includes

---
 file.c      | 12 +++++++-----
 file_path.c | 18 ++++++++----------
 general.h   | 10 ++++------
 retroarch.c |  9 ++++-----
 thread.c    |  8 +++++---
 5 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/file.c b/file.c
index 4546dc9ee8..4ff631292f 100644
--- a/file.c
+++ b/file.c
@@ -27,14 +27,16 @@
 #include "hash.h"
 #include "file_extract.h"
 
-#if defined(_WIN32) && !defined(_XBOX)
-#include <io.h>
-#include <fcntl.h>
-#include <windows.h>
-#elif defined(_XBOX)
+#ifdef _WIN32
+#ifdef _XBOX
 #include <xtl.h>
 #define setmode _setmode
 #define INVALID_FILE_ATTRIBUTES -1
+#else
+#include <io.h>
+#include <fcntl.h>
+#include <windows.h>
+#endif
 #endif
 
 // Dump stuff to file.
diff --git a/file_path.c b/file_path.c
index 82b83fb8d3..50eaeed1a8 100644
--- a/file_path.c
+++ b/file_path.c
@@ -29,21 +29,19 @@
 #endif
 #endif
 
-#ifdef _XBOX
-#include <xtl.h>
-#endif
-
-#if defined(_WIN32) && !defined(_XBOX)
-#include <io.h>
-#include <fcntl.h>
-#include <windows.h>
+#if defined(_WIN32)
 #ifdef _MSC_VER
 #define setmode _setmode
 #endif
-#elif defined(_XBOX)
-#define setmode _setmode
+#ifdef _XBOX
+#include <xtl.h>
 #define INVALID_FILE_ATTRIBUTES -1
 #else
+#include <io.h>
+#include <fcntl.h>
+#include <windows.h>
+#endif
+#else
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <dirent.h>
diff --git a/general.h b/general.h
index 2c5b835796..79911844f4 100644
--- a/general.h
+++ b/general.h
@@ -51,15 +51,13 @@
 #endif
 
 // Windows
-#if defined(_WIN32) && !defined(_XBOX)
+#ifdef _WIN32
+#ifdef _XBOX
+#include <xtl.h>
+#else
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
-#include "msvc/msvc_compat.h"
 #endif
-
-// XBox
-#if defined(_XBOX)
-#include <xtl.h>
 #include "msvc/msvc_compat.h"
 #endif
 
diff --git a/retroarch.c b/retroarch.c
index 14412595a8..f861e58c3d 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -35,14 +35,13 @@
 #include "compat/getopt_rarch.h"
 #include "compat/posix_string.h"
 
-#if defined(_WIN32) && !defined(_XBOX)
+#ifdef _WIN32
+#ifdef _XBOX
+#include <xtl.h>
+#else
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
-#elif defined(_XBOX)
-#include <xtl.h>
 #endif
-
-#ifdef _WIN32
 #include "msvc/msvc_compat.h"
 #endif
 
diff --git a/thread.c b/thread.c
index b8fe6150a5..e0f1e211b8 100644
--- a/thread.c
+++ b/thread.c
@@ -16,11 +16,13 @@
 #include "thread.h"
 #include <stdlib.h>
 
-#if defined(_WIN32) && !defined(_XBOX)
+#if defined(_WIN32)
+#ifdef _XBOX
+#include <xtl.h>
+#else
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
-#elif defined(_XBOX)
-#include <xtl.h>
+#endif
 #elif defined(GEKKO)
 #include "thread/gx_pthread.h"
 #else