diff --git a/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp b/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp
@@ -2,9 +2,6 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "SI.h"
 #include "SI_Device.h"
 #include "SI_DeviceGCController.h"

diff --git a/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.cpp b/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.cpp
@@ -2,9 +2,6 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "SI.h"
 #include "SI_Device.h"
 #include "SI_DeviceGCSteeringWheel.h"

diff --git a/Source/Core/Core/Src/HW/Sram.h b/Source/Core/Core/Src/HW/Sram.h
@@ -36,7 +36,7 @@ distribution.
 #ifndef __SRAM_h__
 #define __SRAM_h__
 
-#include "Common.h"
+#include "CommonTypes.h"
 
 #pragma pack(push,1)
 union SRAM

diff --git a/Source/Core/Core/Src/HW/SystemTimers.h b/Source/Core/Core/Src/HW/SystemTimers.h
@@ -18,7 +18,7 @@
 #ifndef _SYSTEMTIMERS_H
 #define _SYSTEMTIMERS_H
 
-#include "Common.h"
+#include "CommonTypes.h"
 
 namespace SystemTimers
 {

diff --git a/Source/Core/Core/Src/HW/VideoInterface.h b/Source/Core/Core/Src/HW/VideoInterface.h
@@ -5,7 +5,7 @@
 #ifndef _VIDEOINTERFACE_H
 #define _VIDEOINTERFACE_H
 
-#include "Common.h"
+#include "CommonTypes.h"
 class PointerWrap;
 
 namespace VideoInterface

diff --git a/Source/Core/Core/Src/MemTools.h b/Source/Core/Core/Src/MemTools.h
@@ -5,7 +5,7 @@
 #ifndef _MEMTOOLS_H
 #define _MEMTOOLS_H
 
-#include "Common.h"
+#include "CommonTypes.h"
 
 
 namespace EMM

diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp
@@ -2,7 +2,6 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include <math.h>
 #include "Interpreter.h"
 #include "../../HW/Memmap.h"
 

diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp
@@ -2,7 +2,6 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include <float.h>
 #ifdef _WIN32
 #define _interlockedbittestandset workaround_ms_header_bug_platform_sdk6_set
 #define _interlockedbittestandreset workaround_ms_header_bug_platform_sdk6_reset

diff --git a/Source/Core/Core/Src/PowerPC/PPCAnalyst.h b/Source/Core/Core/Src/PowerPC/PPCAnalyst.h
@@ -8,10 +8,10 @@
 #include <vector>
 #include <map>
 
+#include <cstdlib>
 #include <string>
 
 #include "Common.h"
-#include "Gekko.h"
 #include "PPCTables.h"
 
 class PPCSymbolDB;
@@ -62,8 +62,8 @@ struct BlockRegStats
 
 	int GetTotalNumAccesses(int reg) {return numReads[reg] + numWrites[reg];}
 	int GetUseRange(int reg) {
-		return max(lastRead[reg], lastWrite[reg]) - 
-			   min(firstRead[reg], firstWrite[reg]);}
+		return std::max(lastRead[reg], lastWrite[reg]) - 
+			   std::min(firstRead[reg], firstWrite[reg]);}
 
 	inline void SetInputRegister(int reg, short opindex) {
 		if (firstRead[reg] == -1)

diff --git a/Source/Core/Core/Src/PowerPC/PPCCache.h b/Source/Core/Core/Src/PowerPC/PPCCache.h
@@ -5,7 +5,7 @@
 #ifndef _PPCCACHE_H
 #define _PPCCACHE_H
 
-#include "Common.h"
+#include "CommonTypes.h"
 
 #define FAST_ICACHE
 

diff --git a/Source/Core/Core/Src/PowerPC/PPCSymbolDB.h b/Source/Core/Core/Src/PowerPC/PPCSymbolDB.h
@@ -2,7 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "Common.h"
+#include "CommonTypes.h"
 
 #include <map>
 #include <string>

diff --git a/Source/Core/Core/Src/PowerPC/PowerPC.cpp b/Source/Core/Core/Src/PowerPC/PowerPC.cpp
@@ -2,8 +2,6 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include <float.h>
-
 #include "Common.h"
 #include "Atomic.h"
 #include "MathUtil.h"

diff --git a/Source/Core/Core/Src/PowerPC/SignatureDB.h b/Source/Core/Core/Src/PowerPC/SignatureDB.h
@@ -2,7 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "Common.h"
+#include "CommonTypes.h"
 
 #include <map>
 #include <string>

diff --git a/Source/Core/Core/Src/ec_wii.cpp b/Source/Core/Core/Src/ec_wii.cpp
@@ -10,7 +10,6 @@
 #include <stdio.h>
 #include <string.h>
 #include "Common.h"
-#include "Crypto/aes.h"
 #include "polarssl/sha1.h"
 #include "Crypto/tools.h"
 #include "FileUtil.h"

diff --git a/Source/Core/DolphinWX/Src/Debugger/BreakpointWindow.cpp b/Source/Core/DolphinWX/Src/Debugger/BreakpointWindow.cpp
@@ -8,7 +8,6 @@
 #include "HW/Memmap.h"
 #include "BreakpointDlg.h"
 #include "MemoryCheckDlg.h"
-#include "Host.h"
 #include "PowerPC/PowerPC.h"
 #include "FileUtil.h"
 

diff --git a/Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp b/Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp
@@ -30,7 +30,6 @@
 #include "Debugger/PPCDebugInterface.h"
 #include "Debugger/Debugger_SymbolMap.h"
 #include "PowerPC/PPCAnalyst.h"
-#include "PowerPC/Profiler.h"
 #include "PowerPC/PPCSymbolDB.h"
 #include "PowerPC/SignatureDB.h"
 #include "PowerPC/PPCTables.h"

diff --git a/Source/Core/DolphinWX/Src/Debugger/JitWindow.cpp b/Source/Core/DolphinWX/Src/Debugger/JitWindow.cpp
@@ -15,7 +15,6 @@
 #include "PowerPC/JitCommon/JitCache.h"
 #include "PowerPC/PPCAnalyst.h"
 #include "PowerPCDisasm.h"
-#include "Host.h"
 #include "disasm.h"
 
 #include "Debugger/PPCDebugInterface.h"

diff --git a/Source/Core/DolphinWX/Src/Debugger/MemoryWindow.cpp b/Source/Core/DolphinWX/Src/Debugger/MemoryWindow.cpp
@@ -12,7 +12,6 @@
 #include "MemoryWindow.h"
 #include "HW/CPU.h"
 #include "PowerPC/PowerPC.h"
-#include "Host.h"
 #include "FileUtil.h"
 
 #include "Debugger/PPCDebugInterface.h"

diff --git a/Source/Core/InputCommon/Src/GCPadStatus.h b/Source/Core/InputCommon/Src/GCPadStatus.h
@@ -5,8 +5,6 @@
 #ifndef _GCPAD_H_INCLUDED__
 #define _GCPAD_H_INCLUDED__
 
-#include "CommonTypes.h"
-
 #define PAD_ERR_NONE            0
 #define PAD_ERR_NO_CONTROLLER   -1
 #define PAD_ERR_NOT_READY       -2

diff --git a/Source/Core/InputCommon/Src/InputConfig.h b/Source/Core/InputCommon/Src/InputConfig.h
@@ -12,10 +12,8 @@
 #include "ControllerInterface/ControllerInterface.h"
 #include "ControllerEmu.h"
 
-#include <string>
 #include <vector>
 #include <map>
-#include <sstream>
 
 // InputPlugin isn't a very good name anymore since it's used by GCPad/Wiimote
 // which are not even plugins anymore.

diff --git a/Source/Core/VideoBackends/OGL/Src/GLUtil.cpp b/Source/Core/VideoBackends/OGL/Src/GLUtil.cpp
@@ -6,7 +6,6 @@
 #include "VideoConfig.h"
 #include "IniFile.h"
 #include "Core.h"
-#include "Host.h"
 #include "VideoBackend.h"
 #include "ConfigManager.h"
 

diff --git a/Source/Core/VideoBackends/OGL/Src/Render.cpp b/Source/Core/VideoBackends/OGL/Src/Render.cpp
@@ -28,7 +28,6 @@
 #include "ImageWrite.h"
 #include "PixelEngine.h"
 #include "Render.h"
-#include "OpcodeDecoding.h"
 #include "BPStructs.h"
 #include "TextureCache.h"
 #include "RasterFont.h"
@@ -49,7 +48,6 @@
 #include "Debugger.h"
 #include "Core.h"
 #include "Movie.h"
-#include "Host.h"
 #include "BPFunctions.h"
 #include "FPSCounter.h"
 #include "ConfigManager.h"

diff --git a/Source/Core/VideoBackends/OGL/Src/TextureConverter.cpp b/Source/Core/VideoBackends/OGL/Src/TextureConverter.cpp
@@ -5,8 +5,6 @@
 // Fast image conversion using OpenGL shaders.
 // This kind of stuff would be a LOT nicer with OpenCL.
 
-#include <math.h>
-
 #include "TextureConverter.h"
 #include "TextureConversionShader.h"
 #include "TextureCache.h"

diff --git a/Source/Core/VideoBackends/OGL/Src/VertexManager.cpp b/Source/Core/VideoBackends/OGL/Src/VertexManager.cpp
@@ -24,7 +24,6 @@
 #include "VertexLoader.h"
 #include "VertexManager.h"
 #include "IndexGenerator.h"
-#include "OpcodeDecoding.h"
 #include "FileUtil.h"
 #include "Debugger.h"
 #include "StreamBuffer.h"

diff --git a/Source/Core/VideoBackends/Software/Src/SWRenderer.cpp b/Source/Core/VideoBackends/Software/Src/SWRenderer.cpp
@@ -3,7 +3,6 @@
 // Refer to the license.txt file included.
 
 #include "Common.h"
-#include <math.h>
 
 #include "../../OGL/Src/GLUtil.h"
 #include "RasterFont.h"

diff --git a/Source/Core/VideoCommon/Src/BPStructs.cpp b/Source/Core/VideoCommon/Src/BPStructs.cpp
@@ -13,7 +13,6 @@
 #include "BPFunctions.h"
 #include "BPStructs.h"
 #include "TextureDecoder.h"
-#include "OpcodeDecoding.h"
 #include "VertexLoader.h"
 #include "VertexShaderManager.h"
 #include "Thread.h"

diff --git a/Source/Core/VideoCommon/Src/CommandProcessor.cpp b/Source/Core/VideoCommon/Src/CommandProcessor.cpp
@@ -8,7 +8,6 @@
 #include "MathUtil.h"
 #include "Thread.h"
 #include "Atomic.h"
-#include "OpcodeDecoding.h"
 #include "Fifo.h"
 #include "ChunkFile.h"
 #include "CommandProcessor.h"

diff --git a/Source/Core/VideoCommon/Src/VertexLoader.cpp b/Source/Core/VideoCommon/Src/VertexLoader.cpp
@@ -2,8 +2,6 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include <assert.h>
-
 #include "Common.h"
 #include "VideoCommon.h"
 #include "VideoConfig.h"

diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.h b/Source/Core/VideoCommon/Src/VertexShaderGen.h
@@ -5,7 +5,6 @@
 #ifndef GCOGL_VERTEXSHADER_H
 #define GCOGL_VERTEXSHADER_H
 
-#include <stdarg.h>
 #include "XFMemory.h"
 #include "VideoCommon.h"
 #include "ShaderGenCommon.h"