diff --git a/rpcs3/Emu/Cell/PPUThread.cpp b/rpcs3/Emu/Cell/PPUThread.cpp
index e5b8e8bc4..3c8362178 100644
--- 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"
diff --git a/rpcs3/Emu/SysCalls/Modules.cpp b/rpcs3/Emu/SysCalls/Modules.cpp
index ecbdb085d..b538f3777 100644
--- 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)
diff --git a/rpcs3/Emu/SysCalls/Modules/SC_Keyboard.cpp b/rpcs3/Emu/SysCalls/Modules/SC_Keyboard.cpp
index af657d37d..f171ae570 100644
--- 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;
 
diff --git a/rpcs3/Emu/SysCalls/Modules/SC_Mouse.cpp b/rpcs3/Emu/SysCalls/Modules/SC_Mouse.cpp
index 374b3dc3c..44f3dad31 100644
--- 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;
 
diff --git a/rpcs3/Emu/SysCalls/Modules/SC_Pad.cpp b/rpcs3/Emu/SysCalls/Modules/SC_Pad.cpp
index 639c7efa8..5a4dbf212 100644
--- 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;
 
@@ -462,4 +459,4 @@ int cellPadSetSensorMode(u32 port_no, u32 mode)
 		pads[port_no].m_port_setting &= ~CELL_PAD_SETTING_SENSOR_ON;
 
 	return CELL_OK;
-}
\ No newline at end of file
+}
diff --git a/rpcs3/Emu/SysCalls/Modules/cellAdec.cpp b/rpcs3/Emu/SysCalls/Modules/cellAdec.cpp
index 44a2167f1..63caf2f4b 100644
--- 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"
diff --git a/rpcs3/Emu/SysCalls/Modules/cellAtrac.cpp b/rpcs3/Emu/SysCalls/Modules/cellAtrac.cpp
index 664d55024..ef89f02ab 100644
--- 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"
 
diff --git a/rpcs3/Emu/SysCalls/Modules/cellAudio.cpp b/rpcs3/Emu/SysCalls/Modules/cellAudio.cpp
index e3d355574..9ff294a1a 100644
--- 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"
diff --git a/rpcs3/Emu/SysCalls/Modules/cellBgdl.cpp b/rpcs3/Emu/SysCalls/Modules/cellBgdl.cpp
index 72879e8d3..1b0850cdd 100644
--- 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"
 
diff --git a/rpcs3/Emu/SysCalls/Modules/cellCamera.cpp b/rpcs3/Emu/SysCalls/Modules/cellCamera.cpp
index ee00c683f..3d2feac52 100644
--- 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"
 
diff --git a/rpcs3/Emu/SysCalls/Modules/cellCelp8Enc.cpp b/rpcs3/Emu/SysCalls/Modules/cellCelp8Enc.cpp
index 70109e224..28ee19745 100644
--- 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"
 
diff --git a/rpcs3/Emu/SysCalls/Modules/cellCelpEnc.cpp b/rpcs3/Emu/SysCalls/Modules/cellCelpEnc.cpp
index 80bea8108..92b2c9acc 100644
--- 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"
 
diff --git a/rpcs3/Emu/SysCalls/Modules/cellDmux.cpp b/rpcs3/Emu/SysCalls/Modules/cellDmux.cpp
index 254b7352d..b689c0682 100644
--- 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"
 
diff --git a/rpcs3/Emu/SysCalls/Modules/cellFiber.cpp b/rpcs3/Emu/SysCalls/Modules/cellFiber.cpp
index a64a9a914..b192d5623 100644
--- 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"
 
