Remove some indirect headers.

2025-07-08 16:01:42 +12:00 · 2014-07-12 17:46:14 +10:00 · 2014-07-12 17:46:14 +10:00 · a1158c9515
commit a1158c9515
parent 9816ec3aa0
66 changed files with 35 additions and 101 deletions
--- a/rpcs3/Emu/Cell/PPUThread.cpp
+++ b/rpcs3/Emu/Cell/PPUThread.cpp
@ -3,7 +3,6 @@
 #include "Emu/Memory/Memory.h"
 #include "Emu/System.h"
 #include "Emu/Cell/PPUThread.h"
-#include "Emu/SysCalls/SC_FUNC.h"
 #include "Emu/SysCalls/Modules.h"

 #include "Emu/Cell/PPUDecoder.h"
--- a/rpcs3/Emu/SysCalls/Modules.cpp
+++ b/rpcs3/Emu/SysCalls/Modules.cpp
@ -1,13 +1,9 @@
 #include "stdafx.h"
 #include "Utilities/Log.h"
-#include "Emu/Memory/Memory.h"
 #include "Emu/System.h"
-#include "Emu/Cell/PPUThread.h"
-#include "Emu/SysCalls/SC_FUNC.h"
 #include "Emu/SysCalls/Modules.h"
 #include "Crypto/sha1.h"
 #include <mutex>
-#include "Emu/System.h"
 #include "ModuleManager.h"

 u32 getFunctionId(const std::string& name)
--- a/rpcs3/Emu/SysCalls/Modules/SC_Keyboard.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/SC_Keyboard.cpp
@ -2,11 +2,8 @@
 #include "Utilities/Log.h"
 #include "Emu/Memory/Memory.h"
 #include "Emu/System.h"
-#include "Emu/Cell/PPUThread.h"
-#include "Emu/SysCalls/SC_FUNC.h"
 #include "Emu/SysCalls/Modules.h"
 #include "Emu/Io/Keyboard.h"
-#include "Emu/SysCalls/SysCalls.h"

 extern Module *sys_io;

--- a/rpcs3/Emu/SysCalls/Modules/SC_Mouse.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/SC_Mouse.cpp
@ -2,11 +2,8 @@
 #include "Utilities/Log.h"
 #include "Emu/Memory/Memory.h"
 #include "Emu/System.h"
-#include "Emu/Cell/PPUThread.h"
-#include "Emu/SysCalls/SC_FUNC.h"
 #include "Emu/SysCalls/Modules.h"
 #include "Emu/Io/Mouse.h"
-#include "Emu/SysCalls/SysCalls.h"

 extern Module *sys_io;

--- a/rpcs3/Emu/SysCalls/Modules/SC_Pad.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/SC_Pad.cpp
@ -2,11 +2,8 @@
 #include "Utilities/Log.h"
 #include "Emu/Memory/Memory.h"
 #include "Emu/System.h"
-#include "Emu/Cell/PPUThread.h"
-#include "Emu/SysCalls/SC_FUNC.h"
 #include "Emu/SysCalls/Modules.h"
 #include "Emu/Io/Pad.h"
-#include "Emu/SysCalls/SysCalls.h"

 extern Module *sys_io;

--- a/rpcs3/Emu/SysCalls/Modules/cellAdec.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellAdec.cpp
@ -2,8 +2,6 @@
 #include "Utilities/Log.h"
 #include "Emu/Memory/Memory.h"
 #include "Emu/System.h"
-#include "Emu/Cell/PPUThread.h"
-#include "Emu/SysCalls/SC_FUNC.h"
 #include "Emu/SysCalls/Modules.h"
 #include "Emu/SysCalls/SysCalls.h"
 #include "cellPamf.h"
--- a/rpcs3/Emu/SysCalls/Modules/cellAtrac.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellAtrac.cpp
@ -1,9 +1,6 @@
 #include "stdafx.h"
 #include "Utilities/Log.h"
 #include "Emu/Memory/Memory.h"
