diff --git a/Utilities/AtomicPtr.h b/Utilities/AtomicPtr.h
index a2e811bf08..3c13a42af0 100644
--- a/Utilities/AtomicPtr.h
+++ b/Utilities/AtomicPtr.h
@@ -2,6 +2,7 @@
 
 #include "Atomic.h"
 #include <memory>
+#include <cstddef>
 
 // Unfinished. Only std::default_delete will work as expected.
 template<typename T, typename D>
diff --git a/Utilities/Interval.h b/Utilities/Interval.h
index 120edcb073..bd34198e51 100644
--- a/Utilities/Interval.h
+++ b/Utilities/Interval.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <type_traits>
+
 template<typename T1, typename T2> struct range_t
 {
 	T1 _min; // first value
diff --git a/Utilities/Timer.h b/Utilities/Timer.h
index 581a95304f..8b0b3ad836 100644
--- a/Utilities/Timer.h
+++ b/Utilities/Timer.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "types.h"
+
 #include <chrono>
 
 class Timer
diff --git a/Utilities/VirtualMemory.h b/Utilities/VirtualMemory.h
index f3c06470bc..4e7afce3ef 100644
--- a/Utilities/VirtualMemory.h
+++ b/Utilities/VirtualMemory.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "types.h"
+
 namespace utils
 {
 	// Memory protection type
diff --git a/Utilities/date_time.h b/Utilities/date_time.h
index 97e9c0a92b..a61d26ca2f 100644
--- a/Utilities/date_time.h
+++ b/Utilities/date_time.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#include <ctime>
+#include <string>
+
 namespace date_time
 {
 	static inline tm get_time(time_t* _time)
diff --git a/Utilities/hash.h b/Utilities/hash.h
index 6f42c30f50..4f8910d2ec 100644
--- a/Utilities/hash.h
+++ b/Utilities/hash.h
@@ -1,5 +1,6 @@
 #pragma once
-#include <stdint.h>
+
+#include "Utilities/types.h"
 
 namespace rpcs3
 {
@@ -47,4 +48,4 @@ namespace rpcs3
 
 		return hash_struct_base<T, u8>(value);
 	}
-}
\ No newline at end of file
+}
diff --git a/rpcs3/Crypto/key_vault.h b/rpcs3/Crypto/key_vault.h
index f4da403da1..e1015063be 100644
--- a/rpcs3/Crypto/key_vault.h
+++ b/rpcs3/Crypto/key_vault.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "Utilities/types.h"
+
 #include <string>
 #include <vector>
 #include <memory>
diff --git a/rpcs3/Crypto/unedat.h b/rpcs3/Crypto/unedat.h
index fb8559b5f0..810ba3f9ea 100644
--- a/rpcs3/Crypto/unedat.h
+++ b/rpcs3/Crypto/unedat.h
@@ -6,6 +6,8 @@
 
 #include "utils.h"
 
+#include "Utilities/File.h"
+
 constexpr u32 SDAT_FLAG = 0x01000000;
 constexpr u32 EDAT_COMPRESSED_FLAG = 0x00000001;
 constexpr u32 EDAT_FLAG_0x02 = 0x00000002;
diff --git a/rpcs3/Crypto/unpkg.h b/rpcs3/Crypto/unpkg.h
index 1b4b67aefb..af040ab22c 100644
--- a/rpcs3/Crypto/unpkg.h
+++ b/rpcs3/Crypto/unpkg.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "Utilities/BEType.h"
+
 // Constants
 enum
 {
diff --git a/rpcs3/Crypto/unself.h b/rpcs3/Crypto/unself.h
index 24f8a4dc03..8032834594 100644
--- a/rpcs3/Crypto/unself.h
+++ b/rpcs3/Crypto/unself.h
@@ -3,6 +3,10 @@
 #include "key_vault.h"
 #include "zlib.h"
 
+#include "Utilities/types.h"
+#include "Utilities/File.h"
+#include "Utilities/Log.h"
+
 struct AppInfo 
 {
 	u64 authid;
diff --git a/rpcs3/Emu/Audio/AudioDumper.h b/rpcs3/Emu/Audio/AudioDumper.h
index b5b3df2df7..a1fe4bcdaa 100644
--- a/rpcs3/Emu/Audio/AudioDumper.h
+++ b/rpcs3/Emu/Audio/AudioDumper.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#include "Utilities/types.h"
+#include "Utilities/File.h"
+
 struct WAVHeader
 {
 	struct RIFFHeader
diff --git a/rpcs3/Emu/CPU/CPUDisAsm.h b/rpcs3/Emu/CPU/CPUDisAsm.h
index f64d20d356..3c8c726f48 100644
--- a/rpcs3/Emu/CPU/CPUDisAsm.h
+++ b/rpcs3/Emu/CPU/CPUDisAsm.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#include <string>
+#include "Utilities/StrFmt.h"
+
 enum CPUDisAsmMode
 {
 	CPUDisAsm_DumpMode,
diff --git a/rpcs3/Emu/CPU/CPUTranslator.h b/rpcs3/Emu/CPU/CPUTranslator.h
index d624c96d69..800f6f963c 100644
--- a/rpcs3/Emu/CPU/CPUTranslator.h
+++ b/rpcs3/Emu/CPU/CPUTranslator.h
@@ -16,12 +16,12 @@
 #endif
 #include "define_new_memleakdetect.h"
 
-#include "../Utilities/types.h"
-#include "../Utilities/StrFmt.h"
-#include "../Utilities/BEType.h"
-#include "../Utilities/BitField.h"
-#include "../Utilities/Log.h"
-#include "../Utilities/JIT.h"
+#include "Utilities/types.h"
+#include "Utilities/StrFmt.h"
+#include "Utilities/BEType.h"
+#include "Utilities/BitField.h"
+#include "Utilities/Log.h"
+#include "Utilities/JIT.h"
 
 #include <unordered_map>
 #include <map>
diff --git a/rpcs3/Emu/Cell/Common.h b/rpcs3/Emu/Cell/Common.h
index 59960aa816..21ddbd5c85 100644
--- a/rpcs3/Emu/Cell/Common.h
+++ b/rpcs3/Emu/Cell/Common.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "Utilities/types.h"
+
 // Floating-point rounding mode (for both PPU and SPU)
 enum FPSCR_RN
 {
diff --git a/rpcs3/Emu/Cell/ErrorCodes.h b/rpcs3/Emu/Cell/ErrorCodes.h
index beebe4b2e3..d979af3cbe 100644
--- a/rpcs3/Emu/Cell/ErrorCodes.h
+++ b/rpcs3/Emu/Cell/ErrorCodes.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "Utilities/types.h"
+
 enum CellNotAnError : s32
 {
 	CELL_OK     = 0,
diff --git a/rpcs3/Emu/Cell/MFC.h b/rpcs3/Emu/Cell/MFC.h
index 3438bacb4a..186e10d639 100644
--- a/rpcs3/Emu/Cell/MFC.h
+++ b/rpcs3/Emu/Cell/MFC.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "Utilities/types.h"
+
 enum MFC : u8
 {
 	MFC_PUT_CMD      = 0x20, MFC_PUTB_CMD     = 0x21, MFC_PUTF_CMD     = 0x22,
diff --git a/rpcs3/Emu/Cell/Modules/cellAdec.h b/rpcs3/Emu/Cell/Modules/cellAdec.h
index 98f99cdc3b..b7dba1223b 100644
--- a/rpcs3/Emu/Cell/Modules/cellAdec.h
+++ b/rpcs3/Emu/Cell/Modules/cellAdec.h
@@ -1,6 +1,6 @@
 #pragma once
 
-
+#include "Emu/Memory/vm_ptr.h"
 
 // Error Codes
 enum
diff --git a/rpcs3/Emu/Cell/Modules/cellAtrac.h b/rpcs3/Emu/Cell/Modules/cellAtrac.h
index 7d6f21cf1e..a4b3013759 100644
--- a/rpcs3/Emu/Cell/Modules/cellAtrac.h
+++ b/rpcs3/Emu/Cell/Modules/cellAtrac.h
@@ -1,6 +1,6 @@
 #pragma once
 
-
+#include "Emu/Memory/vm_ptr.h"
 
 // Return Codes
 enum
diff --git a/rpcs3/Emu/Cell/Modules/cellAtracMulti.h b/rpcs3/Emu/Cell/Modules/cellAtracMulti.h
index 61ad210185..f8d2e25172 100644
--- a/rpcs3/Emu/Cell/Modules/cellAtracMulti.h
+++ b/rpcs3/Emu/Cell/Modules/cellAtracMulti.h
@@ -1,6 +1,6 @@
 #pragma once
 
-
+#include "Emu/Memory/vm_ptr.h"
 
 // Return Codes
 enum
diff --git a/rpcs3/Emu/Cell/Modules/cellAudio.h b/rpcs3/Emu/Cell/Modules/cellAudio.h
index 3560f99154..9177bb783f 100644
--- a/rpcs3/Emu/Cell/Modules/cellAudio.h
+++ b/rpcs3/Emu/Cell/Modules/cellAudio.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "Emu/Memory/vm_ptr.h"
 #include "Utilities/Thread.h"
 #include "Emu/Memory/vm.h"
 #include "Emu/Audio/AudioBackend.h"
diff --git a/rpcs3/Emu/Cell/Modules/cellAudioIn.h b/rpcs3/Emu/Cell/Modules/cellAudioIn.h
index a93f814282..728a0724b1 100644
--- a/rpcs3/Emu/Cell/Modules/cellAudioIn.h
+++ b/rpcs3/Emu/Cell/Modules/cellAudioIn.h
@@ -1,6 +1,6 @@
 #pragma once
 
-
+#include "Utilities/BEType.h"
 
 // Error codes
 enum
diff --git a/rpcs3/Emu/Cell/Modules/cellBgdl.h b/rpcs3/Emu/Cell/Modules/cellBgdl.h
index b7edc57b62..cf27a2d130 100644
--- a/rpcs3/Emu/Cell/Modules/cellBgdl.h
+++ b/rpcs3/Emu/Cell/Modules/cellBgdl.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "Emu/Memory/vm_ptr.h"
+
 // Return Codes
 enum
 {
diff --git a/rpcs3/Emu/Cell/Modules/cellDmux.h b/rpcs3/Emu/Cell/Modules/cellDmux.h
index a90b6311af..f950df33de 100644
--- a/rpcs3/Emu/Cell/Modules/cellDmux.h
+++ b/rpcs3/Emu/Cell/Modules/cellDmux.h
@@ -1,6 +1,6 @@
 #pragma once
 
-
+#include "Emu/Memory/vm_ptr.h"
 
 // Error Codes
 enum
diff --git a/rpcs3/Emu/Cell/Modules/cellFiber.h b/rpcs3/Emu/Cell/Modules/cellFiber.h
index d1b3732fa4..425fbd39d1 100644
--- a/rpcs3/Emu/Cell/Modules/cellFiber.h
+++ b/rpcs3/Emu/Cell/Modules/cellFiber.h
@@ -1,6 +1,6 @@
 #pragma once
 
-
+#include "Emu/Memory/vm_ptr.h"
 
 // Return Codes
 enum CellFiberError : u32
diff --git a/rpcs3/Emu/Cell/Modules/cellFont.h b/rpcs3/Emu/Cell/Modules/cellFont.h
index 905f142102..8c820163f7 100644
--- a/rpcs3/Emu/Cell/Modules/cellFont.h
+++ b/rpcs3/Emu/Cell/Modules/cellFont.h
@@ -1,6 +1,6 @@
 #pragma once
 
-
+#include "Emu/Memory/vm_ptr.h"
 
 // Error codes
 enum
diff --git a/rpcs3/Emu/Cell/Modules/cellFontFT.h b/rpcs3/Emu/Cell/Modules/cellFontFT.h
index cf8255322a..1f0164cf73 100644
--- a/rpcs3/Emu/Cell/Modules/cellFontFT.h
+++ b/rpcs3/Emu/Cell/Modules/cellFontFT.h
@@ -2,7 +2,7 @@
 
 #include "cellFont.h"
 
-
+#include "Emu/Memory/vm_ptr.h"
 
 struct CellFontLibraryConfigFT
 {
diff --git a/rpcs3/Emu/Cell/Modules/cellFs.h b/rpcs3/Emu/Cell/Modules/cellFs.h
index a7ac94e4a8..00a3bf7ae1 100644
--- a/rpcs3/Emu/Cell/Modules/cellFs.h
+++ b/rpcs3/Emu/Cell/Modules/cellFs.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "Emu/Cell/lv2/sys_fs.h"
+#include "Emu/Memory/vm_ptr.h"
 
 // CellFsRingBuffer.copy
 enum : s32
diff --git a/rpcs3/Emu/Cell/Modules/cellGame.h b/rpcs3/Emu/Cell/Modules/cellGame.h
index 2f104f17fd..493e76af98 100644
--- a/rpcs3/Emu/Cell/Modules/cellGame.h
+++ b/rpcs3/Emu/Cell/Modules/cellGame.h
@@ -2,7 +2,7 @@
 
 #include "Emu/Cell/ErrorCodes.h"
 
-
+#include "Emu/Memory/vm_ptr.h"
 
 // Return Codes
 enum
diff --git a/rpcs3/Emu/Cell/Modules/cellGcmSys.h b/rpcs3/Emu/Cell/Modules/cellGcmSys.h
index 415e46258a..3b3ea8b76e 100644
--- a/rpcs3/Emu/Cell/Modules/cellGcmSys.h
+++ b/rpcs3/Emu/Cell/Modules/cellGcmSys.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "Emu/RSX/GCM.h"
+#include "Emu/Memory/vm_ptr.h"
 
 enum
 {
diff --git a/rpcs3/Emu/Cell/Modules/cellGem.h b/rpcs3/Emu/Cell/Modules/cellGem.h
index 16d66376e3..6f1fe55ec0 100644
--- a/rpcs3/Emu/Cell/Modules/cellGem.h
+++ b/rpcs3/Emu/Cell/Modules/cellGem.h
@@ -1,6 +1,6 @@
 #pragma once
 
-
+#include "Utilities/BEType.h"
 
 static const float CELL_GEM_SPHERE_RADIUS_MM = 22.5f;
 
diff --git a/rpcs3/Emu/Cell/Modules/cellGifDec.h b/rpcs3/Emu/Cell/Modules/cellGifDec.h
index be4b6aad82..87af49ab34 100644
--- a/rpcs3/Emu/Cell/Modules/cellGifDec.h
+++ b/rpcs3/Emu/Cell/Modules/cellGifDec.h
@@ -1,6 +1,6 @@
 #pragma once
 
-
+#include "Emu/Memory/vm_ptr.h"
 
 // Return Codes
 enum
diff --git a/rpcs3/Emu/Cell/Modules/cellHttpUtil.h b/rpcs3/Emu/Cell/Modules/cellHttpUtil.h
index 3d2f324249..04fa26f439 100644
--- a/rpcs3/Emu/Cell/Modules/cellHttpUtil.h
+++ b/rpcs3/Emu/Cell/Modules/cellHttpUtil.h
@@ -1,6 +1,6 @@
 #pragma once
 
-
+#include "Emu/Memory/vm_ptr.h"
 
 // libHttp_Util: 0x80711001 - 0x807110ff
 
diff --git a/rpcs3/Emu/Cell/Modules/cellImeJp.h b/rpcs3/Emu/Cell/Modules/cellImeJp.h
index 617d67820d..ce027e3383 100644
--- a/rpcs3/Emu/Cell/Modules/cellImeJp.h
+++ b/rpcs3/Emu/Cell/Modules/cellImeJp.h
@@ -1,6 +1,6 @@
 #pragma once
 
-
+#include "Emu/Memory/vm_ptr.h"
 
 typedef vm::ptr<void> CellImeJpHandle;
 
diff --git a/rpcs3/Emu/Cell/Modules/cellJpgDec.h b/rpcs3/Emu/Cell/Modules/cellJpgDec.h
index eda7fc4682..5c274afafd 100644
--- a/rpcs3/Emu/Cell/Modules/cellJpgDec.h
+++ b/rpcs3/Emu/Cell/Modules/cellJpgDec.h
@@ -1,6 +1,6 @@
 #pragma once
 
-
+#include "Utilities/BEType.h"
 
 //Return Codes
 enum
diff --git a/rpcs3/Emu/Cell/Modules/cellKb.h b/rpcs3/Emu/Cell/Modules/cellKb.h
index 1698a0a1e2..0461bf978c 100644
--- a/rpcs3/Emu/Cell/Modules/cellKb.h
+++ b/rpcs3/Emu/Cell/Modules/cellKb.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "Utilities/BEType.h"
+
 enum CellKbError : u32
 {
 	CELL_KB_ERROR_FATAL                      = 0x80121001,
diff --git a/rpcs3/Emu/Cell/Modules/cellMic.h b/rpcs3/Emu/Cell/Modules/cellMic.h
index da77ce4f9f..699aef9d2e 100644
--- a/rpcs3/Emu/Cell/Modules/cellMic.h
+++ b/rpcs3/Emu/Cell/Modules/cellMic.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "Utilities/BEType.h"
 #include "Utilities/Thread.h"
 
 // Error Codes
diff --git a/rpcs3/Emu/Cell/Modules/cellMouse.h b/rpcs3/Emu/Cell/Modules/cellMouse.h
index eca0759d89..d23a13c5d8 100644
--- a/rpcs3/Emu/Cell/Modules/cellMouse.h
+++ b/rpcs3/Emu/Cell/Modules/cellMouse.h
@@ -1,6 +1,6 @@
 #pragma once
 
-
+#include "Utilities/BEType.h"
 
 enum
 {
diff --git a/rpcs3/Emu/Cell/Modules/cellMusic.h b/rpcs3/Emu/Cell/Modules/cellMusic.h
index 19a7aab999..a152e5291e 100644
--- a/rpcs3/Emu/Cell/Modules/cellMusic.h
+++ b/rpcs3/Emu/Cell/Modules/cellMusic.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "Emu/Memory/vm_ptr.h"
+
 // Error Codes
 enum
 {
diff --git a/rpcs3/Emu/Cell/Modules/cellNetCtl.h b/rpcs3/Emu/Cell/Modules/cellNetCtl.h
index 07d39805b8..f7c7bb5b5a 100644
--- a/rpcs3/Emu/Cell/Modules/cellNetCtl.h
+++ b/rpcs3/Emu/Cell/Modules/cellNetCtl.h
@@ -1,6 +1,8 @@
 #pragma once
 
+#include "cellGame.h"
 
+#include "Emu/Memory/vm_ptr.h"
 
 // Error Codes
 enum CellNetCtlError : u32
diff --git a/rpcs3/Emu/Cell/Modules/cellPad.h b/rpcs3/Emu/Cell/Modules/cellPad.h
index ba0fbb16db..9ffda8fb26 100644
--- a/rpcs3/Emu/Cell/Modules/cellPad.h
+++ b/rpcs3/Emu/Cell/Modules/cellPad.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "Emu/Io/PadHandler.h"
+#include "Utilities/BEType.h"
 #include <array>
 
 enum CellPadError : u32
diff --git a/rpcs3/Emu/Cell/Modules/cellPamf.h b/rpcs3/Emu/Cell/Modules/cellPamf.h
index 4952aa7544..87621732eb 100644
--- a/rpcs3/Emu/Cell/Modules/cellPamf.h
+++ b/rpcs3/Emu/Cell/Modules/cellPamf.h
@@ -1,6 +1,6 @@
 #pragma once
 
-
+#include "Emu/Memory/vm_ptr.h"
 
 // Error Codes
 enum
diff --git a/rpcs3/Emu/Cell/Modules/cellPng.h b/rpcs3/Emu/Cell/Modules/cellPng.h
index 00e02b54d6..8ee916169c 100644
--- a/rpcs3/Emu/Cell/Modules/cellPng.h
+++ b/rpcs3/Emu/Cell/Modules/cellPng.h
@@ -1,6 +1,6 @@
 #pragma once
 
-
+#include "Emu/Memory/vm_ptr.h"
 
 enum CellPngTxtType : s32
 {
diff --git a/rpcs3/Emu/Cell/Modules/cellPngDec.h b/rpcs3/Emu/Cell/Modules/cellPngDec.h
index 0377e7ed41..b6e3b1b924 100644
--- a/rpcs3/Emu/Cell/Modules/cellPngDec.h
+++ b/rpcs3/Emu/Cell/Modules/cellPngDec.h
@@ -1,8 +1,11 @@
 #pragma once
 
-
 #include "cellPng.h"
 
+#include "Emu/Memory/vm_ptr.h"
+
+#include "png.h"
+
 enum : u32
 {
 	PNGDEC_CODEC_VERSION = 0x00420000,
@@ -345,4 +348,4 @@ class LibPngCustomException : public std::runtime_error
 {
 public:
 	LibPngCustomException(char const* const message) : runtime_error(message) {}
-};
\ No newline at end of file
+};
diff --git a/rpcs3/Emu/Cell/Modules/cellResc.h b/rpcs3/Emu/Cell/Modules/cellResc.h
index 5a37f43fd0..af35fe0daa 100644
--- a/rpcs3/Emu/Cell/Modules/cellResc.h
+++ b/rpcs3/Emu/Cell/Modules/cellResc.h
@@ -1,6 +1,6 @@
 #pragma once
 
-
+#include "Utilities/BEType.h"
 
 enum
 {
diff --git a/rpcs3/Emu/Cell/Modules/cellRtc.h b/rpcs3/Emu/Cell/Modules/cellRtc.h
index 878e220a95..2cb6c50f55 100644
--- a/rpcs3/Emu/Cell/Modules/cellRtc.h
+++ b/rpcs3/Emu/Cell/Modules/cellRtc.h
@@ -1,6 +1,6 @@
 #pragma once
 
-
+#include "Utilities/BEType.h"
 
 // Return Codes
 enum
diff --git a/rpcs3/Emu/Cell/Modules/cellRudp.h b/rpcs3/Emu/Cell/Modules/cellRudp.h
index 75b9d3905d..b06e920c90 100644
--- a/rpcs3/Emu/Cell/Modules/cellRudp.h
+++ b/rpcs3/Emu/Cell/Modules/cellRudp.h
@@ -1,6 +1,6 @@
 #pragma once
 
-
+#include "Emu/Memory/vm_ptr.h"
 
 // Return Codes
 enum
diff --git a/rpcs3/Emu/Cell/Modules/cellSail.h b/rpcs3/Emu/Cell/Modules/cellSail.h
index 73509e5546..57ab89000b 100644
--- a/rpcs3/Emu/Cell/Modules/cellSail.h
+++ b/rpcs3/Emu/Cell/Modules/cellSail.h
@@ -2,7 +2,7 @@
 
 #include "cellVpost.h"
 
-
+#include "Emu/Memory/vm_ptr.h"
 
 // Error Codes
 enum
diff --git a/rpcs3/Emu/Cell/Modules/cellScreenshot.h b/rpcs3/Emu/Cell/Modules/cellScreenshot.h
index e7e45066cb..8025081f5d 100644
--- a/rpcs3/Emu/Cell/Modules/cellScreenshot.h
+++ b/rpcs3/Emu/Cell/Modules/cellScreenshot.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "Emu/Memory/vm_ptr.h"
+
 // Return Codes
 enum
 {
diff --git a/rpcs3/Emu/Cell/Modules/cellSearch.h b/rpcs3/Emu/Cell/Modules/cellSearch.h
index 188c7f9dac..e52e945984 100644
--- a/rpcs3/Emu/Cell/Modules/cellSearch.h
+++ b/rpcs3/Emu/Cell/Modules/cellSearch.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "Emu/Memory/vm_ptr.h"
+
 // Error Codes
 enum CellSearchError : u32
 {
diff --git a/rpcs3/Emu/Cell/Modules/cellSpudll.h b/rpcs3/Emu/Cell/Modules/cellSpudll.h
index e78ab66717..1f321f5976 100644
--- a/rpcs3/Emu/Cell/Modules/cellSpudll.h
+++ b/rpcs3/Emu/Cell/Modules/cellSpudll.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "Emu/Memory/vm_ptr.h"
+
 enum CellSpudllError : u32
 {
 	CELL_SPUDLL_ERROR_INVAL        = 0x80410602,
diff --git a/rpcs3/Emu/Cell/Modules/cellSubDisplay.h b/rpcs3/Emu/Cell/Modules/cellSubDisplay.h
index 76249e4777..a219eeef56 100644
--- a/rpcs3/Emu/Cell/Modules/cellSubDisplay.h
+++ b/rpcs3/Emu/Cell/Modules/cellSubDisplay.h
@@ -1,6 +1,6 @@
 #pragma once
 
-
+#include "Utilities/BEType.h"
 
 // Return Codes
 enum CellSubDisplayError : u32
diff --git a/rpcs3/Emu/Cell/Modules/cellSync.h b/rpcs3/Emu/Cell/Modules/cellSync.h
index 2e8de41b96..023efdd79a 100644
--- a/rpcs3/Emu/Cell/Modules/cellSync.h
+++ b/rpcs3/Emu/Cell/Modules/cellSync.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "Emu/Memory/vm_ptr.h"
+
 #include "Utilities/BitField.h"
 
 // Return Codes
diff --git a/rpcs3/Emu/Cell/Modules/cellSync2.h b/rpcs3/Emu/Cell/Modules/cellSync2.h
index a890007a37..b22fc51c50 100644
--- a/rpcs3/Emu/Cell/Modules/cellSync2.h
+++ b/rpcs3/Emu/Cell/Modules/cellSync2.h
@@ -1,6 +1,6 @@
 #pragma once
 
-
+#include "Emu/Memory/vm_ptr.h"
 
 // Return Codes
 enum CellSync2Error : u32
diff --git a/rpcs3/Emu/Cell/Modules/cellSysconf.h b/rpcs3/Emu/Cell/Modules/cellSysconf.h
index 6965ebb594..b84728aa22 100644
--- a/rpcs3/Emu/Cell/Modules/cellSysconf.h
+++ b/rpcs3/Emu/Cell/Modules/cellSysconf.h
@@ -1,6 +1,6 @@
 #pragma once
 
-
+#include "Emu/Memory/vm_ptr.h"
 
 typedef void(CellSysconfCallback)(s32 result, vm::ptr<void> userdata);
 
diff --git a/rpcs3/Emu/Cell/Modules/cellSysutil.h b/rpcs3/Emu/Cell/Modules/cellSysutil.h
index a65461899f..db23e68989 100644
--- a/rpcs3/Emu/Cell/Modules/cellSysutil.h
+++ b/rpcs3/Emu/Cell/Modules/cellSysutil.h
@@ -1,6 +1,6 @@
-#pragma once
-
+#pragma once
 
+#include "Emu/Memory/vm_ptr.h"
 
 enum CellSysutilError : u32
 {
diff --git a/rpcs3/Emu/Cell/Modules/cellSysutilAvc2.h b/rpcs3/Emu/Cell/Modules/cellSysutilAvc2.h
index 6441b9c348..99ff01f191 100644
--- a/rpcs3/Emu/Cell/Modules/cellSysutilAvc2.h
+++ b/rpcs3/Emu/Cell/Modules/cellSysutilAvc2.h
@@ -1,6 +1,8 @@
 #pragma once
 
+#include "sceNp2.h"
 
+#include "Emu/Memory/vm_ptr.h"
 
 // Error codes
 enum CellSysutilAvc2Error : u32
diff --git a/rpcs3/Emu/Cell/Modules/cellUserInfo.h b/rpcs3/Emu/Cell/Modules/cellUserInfo.h
index c1735ecbae..ff6008916a 100644
--- a/rpcs3/Emu/Cell/Modules/cellUserInfo.h
+++ b/rpcs3/Emu/Cell/Modules/cellUserInfo.h
@@ -1,6 +1,6 @@
 #pragma once
 
-
+#include "Emu/Memory/vm_ptr.h"
 
 // Error Codes
 enum CellUserInfoError : u32
diff --git a/rpcs3/Emu/Cell/Modules/cellVdec.h b/rpcs3/Emu/Cell/Modules/cellVdec.h
index 54c5b5706e..f67e48f913 100644
--- a/rpcs3/Emu/Cell/Modules/cellVdec.h
+++ b/rpcs3/Emu/Cell/Modules/cellVdec.h
@@ -1,6 +1,6 @@
 #pragma once
 
-
+#include "Utilities/BEType.h"
 
 // Error Codes
 enum
diff --git a/rpcs3/Emu/Cell/Modules/cellVideoOut.h b/rpcs3/Emu/Cell/Modules/cellVideoOut.h
index f7e4333e4f..5cee8dc34b 100644
--- a/rpcs3/Emu/Cell/Modules/cellVideoOut.h
+++ b/rpcs3/Emu/Cell/Modules/cellVideoOut.h
@@ -1,9 +1,9 @@
 #pragma once
 
-
-
 #include "Emu/Cell/ErrorCodes.h"
 
+#include "Emu/Memory/vm_ptr.h"
+
 // Video Out Error Codes
 enum CellVideoOutError : u32
 {
diff --git a/rpcs3/Emu/Cell/Modules/cellVideoUpload.h b/rpcs3/Emu/Cell/Modules/cellVideoUpload.h
index c7694a438f..35e49f1e59 100644
--- a/rpcs3/Emu/Cell/Modules/cellVideoUpload.h
+++ b/rpcs3/Emu/Cell/Modules/cellVideoUpload.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "Emu/Memory/vm_ptr.h"
+
 struct CellVideoUploadOption
 {
 	be_t<s32> type;
diff --git a/rpcs3/Emu/Cell/Modules/cellVpost.h b/rpcs3/Emu/Cell/Modules/cellVpost.h
index b1d8ad264e..3b1cba6b4d 100644
--- a/rpcs3/Emu/Cell/Modules/cellVpost.h
+++ b/rpcs3/Emu/Cell/Modules/cellVpost.h
@@ -5,7 +5,7 @@ extern "C"
 #include "libswscale/swscale.h"
 }
 
-
+#include "Utilities/BEType.h"
 
 // Error Codes
 enum
diff --git a/rpcs3/Emu/Cell/Modules/cellWebBrowser.h b/rpcs3/Emu/Cell/Modules/cellWebBrowser.h
index 050156dbaf..7a66f5b421 100644
--- a/rpcs3/Emu/Cell/Modules/cellWebBrowser.h
+++ b/rpcs3/Emu/Cell/Modules/cellWebBrowser.h
@@ -2,6 +2,8 @@
 
 #include "cellSysutil.h"
 
+#include "Emu/Memory/vm_ptr.h"
+
 //events
 enum CellWebBrowserEvent : s32
 {
diff --git a/rpcs3/Emu/Cell/Modules/libmixer.h b/rpcs3/Emu/Cell/Modules/libmixer.h
index 43b6c8e1e9..a12301c65c 100644
--- a/rpcs3/Emu/Cell/Modules/libmixer.h
+++ b/rpcs3/Emu/Cell/Modules/libmixer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-
+#include "Emu/Memory/vm_ptr.h"
 
 // Error Codes
 enum
diff --git a/rpcs3/Emu/Cell/Modules/libsnd3.h b/rpcs3/Emu/Cell/Modules/libsnd3.h
index 083c2bc86b..ea296d8162 100644
--- a/rpcs3/Emu/Cell/Modules/libsnd3.h
+++ b/rpcs3/Emu/Cell/Modules/libsnd3.h
@@ -1,6 +1,6 @@
 #pragma once
 
-
+#include "Emu/Memory/vm_ptr.h"
 
 // Error Codes
 enum
diff --git a/rpcs3/Emu/Cell/Modules/libsynth2.h b/rpcs3/Emu/Cell/Modules/libsynth2.h
index cd2ce07f89..fe00ee3bcf 100644
--- a/rpcs3/Emu/Cell/Modules/libsynth2.h
+++ b/rpcs3/Emu/Cell/Modules/libsynth2.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "Utilities/BEType.h"
+
 // Error Codes
 enum
 {
diff --git a/rpcs3/Emu/Cell/Modules/sceNp.h b/rpcs3/Emu/Cell/Modules/sceNp.h
index c44de05d89..069c33f439 100644
--- a/rpcs3/Emu/Cell/Modules/sceNp.h
+++ b/rpcs3/Emu/Cell/Modules/sceNp.h
@@ -1,9 +1,9 @@
 #pragma once
 
-
-
 #include "cellRtc.h"
 
+#include "Utilities/BEType.h"
+
 // Error Codes
 enum
 {
@@ -696,4 +696,4 @@ struct SceNpSignalingNetInfo
 };
 
 // NP signaling callback function
-typedef void(*SceNpSignalingHandler)(u32 ctx_id, u32 subject_id, s32 event, s32 error_code, u32 arg_addr);
\ No newline at end of file
+typedef void(*SceNpSignalingHandler)(u32 ctx_id, u32 subject_id, s32 event, s32 error_code, u32 arg_addr);
diff --git a/rpcs3/Emu/Cell/Modules/sceNp2.h b/rpcs3/Emu/Cell/Modules/sceNp2.h
index 27bd028ec7..84e0e7648f 100644
--- a/rpcs3/Emu/Cell/Modules/sceNp2.h
+++ b/rpcs3/Emu/Cell/Modules/sceNp2.h
@@ -1,6 +1,8 @@
 #pragma once
 
+#include "sceNp.h"
 
+#include "Emu/Memory/vm_ptr.h"
 
 // Error codes
 enum
@@ -1504,4 +1506,4 @@ struct SceNpMatching2CbQueueInfo
 	be_t<u32> curSessionMsgCbQueueLen;
 	be_t<u32> maxSessionMsgCbQueueLen;
 	u8 reserved[12];
-};
\ No newline at end of file
+};
diff --git a/rpcs3/Emu/Cell/Modules/sceNpClans.h b/rpcs3/Emu/Cell/Modules/sceNpClans.h
index 7faba3c130..44035aab2d 100644
--- a/rpcs3/Emu/Cell/Modules/sceNpClans.h
+++ b/rpcs3/Emu/Cell/Modules/sceNpClans.h
@@ -1,6 +1,8 @@
 #pragma once
 
+#include "sceNp.h"
 
+#include "Utilities/BEType.h"
 
 // Return codes
 enum
diff --git a/rpcs3/Emu/Cell/Modules/sceNpCommerce2.h b/rpcs3/Emu/Cell/Modules/sceNpCommerce2.h
index aebbca5fcc..85468754c7 100644
--- a/rpcs3/Emu/Cell/Modules/sceNpCommerce2.h
+++ b/rpcs3/Emu/Cell/Modules/sceNpCommerce2.h
@@ -1,9 +1,9 @@
 #pragma once
 
-
-
 #include "cellRtc.h"
 
+#include "Utilities/BEType.h"
+
 // Return codes
 enum
 {
diff --git a/rpcs3/Emu/Cell/Modules/sceNpSns.h b/rpcs3/Emu/Cell/Modules/sceNpSns.h
index 2362ee2f3a..93c3a18402 100644
--- a/rpcs3/Emu/Cell/Modules/sceNpSns.h
+++ b/rpcs3/Emu/Cell/Modules/sceNpSns.h
@@ -1,6 +1,6 @@
 #pragma once
 
-
+#include "Emu/Memory/vm_ptr.h"
 
 // Return codes
 enum sceNpSnsError : u32
diff --git a/rpcs3/Emu/Cell/Modules/sceNpTus.h b/rpcs3/Emu/Cell/Modules/sceNpTus.h
index e70b754e05..6e19cf91a0 100644
--- a/rpcs3/Emu/Cell/Modules/sceNpTus.h
+++ b/rpcs3/Emu/Cell/Modules/sceNpTus.h
@@ -1,8 +1,9 @@
 #pragma once
 
-
+#include "Utilities/BEType.h"
 
 #include "cellRtc.h"
+#include "sceNp.h"
 
 // Constants for TUS functions and structures
 enum
@@ -47,4 +48,4 @@ struct SceNpTusDataStatus
 	be_t<u32> dataSize;
 	u8 pad[4];
 	SceNpTusDataInfo info;
-};
\ No newline at end of file
+};
diff --git a/rpcs3/Emu/Cell/Modules/sysPrxForUser.h b/rpcs3/Emu/Cell/Modules/sysPrxForUser.h
index d14dbcb09d..d1f88d87bd 100644
--- a/rpcs3/Emu/Cell/Modules/sysPrxForUser.h
+++ b/rpcs3/Emu/Cell/Modules/sysPrxForUser.h
@@ -1,6 +1,7 @@
 #pragma once
 
-
+#include "Emu/Memory/vm_ptr.h"
+#include "Emu/Cell/ErrorCodes.h"
 
 using spu_printf_cb_t = vm::ptr<s32(u32 arg)>;
 
diff --git a/rpcs3/Emu/Cell/Modules/sys_lv2dbg.h b/rpcs3/Emu/Cell/Modules/sys_lv2dbg.h
index c903f4db3e..1a58844886 100644
--- a/rpcs3/Emu/Cell/Modules/sys_lv2dbg.h
+++ b/rpcs3/Emu/Cell/Modules/sys_lv2dbg.h
@@ -9,6 +9,8 @@
 #include "Emu/Cell/lv2/sys_lwcond.h"
 #include "Emu/Cell/lv2/sys_event_flag.h"
 
+#include "Emu/Memory/vm_ptr.h"
+
 
 
 // Error Codes
diff --git a/rpcs3/Emu/Cell/SPUAnalyser.h b/rpcs3/Emu/Cell/SPUAnalyser.h
index 65ac1d5d97..a0dd3f3fbc 100644
--- a/rpcs3/Emu/Cell/SPUAnalyser.h
+++ b/rpcs3/Emu/Cell/SPUAnalyser.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "Utilities/types.h"
+
 // SPU Instruction Type
 struct spu_itype
 {
diff --git a/rpcs3/Emu/Cell/SPUOpcodes.h b/rpcs3/Emu/Cell/SPUOpcodes.h
index 2db6b6b1f0..35c9e0103a 100644
--- a/rpcs3/Emu/Cell/SPUOpcodes.h
+++ b/rpcs3/Emu/Cell/SPUOpcodes.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../../Utilities/BitField.h"
+#include "Utilities/BitField.h"
 
 union spu_opcode_t
 {
diff --git a/rpcs3/Emu/Cell/SPUThread.h b/rpcs3/Emu/Cell/SPUThread.h
index b79075a2f5..5dbc4ba032 100644
--- a/rpcs3/Emu/Cell/SPUThread.h
+++ b/rpcs3/Emu/Cell/SPUThread.h
@@ -4,6 +4,8 @@
 #include "Emu/Cell/SPUInterpreter.h"
 #include "Emu/Memory/vm.h"
 #include "MFC.h"
+#include "Emu/Memory/vm.h"
+#include "Utilities/BEType.h"
 
 #include <map>
 
diff --git a/rpcs3/Emu/Cell/lv2/sys_cond.h b/rpcs3/Emu/Cell/lv2/sys_cond.h
index d83e92f55e..6a0cf1ab0f 100644
--- a/rpcs3/Emu/Cell/lv2/sys_cond.h
+++ b/rpcs3/Emu/Cell/lv2/sys_cond.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "sys_sync.h"
+#include "sys_mutex.h"
 
 struct lv2_mutex;
 
diff --git a/rpcs3/Emu/Cell/lv2/sys_event.h b/rpcs3/Emu/Cell/lv2/sys_event.h
index 2384c41133..39f90099b9 100644
--- a/rpcs3/Emu/Cell/lv2/sys_event.h
+++ b/rpcs3/Emu/Cell/lv2/sys_event.h
@@ -2,6 +2,8 @@
 
 #include "sys_sync.h"
 
+#include "Emu/Memory/vm_ptr.h"
+
 class cpu_thread;
 
 // Event Queue Type
diff --git a/rpcs3/Emu/Cell/lv2/sys_event_flag.h b/rpcs3/Emu/Cell/lv2/sys_event_flag.h
index ebcc3a839a..3bdbdefb73 100644
--- a/rpcs3/Emu/Cell/lv2/sys_event_flag.h
+++ b/rpcs3/Emu/Cell/lv2/sys_event_flag.h
@@ -2,6 +2,8 @@
 
 #include "sys_sync.h"
 
+#include "Emu/Memory/vm_ptr.h"
+
 enum
 {
 	SYS_SYNC_WAITER_SINGLE = 0x10000,
diff --git a/rpcs3/Emu/Cell/lv2/sys_fs.h b/rpcs3/Emu/Cell/lv2/sys_fs.h
index 2ce8496360..951740f36c 100644
--- a/rpcs3/Emu/Cell/lv2/sys_fs.h
+++ b/rpcs3/Emu/Cell/lv2/sys_fs.h
@@ -2,6 +2,7 @@
 
 #include "Emu/Memory/vm_ptr.h"
 #include "Emu/Cell/ErrorCodes.h"
+#include "Utilities/File.h"
 
 // Open Flags
 enum : s32
diff --git a/rpcs3/Emu/Cell/lv2/sys_interrupt.h b/rpcs3/Emu/Cell/lv2/sys_interrupt.h
index 6b87f59f56..13f97364f9 100644
--- a/rpcs3/Emu/Cell/lv2/sys_interrupt.h
+++ b/rpcs3/Emu/Cell/lv2/sys_interrupt.h
@@ -2,6 +2,8 @@
 
 #include "sys_sync.h"
 
+#include "Emu/Memory/vm_ptr.h"
+
 class ppu_thread;
 
 struct lv2_int_tag final : lv2_obj
diff --git a/rpcs3/Emu/Cell/lv2/sys_lwcond.h b/rpcs3/Emu/Cell/lv2/sys_lwcond.h
index b34655e27d..70249b0d3f 100644
--- a/rpcs3/Emu/Cell/lv2/sys_lwcond.h
+++ b/rpcs3/Emu/Cell/lv2/sys_lwcond.h
@@ -2,6 +2,8 @@
 
 #include "sys_sync.h"
 
+#include "Emu/Memory/vm_ptr.h"
+
 struct sys_lwmutex_t;
 
 struct sys_lwcond_attribute_t
diff --git a/rpcs3/Emu/Cell/lv2/sys_lwmutex.h b/rpcs3/Emu/Cell/lv2/sys_lwmutex.h
index 5ee8a6c8bf..cf2e5cb3d3 100644
--- a/rpcs3/Emu/Cell/lv2/sys_lwmutex.h
+++ b/rpcs3/Emu/Cell/lv2/sys_lwmutex.h
@@ -2,6 +2,8 @@
 
 #include "sys_sync.h"
 
+#include "Emu/Memory/vm_ptr.h"
+
 struct sys_lwmutex_attribute_t
 {
 	be_t<u32> protocol;
diff --git a/rpcs3/Emu/Cell/lv2/sys_memory.h b/rpcs3/Emu/Cell/lv2/sys_memory.h
index 03816c78c7..64ae6eef5e 100644
--- a/rpcs3/Emu/Cell/lv2/sys_memory.h
+++ b/rpcs3/Emu/Cell/lv2/sys_memory.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Emu/Memory/vm_ptr.h"
 #include "Emu/Cell/ErrorCodes.h"
+#include "Emu/Memory/vm_ptr.h"
 #include "Emu/IdManager.h"
 
 enum : u32
diff --git a/rpcs3/Emu/Cell/lv2/sys_mmapper.h b/rpcs3/Emu/Cell/lv2/sys_mmapper.h
index e121433f1c..99207cd7b4 100644
--- a/rpcs3/Emu/Cell/lv2/sys_mmapper.h
+++ b/rpcs3/Emu/Cell/lv2/sys_mmapper.h
@@ -1,9 +1,11 @@
 #pragma once
 
 #include "sys_sync.h"
-#include <vector>
+
 #include "Emu/Memory/vm_ptr.h"
 
+#include <vector>
+
 struct lv2_memory_container;
 
 struct lv2_memory : lv2_obj
diff --git a/rpcs3/Emu/Cell/lv2/sys_mutex.h b/rpcs3/Emu/Cell/lv2/sys_mutex.h
index 548da7a0ce..e70cb3658c 100644
--- a/rpcs3/Emu/Cell/lv2/sys_mutex.h
+++ b/rpcs3/Emu/Cell/lv2/sys_mutex.h
@@ -2,6 +2,8 @@
 
 #include "sys_sync.h"
 
+#include "Emu/Memory/vm_ptr.h"
+
 struct sys_mutex_attribute_t
 {
 	be_t<u32> protocol; // SYS_SYNC_FIFO, SYS_SYNC_PRIORITY or SYS_SYNC_PRIORITY_INHERIT
diff --git a/rpcs3/Emu/Cell/lv2/sys_net.h b/rpcs3/Emu/Cell/lv2/sys_net.h
index 191677c513..891f57e3d1 100644
--- a/rpcs3/Emu/Cell/lv2/sys_net.h
+++ b/rpcs3/Emu/Cell/lv2/sys_net.h
@@ -3,6 +3,8 @@
 #include "Utilities/bit_set.h"
 #include "Utilities/mutex.h"
 
+#include "Emu/Memory/vm_ptr.h"
+
 #include <vector>
 #include <utility>
 #include <functional>
diff --git a/rpcs3/Emu/Cell/lv2/sys_prx.h b/rpcs3/Emu/Cell/lv2/sys_prx.h
index ffc967e604..442fe21824 100644
--- a/rpcs3/Emu/Cell/lv2/sys_prx.h
+++ b/rpcs3/Emu/Cell/lv2/sys_prx.h
@@ -1,8 +1,10 @@
 #pragma once
 
-#include "Emu/Cell/PPUAnalyser.h"
 #include "sys_sync.h"
 
+#include "Emu/Cell/PPUAnalyser.h"
+#include "Emu/Memory/vm_ptr.h"
+
 // Return codes
 enum CellPrxError : u32
 {
diff --git a/rpcs3/Emu/Cell/lv2/sys_rsx.h b/rpcs3/Emu/Cell/lv2/sys_rsx.h
index c491ed33dc..df8cee938f 100644
--- a/rpcs3/Emu/Cell/lv2/sys_rsx.h
+++ b/rpcs3/Emu/Cell/lv2/sys_rsx.h
@@ -1,4 +1,6 @@
-#pragma once
+#pragma once
+
+#include "Emu/Memory/vm_ptr.h"
 
 #include "Emu/Memory/vm_ptr.h"
 
diff --git a/rpcs3/Emu/Cell/lv2/sys_rwlock.h b/rpcs3/Emu/Cell/lv2/sys_rwlock.h
index 86b8772858..33e3340914 100644
--- a/rpcs3/Emu/Cell/lv2/sys_rwlock.h
+++ b/rpcs3/Emu/Cell/lv2/sys_rwlock.h
@@ -2,6 +2,8 @@
 
 #include "sys_sync.h"
 
+#include "Emu/Memory/vm_ptr.h"
+
 struct sys_rwlock_attribute_t
 {
 	be_t<u32> protocol;
diff --git a/rpcs3/Emu/Cell/lv2/sys_semaphore.h b/rpcs3/Emu/Cell/lv2/sys_semaphore.h
index 3c3862fbb2..0e10fc33cb 100644
--- a/rpcs3/Emu/Cell/lv2/sys_semaphore.h
+++ b/rpcs3/Emu/Cell/lv2/sys_semaphore.h
@@ -2,6 +2,8 @@
 
 #include "sys_sync.h"
 
+#include "Emu/Memory/vm_ptr.h"
+
 struct sys_semaphore_attribute_t
 {
 	be_t<u32> protocol;
diff --git a/rpcs3/Emu/Cell/lv2/sys_spu.h b/rpcs3/Emu/Cell/lv2/sys_spu.h
index 2874e5935b..584864efe0 100644
--- a/rpcs3/Emu/Cell/lv2/sys_spu.h
+++ b/rpcs3/Emu/Cell/lv2/sys_spu.h
@@ -3,6 +3,9 @@
 #include "sys_event.h"
 #include "Emu/Cell/SPUThread.h"
 
+#include "Emu/Memory/vm_ptr.h"
+#include "Utilities/File.h"
+
 enum : s32
 {
 	SYS_SPU_THREAD_GROUP_TYPE_NORMAL                = 0x00,
diff --git a/rpcs3/Emu/Cell/lv2/sys_ss.h b/rpcs3/Emu/Cell/lv2/sys_ss.h
index c70649380e..12a0ac1230 100644
--- a/rpcs3/Emu/Cell/lv2/sys_ss.h
+++ b/rpcs3/Emu/Cell/lv2/sys_ss.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Emu/Memory/vm.h"
+#include "Emu/Memory/vm_ptr.h"
 #include "Emu/Cell/ErrorCodes.h"
 
 struct CellSsOpenPSID
diff --git a/rpcs3/Emu/Cell/lv2/sys_timer.h b/rpcs3/Emu/Cell/lv2/sys_timer.h
index a13ba6a0a6..142da7444d 100644
--- a/rpcs3/Emu/Cell/lv2/sys_timer.h
+++ b/rpcs3/Emu/Cell/lv2/sys_timer.h
@@ -1,6 +1,10 @@
 #pragma once
 
+#include "sys_event.h"
+
 #include "Utilities/Thread.h"
+#include "Emu/Memory/vm_ptr.h"
+
 
 // Timer State
 enum : u32
diff --git a/rpcs3/Emu/Cell/lv2/sys_trace.h b/rpcs3/Emu/Cell/lv2/sys_trace.h
index 5b253893c3..83c9105142 100644
--- a/rpcs3/Emu/Cell/lv2/sys_trace.h
+++ b/rpcs3/Emu/Cell/lv2/sys_trace.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "Utilities/types.h"
+
 // SysCalls
 s32 sys_trace_create();
 s32 sys_trace_start();
diff --git a/rpcs3/Emu/GameInfo.h b/rpcs3/Emu/GameInfo.h
index 8c23891508..efea30628f 100644
--- a/rpcs3/Emu/GameInfo.h
+++ b/rpcs3/Emu/GameInfo.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "Utilities/types.h"
+
 struct GameInfo
 {
 	std::string path;
diff --git a/rpcs3/Emu/Io/KeyboardHandler.h b/rpcs3/Emu/Io/KeyboardHandler.h
index 9ac53f75df..206a9df014 100644
--- a/rpcs3/Emu/Io/KeyboardHandler.h
+++ b/rpcs3/Emu/Io/KeyboardHandler.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "Utilities/types.h"
+
 #include <mutex>
 
 // TODO: HLE info (constants, structs, etc.) should not be available here
diff --git a/rpcs3/Emu/RSX/Common/GLSLCommon.h b/rpcs3/Emu/RSX/Common/GLSLCommon.h
index 5a595980dc..de18ca1159 100644
--- a/rpcs3/Emu/RSX/Common/GLSLCommon.h
+++ b/rpcs3/Emu/RSX/Common/GLSLCommon.h
@@ -4,6 +4,8 @@
 #include "GLSLTypes.h"
 #include "ShaderParam.h"
 
+#include "Utilities/StrFmt.h"
+
 namespace program_common
 {
 	static void insert_compare_op(std::ostream& OS, bool low_precision)
@@ -810,4 +812,4 @@ namespace glsl
 			return "TEX2D_DEPTH_RGBA8($_i, $0.xy)";
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/rpcs3/Emu/RSX/Common/ProgramStateCache.h b/rpcs3/Emu/RSX/Common/ProgramStateCache.h
index 24b7ca9d4b..f263c9ad89 100644
--- a/rpcs3/Emu/RSX/Common/ProgramStateCache.h
+++ b/rpcs3/Emu/RSX/Common/ProgramStateCache.h
@@ -7,6 +7,7 @@
 #include "Utilities/GSL.h"
 #include "Utilities/hash.h"
 #include "Utilities/mutex.h"
+#include "Utilities/Log.h"
 
 #include <deque>
 
diff --git a/rpcs3/Emu/RSX/Common/ShaderParam.h b/rpcs3/Emu/RSX/Common/ShaderParam.h
index 87f6988d10..9315deaaa0 100644
--- a/rpcs3/Emu/RSX/Common/ShaderParam.h
+++ b/rpcs3/Emu/RSX/Common/ShaderParam.h
@@ -4,6 +4,7 @@
 #include <vector>
 
 #include "Utilities/StrUtil.h"
+#include "Utilities/types.h"
 
 enum class FUNCTION {
 	FUNCTION_DP2,
diff --git a/rpcs3/Emu/RSX/Common/ring_buffer_helper.h b/rpcs3/Emu/RSX/Common/ring_buffer_helper.h
index 91a99d5487..63ddee21b3 100644
--- a/rpcs3/Emu/RSX/Common/ring_buffer_helper.h
+++ b/rpcs3/Emu/RSX/Common/ring_buffer_helper.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "Utilities/Log.h"
+
 /**
  * Ring buffer memory helper :
  * There are 2 "pointers" (offset inside a memory buffer to be provided by class derrivative)
diff --git a/rpcs3/Emu/RSX/Common/texture_cache_predictor.h b/rpcs3/Emu/RSX/Common/texture_cache_predictor.h
index cc67193089..07795d350e 100644
--- a/rpcs3/Emu/RSX/Common/texture_cache_predictor.h
+++ b/rpcs3/Emu/RSX/Common/texture_cache_predictor.h
@@ -3,6 +3,7 @@
 #include "../rsx_cache.h"
 #include "../rsx_utils.h"
 #include "TextureUtils.h"
+#include <atomic>
 
 
 namespace rsx
@@ -413,4 +414,4 @@ namespace std
 			return result;
 		}
 	};
-} // namespace std
\ No newline at end of file
+} // namespace std
diff --git a/rpcs3/Emu/RSX/Common/texture_cache_utils.h b/rpcs3/Emu/RSX/Common/texture_cache_utils.h
index 7c5d265519..81ecca46a3 100644
--- a/rpcs3/Emu/RSX/Common/texture_cache_utils.h
+++ b/rpcs3/Emu/RSX/Common/texture_cache_utils.h
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include "../rsx_cache.h"
 #include "../rsx_utils.h"
@@ -6,6 +6,7 @@
 #include "TextureUtils.h"
 
 #include <list>
+#include <unordered_set>
 #include <atomic>
 
 
@@ -1685,4 +1686,4 @@ namespace rsx
 		}
 	};
 
-} // namespace rsx
\ No newline at end of file
+} // namespace rsx
diff --git a/rpcs3/Emu/RSX/D3D12/D3D12Formats.h b/rpcs3/Emu/RSX/D3D12/D3D12Formats.h
index 39ecff689f..b3306534f7 100644
--- a/rpcs3/Emu/RSX/D3D12/D3D12Formats.h
+++ b/rpcs3/Emu/RSX/D3D12/D3D12Formats.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "../gcm_enums.h"
+
 #include <d3d12.h>
 
 /**
diff --git a/rpcs3/Emu/RSX/D3D12/D3D12FragmentProgramDecompiler.h b/rpcs3/Emu/RSX/D3D12/D3D12FragmentProgramDecompiler.h
index ab5c03ca8c..113866b4b5 100644
--- a/rpcs3/Emu/RSX/D3D12/D3D12FragmentProgramDecompiler.h
+++ b/rpcs3/Emu/RSX/D3D12/D3D12FragmentProgramDecompiler.h
@@ -11,7 +11,8 @@ protected:
 	virtual std::string getFloatTypeName(size_t elementCount) override;
 	virtual std::string getHalfTypeName(size_t elementCount) override;
 	virtual std::string getFunction(enum class FUNCTION) override;
-	virtual std::string compareFunction(enum class COMPARE, const std::string &, const std::string &) override;
+	virtual std::string saturate(const std::string &code) override;
+	virtual std::string compareFunction(enum COMPARE, const std::string &, const std::string &) override;
 
 	virtual void insertHeader(std::stringstream &OS) override;
 	virtual void insertInputs(std::stringstream &OS) override;
diff --git a/rpcs3/Emu/RSX/D3D12/D3D12MemoryHelpers.h b/rpcs3/Emu/RSX/D3D12/D3D12MemoryHelpers.h
index 10c8b5c7ad..3d7e565a0e 100644
--- a/rpcs3/Emu/RSX/D3D12/D3D12MemoryHelpers.h
+++ b/rpcs3/Emu/RSX/D3D12/D3D12MemoryHelpers.h
@@ -2,6 +2,9 @@
 #include "D3D12Utils.h"
 #include "d3dx12.h"
 #include "../Common/ring_buffer_helper.h"
+
+#include "Utilities/mutex.h"
+
 #include <list>
 #include <mutex>
 
diff --git a/rpcs3/Emu/RSX/D3D12/D3D12PipelineState.h b/rpcs3/Emu/RSX/D3D12/D3D12PipelineState.h
index cfdf95eba8..e0ddf4d208 100644
--- a/rpcs3/Emu/RSX/D3D12/D3D12PipelineState.h
+++ b/rpcs3/Emu/RSX/D3D12/D3D12PipelineState.h
@@ -4,6 +4,8 @@
 #include "../Common/ProgramStateCache.h"
 #include "D3D12VertexProgramDecompiler.h"
 #include "D3D12FragmentProgramDecompiler.h"
+#include "Utilities/File.h"
+
 
 struct D3D12PipelineProperties
 {
@@ -86,7 +88,7 @@ public:
 	//	void Decompile(RSXFragmentProgram& prog)
 
 	/** Compile the decompiled fragment shader into a format we can use with OpenGL. */
-	void Compile(const std::string &code, enum class SHADER_TYPE st);
+	void Compile(const std::string &code, enum SHADER_TYPE st);
 };
 
 static
diff --git a/rpcs3/Emu/RSX/D3D12/D3D12VertexProgramDecompiler.h b/rpcs3/Emu/RSX/D3D12/D3D12VertexProgramDecompiler.h
index 8c0eee1278..372c8cc908 100644
--- a/rpcs3/Emu/RSX/D3D12/D3D12VertexProgramDecompiler.h
+++ b/rpcs3/Emu/RSX/D3D12/D3D12VertexProgramDecompiler.h
@@ -9,8 +9,8 @@ struct D3D12VertexProgramDecompiler : public VertexProgramDecompiler
 protected:
 	virtual std::string getFloatTypeName(size_t elementCount) override;
 	std::string getIntTypeName(size_t elementCount) override;
-	virtual std::string getFunction(enum class FUNCTION) override;
-	virtual std::string compareFunction(enum class COMPARE, const std::string &, const std::string &, bool scalar) override;
+	virtual std::string getFunction(enum FUNCTION) override;
+	virtual std::string compareFunction(enum COMPARE, const std::string &, const std::string &, bool scalar) override;
 
 	virtual void insertHeader(std::stringstream &OS);
 	virtual void insertInputs(std::stringstream &OS, const std::vector<ParamType> &inputs);
diff --git a/rpcs3/Emu/RSX/GL/GLGSRender.h b/rpcs3/Emu/RSX/GL/GLGSRender.h
index c9ca8e0428..46454c544f 100644
--- a/rpcs3/Emu/RSX/GL/GLGSRender.h
+++ b/rpcs3/Emu/RSX/GL/GLGSRender.h
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 #include "Emu/RSX/GSRender.h"
 #include "GLHelpers.h"
 #include "GLTexture.h"
@@ -7,8 +7,6 @@
 #include "GLProgramBuffer.h"
 #include "GLTextOut.h"
 #include "GLOverlays.h"
-#include "../rsx_utils.h"
-#include "../rsx_cache.h"
 
 #pragma comment(lib, "opengl32.lib")
 
diff --git a/rpcs3/Emu/RSX/GL/GLHelpers.h b/rpcs3/Emu/RSX/GL/GLHelpers.h
index 17eeab5dd8..986c1e91c3 100644
--- a/rpcs3/Emu/RSX/GL/GLHelpers.h
+++ b/rpcs3/Emu/RSX/GL/GLHelpers.h
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include <exception>
 #include <string>
@@ -14,6 +14,7 @@
 
 #include "Emu/System.h"
 #include "Utilities/geometry.h"
+#include "Utilities/Log.h"
 
 #define GL_FRAGMENT_TEXTURES_START 0
 #define GL_VERTEX_TEXTURES_START   GL_FRAGMENT_TEXTURES_START + 16
diff --git a/rpcs3/Emu/RSX/GL/GLProgramBuffer.h b/rpcs3/Emu/RSX/GL/GLProgramBuffer.h
index 9d3b068c52..3eb2743d56 100644
--- a/rpcs3/Emu/RSX/GL/GLProgramBuffer.h
+++ b/rpcs3/Emu/RSX/GL/GLProgramBuffer.h
@@ -2,6 +2,7 @@
 #include "GLVertexProgram.h"
 #include "GLFragmentProgram.h"
 #include "GLHelpers.h"
+#include "../RSXThread.h"
 #include "../Common/ProgramStateCache.h"
 
 struct GLTraits
diff --git a/rpcs3/Emu/RSX/GL/GLTextureCache.h b/rpcs3/Emu/RSX/GL/GLTextureCache.h
index 7d54e72213..899eaadc8d 100644
--- a/rpcs3/Emu/RSX/GL/GLTextureCache.h
+++ b/rpcs3/Emu/RSX/GL/GLTextureCache.h
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include "stdafx.h"
 
@@ -15,10 +15,10 @@
 #include "Emu/System.h"
 #include "GLRenderTargets.h"
 #include "GLOverlays.h"
+#include "GLTexture.h"
 #include "../Common/TextureUtils.h"
 #include "../Common/texture_cache.h"
 #include "../../Memory/vm.h"
-#include "../rsx_utils.h"
 
 class GLGSRender;
 
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_controls.h b/rpcs3/Emu/RSX/Overlays/overlay_controls.h
index 7a51ef88d5..8f819dd047 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_controls.h
+++ b/rpcs3/Emu/RSX/Overlays/overlay_controls.h
@@ -1,6 +1,7 @@
 #pragma once
 #include "Utilities/types.h"
 #include "Utilities/geometry.h"
+#include "Utilities/File.h"
 #include "Emu/System.h"
 
 #include <string>
diff --git a/rpcs3/Emu/RSX/rsx_cache.h b/rpcs3/Emu/RSX/rsx_cache.h
index c5d816384d..8f387edda2 100644
--- a/rpcs3/Emu/RSX/rsx_cache.h
+++ b/rpcs3/Emu/RSX/rsx_cache.h
@@ -1,6 +1,7 @@
 #pragma once
 #include "Utilities/VirtualMemory.h"
 #include "Utilities/hash.h"
+#include "Utilities/File.h"
 #include "Emu/Memory/vm.h"
 #include "gcm_enums.h"
 #include "Common/ProgramStateCache.h"
@@ -10,6 +11,7 @@
 
 #include "rsx_utils.h"
 #include <thread>
+#include <chrono>
 
 namespace rsx
 {
diff --git a/rpcs3/Emu/RSX/rsx_vertex_data.h b/rpcs3/Emu/RSX/rsx_vertex_data.h
index 6af034b373..2081dc235a 100644
--- a/rpcs3/Emu/RSX/rsx_vertex_data.h
+++ b/rpcs3/Emu/RSX/rsx_vertex_data.h
@@ -1,6 +1,8 @@
 #pragma once
 
 #include "GCM.h"
+#include "rsx_decode.h"
+
 #include "Utilities/types.h"
 #include "Utilities/BEType.h"
 #include "rsx_utils.h"