diff --git a/rpcs3/Emu/SysCalls/Modules/cellFont.cpp b/rpcs3/Emu/SysCalls/Modules/cellFont.cpp
index 3692abbcd..177f716bd 100644
--- 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"
diff --git a/rpcs3/Emu/SysCalls/Modules/cellFontFT.cpp b/rpcs3/Emu/SysCalls/Modules/cellFontFT.cpp
index 19d3c204c..8104be11f 100644
--- 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"
diff --git a/rpcs3/Emu/SysCalls/Modules/cellGame.cpp b/rpcs3/Emu/SysCalls/Modules/cellGame.cpp
index 24c0ba865..1022906f7 100644
--- 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"
diff --git a/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp b/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp
index 297d6e00c..9ebe134f3 100644
--- 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"
diff --git a/rpcs3/Emu/SysCalls/Modules/cellGem.cpp b/rpcs3/Emu/SysCalls/Modules/cellGem.cpp
index 5133ce51c..bb9390016 100644
--- 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"
 
diff --git a/rpcs3/Emu/SysCalls/Modules/cellGifDec.cpp b/rpcs3/Emu/SysCalls/Modules/cellGifDec.cpp
index 866d6d48d..b21151bbd 100644
--- 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"
diff --git a/rpcs3/Emu/SysCalls/Modules/cellHttpUtil.cpp b/rpcs3/Emu/SysCalls/Modules/cellHttpUtil.cpp
index 97f94de79..e5ef30832 100644
--- 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"
 
diff --git a/rpcs3/Emu/SysCalls/Modules/cellImejp.cpp b/rpcs3/Emu/SysCalls/Modules/cellImejp.cpp
index b3dc1bd5d..fea418acb 100644
--- 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"
 
diff --git a/rpcs3/Emu/SysCalls/Modules/cellJpgDec.cpp b/rpcs3/Emu/SysCalls/Modules/cellJpgDec.cpp
index c24fcc5f8..8a7aa659c 100644
--- 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"
diff --git a/rpcs3/Emu/SysCalls/Modules/cellJpgEnc.cpp b/rpcs3/Emu/SysCalls/Modules/cellJpgEnc.cpp
index e8aa461f2..3bfebc50e 100644
--- 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"
 
diff --git a/rpcs3/Emu/SysCalls/Modules/cellKey2char.cpp b/rpcs3/Emu/SysCalls/Modules/cellKey2char.cpp
index eef9eb72f..3a635b569 100644
--- 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"
 
diff --git a/rpcs3/Emu/SysCalls/Modules/cellL10n.cpp b/rpcs3/Emu/SysCalls/Modules/cellL10n.cpp
index 571a332fe..ea34d1056 100644
--- 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..
diff --git a/rpcs3/Emu/SysCalls/Modules/cellLv2dbg.cpp b/rpcs3/Emu/SysCalls/Modules/cellLv2dbg.cpp
index 01dd518bb..13126bd40 100644
--- 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"
 
diff --git a/rpcs3/Emu/SysCalls/Modules/cellMic.cpp b/rpcs3/Emu/SysCalls/Modules/cellMic.cpp
index 23b2a9f61..a8d0d7416 100644
--- 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"
 
diff --git a/rpcs3/Emu/SysCalls/Modules/cellMsgDialog.cpp b/rpcs3/Emu/SysCalls/Modules/cellMsgDialog.cpp
index 508f9516c..d3959b9e3 100644
--- 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"
 
diff --git a/rpcs3/Emu/SysCalls/Modules/cellMusicDecode.cpp b/rpcs3/Emu/SysCalls/Modules/cellMusicDecode.cpp
index 14c64aefd..24785dfa7 100644
--- 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"
 
diff --git a/rpcs3/Emu/SysCalls/Modules/cellMusicExport.cpp b/rpcs3/Emu/SysCalls/Modules/cellMusicExport.cpp
index 7ded73fc7..268677caa 100644
--- 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"
 
diff --git a/rpcs3/Emu/SysCalls/Modules/cellNetCtl.cpp b/rpcs3/Emu/SysCalls/Modules/cellNetCtl.cpp
index 611979dbb..9204105a3 100644
--- 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();
@@ -140,4 +138,4 @@ void cellNetCtl_init()
 	cellNetCtl->AddFunc(0x0f1f13d3, cellNetCtlNetStartDialogUnloadAsync);
 
 	cellNetCtl->AddFunc(0x3a12865f, cellNetCtlGetNatInfo);