-#include "Emu/System.h"
-#include "Emu/Cell/PPUThread.h"
-#include "Emu/SysCalls/SC_FUNC.h"
 #include "Emu/SysCalls/Modules.h"
 #include "Emu/SysCalls/SysCalls.h"

--- a/rpcs3/Emu/SysCalls/Modules/cellAudio.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellAudio.cpp
@ -2,8 +2,6 @@
 #include "Utilities/Log.h"
 #include "Emu/Memory/Memory.h"
 #include "Emu/System.h"
-#include "Emu/Cell/PPUThread.h"
-#include "Emu/SysCalls/SC_FUNC.h"
 #include "Emu/SysCalls/Modules.h"
 #include "Emu/SysCalls/SysCalls.h"
 #include "Utilities/SQueue.h"
--- a/rpcs3/Emu/SysCalls/Modules/cellBgdl.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellBgdl.cpp
@ -1,5 +1,5 @@
-#include "stdafx.h"
 #if 0
+#include "stdafx.h"
 #include "Emu/SysCalls/SysCalls.h"
 #include "Emu/SysCalls/SC_FUNC.h"

--- a/rpcs3/Emu/SysCalls/Modules/cellCamera.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellCamera.cpp
@ -1,5 +1,5 @@
-#include "stdafx.h"
 #if 0
+#include "stdafx.h"
 #include "Emu/SysCalls/SysCalls.h"
 #include "Emu/SysCalls/SC_FUNC.h"

--- a/rpcs3/Emu/SysCalls/Modules/cellCelp8Enc.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellCelp8Enc.cpp
@ -1,5 +1,5 @@
-#include "stdafx.h"
 #if 0
+#include "stdafx.h"
 #include "Emu/SysCalls/SysCalls.h"
 #include "Emu/SysCalls/SC_FUNC.h"

--- a/rpcs3/Emu/SysCalls/Modules/cellCelpEnc.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellCelpEnc.cpp
@ -1,5 +1,5 @@
-#include "stdafx.h"
 #if 0
+#include "stdafx.h"
 #include "Emu/SysCalls/SysCalls.h"
 #include "Emu/SysCalls/SC_FUNC.h"

--- a/rpcs3/Emu/SysCalls/Modules/cellDmux.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellDmux.cpp
@ -3,10 +3,8 @@
 #include "Emu/Memory/Memory.h"
 #include "Emu/System.h"
 #include "Emu/Cell/PPUThread.h"
-#include "Emu/SysCalls/SC_FUNC.h"
 #include "Emu/SysCalls/Modules.h"
 #include "Emu/SysCalls/SysCalls.h"
-#include "Emu/SysCalls/SC_FUNC.h"
 #include "cellPamf.h"
 #include "cellDmux.h"

--- a/rpcs3/Emu/SysCalls/Modules/cellFiber.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellFiber.cpp
@ -1,5 +1,5 @@
-#include "stdafx.h"
 #if 0
+#include "stdafx.h"
 #include "Emu/SysCalls/SysCalls.h"
 #include "Emu/SysCalls/SC_FUNC.h"

--- a/rpcs3/Emu/SysCalls/Modules/cellFont.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellFont.cpp
@ -3,7 +3,6 @@
 #include "Emu/Memory/Memory.h"
 #include "Emu/System.h"
 #include "Emu/Cell/PPUThread.h"
-#include "Emu/SysCalls/SC_FUNC.h"
 #include "Emu/SysCalls/Modules.h"
 #include "Emu/SysCalls/SysCalls.h"
 #include "Emu/FS/vfsFile.h"
--- a/rpcs3/Emu/SysCalls/Modules/cellFontFT.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellFontFT.cpp
@ -2,8 +2,6 @@
 #include "Utilities/Log.h"
 #include "Emu/Memory/Memory.h"
 #include "Emu/System.h"
-#include "Emu/Cell/PPUThread.h"
-#include "Emu/SysCalls/SC_FUNC.h"
 #include "Emu/SysCalls/Modules.h"
 #include "Emu/SysCalls/SysCalls.h"
 #include "cellFont.h"
