Remove some unnecessary includes as well as simplifying exisiting one…

…s if possible.
dolphin-emu · Oct 19, 2013 · 97cd42f · 97cd42f
1 parent bf352c3
commit 97cd42f
Show file tree

Hide file tree

Showing 69 changed files with 30 additions and 98 deletions.
diff --git a/Source/Core/AudioCommon/Src/NullSoundStream.cpp b/Source/Core/AudioCommon/Src/NullSoundStream.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "AudioCommon.h"
+#include "CommonTypes.h"
 #include "NullSoundStream.h"
 #include "../../Core/Src/HW/SystemTimers.h"
 #include "../../Core/Src/HW/AudioInterface.h"

diff --git a/Source/Core/AudioCommon/Src/NullSoundStream.h b/Source/Core/AudioCommon/Src/NullSoundStream.h
@@ -5,8 +5,8 @@
 #ifndef _NULLSOUNDSTREAM_H_
 #define _NULLSOUNDSTREAM_H_
 
+#include <stdlib.h>
 #include "SoundStream.h"
-#include "Thread.h"
 
 #define BUF_SIZE (48000 * 4 / 32)
 

diff --git a/Source/Core/AudioCommon/Src/OpenALStream.h b/Source/Core/AudioCommon/Src/OpenALStream.h
@@ -5,7 +5,7 @@
 #ifndef _OPENALSTREAM_H_
 #define _OPENALSTREAM_H_
 
-#include "Common.h"
+#include "CommonTypes.h"
 #include "SoundStream.h"
 #include "Thread.h"
 

diff --git a/Source/Core/Common/Src/BreakPoints.h b/Source/Core/Common/Src/BreakPoints.h
@@ -8,7 +8,7 @@
 #include <vector>
 #include <string>
 
-#include "Common.h"
+#include "CommonTypes.h"
 
 class DebugInterface;
 
@@ -67,7 +67,7 @@ class BreakPoints
 	void Remove(u32 _iAddress);
 	void Clear();
 
-    void DeleteByAddress(u32 _Address);
+	void DeleteByAddress(u32 _Address);
 
 private:
 	TBreakPoints m_BreakPoints;
@@ -93,7 +93,7 @@ class MemChecks
 
 	// memory breakpoint
 	TMemCheck *GetMemCheck(u32 address);
-    void Remove(u32 _Address);
+	void Remove(u32 _Address);
 
 	void Clear() { m_MemChecks.clear(); };
 };

diff --git a/Source/Core/Common/Src/CDUtils.h b/Source/Core/Common/Src/CDUtils.h
@@ -1,10 +1,8 @@
 #ifndef _CDUTILS_H_
 #define _CDUTILS_H_
 
-#include <stdlib.h>
 #include <vector>
 #include <string>
-#include <stdio.h>
 
 // Returns a pointer to an array of strings with the device names
 std::vector<std::string> cdio_get_devices();

diff --git a/Source/Core/Common/Src/ConsoleListener.cpp b/Source/Core/Common/Src/ConsoleListener.cpp
@@ -3,18 +3,15 @@
 // Refer to the license.txt file included.
 
 #include <algorithm>  // min
+#include <cstdlib>
 #include <string> // System: To be able to add strings with "+"
 #include <stdio.h>
 #include <math.h>
 #ifdef _WIN32
 #include <windows.h>
 #include <array>
-#else
-#include <stdarg.h>
 #endif
 
-#include "Common.h"
-#include "LogManager.h" // Common
 #include "ConsoleListener.h" // Common
 
 ConsoleListener::ConsoleListener()

diff --git a/Source/Core/Common/Src/DebugInterface.h b/Source/Core/Common/Src/DebugInterface.h
@@ -2,7 +2,6 @@
 #define _DEBUGINTERFACE_H
 
 #include <string>
