Add missing #includes to header files

- Multiple header files where missing #includes to other headers that where used in the header. Correct header was included in correct order in source files which caused everything to compile. - Added missing #includes so header files correctly include all their dependencies and fixes problems with IDEs being unable to parse headers correctly due to missing symbols
2024-11-25 04:02:42 +01:00 · 2018-09-26 01:14:10 +03:00 · 2018-09-26 01:14:10 +03:00 · e9e87b8bd9
commit e9e87b8bd9
parent 499035512b
115 changed files with 210 additions and 73 deletions
--- 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>
--- 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
--- a/Utilities/Timer.h
+++ b/Utilities/Timer.h
@ -1,5 +1,7 @@
 #pragma once

+#include "types.h"
+
 #include <chrono>

 class Timer
--- a/Utilities/VirtualMemory.h
+++ b/Utilities/VirtualMemory.h
@ -1,5 +1,7 @@
 #pragma once

+#include "types.h"
+
 namespace utils
 {
 	// Memory protection type
--- 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)
--- a/Utilities/hash.h
+++ b/Utilities/hash.h
@ -1,5 +1,6 @@
 #pragma once
-#include <stdint.h>
+
+#include "Utilities/types.h"

 namespace rpcs3
 {
--- 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>
--- 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;
--- a/rpcs3/Crypto/unpkg.h
+++ b/rpcs3/Crypto/unpkg.h
@ -1,5 +1,7 @@
 #pragma once

+#include "Utilities/BEType.h"
+
 // Constants
 enum
 {
--- 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;
--- 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
--- 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,
--- 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>
--- 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
 {
--- 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,
--- 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,
--- 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
--- 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
--- 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
--- 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"
--- 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
--- 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
 {
--- 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
--- 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
--- 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
--- 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
 {
--- 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
--- 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
--- 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
 {
--- 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;

--- 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
--- 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

--- 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;

--- 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
--- 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,
--- 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
--- 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
 {
--- 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
 {
--- 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
--- 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
--- 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
--- 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
 {
--- 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,
--- 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
 {
--- 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
--- 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
--- 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
--- 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
 {
--- 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
 {
--- 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,
--- 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
--- 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
--- 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
--- 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);

--- 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
 {
--- 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
--- 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
--- 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
--- 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
 {
--- 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;
--- 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
--- 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
 {
--- 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
--- 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
--- 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
 {
--- 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
 {
--- 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
--- 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
--- 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
 {
--- 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
--- 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
--- 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)>;

--- 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
--- 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
 {
--- 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
 {
--- 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>

--- 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;

--- 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
--- 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,
--- 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
--- 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
--- 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
--- 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;
--- 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
--- 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
--- 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
--- 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>
--- 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
 {
--- 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"

--- 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;
--- 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;
--- 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,
--- 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
--- 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
--- 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();
--- 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;
--- 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
--- 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)
--- 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>

--- 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,
--- a/Show More
+++ b/Show More