--- a/rpcs3/Emu/SysCalls/Modules/cellGame.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellGame.cpp
@ -2,7 +2,6 @@
 #include "Utilities/Log.h"
 #include "Emu/Memory/Memory.h"
 #include "Emu/System.h"
-#include "Emu/Cell/PPUThread.h"
 #include "Emu/SysCalls/SC_FUNC.h"
 #include "Emu/SysCalls/Modules.h"
 #include "Emu/SysCalls/SysCalls.h"
--- a/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp
@ -2,8 +2,6 @@
 #include "Utilities/Log.h"
 #include "Emu/Memory/Memory.h"
 #include "Emu/System.h"
-#include "Emu/Cell/PPUThread.h"
-#include "Emu/SysCalls/SC_FUNC.h"
 #include "Emu/SysCalls/Modules.h"
 #include "Emu/SysCalls/SysCalls.h"
 #include "Emu/GS/GCM.h"
--- a/rpcs3/Emu/SysCalls/Modules/cellGem.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellGem.cpp
@ -1,5 +1,5 @@
-#include "stdafx.h"
 #if 0
+#include "stdafx.h"
 #include "Emu/SysCalls/SysCalls.h"
 #include "Emu/SysCalls/SC_FUNC.h"

--- a/rpcs3/Emu/SysCalls/Modules/cellGifDec.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellGifDec.cpp
@ -2,8 +2,6 @@
 #include "Utilities/Log.h"
 #include "Emu/Memory/Memory.h"
 #include "Emu/System.h"
-#include "Emu/Cell/PPUThread.h"
-#include "Emu/SysCalls/SC_FUNC.h"
 #include "Emu/SysCalls/Modules.h"
 #include "Emu/SysCalls/SysCalls.h"
 #include "cellGifDec.h"
--- a/rpcs3/Emu/SysCalls/Modules/cellHttpUtil.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellHttpUtil.cpp
@ -1,5 +1,5 @@
-#include "stdafx.h"
 #if 0
+#include "stdafx.h"
 #include "Emu/SysCalls/SysCalls.h"
 #include "Emu/SysCalls/SC_FUNC.h"

--- a/rpcs3/Emu/SysCalls/Modules/cellImejp.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellImejp.cpp
@ -1,5 +1,5 @@
-#include "stdafx.h"
 #if 0
+#include "stdafx.h"
 #include "Emu/SysCalls/SysCalls.h"
 #include "Emu/SysCalls/SC_FUNC.h"

--- a/rpcs3/Emu/SysCalls/Modules/cellJpgDec.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellJpgDec.cpp
@ -2,8 +2,6 @@
 #include "Utilities/Log.h"
 #include "Emu/Memory/Memory.h"
 #include "Emu/System.h"
-#include "Emu/Cell/PPUThread.h"
-#include "Emu/SysCalls/SC_FUNC.h"
 #include "Emu/SysCalls/Modules.h"
 #include "cellJpgDec.h"
 #include "stblib/stb_image.h"
--- a/rpcs3/Emu/SysCalls/Modules/cellJpgEnc.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellJpgEnc.cpp
@ -1,5 +1,5 @@
-#include "stdafx.h"
 #if 0
+#include "stdafx.h"
 #include "Emu/SysCalls/SysCalls.h"
 #include "Emu/SysCalls/SC_FUNC.h"

--- a/rpcs3/Emu/SysCalls/Modules/cellKey2char.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellKey2char.cpp
@ -1,5 +1,5 @@
-#include "stdafx.h"
 #if 0
+#include "stdafx.h"
 #include "Emu/SysCalls/SysCalls.h"
 #include "Emu/SysCalls/SC_FUNC.h"

--- a/rpcs3/Emu/SysCalls/Modules/cellL10n.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellL10n.cpp
@ -2,8 +2,6 @@
 #include "Utilities/Log.h"
 #include "Emu/Memory/Memory.h"
 #include "Emu/System.h"
-#include "Emu/Cell/PPUThread.h"
-#include "Emu/SysCalls/SC_FUNC.h"
 #include "Emu/SysCalls/Modules.h"

 // Requires GCC 4.10 apparently..