-}
\ No newline at end of file
+}
diff --git a/rpcs3/Emu/SysCalls/Modules/cellOvis.cpp b/rpcs3/Emu/SysCalls/Modules/cellOvis.cpp
index 25907207e..f47f40314 100644
--- 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"
 
diff --git a/rpcs3/Emu/SysCalls/Modules/cellPamf.cpp b/rpcs3/Emu/SysCalls/Modules/cellPamf.cpp
index ccda72ca4..b71d83ba3 100644
--- 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"
 
diff --git a/rpcs3/Emu/SysCalls/Modules/cellPhotoDecode.cpp b/rpcs3/Emu/SysCalls/Modules/cellPhotoDecode.cpp
index 9281f3c17..34d893e1f 100644
--- 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"
 
diff --git a/rpcs3/Emu/SysCalls/Modules/cellPhotoExport.cpp b/rpcs3/Emu/SysCalls/Modules/cellPhotoExport.cpp
index 71dd6f5bc..3268783be 100644
--- 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"
 
diff --git a/rpcs3/Emu/SysCalls/Modules/cellPhotoImport.cpp b/rpcs3/Emu/SysCalls/Modules/cellPhotoImport.cpp
index c5815b9f5..ed24bfb5a 100644
--- 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"
 
diff --git a/rpcs3/Emu/SysCalls/Modules/cellPngDec.cpp b/rpcs3/Emu/SysCalls/Modules/cellPngDec.cpp
index 1ab78ff7a..1b7e153a4 100644
--- 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"
diff --git a/rpcs3/Emu/SysCalls/Modules/cellPngEnc.cpp b/rpcs3/Emu/SysCalls/Modules/cellPngEnc.cpp
index 4b59e80a2..5d1068073 100644
--- 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"
 
diff --git a/rpcs3/Emu/SysCalls/Modules/cellPrint.cpp b/rpcs3/Emu/SysCalls/Modules/cellPrint.cpp
index 191c53c1d..62b1d312a 100644
--- 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"
 
diff --git a/rpcs3/Emu/SysCalls/Modules/cellResc.cpp b/rpcs3/Emu/SysCalls/Modules/cellResc.cpp
index 60cd6fde8..4b61ee5c3 100644
--- 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"
diff --git a/rpcs3/Emu/SysCalls/Modules/cellRtc.cpp b/rpcs3/Emu/SysCalls/Modules/cellRtc.cpp
index 97ee89cc4..685629979 100644
--- 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"
diff --git a/rpcs3/Emu/SysCalls/Modules/cellRudp.cpp b/rpcs3/Emu/SysCalls/Modules/cellRudp.cpp
index 6cef6bbf0..e8c1261ec 100644
--- 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"
 
diff --git a/rpcs3/Emu/SysCalls/Modules/cellSail.cpp b/rpcs3/Emu/SysCalls/Modules/cellSail.cpp
index b301af90b..e59037621 100644
--- 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"
 
diff --git a/rpcs3/Emu/SysCalls/Modules/cellSailRec.cpp b/rpcs3/Emu/SysCalls/Modules/cellSailRec.cpp
index dce0b36ac..c3ff0bbe4 100644
--- 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"
 
diff --git a/rpcs3/Emu/SysCalls/Modules/cellScreenshot.cpp b/rpcs3/Emu/SysCalls/Modules/cellScreenshot.cpp
index bcc77d546..6972ae06d 100644
--- 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"
 
diff --git a/rpcs3/Emu/SysCalls/Modules/cellSearch.cpp b/rpcs3/Emu/SysCalls/Modules/cellSearch.cpp
index 8ba73eba8..4da681843 100644
--- 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"
 
diff --git a/rpcs3/Emu/SysCalls/Modules/cellSheap.cpp b/rpcs3/Emu/SysCalls/Modules/cellSheap.cpp
index ea15f3819..feee6c524 100644
--- 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"
 
diff --git a/rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp b/rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp
index 79d330909..122c0ff1f 100644
--- 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"
diff --git a/rpcs3/Emu/SysCalls/Modules/cellSsl.cpp b/rpcs3/Emu/SysCalls/Modules/cellSsl.cpp
index c0a30dc9f..3bf12e87c 100644
--- 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"
 
