Merge pull request #5661 from unknownbrackets/warnings

Reduce a bunch of includes, fix a couple warnings

Core/CoreTiming.cpp

@@ -19,15 +19,16 @@
 #include <vector>
 #include <cstdio>
 
-#include "MsgHandler.h"
+#include "Common/MsgHandler.h"
-#include "StdMutex.h"
+#include "Common/StdMutex.h"
-#include "Atomics.h"
+#include "Common/Atomics.h"
-#include "CoreTiming.h"
+#include "Core/CoreTiming.h"
-#include "Core.h"
+#include "Core/Core.h"
-#include "Config.h"
+#include "Core/Config.h"
-#include "HLE/sceKernelThread.h"
+#include "Core/HLE/sceKernelThread.h"
-#include "../Common/ChunkFile.h"
+#include "Core/HLE/sceDisplay.h"
-#include "HLE/sceDisplay.h"
+#include "Core/MIPS/MIPS.h"
+#include "Common/ChunkFile.h"
 
 int CPU_HZ = 222000000;
 

Core/Debugger/DebugInterface.h

@@ -17,7 +17,6 @@
 
 #pragma once
 #include <string>
-#include <cstdio>
 #include "Common/CommonTypes.h"
 #include "native/math/expression_parser.h"
 

Core/Dialog/PSPDialog.h

@@ -19,7 +19,6 @@
 
 #include "Common/Common.h"
 #include "Common/CommonTypes.h"
-#include "Core/Config.h"
 
 class PointerWrap;
 

Core/Dialog/PSPGamedataInstallDialog.cpp

@@ -17,6 +17,7 @@
 
 #include "Common/ChunkFile.h"
 #include "Core/MemMap.h"
+#include "Core/System.h"
 #include "Core/FileSystems/MetaFileSystem.h"
 #include "Core/Dialog/PSPGamedataInstallDialog.h"
 

Core/Dialog/PSPGamedataInstallDialog.h

@@ -18,7 +18,6 @@
 #pragma once
 
 #include "Core/Dialog/PSPDialog.h"