--- a/rpcs3/Emu/SysCalls/Modules/cellLv2dbg.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellLv2dbg.cpp
@ -1,5 +1,5 @@
-#include "stdafx.h"
 #if 0
+#include "stdafx.h"
 #include "Emu/SysCalls/SysCalls.h"
 #include "Emu/SysCalls/SC_FUNC.h"

--- a/rpcs3/Emu/SysCalls/Modules/cellMic.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellMic.cpp
@ -1,5 +1,5 @@
-#include "stdafx.h"
 #if 0
+#include "stdafx.h"
 #include "Emu/SysCalls/SysCalls.h"
 #include "Emu/SysCalls/SC_FUNC.h"

--- a/rpcs3/Emu/SysCalls/Modules/cellMsgDialog.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellMsgDialog.cpp
@ -2,8 +2,6 @@
 #include "Utilities/Log.h"
 #include "Emu/Memory/Memory.h"
 #include "Emu/System.h"
-#include "Emu/Cell/PPUThread.h"
-#include "Emu/SysCalls/SC_FUNC.h"
 #include "Emu/SysCalls/Modules.h"
 #include "rpcs3.h"

--- a/rpcs3/Emu/SysCalls/Modules/cellMusicDecode.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellMusicDecode.cpp
@ -1,5 +1,5 @@
-#include "stdafx.h"
 #if 0
+#include "stdafx.h"
 #include "Emu/SysCalls/SysCalls.h"
 #include "Emu/SysCalls/SC_FUNC.h"

--- a/rpcs3/Emu/SysCalls/Modules/cellMusicExport.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellMusicExport.cpp
@ -1,5 +1,5 @@
-#include "stdafx.h"
 #if 0
+#include "stdafx.h"
 #include "Emu/SysCalls/SysCalls.h"
 #include "Emu/SysCalls/SC_FUNC.h"

--- a/rpcs3/Emu/SysCalls/Modules/cellNetCtl.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellNetCtl.cpp
@ -2,8 +2,6 @@
 #include "Utilities/Log.h"
 #include "Emu/Memory/Memory.h"
 #include "Emu/System.h"
-#include "Emu/Cell/PPUThread.h"
-#include "Emu/SysCalls/SC_FUNC.h"
 #include "Emu/SysCalls/Modules.h"

 //void cellNetCtl_init();
--- a/rpcs3/Emu/SysCalls/Modules/cellOvis.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellOvis.cpp
@ -1,5 +1,5 @@
-#include "stdafx.h"
 #if 0
+#include "stdafx.h"
 #include "Emu/SysCalls/SysCalls.h"
 #include "Emu/SysCalls/SC_FUNC.h"

--- a/rpcs3/Emu/SysCalls/Modules/cellPamf.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellPamf.cpp
@ -2,8 +2,6 @@
 #include "Utilities/Log.h"
 #include "Emu/Memory/Memory.h"
 #include "Emu/System.h"
-#include "Emu/Cell/PPUThread.h"
-#include "Emu/SysCalls/SC_FUNC.h"
 #include "Emu/SysCalls/Modules.h"
 #include "cellPamf.h"

--- a/rpcs3/Emu/SysCalls/Modules/cellPhotoDecode.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellPhotoDecode.cpp
@ -1,5 +1,5 @@
-#include "stdafx.h"
 #if 0
+#include "stdafx.h"
 #include "Emu/SysCalls/SysCalls.h"
 #include "Emu/SysCalls/SC_FUNC.h"

--- a/rpcs3/Emu/SysCalls/Modules/cellPhotoExport.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellPhotoExport.cpp
@ -1,5 +1,5 @@
-#include "stdafx.h"
 #if 0
+#include "stdafx.h"
 #include "Emu/SysCalls/SysCalls.h"
 #include "Emu/SysCalls/SC_FUNC.h"

--- a/rpcs3/Emu/SysCalls/Modules/cellPhotoImport.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellPhotoImport.cpp
@ -1,5 +1,5 @@
-#include "stdafx.h"
 #if 0