diff --git a/rpcs3/Emu/SysCalls/Modules/cellSubdisplay.cpp b/rpcs3/Emu/SysCalls/Modules/cellSubdisplay.cpp
index 467f82d29..0f4c7ad87 100644
--- 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"
 
diff --git a/rpcs3/Emu/SysCalls/Modules/cellSync.cpp b/rpcs3/Emu/SysCalls/Modules/cellSync.cpp
index ae5e37b58..e66b8a4f3 100644
--- 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();
diff --git a/rpcs3/Emu/SysCalls/Modules/cellSync2.cpp b/rpcs3/Emu/SysCalls/Modules/cellSync2.cpp
index 1817f3c1b..ecaa713f8 100644
--- 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"
 
diff --git a/rpcs3/Emu/SysCalls/Modules/cellSysmodule.cpp b/rpcs3/Emu/SysCalls/Modules/cellSysmodule.cpp
index 50c75daa2..4e0f94954 100644
--- 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"
 
diff --git a/rpcs3/Emu/SysCalls/Modules/cellSysutil.cpp b/rpcs3/Emu/SysCalls/Modules/cellSysutil.cpp
index 94d22486e..caa363b96 100644
--- 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"
diff --git a/rpcs3/Emu/SysCalls/Modules/cellSysutilAp.cpp b/rpcs3/Emu/SysCalls/Modules/cellSysutilAp.cpp
index e18d26908..2c2ddb95b 100644
--- 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();
diff --git a/rpcs3/Emu/SysCalls/Modules/cellSysutil_SaveData.cpp b/rpcs3/Emu/SysCalls/Modules/cellSysutil_SaveData.cpp
index 2517a23fe..2393b0c2f 100644
--- 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"
diff --git a/rpcs3/Emu/SysCalls/Modules/cellUsbd.cpp b/rpcs3/Emu/SysCalls/Modules/cellUsbd.cpp
index fa4323a05..eb8d7dc36 100644
--- 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"
 
diff --git a/rpcs3/Emu/SysCalls/Modules/cellUsbpspcm.cpp b/rpcs3/Emu/SysCalls/Modules/cellUsbpspcm.cpp
index 9ce3671f2..005c2741c 100644
--- 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"
 
diff --git a/rpcs3/Emu/SysCalls/Modules/cellUserInfo.cpp b/rpcs3/Emu/SysCalls/Modules/cellUserInfo.cpp
index 7143cca15..615a1d392 100644
--- 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"
diff --git a/rpcs3/Emu/SysCalls/Modules/cellVdec.cpp b/rpcs3/Emu/SysCalls/Modules/cellVdec.cpp
index b80bd8a88..f2dcf6169 100644
--- 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"
 
diff --git a/rpcs3/Emu/SysCalls/Modules/cellVoice.cpp b/rpcs3/Emu/SysCalls/Modules/cellVoice.cpp
index 63dc1763d..2330a2773 100644
--- 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"
 
diff --git a/rpcs3/Emu/SysCalls/Modules/cellVpost.cpp b/rpcs3/Emu/SysCalls/Modules/cellVpost.cpp
index 821986171..ae26d1a07 100644
--- 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"
diff --git a/rpcs3/Emu/SysCalls/Modules/libmixer.cpp b/rpcs3/Emu/SysCalls/Modules/libmixer.cpp
index d48f5efef..b3a2c194e 100644
--- 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"
diff --git a/rpcs3/Emu/SysCalls/SysCalls.cpp b/rpcs3/Emu/SysCalls/SysCalls.cpp
index 814df0ba9..48c1a4c10 100644
--- 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"
 
diff --git a/rpcs3/Emu/SysCalls/lv2/sys_interrupt.cpp b/rpcs3/Emu/SysCalls/lv2/sys_interrupt.cpp
index ba0c995a9..065f5cd4d 100644
--- 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"
@@ -108,4 +107,4 @@ void sys_interrupt_thread_eoi()
 
 	GetCurrentPPUThread().Stop();
 	return;
-}
\ No newline at end of file
+}