-#include "Core/System.h"
 
 struct SceUtilityGamedataInstallParam {
 	pspUtilityDialogCommon common;

Core/Dialog/PSPMsgDialog.h

@@ -17,7 +17,8 @@
 
 #pragma once
 
-#include "PSPDialog.h"
+#include <string>
+#include "Core/Dialog/PSPDialog.h"
 
 #define SCE_UTILITY_MSGDIALOG_OPTION_ERRORSOUND         0x00000000
 #define SCE_UTILITY_MSGDIALOG_OPTION_TEXTSOUND          0x00000001

Core/Dialog/PSPNetconfDialog.cpp

@@ -17,6 +17,7 @@
 
 #include "PSPNetconfDialog.h"
 #include "ChunkFile.h"
+#include "Core/Config.h"
 #include "Core/MemMap.h"
 #include "Core/HLE/sceNetAdhoc.h"
 #include "Core/Util/PPGeDraw.h"

Core/Dialog/PSPNetconfDialog.h

@@ -19,7 +19,6 @@
 
 #include "Core/Dialog/PSPDialog.h"
 #include "Core/MemMap.h"
-#include "Core/System.h"
 
 struct SceUtilityNetconfData {
 	char groupName[8];

Core/Dialog/PSPPlaceholderDialog.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "PSPDialog.h"
+#include "Core/Dialog/PSPDialog.h"
 
 class PSPPlaceholderDialog: public PSPDialog {
 public:

Core/Dialog/PSPSaveDialog.h

@@ -17,8 +17,8 @@
 
 #pragma once
 
-#include "PSPDialog.h"
+#include "Core/Dialog/PSPDialog.h"
-#include "SavedataParam.h"
+#include "Core/Dialog/SavedataParam.h"
 
 #define SCE_UTILITY_SAVEDATA_ERROR_TYPE                 (0x80110300)
 

Core/Dialog/SavedataParam.cpp

@@ -18,7 +18,9 @@
 
 #include "base/logging.h"
 #include "Common/ChunkFile.h"
+#include "Core/Config.h"
 #include "Core/Reporting.h"
+#include "Core/System.h"
 #include "Core/Dialog/SavedataParam.h"
 #include "Core/Dialog/PSPSaveDialog.h"
 #include "Core/FileSystems/MetaFileSystem.h"
@@ -27,6 +29,7 @@
 #include "Core/HLE/sceChnnlsv.h"
 #include "Core/ELF/ParamSFO.h"
 #include "Core/HW/MemoryStick.h"
+#include "Core/Util/PPGeDraw.h"
 
 #include "image/png_load.h"
 

Core/Dialog/SavedataParam.h

@@ -19,17 +19,16 @@
 
 #include "Common/CommonTypes.h"
 #include "Core/MemMap.h"
-#include "Core/HLE/sceKernel.h"
 #include "Core/HLE/sceRtc.h"
-#include "Core/System.h"
 #include "Core/Dialog/PSPDialog.h"
-#include "Core/Util/PPGeDraw.h"
 
 #undef st_ctime
 #undef st_atime
 #undef st_mtime
 
+class PPGeImage;
 struct PSPFileInfo;
+typedef u32_le SceSize_le;
 
 enum SceUtilitySavedataType
 {

Core/Font/PGF.cpp

@@ -20,6 +20,7 @@
 // Thanks to the JPCSP project! This sceFont implementation is basically a C++ take on JPCSP's font code.
 // Some parts, especially in this file, were simply copied, so I guess this really makes this file GPL3.
 
+#include "Common/ChunkFile.h"
 #include "Core/MemMap.h"
 #include "Core/Reporting.h"
 #include "Core/Font/PGF.h"

Core/Font/PGF.h

@@ -23,9 +23,10 @@
 #include <vector>
 
 #include "Common/Log.h"
-#include "Common/ChunkFile.h"
 #include "Common/CommonTypes.h"
 
+class PointerWrap;
+
 enum {
 	FONT_FILETYPE_PGF = 0x00,
 	FONT_FILETYPE_BWFON = 0x01,

Core/HLE/FunctionWrappers.h

@@ -19,6 +19,7 @@
 
 #include "Common/CommonTypes.h"
 #include "Core/HLE/HLE.h"
+#include "Core/MemMap.h"
 
 // For easy parameter parsing and return value processing.
 

Core/HLE/HLE.h

@@ -18,10 +18,9 @@
 #pragma once
 
 #include "Common/CommonTypes.h"
-#include "Common/ChunkFile.h"
-#include "Core/MemMap.h"  // TODO: Try to get rid of this include.
 #include "Core/MIPS/MIPS.h"
 
+class PointerWrap;
 typedef void (* HLEFunc)();
 
 enum {
@@ -70,11 +69,6 @@ struct Syscall
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
 #endif
 
-#include "FunctionWrappers.h"
-
-
-#define P_INT(n, name) const int name = currentMIPS->r[4+n];
-
 const char *GetFuncName(const char *module, u32 nib);
 const char *GetFuncName(int module, int func);
 const HLEFunction *GetFunc(const char *module, u32 nib);

Core/HLE/HLETables.cpp

@@ -15,9 +15,9 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#include "HLE.h"
+#include "Core/HLE/HLE.h"
-
+#include "Core/HLE/HLETables.h"
-#include "HLETables.h"
+#include "Core/HLE/FunctionWrappers.h"
 
 #include "sceAtrac.h"
 #include "sceAudio.h"

Core/HLE/ReplaceTables.cpp

@@ -19,6 +19,7 @@
 
 #include "base/basictypes.h"
 #include "base/logging.h"
+#include "Core/MemMap.h"
 #include "Core/MIPS/JitCommon/JitCommon.h"
 #include "Core/MIPS/MIPSAnalyst.h"
 #include "Core/HLE/ReplaceTables.h"

Core/HLE/proAdhoc.h

@@ -5,7 +5,6 @@
 #include "thread/thread.h"
 #include "net/resolve.h"
 
-#include "Common/ChunkFile.h" 
 #include "Core/Config.h"
 #include "Core/CoreTiming.h"
 #include "Core/HLE/HLE.h"
@@ -15,6 +14,8 @@
 #include "Core/HLE/sceKernelMutex.h"
 #include "Core/HLE/sceUtility.h"
 
+class PointerWrap;
+
 // Net stuff
 #ifdef _XBOX
 #include <winsockx.h>

Core/HLE/sceAtrac.cpp

@@ -17,8 +17,10 @@
 
 
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/FunctionWrappers.h"
 #include "Core/MIPS/MIPS.h"
 #include "Core/CoreTiming.h"
+#include "Core/MemMap.h"
 #include "Core/Reporting.h"
 #include "Core/Config.h"
 #include "Core/HW/MediaEngine.h"

Core/HLE/sceAudio.cpp

@@ -20,6 +20,7 @@
 #include "Core/Host.h"
 #include "Core/CoreTiming.h"
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/FunctionWrappers.h"
 #include "Core/HLE/sceKernelThread.h"
 #include "Core/HLE/sceAudio.h"
 #include "Core/HLE/__sceAudio.h"

Core/HLE/sceAudiocodec.cpp

@@ -16,8 +16,9 @@
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
 #include "Core/HLE/HLE.h"
-
+#include "Core/HLE/FunctionWrappers.h"
-#include "sceAudiocodec.h"
+#include "Core/HLE/sceAudiocodec.h"
+#include "Core/MemMap.h"
 #include "Core/Reporting.h"
 #include "Core/HW/SimpleMp3Dec.h"
 

Core/HLE/sceCcc.cpp

@@ -20,7 +20,9 @@
 #include "util/text/shiftjis.h"
 
 #include "Common/ChunkFile.h"
+#include "Core/MemMap.h"
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/FunctionWrappers.h"
 #include "Core/Reporting.h"
 
 typedef PSPPointer<char> PSPCharPointer;

Core/HLE/sceCcc.h

@@ -17,8 +17,6 @@
 
 #pragma once
 
-#include "HLE.h"
-
 class PointerWrap;
 
 void Register_sceCcc();

Core/HLE/sceChnnlsv.cpp

@@ -15,10 +15,12 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#include "HLE.h"
+#include "Core/MemMap.h"
+#include "Core/HLE/HLE.h"
+#include "Core/HLE/FunctionWrappers.h"
 
-#include "sceChnnlsv.h"
+#include "Core/HLE/sceChnnlsv.h"
-#include "sceKernel.h"
+#include "Core/HLE/sceKernel.h"
 extern "C"
 {
 #include "ext/libkirk/kirk_engine.h"

Core/HLE/sceCtrl.cpp

@@ -17,8 +17,10 @@
 
 #include <math.h>
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/FunctionWrappers.h"
 #include "Core/MIPS/MIPS.h"
 #include "Core/CoreTiming.h"
+#include "Core/MemMap.h"
 #include "Common/ChunkFile.h"
 #include "Common/StdMutex.h"
 #include "Core/HLE/sceCtrl.h"

Core/HLE/sceDeflt.cpp

@@ -19,6 +19,8 @@
 
 #include "Common/CommonTypes.h"
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/FunctionWrappers.h"
+#include "Core/MemMap.h"
 
 int sceZlibDecompress(u32 OutBuffer, int OutBufferLength, u32 InBuffer, u32 Crc32Addr) {
 	DEBUG_LOG(HLE, "sceZlibDecompress(%08x, %x, %08x, %08x)", OutBuffer, OutBufferLength, InBuffer, Crc32Addr);

Core/HLE/sceDisplay.cpp

@@ -37,6 +37,7 @@
 #include "Core/Config.h"
 #include "Core/System.h"
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/FunctionWrappers.h"
 #include "Core/HLE/sceDisplay.h"
 #include "Core/HLE/sceKernel.h"
 #include "Core/HLE/sceKernelThread.h"

Core/HLE/sceDmac.cpp

@@ -20,6 +20,7 @@
 #include "Core/MemMap.h"
 #include "Core/Reporting.h"
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/FunctionWrappers.h"
 #include "Core/Debugger/Breakpoints.h"
 #include "GPU/GPUInterface.h"
 #include "GPU/GPUState.h"

Core/HLE/sceFont.cpp

@@ -9,9 +9,11 @@
 
 #include "Common/ChunkFile.h"
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/FunctionWrappers.h"
 #include "Core/MIPS/MIPS.h"
 #include "Core/FileSystems/FileSystem.h"
 #include "Core/FileSystems/MetaFileSystem.h"
+#include "Core/MemMap.h"
 #include "Core/Reporting.h"
 #include "Core/System.h"
 #include "Core/HLE/sceKernel.h"

Core/HLE/sceGameUpdate.cpp

@@ -15,8 +15,8 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#include "HLE.h"
+#include "Core/HLE/HLE.h"
-
+#include "Core/HLE/FunctionWrappers.h"
 
 u32 sceGameUpdateInit()
 {

Core/HLE/sceGameUpdate.h

@@ -17,6 +17,4 @@
 
 #pragma once
 
-#include "HLE.h"
-
 void Register_sceGameUpdate();

Core/HLE/sceGe.cpp

@@ -20,6 +20,7 @@
 
 #include "Common/ChunkFile.h"
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/FunctionWrappers.h"
 #include "Core/MIPS/MIPS.h"
 #include "Core/System.h"
 #include "Core/CoreParameter.h"

Core/HLE/sceHeap.cpp

@@ -16,11 +16,13 @@
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
 #include "Common/ChunkFile.h"
+#include "Core/MemMap.h"
 #include "Core/Reporting.h"
 #include "Core/HLE/HLE.h"
-#include "sceKernelMemory.h"
+#include "Core/HLE/FunctionWrappers.h"
+#include "Core/HLE/sceKernelMemory.h"
 #include "Core/HLE/sceHeap.h"
-#include "../Util/BlockAllocator.h"
+#include "Core/Util/BlockAllocator.h"
 #include <map>
 
 struct Heap {

Core/HLE/sceHprm.cpp

@@ -15,10 +15,11 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#include "HLE.h"
+#include "Core/HLE/HLE.h"
-#include "../MIPS/MIPS.h"
+#include "Core/HLE/FunctionWrappers.h"
-
+#include "Core/HLE/sceHprm.h"
-#include "sceCtrl.h"
+#include "Core/MemMap.h"
+#include "Core/MIPS/MIPS.h"
 
 u32 sceHprmPeekCurrentKey(u32 keyAddress) {
 	DEBUG_LOG(HLE,"0=sceHprmPeekCurrentKey(ptr)");

Core/HLE/sceHprm.h

@@ -17,6 +17,4 @@
 
 #pragma once
 
-#include "HLE.h"
-
 void Register_sceHprm();

Core/HLE/sceHttp.cpp

@@ -15,9 +15,10 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#include "HLE.h"
+#include "Core/HLE/HLE.h"
+#include "Core/HLE/FunctionWrappers.h"
 
-#include "sceHttp.h"
+#include "Core/HLE/sceHttp.h"
 #include "net/http_client.h"
 
 // If http isn't loaded (seems unlikely), most functions should return SCE_KERNEL_ERROR_LIBRARY_NOTFOUND

Core/HLE/sceImpose.cpp

@@ -15,12 +15,13 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#include "HLE.h"
+#include "Core/HLE/HLE.h"
-#include "FunctionWrappers.h"
+#include "Core/HLE/FunctionWrappers.h"
-#include "../MIPS/MIPS.h"
+#include "Core/MIPS/MIPS.h"
-#include "../Config.h"
+#include "Core/Config.h"
-#include "ChunkFile.h"
+#include "Core/MemMap.h"
-#include "sceUtility.h"
+#include "Common/ChunkFile.h"
+#include "Core/HLE/sceUtility.h"
 
 const int PSP_UMD_POPUP_DISABLE = 0;
 const int PSP_UMD_POPUP_ENABLE = 1;

Core/HLE/sceIo.cpp

@@ -22,10 +22,13 @@
 #include "native/thread/threadutil.h"
 #include "Core/Core.h"
 #include "Core/Config.h"
+#include "Core/MemMap.h"
 #include "Core/System.h"
 #include "Core/Host.h"
 #include "Core/SaveState.h"
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/FunctionWrappers.h"
+#include "Core/HLE/sceKernel.h"
 #include "Core/MIPS/MIPS.h"
 #include "Core/HW/MemoryStick.h"
 #include "Core/HW/AsyncIOManager.h"

Core/HLE/sceIo.h

@@ -19,9 +19,8 @@
 
 #include <string>
 
-#include "Core/System.h"
+class PointerWrap;
-#include "Core/HLE/HLE.h"
+class KernelObject;
-#include "Core/HLE/sceKernel.h"
 
 void __IoInit();
 void __IoDoState(PointerWrap &p);

Core/HLE/sceJpeg.cpp

@@ -17,11 +17,13 @@
 
 #include "native/ext/jpge/jpgd.h"
 
-#include "Common.h"
+#include "Common/Common.h"
 #include "Common/ChunkFile.h"
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/FunctionWrappers.h"
+#include "Core/MemMap.h"
 #include "Core/Reporting.h"
-#include "sceMpeg.h"
+#include "Core/HLE/sceMpeg.h"
 
 //Uncomment if you want to dump JPEGs loaded through sceJpeg to a file
 //#define JPEG_DEBUG

Core/HLE/sceJpeg.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "HLE.h"
+class PointerWrap;
 
 void Register_sceJpeg();
 void __JpegInit();

Core/HLE/sceKernel.cpp

@@ -19,9 +19,11 @@
 #include "Core/Config.h"
 #include "Core/CwCheat.h"
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/FunctionWrappers.h"
 #include "Core/MIPS/MIPS.h"
 #include "Core/MIPS/MIPSCodeUtils.h"
 #include "Core/MIPS/MIPSInt.h"
+#include "Core/MIPS/JitCommon/JitCommon.h"
 
 #include "Common/LogManager.h"
 #include "Core/FileSystems/FileSystem.h"
@@ -49,6 +51,7 @@
 #include "sceKernelInterrupt.h"
 #include "sceKernelThread.h"
 #include "sceKernelMemory.h"
+#include "sceKernelModule.h"
 #include "sceKernelMutex.h"
 #include "sceKernelMbx.h"
 #include "sceKernelMsgPipe.h"

Core/HLE/sceKernelAlarm.cpp

@@ -15,12 +15,13 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#include "sceKernel.h"
+#include "Core/HLE/sceKernel.h"
-#include "sceKernelAlarm.h"
+#include "Core/HLE/sceKernelAlarm.h"
-#include "sceKernelInterrupt.h"
+#include "Core/HLE/sceKernelInterrupt.h"
-#include "HLE.h"
+#include "Core/HLE/HLE.h"
 #include "Core/CoreTiming.h"
-#include "ChunkFile.h"
+#include "Core/MemMap.h"
+#include "Common/ChunkFile.h"
 #include <list>
 
 const int NATIVEALARM_SIZE = 20;

Core/HLE/sceKernelEventFlag.cpp

@@ -20,6 +20,7 @@
 #include "Core/HLE/HLE.h"
 #include "Core/MIPS/MIPS.h"
 #include "Core/CoreTiming.h"
+#include "Core/MemMap.h"
 #include "Core/Reporting.h"
 #include "Common/ChunkFile.h"
 

Core/HLE/sceKernelInterrupt.cpp

@@ -20,6 +20,7 @@
 #include <map>
 
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/FunctionWrappers.h"
 #include "Core/MIPS/MIPS.h"
 #include "Common/ChunkFile.h"
 

Core/HLE/sceKernelMbx.cpp

@@ -23,6 +23,7 @@
 #include "Core/HLE/sceKernelMbx.h"
 #include "Core/HLE/HLE.h"
 #include "Core/CoreTiming.h"
+#include "Core/MemMap.h"
 #include "Core/Reporting.h"
 #include "Core/HLE/KernelWaitHelpers.h"
 

Core/HLE/sceKernelMemory.cpp

@@ -22,6 +22,7 @@
 
 #include "Common/ChunkFile.h"
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/FunctionWrappers.h"
 #include "Core/System.h"
 #include "Core/MIPS/MIPS.h"
 #include "Core/MemMap.h"

Core/HLE/sceKernelModule.cpp

@@ -24,6 +24,7 @@
 #include "Common/FileUtil.h"
 #include "Core/Config.h"
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/FunctionWrappers.h"
 #include "Core/HLE/HLETables.h"
 #include "Core/Reporting.h"
 #include "Core/Host.h"

Core/HLE/sceKernelModule.h

@@ -17,8 +17,10 @@
 
 #pragma once
 
-#include "sceKernel.h"
+#include <string>
-#include "HLE.h"
+#include "Core/HLE/sceKernel.h"
+
+class PointerWrap;
 
 KernelObject *__KernelModuleObject();
 void __KernelModuleDoState(PointerWrap &p);

Core/HLE/sceKernelMsgPipe.cpp

@@ -19,6 +19,7 @@
 
 #include "Core/Reporting.h"
 #include "Core/CoreTiming.h"
+#include "Core/MemMap.h"
 #include "Core/HLE/HLE.h"
 #include "Core/HLE/sceKernel.h"
 #include "Core/HLE/sceKernelMsgPipe.h"

Core/HLE/sceKernelSemaphore.cpp

@@ -19,6 +19,7 @@
 #include "Core/HLE/HLE.h"
 #include "Core/MIPS/MIPS.h"
 #include "Core/CoreTiming.h"
+#include "Core/MemMap.h"
 #include "Core/Reporting.h"
 #include "Common/ChunkFile.h"
 #include "Core/HLE/sceKernel.h"

Core/HLE/sceKernelThread.h

@@ -20,12 +20,12 @@
 #include <string>
 #include <vector>
 
+#include "Common/CommonTypes.h"
+#include "Core/HLE/sceKernel.h"
+
 // There's a good description of the thread scheduling rules in:
 // http://code.google.com/p/jpcsp/source/browse/trunk/src/jpcsp/HLE/modules150/ThreadManForUser.java
 
-#include "sceKernelModule.h"
-#include "HLE.h"
-
 int sceKernelChangeThreadPriority(SceUID threadID, int priority);
 int __KernelCreateThread(const char *threadName, SceUID moduleID, u32 entry, u32 prio, int stacksize, u32 attr, u32 optionAddr);
 int sceKernelCreateThread(const char *threadName, u32 entry, u32 prio, int stacksize, u32 attr, u32 optionAddr);

Core/HLE/sceKernelTime.cpp

@@ -30,6 +30,7 @@
 #include "Core/HLE/sceKernelTime.h"
 #include "Core/HLE/sceKernelThread.h"
 #include "Core/HLE/sceRtc.h"
+#include "Core/MemMap.h"
 
 // The time when the game started.
 static time_t start_time;

Core/HLE/sceKernelVTimer.cpp

@@ -17,13 +17,14 @@
 
 #include <algorithm>
 #include "Core/CoreTiming.h"
+#include "Core/MemMap.h"
 #include "Core/Reporting.h"
-#include "sceKernel.h"
+#include "Core/HLE/sceKernel.h"
-#include "sceKernelInterrupt.h"
+#include "Core/HLE/sceKernelInterrupt.h"
-#include "sceKernelMemory.h"
+#include "Core/HLE/sceKernelMemory.h"
-#include "sceKernelVTimer.h"
+#include "Core/HLE/sceKernelVTimer.h"
-#include "HLE.h"
+#include "Core/HLE/HLE.h"
-#include "ChunkFile.h"
+#include "Common/ChunkFile.h"
 
 static int vtimerTimer = -1;
 static SceUID runningVTimer = 0;

Core/HLE/sceMd5.cpp

@@ -16,6 +16,8 @@
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/FunctionWrappers.h"
+#include "Core/MemMap.h"
 #include "Core/Reporting.h"
 #include "Common/Crypto/md5.h"
 #include "Common/Crypto/sha1.h"

Core/HLE/sceMd5.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "HLE.h"
+#include "Common/CommonTypes.h"
 
 void Register_sceMd5();
 

Core/HLE/sceMp3.cpp

@@ -20,8 +20,10 @@
 
 #include "Core/Config.h"
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/FunctionWrappers.h"
 #include "Core/HLE/sceMp3.h"
 #include "Core/HW/MediaEngine.h"
+#include "Core/MemMap.h"
 #include "Core/Reporting.h"
 
 #ifdef USE_FFMPEG

Core/HLE/sceMp3.h

@@ -17,8 +17,6 @@
 
 #pragma once
 
-#include "HLE.h"
-
 class PointerWrap;
 
 void Register_sceMp3();

Core/HLE/sceMp4.cpp

@@ -16,6 +16,7 @@
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/FunctionWrappers.h"
 #include "Core/Reporting.h"
 
 

Core/HLE/sceMp4.h

@@ -17,6 +17,4 @@
 
 #pragma once
 
-#include "HLE.h"
-
 void Register_sceMp4();

Core/HLE/sceMpeg.cpp

@@ -21,8 +21,10 @@
 #include <algorithm>
 
 #include "Core/HLE/sceMpeg.h"
+#include "Core/HLE/sceKernelModule.h"
 #include "Core/HLE/sceKernelThread.h"
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/FunctionWrappers.h"
 #include "Core/HW/MediaEngine.h"
 #include "Core/Config.h"
 #include "Core/Reporting.h"

Core/HLE/sceMpeg.h

@@ -17,8 +17,7 @@
 
 #pragma once
 
-#include "Common/CommonTypes.h"
+#include "Common/Common.h"
-#include "Core/MIPS/MIPS.h"
 
 class PointerWrap;
 

Core/HLE/sceMt19937.cpp

@@ -16,6 +16,8 @@
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/FunctionWrappers.h"
+#include "Core/MemMap.h"
 #include "Core/Reporting.h"
 
 u32 sceMt19937Init(u32 mt19937Addr, u32 seed)

Core/HLE/sceMt19937.h

@@ -17,6 +17,4 @@
 
 #pragma once
 
-#include "HLE.h"
-
 void Register_sceMt19937();

Core/HLE/sceNet.cpp

@@ -20,8 +20,10 @@
 
 #include "Common/ChunkFile.h"
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/FunctionWrappers.h"
 #include "Core/MIPS/MIPS.h"
 #include "Core/Config.h"
+#include "Core/MemMap.h"
 
 #include "sceKernel.h"
 #include "sceKernelThread.h"

Core/HLE/sceNet.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "Common/ChunkFile.h"
+class PointerWrap;
 
 void Register_sceNet();
 void Register_sceWlanDrv();

Core/HLE/sceNetAdhoc.cpp

@@ -20,7 +20,10 @@
 
 // This is a direct port of Coldbird's code from http://code.google.com/p/aemu/
 // All credit goes to him!
-#include "proAdhoc.h"
+#include "Common/ChunkFile.h"
+#include "Core/HLE/FunctionWrappers.h"
+#include "Core/HLE/proAdhoc.h"
+#include "Core/MemMap.h"
 
 enum {
 	ERROR_NET_ADHOC_INVALID_SOCKET_ID            = 0x80410701,

Core/HLE/sceNetAdhoc.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "Common/ChunkFile.h"
+class PointerWrap;
 
 void Register_sceNetAdhoc();
 

Core/HLE/sceNp.cpp

@@ -16,11 +16,12 @@
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
 // This is pretty much a stub implementation. Doesn't actually do anything, just tries to return values
-// to keep games happy anyway. So, no ATRAC3 music until someone has reverse engineered Atrac3+.
+// to keep games happy anyway.
 
-#include "HLE.h"
+#include "Core/HLE/HLE.h"
+#include "Core/HLE/FunctionWrappers.h"
 
-#include "sceNp.h"
+#include "Core/HLE/sceNp.h"
 
 int sceNp_857B47D3()
 {

Core/HLE/sceOpenPSID.cpp

@@ -15,9 +15,10 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#include "HLE.h"
+#include "Core/HLE/HLE.h"
-
+#include "Core/HLE/FunctionWrappers.h"
-#include "sceOpenPSID.h"
+#include "Core/HLE/sceOpenPSID.h"
+#include "Core/MemMap.h"
 
 int sceOpenPSIDGetOpenPSID(u32 OpenPSIDPtr)
 {

Core/HLE/sceP3da.cpp

@@ -16,6 +16,8 @@
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/FunctionWrappers.h"
+#include "Core/MemMap.h"
 #include "Core/Reporting.h"
 
 

Core/HLE/sceP3da.h

@@ -17,6 +17,4 @@
 
 #pragma once
 
-#include "HLE.h"
-
 void Register_sceP3da();

Core/HLE/sceParseHttp.cpp

@@ -15,9 +15,8 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#include "HLE.h"
+#include "Core/HLE/HLE.h"
-
+#include "Core/HLE/sceParseHttp.h"
-#include "sceParseHttp.h"
 
 const HLEFunction sceParseHttp [] = 
 {

Core/HLE/sceParseUri.cpp

@@ -15,9 +15,8 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#include "HLE.h"
+#include "Core/HLE/HLE.h"
-
+#include "Core/HLE/sceParseUri.h"
-#include "sceParseUri.h"
 
 const HLEFunction sceParseUri[] =
 {

Core/HLE/scePauth.cpp

@@ -18,10 +18,12 @@
 #include "zlib.h"
 #include <stdio.h>
 
+#include "Core/MemMap.h"
 #include "Core/System.h"
 #include "Core/FileSystems/MetaFileSystem.h"
 #include "Core/HLE/scePauth.h"
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/FunctionWrappers.h"
 
 int scePauth_F7AA47F6(u32 srcPtr, int srcLength, u32 destLengthPtr, u32 workArea)
 {

Core/HLE/scePower.cpp

@@ -18,7 +18,9 @@
 #include <vector>
 #include "Common/ChunkFile.h"
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/FunctionWrappers.h"
 #include "Core/CoreTiming.h"
+#include "Core/MemMap.h"
 #include "Core/Reporting.h"
 #include "Core/Config.h"
 

Core/HLE/scePsmf.cpp

@@ -16,6 +16,7 @@
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/FunctionWrappers.h"
 #include "Common/ChunkFile.h"
 #include "Core/Reporting.h"
 

Core/HLE/scePspNpDrm_user.cpp

@@ -1,6 +1,7 @@
 #include "scePspNpDrm_user.h"
 
-#include "HLE.h"
+#include "Core/HLE/HLE.h"
+#include "Core/HLE/FunctionWrappers.h"
 
 u32 sceIoIoctl(u32 id, u32 cmd, u32 indataPtr, u32 inlen, u32 outdataPtr, u32 outlen);
 

Core/HLE/sceRtc.cpp

@@ -30,9 +30,11 @@
 
 #include "Common/ChunkFile.h"
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/FunctionWrappers.h"
 #include "Core/MIPS/MIPS.h"
 #include "Core/Reporting.h"
 #include "Core/CoreTiming.h"
+#include "Core/MemMap.h"
 
 #include "Core/HLE/sceKernel.h"
 #include "Core/HLE/sceRtc.h"

Core/HLE/sceRtc.h

@@ -17,6 +17,10 @@
 
 #pragma once
 
+#include "Common/Common.h"
+
+class PointerWrap;
+
 struct PSPTimeval {
 	s32_le tv_sec;
 	s32_le tv_usec;

Core/HLE/sceSas.cpp

@@ -30,8 +30,10 @@
 #include "base/basictypes.h"
 #include "Common/Log.h"
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/FunctionWrappers.h"
 #include "Core/MIPS/MIPS.h"
 #include "Core/HW/SasAudio.h"
+#include "Core/MemMap.h"
 #include "Core/Reporting.h"
 
 #include "Core/HLE/sceSas.h"

Core/HLE/sceSsl.cpp

@@ -15,10 +15,12 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#include "HLE.h"
+#include "Core/HLE/HLE.h"
-#include "ChunkFile.h"
+#include "Core/HLE/FunctionWrappers.h"
+#include "Core/MemMap.h"
+#include "Common/ChunkFile.h"
 
-#include "sceSsl.h"
+#include "Core/HLE/sceSsl.h"
 
 #define ERROR_SSL_NOT_INIT          0x80435001;
 #define ERROR_SSL_ALREADY_INIT      0x80435020;

Core/HLE/sceUmd.cpp

@@ -20,11 +20,13 @@
 #include "file/file_util.h"
 
 #include "Common/ChunkFile.h"
+#include "Core/MemMap.h"
 #include "Core/System.h"
 #include "Core/CoreTiming.h"
 #include "Core/Reporting.h"
 #include "Core/MIPS/MIPS.h"
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/FunctionWrappers.h"
 #include "Core/HLE/sceUmd.h"
 #include "Core/HLE/sceKernelThread.h"
 #include "Core/HLE/sceKernelInterrupt.h"

Core/HLE/sceUsb.cpp

@@ -15,11 +15,12 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#include "HLE.h"
+#include "Core/HLE/HLE.h"
-#include "../MIPS/MIPS.h"
+#include "Core/HLE/FunctionWrappers.h"
+#include "Core/MIPS/MIPS.h"
 #include "Core/CoreTiming.h"
-#include "ChunkFile.h"
+#include "Common/ChunkFile.h"
-#include "sceUsb.h"
+#include "Core/HLE/sceUsb.h"
 
 bool usbActivated = false;
 

Core/HLE/sceUtility.cpp

@@ -22,8 +22,10 @@
 
 #include "Common/ChunkFile.h"
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/FunctionWrappers.h"
 #include "Core/MIPS/MIPS.h"
 #include "Core/Reporting.h"
+#include "Core/Config.h"
 
 #include "Core/HLE/sceKernel.h"
 #include "Core/HLE/sceKernelThread.h"

Core/HLE/sceVaudio.cpp

@@ -18,6 +18,7 @@
 #include "Common/ChunkFile.h"
 #include "Core/Reporting.h"
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/FunctionWrappers.h"
 #include "Core/HLE/sceVaudio.h"
 #include "Core/HLE/sceAudio.h"
 #include "Core/HLE/__sceAudio.h"

Core/HW/MediaEngine.h

@@ -26,10 +26,10 @@
 
 #include <map>
 #include "Common/CommonTypes.h"
-#include "Common/ChunkFile.h"
 #include "Core/HLE/sceMpeg.h"
 #include "Core/HW/MpegDemux.h"
 
+class PointerWrap;
 struct SimpleAT3;
 
 #ifdef USE_FFMPEG

Core/HW/MemoryStick.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Common/ChunkFile.h"
+#include "Common/CommonTypes.h"
 
 class PointerWrap;
 

Core/HW/MpegDemux.h

@@ -4,9 +4,10 @@
 #pragma once
 
 #include "Common/CommonTypes.h"
-#include "Common/ChunkFile.h"
 #include "Core/HW/BufferQueue.h"
 
+class PointerWrap;
+
 class MpegDemux
 {
 public:

Core/HW/SasAudio.h

@@ -22,10 +22,11 @@
 
 #pragma once
 
-#include "Common/ChunkFile.h"
 #include "Common/CommonTypes.h"
 #include "Core/HW/BufferQueue.h"
 
+class PointerWrap;
+
 enum {
 	PSP_SAS_VOICES_MAX = 32,
 

Core/MIPS/ARM/ArmCompBranch.cpp

@@ -17,6 +17,7 @@
 
 #include "Core/Reporting.h"
 #include "Core/Config.h"
+#include "Core/MemMap.h"
 #include "Core/HLE/HLE.h"
 #include "Core/HLE/HLETables.h"
 

Core/MIPS/ARM/ArmCompFPU.cpp

@@ -16,6 +16,7 @@
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
 #include "Core/Config.h"
+#include "Core/MemMap.h"
 #include "Core/MIPS/MIPS.h"
 #include "Core/MIPS/MIPSCodeUtils.h"
 #include "Core/MIPS/MIPSTables.h"

Core/MIPS/ARM/ArmJit.cpp

@@ -20,6 +20,7 @@
 #include "Core/Reporting.h"
 #include "Core/Core.h"
 #include "Core/CoreTiming.h"
+#include "Core/MemMap.h"
 #include "Core/MIPS/MIPS.h"
 #include "Core/MIPS/MIPSCodeUtils.h"
 #include "Core/MIPS/MIPSInt.h"

Core/MIPS/JitCommon/JitState.h

@@ -18,6 +18,8 @@
 
 #pragma once
 
+#include "Common/Common.h"
+
 struct JitBlock;
 
 namespace MIPSComp {

Core/MIPS/MIPS.h

@@ -19,9 +19,10 @@
 
 #include "util/random/rng.h"
 #include "Common/CommonTypes.h"
-#include "Common/ChunkFile.h"
 #include "Core/Opcode.h"
 
+class PointerWrap;
+
 typedef Memory::Opcode MIPSOpcode;
 
 enum MIPSGPReg

Core/MIPS/MIPSAnalyst.cpp

@@ -20,6 +20,7 @@
 #include "ext/cityhash/city.h"
 #include "Common/FileUtil.h"
 #include "Core/Config.h"
+#include "Core/MemMap.h"
 #include "Core/System.h"
 #include "Core/MIPS/MIPS.h"
 #include "Core/MIPS/MIPSTables.h"

Core/MIPS/MIPSCodeUtils.cpp

@@ -15,10 +15,11 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#include "MIPS.h"
+#include "Core/MIPS/MIPS.h"
-#include "MIPSTables.h"
+#include "Core/MIPS/MIPSTables.h"
-#include "MIPSCodeUtils.h"
+#include "Core/MIPS/MIPSCodeUtils.h"
-#include "../Host.h"
+#include "Core/Host.h"
+#include "Core/MemMap.h"
 
 namespace MIPSCodeUtils
 {

Core/MIPS/MIPSCodeUtils.h

@@ -17,9 +17,8 @@
 
 #pragma once
 
-#include "JitCommon/JitCommon.h"
 #include "Common/CommonTypes.h"
-#include "Core/HLE/HLE.h"
+#include "Core/MIPS/MIPS.h"
 
 // Invalid branch target address
 #define INVALIDTARGET 0xFFFFFFFF

Core/MIPS/MIPSInt.cpp

@@ -25,6 +25,7 @@
 #include "Core/Config.h"
 #include "Core/Core.h"
 #include "Core/Host.h"
+#include "Core/MemMap.h"
 #include "Core/MIPS/MIPS.h"
 #include "Core/MIPS/MIPSInt.h"
 #include "Core/MIPS/MIPSTables.h"