+#include "stdafx.h"
 #include "Emu/SysCalls/SysCalls.h"
 #include "Emu/SysCalls/SC_FUNC.h"

--- a/rpcs3/Emu/SysCalls/Modules/cellPngDec.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellPngDec.cpp
@ -2,8 +2,6 @@
 #include "Utilities/Log.h"
 #include "Emu/Memory/Memory.h"
 #include "Emu/System.h"
-#include "Emu/Cell/PPUThread.h"
-#include "Emu/SysCalls/SC_FUNC.h"
 #include "Emu/SysCalls/Modules.h"
 #include "cellPngDec.h"
 #include "stblib/stb_image.h"
--- a/rpcs3/Emu/SysCalls/Modules/cellPngEnc.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellPngEnc.cpp
@ -1,5 +1,5 @@
-#include "stdafx.h"
 #if 0
+#include "stdafx.h"
 #include "Emu/SysCalls/SysCalls.h"
 #include "Emu/SysCalls/SC_FUNC.h"

--- a/rpcs3/Emu/SysCalls/Modules/cellPrint.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellPrint.cpp
@ -1,5 +1,5 @@
-#include "stdafx.h"
 #if 0
+#include "stdafx.h"
 #include "Emu/SysCalls/SysCalls.h"
 #include "Emu/SysCalls/SC_FUNC.h"

--- a/rpcs3/Emu/SysCalls/Modules/cellResc.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellResc.cpp
@ -2,8 +2,6 @@
 #include "Utilities/Log.h"
 #include "Emu/Memory/Memory.h"
 #include "Emu/System.h"
-#include "Emu/Cell/PPUThread.h"
-#include "Emu/SysCalls/SC_FUNC.h"
 #include "Emu/SysCalls/Modules.h"
 #include "cellSysutil.h"
 #include "cellResc.h"
--- a/rpcs3/Emu/SysCalls/Modules/cellRtc.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellRtc.cpp
@ -1,7 +1,6 @@
 #include "stdafx.h"
 #include "Utilities/Log.h"
 #include "Emu/Memory/Memory.h"
-#include "Emu/SysCalls/SC_FUNC.h"
 #include "Emu/SysCalls/Modules.h"

 #include "cellRtc.h"
--- a/rpcs3/Emu/SysCalls/Modules/cellRudp.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellRudp.cpp
@ -1,5 +1,5 @@
-#include "stdafx.h"
 #if 0
+#include "stdafx.h"
 #include "Emu/SysCalls/SysCalls.h"
 #include "Emu/SysCalls/SC_FUNC.h"

--- a/rpcs3/Emu/SysCalls/Modules/cellSail.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellSail.cpp
@ -1,5 +1,5 @@
-#include "stdafx.h"
 #if 0
+#include "stdafx.h"
 #include "Emu/SysCalls/SysCalls.h"
 #include "Emu/SysCalls/SC_FUNC.h"

--- a/rpcs3/Emu/SysCalls/Modules/cellSailRec.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellSailRec.cpp
@ -1,5 +1,5 @@
-#include "stdafx.h"
 #if 0
+#include "stdafx.h"
 #include "Emu/SysCalls/SysCalls.h"
 #include "Emu/SysCalls/SC_FUNC.h"

--- a/rpcs3/Emu/SysCalls/Modules/cellScreenshot.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellScreenshot.cpp
@ -1,5 +1,5 @@
-#include "stdafx.h"
 #if 0
+#include "stdafx.h"
 #include "Emu/SysCalls/SysCalls.h"
 #include "Emu/SysCalls/SC_FUNC.h"

--- a/rpcs3/Emu/SysCalls/Modules/cellSearch.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellSearch.cpp
@ -1,5 +1,5 @@
-#include "stdafx.h"
 #if 0
+#include "stdafx.h"
 #include "Emu/SysCalls/SysCalls.h"
 #include "Emu/SysCalls/SC_FUNC.h"

