Move #include <window.h> from all files that include it and common.h to common.h

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1861 8ced0084-cf51-0410-be5f-012b33b47a6e

Source/Core/Common/Src/Common.h

@@ -24,6 +24,7 @@
 #define CHECK_HEAP_INTEGRITY()
 
 #ifdef _WIN32
+#include <windows.h>
 	#ifdef _DEBUG
 	#include <crtdbg.h>
 	#undef CHECK_HEAP_INTEGRITY

Source/Core/Common/Src/DriveUtil.cpp

@@ -19,7 +19,6 @@
 #include "DriveUtil.h"
 
 #ifdef _WIN32
-#include <windows.h>
 #include <winioctl.h>
 #endif
 

Source/Core/Common/Src/DynamicLibrary.cpp

@@ -29,9 +29,7 @@ and stopped.
 // Includes
 // ¯¯¯¯¯¯¯¯¯¯¯¯¯
 #include <string.h>
-#ifdef _WIN32
-#include <windows.h>
-#else
+#ifndef _WIN32
 #include <dlfcn.h>
 #include <stdio.h>
 #endif

Source/Core/Common/Src/FileSearch.cpp

@@ -19,8 +19,6 @@
 #ifndef _WIN32
 #include <sys/types.h>
 #include <dirent.h>
-#else
-#include <windows.h>
 #endif
 
 #include <string>

Source/Core/Common/Src/FileUtil.cpp

@@ -19,7 +19,6 @@
 #include "FileUtil.h"
 
 #ifdef _WIN32
-#include <windows.h>
 #include <shlobj.h>		// for SHGetFolderPath
 #include <shellapi.h>
 #include <commdlg.h>	// for GetSaveFileName

Source/Core/Common/Src/MappedFile.cpp

@@ -15,9 +15,7 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
-#ifdef _WIN32
-#include <windows.h>
-#else
+#ifndef _WIN32
 #include <unistd.h>
 #include <sys/mman.h>
 #include <sys/stat.h>

Source/Core/Common/Src/MemArena.cpp

@@ -18,9 +18,7 @@
 #include "Common.h"
 #include "MemArena.h"
 
-#ifdef _WIN32
-#include <windows.h>
-#else
+#ifndef _WIN32
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <fcntl.h>

Source/Core/Common/Src/MemArena.h

@@ -18,10 +18,6 @@
 #ifndef _MEMARENA_H
 #define _MEMARENA_H
 
-#ifdef _WIN32
-#include <windows.h>
-#endif
-
 #include "Common.h"
 
 // This class lets you create a block of anonymous RAM, and then arbitrarily map views into it.

Source/Core/Common/Src/MemoryUtil.cpp

@@ -18,9 +18,7 @@
 #include "Common.h"
 #include "MemoryUtil.h"
 
-#ifdef _WIN32
-#include <windows.h>
-#elif __GNUC__
+#ifdef __GNUC__
 #include <sys/mman.h>
 #include <errno.h>
 #include <stdio.h>

Source/Core/Common/Src/Thread.h

@@ -19,7 +19,6 @@
 #define _THREAD_H
 
 #ifdef _WIN32
-#include <windows.h>
 #define THREAD_RETURN DWORD WINAPI
 #else
 #define THREAD_RETURN void*

Source/Core/Common/Src/Timer.cpp

@@ -16,7 +16,6 @@
 // http://code.google.com/p/dolphin-emu/
 
 #ifdef _WIN32
-#include <windows.h>
 #include <mmsystem.h>
 #endif
 

Source/Core/Core/Src/ARDecrypt.h

@@ -17,10 +17,6 @@
 #ifndef _ARDECRYPT_H_
 #define _ARDECRYPT_H_
 
-#ifdef _WIN32
-#include <windows.h>
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

Source/Core/Core/Src/Core.cpp

@@ -19,12 +19,6 @@
 //////////////////////////////////////////////////////////////////////////////////////////
 // Include
 // ¯¯¯¯¯¯¯¯¯¯
-#ifdef _WIN32
-#include <windows.h>
-#else
-
-#endif
-
 #include "Thread.h"
 #include "Timer.h"
 #include "Common.h"

Source/Core/Core/Src/HW/CPUCompare.cpp

@@ -14,10 +14,6 @@
 
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
-#ifdef _WIN32
-#include <windows.h>
-#endif
-
 #include "Common.h"
 #include "../Core.h"
 

Source/Core/Core/Src/HW/CommandProcessor.h

@@ -22,10 +22,6 @@
 #include "pluginspecs_video.h"
 class PointerWrap;
 
-#ifdef _WIN32
-#include <windows.h>
-#endif
-
 extern bool MT;
 namespace CommandProcessor
 {

Source/Core/Core/Src/MemTools.cpp

@@ -16,12 +16,7 @@
 // http://code.google.com/p/dolphin-emu/
 
 
-#ifdef _WIN32
-
-#include <windows.h>
-
-#else
-
+#ifndef _WIN32
 #include <execinfo.h>
 #include <stdio.h>
 #include <signal.h>

Source/Core/DiscIO/Src/CompressedBlob.cpp

@@ -19,7 +19,6 @@
 
 #ifdef _WIN32
 #include <io.h>
-#include <windows.h>
 #else
 #include <unistd.h>
 #endif

Source/Plugins/Plugin_DSP_HLE/Src/Logging/Console.cpp

@@ -21,9 +21,6 @@
 #include <string>
 #include <stdio.h>
 #include "Common.h"
-#ifdef _WIN32
-#include <windows.h>
-#endif
 
 #if defined(HAVE_WX) && HAVE_WX
 #include "../Debugger/Debugger.h"

Source/Plugins/Plugin_DSP_LLE/Src/Logging/Logging.cpp

@@ -25,7 +25,6 @@
 #include <iostream>
 #include <vector>
 #include <string> // So that we can test if std::string == abc
-#include <windows.h>
 
 #include "Common.h"
 

Source/Plugins/Plugin_VideoDX9/Src/main.cpp

@@ -16,7 +16,6 @@
 // http://code.google.com/p/dolphin-emu/
 
 #include <tchar.h>
-#include <windows.h> 
 #include <d3dx9.h>
 
 #include "Common.h"

Source/Plugins/Plugin_Wiimote/Src/Console.cpp

@@ -22,9 +22,6 @@
 // ¯¯¯¯¯¯¯¯¯¯¯¯¯
 #include <string>
 #include <stdio.h>
-#ifdef _WIN32
-	#include <windows.h>
-#endif
 
 #include "StringUtil.h"