-#include <string.h>
 
 class DebugInterface
 {

diff --git a/Source/Core/Common/Src/ExtendedTrace.h b/Source/Core/Common/Src/ExtendedTrace.h
@@ -18,7 +18,6 @@
 #if defined(WIN32)
 
 #include <windows.h>
-#include <tchar.h>
 
 #include <string>
 

diff --git a/Source/Core/Common/Src/FPURoundMode.h b/Source/Core/Common/Src/FPURoundMode.h
@@ -16,7 +16,7 @@
 // http://code.google.com/p/dolphin-emu/
 #ifndef FPU_ROUND_MODE_H_
 #define FPU_ROUND_MODE_H_
-#include "Common.h"
+#include "CommonTypes.h"
 
 namespace FPURoundMode
 {

diff --git a/Source/Core/Common/Src/SDCardUtil.h b/Source/Core/Common/Src/SDCardUtil.h
@@ -15,6 +15,6 @@
 // Official Git repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
-#include "Common.h"
+#include "CommonTypes.h"
 
 bool SDCardCreate(u64 disk_size /*in MB*/, const char* filename);
diff --git a/Source/Core/Common/Src/Timer.h b/Source/Core/Common/Src/Timer.h
@@ -5,7 +5,7 @@
 #ifndef _TIMER_H_
 #define _TIMER_H_
 
-#include "Common.h"
+#include "CommonTypes.h"
 #include <string>
 
 namespace Common

diff --git a/Source/Core/Core/Src/ARDecrypt.h b/Source/Core/Core/Src/ARDecrypt.h
@@ -5,9 +5,6 @@
 #ifndef _ARDECRYPT_H_
 #define _ARDECRYPT_H_
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <vector>
 #include "Common.h"
 #include "ActionReplay.h"

diff --git a/Source/Core/Core/Src/Boot/Boot.cpp b/Source/Core/Core/Src/Boot/Boot.cpp
@@ -12,13 +12,11 @@
 #include "../PowerPC/PowerPC.h"
 #include "../PowerPC/PPCAnalyst.h"
 #include "../Core.h"
-#include "../HW/HW.h"
 #include "../HW/EXI_DeviceIPL.h"
 #include "../HW/Memmap.h"
 #include "../HW/ProcessorInterface.h"
 #include "../HW/DVDInterface.h"
 #include "../HW/VideoInterface.h"
-#include "../HW/CPU.h"
 #include "../IPC_HLE/WII_IPC_HLE.h"
 
 #include "../Debugger/Debugger_SymbolMap.h" // Debugger
@@ -30,7 +28,6 @@
 #include "../PatchEngine.h"
 #include "../PowerPC/SignatureDB.h"
 #include "../PowerPC/PPCSymbolDB.h"
-#include "../MemTools.h"
 
 #include "../ConfigManager.h"
 #include "VolumeCreator.h" // DiscIO

diff --git a/Source/Core/Core/Src/Boot/Boot.h b/Source/Core/Core/Src/Boot/Boot.h
@@ -5,9 +5,9 @@
 #ifndef _BOOT_H
 #define _BOOT_H
 
+#include <cstdlib>
 #include <string>
 
-#include "Common.h"
 #include "../CoreParameter.h"
 
 class CBoot

diff --git a/Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp b/Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp
@@ -14,7 +14,6 @@
 #include "../HW/DVDInterface.h"
 #include "../HW/CPU.h"
 
-#include "../Host.h"
 #include "../VolumeHandler.h"
 #include "../PatchEngine.h"
 #include "../MemTools.h"

diff --git a/Source/Core/Core/Src/Boot/Boot_DOL.h b/Source/Core/Core/Src/Boot/Boot_DOL.h
@@ -5,7 +5,7 @@
 #ifndef _BOOT_DOL_H
 #define _BOOT_DOL_H
 
-#include "Common.h"
+#include "CommonTypes.h"
 
 class CDolLoader
 {

diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp
@@ -16,7 +16,6 @@
 #include "MathUtil.h"
 #include "MemoryUtil.h"
 
-#include "Console.h"
 #include "Core.h"
 #include "CPUDetect.h"
 #include "CoreTiming.h"

diff --git a/Source/Core/Core/Src/Core.h b/Source/Core/Core/Src/Core.h
@@ -15,7 +15,7 @@
 #include <vector>
 #include <string>
 
-#include "Common.h"
+#include "CommonTypes.h"
 #include "CoreParameter.h"
 
 namespace Core

diff --git a/Source/Core/Core/Src/DSP/DSPEmitter.cpp b/Source/Core/Core/Src/DSP/DSPEmitter.cpp
@@ -10,7 +10,6 @@
 #include "DSPHost.h"
 #include "DSPInterpreter.h"
 #include "DSPAnalyzer.h"
-#include "Jit/DSPJitUtil.h"
 #include "x64Emitter.h"
 #include "x64ABI.h"
 

diff --git a/Source/Core/Core/Src/DSP/DSPInterpreter.cpp b/Source/Core/Core/Src/DSP/DSPInterpreter.cpp
@@ -24,7 +24,6 @@
    ====================================================================*/
 
 #include "DSPTables.h"
-#include "DSPHost.h"
 #include "DSPCore.h"
 #include "DSPAnalyzer.h"
 

diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitArithmetic.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitArithmetic.cpp
@@ -8,9 +8,6 @@
 #include "../DSPIntUtil.h"
 #include "../DSPEmitter.h"
 #include "../DSPAnalyzer.h"
-#ifdef _M_X64
-#include "DSPJitUtil.h"
-#endif
 #include "x64Emitter.h"
 #include "x64ABI.h"
 using namespace Gen;

diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitBranch.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitBranch.cpp
@@ -6,7 +6,6 @@
 #include "../DSPEmitter.h"
 #include "../DSPStacks.h"
 #include "../DSPAnalyzer.h"
-#include "DSPJitUtil.h"
 #include "x64Emitter.h"
 #include "x64ABI.h"
 

diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitCCUtil.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitCCUtil.cpp
@@ -9,7 +9,6 @@
 
 #include "../DSPIntUtil.h"
 #include "../DSPEmitter.h"
-#include "DSPJitUtil.h"
 #include "x64Emitter.h"
 #include "x64ABI.h"
 using namespace Gen;

diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitExtOps.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitExtOps.cpp
@@ -4,7 +4,6 @@
 
 #include "../DSPMemoryMap.h"
 #include "../DSPEmitter.h"
-#include "DSPJitUtil.h"
 #include "x64Emitter.h"
 #include "x64ABI.h"
 

diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitLoadStore.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitLoadStore.cpp
@@ -7,7 +7,6 @@
 #include "../DSPIntCCUtil.h"
 #include "../DSPIntUtil.h"
 #include "../DSPEmitter.h"
-#include "DSPJitUtil.h"
 #include "x64Emitter.h"
 #include "x64ABI.h"
 using namespace Gen;

diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitMisc.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitMisc.cpp
@@ -4,7 +4,6 @@
 
 #include "../DSPIntUtil.h"
 #include "../DSPEmitter.h"
-#include "DSPJitUtil.h"
 #include "x64Emitter.h"
 #include "x64ABI.h"
 using namespace Gen;

diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitMultiplier.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitMultiplier.cpp
@@ -10,9 +10,6 @@
 #include "../DSPIntUtil.h"
 #include "../DSPEmitter.h"
 #include "../DSPAnalyzer.h"
-#ifdef _M_X64
-#include "DSPJitUtil.h"
-#endif
 #include "x64Emitter.h"
 #include "x64ABI.h"
 using namespace Gen;

diff --git a/Source/Core/Core/Src/Debugger/Debugger_SymbolMap.cpp b/Source/Core/Core/Src/Debugger/Debugger_SymbolMap.cpp
@@ -10,7 +10,6 @@
 #include "../PowerPC/PowerPC.h"
 #include "../PowerPC/PPCAnalyst.h"
 #include "../PowerPC/PPCSymbolDB.h"
-#include "PowerPCDisasm.h"
 
 namespace Dolphin_Debugger
 {

diff --git a/Source/Core/Core/Src/HLE/HLE.h b/Source/Core/Core/Src/HLE/HLE.h
@@ -6,7 +6,7 @@
 #define _HLE_H
 
 #include <map>
-#include "Common.h"
+#include "CommonTypes.h"
 
 namespace HLE
 {

diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPDebugInterface.h b/Source/Core/Core/Src/HW/DSPLLE/DSPDebugInterface.h
@@ -6,6 +6,7 @@
 #define _DSPDEBUGINTERFACE_H
 
 #include <string>
+#include <string.h>
 
 #include "DebugInterface.h"
 #include "Common.h"

diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPLLEGlobals.h b/Source/Core/Core/Src/HW/DSPLLE/DSPLLEGlobals.h
@@ -7,7 +7,6 @@
 
 #include "Common.h"
 #include "AudioCommon.h"
-#include <stdio.h>
 
 // TODO: Get rid of this file.
 

diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPSymbols.cpp b/Source/Core/Core/Src/HW/DSPLLE/DSPSymbols.cpp
@@ -2,8 +2,6 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include <stdarg.h>
-
 #include <list>
 #include <map>
 #include <string>

diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPSymbols.h b/Source/Core/Core/Src/HW/DSPLLE/DSPSymbols.h
@@ -8,8 +8,6 @@
 #include "Common.h"
 #include "SymbolDB.h"
 
-#include <stdio.h>
-
 namespace DSPSymbols {
 
 class DSPSymbolDB : public SymbolDB 

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

diff --git a/Source/Core/Core/Src/HW/EXI.h b/Source/Core/Core/Src/HW/EXI.h
@@ -5,7 +5,7 @@
 #ifndef _EXIINTERFACE_H
 #define _EXIINTERFACE_H
 
-#include "Common.h"
+#include "CommonTypes.h"
 #include "EXI_Channel.h"
 #include "Thread.h"
 class PointerWrap;

diff --git a/Source/Core/Core/Src/HW/EXI_Channel.h b/Source/Core/Core/Src/HW/EXI_Channel.h
@@ -5,7 +5,7 @@
 #ifndef _EXICHANNEL_H
 #define _EXICHANNEL_H
 
-#include "Common.h"
+#include "CommonTypes.h"
 
 #include "EXI_Device.h"
 

diff --git a/Source/Core/Core/Src/HW/EXI_Device.h b/Source/Core/Core/Src/HW/EXI_Device.h
@@ -5,7 +5,7 @@
 #ifndef _EXIDEVICE_H
 #define _EXIDEVICE_H
 
-#include "Common.h"
+#include "CommonTypes.h"
 #include "ChunkFile.h"
 
 enum TEXIDevices

diff --git a/Source/Core/Core/Src/HW/GCPad.cpp b/Source/Core/Core/Src/HW/GCPad.cpp
@@ -10,7 +10,6 @@
 #include "../ConfigManager.h"
 
 #include "../../InputCommon/Src/InputConfig.h"
-#include "Host.h"
 
 namespace Pad
 {

diff --git a/Source/Core/Core/Src/HW/ProcessorInterface.h b/Source/Core/Core/Src/HW/ProcessorInterface.h
@@ -5,7 +5,7 @@
 #ifndef _PROCESSORINTERFACE_H
 #define _PROCESSORINTERFACE_H
 
-#include "Common.h"
+#include "CommonTypes.h"
 class PointerWrap;
 
 // Holds statuses of things like the write gatherer used for fifos, and interrupts from various sources

diff --git a/Source/Core/Core/Src/HW/SI_DeviceDanceMat.cpp b/Source/Core/Core/Src/HW/SI_DeviceDanceMat.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_DeviceDanceMat.h"