--- a/rpcs3/Emu/SysCalls/Modules/cellSheap.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellSheap.cpp
@ -1,5 +1,5 @@
-#include "stdafx.h"
 #if 0
+#include "stdafx.h"
 #include "Emu/SysCalls/SysCalls.h"
 #include "Emu/SysCalls/SC_FUNC.h"

--- a/rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp
@ -2,8 +2,6 @@
 #include "Utilities/Log.h"
 #include "Emu/Memory/Memory.h"
 #include "Emu/System.h"
-#include "Emu/Cell/PPUThread.h"
-#include "Emu/SysCalls/SC_FUNC.h"
 #include "Emu/SysCalls/Modules.h"

 #include "cellSpurs.h"
--- a/rpcs3/Emu/SysCalls/Modules/cellSsl.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellSsl.cpp
@ -1,5 +1,5 @@
-#include "stdafx.h"
 #if 0
+#include "stdafx.h"
 #include "Emu/SysCalls/SysCalls.h"
 #include "Emu/SysCalls/SC_FUNC.h"

--- a/rpcs3/Emu/SysCalls/Modules/cellSubdisplay.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellSubdisplay.cpp
@ -1,5 +1,5 @@
-#include "stdafx.h"
 #if 0
+#include "stdafx.h"
 #include "Emu/SysCalls/SysCalls.h"
 #include "Emu/SysCalls/SC_FUNC.h"

--- a/rpcs3/Emu/SysCalls/Modules/cellSync.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellSync.cpp
@ -2,8 +2,6 @@
 #include "Utilities/Log.h"
 #include "Emu/Memory/Memory.h"
 #include "Emu/System.h"
-#include "Emu/Cell/PPUThread.h"
-#include "Emu/SysCalls/SC_FUNC.h"
 #include "Emu/SysCalls/Modules.h"

 //void cellSync_init();
--- a/rpcs3/Emu/SysCalls/Modules/cellSync2.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellSync2.cpp
@ -1,5 +1,5 @@
-#include "stdafx.h"
 #if 0
+#include "stdafx.h"
 #include "Emu/SysCalls/SysCalls.h"
 #include "Emu/SysCalls/SC_FUNC.h"

--- a/rpcs3/Emu/SysCalls/Modules/cellSysmodule.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellSysmodule.cpp
@ -2,8 +2,6 @@
 #include "Utilities/Log.h"
 #include "Emu/Memory/Memory.h"
 #include "Emu/System.h"
-#include "Emu/Cell/PPUThread.h"
-#include "Emu/SysCalls/SC_FUNC.h"
 #include "Emu/SysCalls/ModuleManager.h"
 #include "Emu/SysCalls/Modules.h"

--- a/rpcs3/Emu/SysCalls/Modules/cellSysutil.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellSysutil.cpp
@ -2,7 +2,6 @@
 #include "Utilities/Log.h"
 #include "Emu/Memory/Memory.h"
 #include "Emu/System.h"
-#include "Emu/SysCalls/SC_FUNC.h"
 #include "Emu/SysCalls/Modules.h"
 #include "Emu/DbgCommand.h"
 #include "Emu/FS/vfsFile.h"
--- a/rpcs3/Emu/SysCalls/Modules/cellSysutilAp.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellSysutilAp.cpp
@ -2,8 +2,6 @@
 #include "Utilities/Log.h"
 #include "Emu/Memory/Memory.h"
 #include "Emu/System.h"
-#include "Emu/Cell/PPUThread.h"
-#include "Emu/SysCalls/SC_FUNC.h"
 #include "Emu/SysCalls/Modules.h"

 //void cellSysutilAp_init();
--- a/rpcs3/Emu/SysCalls/Modules/cellSysutil_SaveData.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellSysutil_SaveData.cpp
@ -2,8 +2,6 @@
 #include "Utilities/Log.h"
 #include "Emu/Memory/Memory.h"
 #include "Emu/System.h"
-#include "Emu/Cell/PPUThread.h"
-#include "Emu/SysCalls/SC_FUNC.h"
 #include "Emu/SysCalls/Modules.h"
 #include "Emu/FS/vfsFile.h"
 #include "Emu/FS/vfsDir.h"
