From 00287b7a65fb91114ac9ab473cb57d0bc080d4a2 Mon Sep 17 00:00:00 2001
From: ShizZy <shizzy@6bit.net>
Date: Mon, 23 Sep 2013 22:09:26 -0400
Subject: [PATCH] removed <windows.h> include from common.h and added it only
 where needed

---
 src/common/src/common.h               | 4 ----
 src/common/src/file_sys_directory.cpp | 2 +-
 src/core/src/arm/armdefs.h            | 4 ++++
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/common/src/common.h b/src/common/src/common.h
index e1cae4fee..0e5bf1cd3 100644
--- a/src/common/src/common.h
+++ b/src/common/src/common.h
@@ -50,10 +50,6 @@ private:
 #include "common_paths.h"
 #include "platform.h"
 
-#if EMU_PLATFORM == PLATFORM_WINDOWS
-#include <windows.h>
-#endif
-
 #ifdef __APPLE__
 // The Darwin ABI requires that stack frames be aligned to 16-byte boundaries.
 // This is only needed on i386 gcc - x86_64 already aligns to 16 bytes.
diff --git a/src/common/src/file_sys_directory.cpp b/src/common/src/file_sys_directory.cpp
index c20557bad..79acb181c 100644
--- a/src/common/src/file_sys_directory.cpp
+++ b/src/common/src/file_sys_directory.cpp
@@ -24,7 +24,7 @@
 #include "utf8.h"
 
 #if EMU_PLATFORM == PLATFORM_WINDOWS
-//#include "Common/CommonWindows.h"
+#include <windows.h>
 #include <sys/stat.h>
 #else
 #include <dirent.h>
diff --git a/src/core/src/arm/armdefs.h b/src/core/src/arm/armdefs.h
index a0cf28a92..69cf790e4 100644
--- a/src/core/src/arm/armdefs.h
+++ b/src/core/src/arm/armdefs.h
@@ -22,6 +22,10 @@
 #include <stdlib.h>
 #include <errno.h>
 
+#if EMU_PLATFORM == PLATFORM_WINDOWS
+#include <windows.h>
+#endif
+
 //teawater add for arm2x86 2005.02.14-------------------------------------------
 // koodailar remove it for mingw 2005.12.18----------------
 //anthonylee modify it for portable 2007.01.30