--- a/rpcs3/Emu/SysCalls/Modules/cellUsbd.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellUsbd.cpp
@ -1,5 +1,5 @@
-#include "stdafx.h"
 #if 0
+#include "stdafx.h"
 #include "Emu/SysCalls/SysCalls.h"
 #include "Emu/SysCalls/SC_FUNC.h"

--- a/rpcs3/Emu/SysCalls/Modules/cellUsbpspcm.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellUsbpspcm.cpp
@ -1,5 +1,5 @@
-#include "stdafx.h"
 #if 0
+#include "stdafx.h"
 #include "Emu/SysCalls/SysCalls.h"
 #include "Emu/SysCalls/SC_FUNC.h"

--- a/rpcs3/Emu/SysCalls/Modules/cellUserInfo.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellUserInfo.cpp
@ -2,8 +2,6 @@
 #include "Utilities/Log.h"
 #include "Emu/Memory/Memory.h"
 #include "Emu/System.h"
-#include "Emu/Cell/PPUThread.h"
-#include "Emu/SysCalls/SC_FUNC.h"
 #include "Emu/SysCalls/Modules.h"

 #include "cellUserInfo.h"
--- a/rpcs3/Emu/SysCalls/Modules/cellVdec.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellVdec.cpp
@ -2,8 +2,6 @@
 #include "Utilities/Log.h"
 #include "Emu/Memory/Memory.h"
 #include "Emu/System.h"
-#include "Emu/Cell/PPUThread.h"
-#include "Emu/SysCalls/SC_FUNC.h"
 #include "Emu/SysCalls/Modules.h"
 #include "cellPamf.h"

--- a/rpcs3/Emu/SysCalls/Modules/cellVoice.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellVoice.cpp
@ -1,5 +1,5 @@
-#include "stdafx.h"
 #if 0
+#include "stdafx.h"
 #include "Emu/SysCalls/SysCalls.h"
 #include "Emu/SysCalls/SC_FUNC.h"

--- a/rpcs3/Emu/SysCalls/Modules/cellVpost.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellVpost.cpp
@ -2,8 +2,6 @@
 #include "Utilities/Log.h"
 #include "Emu/Memory/Memory.h"
 #include "Emu/System.h"
-#include "Emu/Cell/PPUThread.h"
-#include "Emu/SysCalls/SC_FUNC.h"
 #include "Emu/SysCalls/Modules.h"

 extern "C"
--- a/rpcs3/Emu/SysCalls/Modules/libmixer.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/libmixer.cpp
@ -3,7 +3,6 @@
 #include "Emu/Memory/Memory.h"
 #include "Emu/System.h"
 #include "Emu/Cell/PPUThread.h"
-#include "Emu/SysCalls/SC_FUNC.h"
 #include "Emu/SysCalls/Modules.h"
 #include "Emu/Audio/cellAudio.h"
 #include "libmixer.h"
--- a/rpcs3/Emu/SysCalls/SysCalls.cpp
+++ b/rpcs3/Emu/SysCalls/SysCalls.cpp
@ -3,7 +3,6 @@
 #include "Emu/Memory/Memory.h"
 #include "Emu/System.h"
 #include "Emu/Cell/PPUThread.h"
-#include "Emu/SysCalls/SC_FUNC.h"
 #include "Emu/SysCalls/Modules.h"
 #include "ModuleManager.h"

--- a/rpcs3/Emu/SysCalls/lv2/sys_interrupt.cpp
+++ b/rpcs3/Emu/SysCalls/lv2/sys_interrupt.cpp
@ -4,7 +4,6 @@
 #include "Emu/System.h"
 #include "Emu/Cell/PPUThread.h"
 #include "Emu/Cell/RawSPUThread.h"
-#include "Emu/SysCalls/SC_FUNC.h"
 #include "Emu/SysCalls/Modules.h"
 #include "Emu/SysCalls/SysCalls.h"
 #include "sys_interrupt.h"