diff --git a/Utilities/File.cpp b/Utilities/File.cpp index ec0f49c89..1adce40f5 100644 --- a/Utilities/File.cpp +++ b/Utilities/File.cpp @@ -1,8 +1,6 @@ #include "File.h" #include "mutex.h" #include "StrFmt.h" -#include "StrUtil.h" -#include "Crypto/sha1.h" #include #include @@ -18,6 +16,8 @@ using namespace std::literals::string_literals; #ifdef _WIN32 +#include "Utilities/StrUtil.h" + #include #include diff --git a/Utilities/StrFmt.cpp b/Utilities/StrFmt.cpp index dd5930333..3b55ae386 100644 --- a/Utilities/StrFmt.cpp +++ b/Utilities/StrFmt.cpp @@ -2,7 +2,6 @@ #include "StrUtil.h" #include "cfmt.h" #include "util/endian.hpp" -#include "util/logs.hpp" #include "util/v128.hpp" #include diff --git a/Utilities/Thread.h b/Utilities/Thread.h index edc488e73..52096a270 100644 --- a/Utilities/Thread.h +++ b/Utilities/Thread.h @@ -5,10 +5,6 @@ #include "util/shared_ptr.hpp" #include -#include - -#include "mutex.h" -#include "lockless.h" // Hardware core layout enum class native_core_arrangement : u32 diff --git a/Utilities/cfmt.h b/Utilities/cfmt.h index 3b2c94dcb..9d23c6f75 100644 --- a/Utilities/cfmt.h +++ b/Utilities/cfmt.h @@ -2,7 +2,6 @@ #include "util/types.hpp" #include -#include #include #include "util/asm.hpp" diff --git a/Utilities/cheat_info.cpp b/Utilities/cheat_info.cpp index 42ffb89e5..c46f2089e 100644 --- a/Utilities/cheat_info.cpp +++ b/Utilities/cheat_info.cpp @@ -1,6 +1,5 @@ #include "stdafx.h" #include "cheat_info.h" -#include "Config.h" #include "StrUtil.h" LOG_CHANNEL(log_cheat, "Cheat"); diff --git a/Utilities/cond.cpp b/Utilities/cond.cpp index af572d191..425f74d80 100644 --- a/Utilities/cond.cpp +++ b/Utilities/cond.cpp @@ -1,5 +1,4 @@ #include "cond.h" -#include "sync.h" // use constants, increase signal space diff --git a/Utilities/ppu_patch.h b/Utilities/ppu_patch.h index 667242dac..f88786cf2 100644 --- a/Utilities/ppu_patch.h +++ b/Utilities/ppu_patch.h @@ -2,7 +2,6 @@ #include #include -#include #include // Patch utilities specific to PPU code diff --git a/Utilities/sync.h b/Utilities/sync.h index 7264ba924..db46d6104 100644 --- a/Utilities/sync.h +++ b/Utilities/sync.h @@ -12,18 +12,12 @@ #include #include #elif __linux__ -#include #include #include #include #include #include #endif -#include -#include -#include -#include -#include #ifdef _WIN32 DYNAMIC_IMPORT("ntdll.dll", NtWaitForKeyedEvent, NTSTATUS(HANDLE, PVOID Key, BOOLEAN Alertable, PLARGE_INTEGER Timeout)); @@ -60,6 +54,9 @@ struct futex_waitv }; #endif #else + +#include + enum { FUTEX_PRIVATE_FLAG = 0, diff --git a/Utilities/transactional_storage.h b/Utilities/transactional_storage.h index dda86efe0..55e8aa9f9 100644 --- a/Utilities/transactional_storage.h +++ b/Utilities/transactional_storage.h @@ -1,6 +1,7 @@ #include "util/types.hpp" #include #include +#include "Emu/Cell/timers.hpp" // Thread-safe object pool with garbage collection class universal_pool diff --git a/rpcs3/Crypto/ec.cpp b/rpcs3/Crypto/ec.cpp index a4b11d7c3..efef91228 100644 --- a/rpcs3/Crypto/ec.cpp +++ b/rpcs3/Crypto/ec.cpp @@ -2,7 +2,7 @@ // Licensed under the terms of the GNU GPL, version 2 // http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt -#include "utils.h" +#include "util/types.hpp" #include static inline int bn_compare(u8* a, u8* b, u32 n) diff --git a/rpcs3/Crypto/lz.cpp b/rpcs3/Crypto/lz.cpp index da2b05c36..30e201c5f 100644 --- a/rpcs3/Crypto/lz.cpp +++ b/rpcs3/Crypto/lz.cpp @@ -2,6 +2,7 @@ // Licensed under the terms of the GNU GPL, version 2.0 or later versions. // http://www.gnu.org/licenses/gpl-2.0.txt +#include #include "lz.h" void decode_range(unsigned int *range, unsigned int *code, unsigned char **src) diff --git a/rpcs3/Crypto/lz.h b/rpcs3/Crypto/lz.h index b8ad0f3a0..5ad68ea66 100644 --- a/rpcs3/Crypto/lz.h +++ b/rpcs3/Crypto/lz.h @@ -6,8 +6,6 @@ // Reverse-engineered custom Lempel–Ziv–Markov based compression. -#include - void decode_range(unsigned int *range, unsigned int *code, unsigned char **src); int decode_bit(unsigned int *range, unsigned int *code, int *index, unsigned char **src, unsigned char *c); int decode_number(unsigned char *ptr, int index, int *bit_flag, unsigned int *range, unsigned int *code, unsigned char **src); diff --git a/rpcs3/Crypto/unedat.cpp b/rpcs3/Crypto/unedat.cpp index 019226529..d7eacd5ca 100644 --- a/rpcs3/Crypto/unedat.cpp +++ b/rpcs3/Crypto/unedat.cpp @@ -4,6 +4,7 @@ #include "sha1.h" #include "lz.h" #include "ec.h" +#include "utils.h" #include "Emu/system_utils.hpp" diff --git a/rpcs3/Crypto/unedat.h b/rpcs3/Crypto/unedat.h index fa26da2f4..31fce60d4 100644 --- a/rpcs3/Crypto/unedat.h +++ b/rpcs3/Crypto/unedat.h @@ -1,9 +1,6 @@ #pragma once #include - -#include "utils.h" - #include "Utilities/File.h" constexpr u32 SDAT_FLAG = 0x01000000; diff --git a/rpcs3/Crypto/unpkg.cpp b/rpcs3/Crypto/unpkg.cpp index 5bd04e7e4..baf612657 100644 --- a/rpcs3/Crypto/unpkg.cpp +++ b/rpcs3/Crypto/unpkg.cpp @@ -5,7 +5,6 @@ #include "util/logs.hpp" #include "Utilities/StrUtil.h" #include "Utilities/Thread.h" -#include "Utilities/mutex.h" #include "Emu/System.h" #include "Emu/system_utils.hpp" #include "Emu/VFS.h" diff --git a/rpcs3/Crypto/unself.cpp b/rpcs3/Crypto/unself.cpp index e6a112e92..66000c4f1 100644 --- a/rpcs3/Crypto/unself.cpp +++ b/rpcs3/Crypto/unself.cpp @@ -1,14 +1,11 @@ #include "stdafx.h" #include "aes.h" -#include "utils.h" #include "unself.h" -#include "Emu/VFS.h" +#include "util/asm.hpp" #include "Emu/System.h" #include "Emu/system_utils.hpp" #include "Crypto/unzip.h" -#include - inline u8 Read8(const fs::file& f) { u8 ret; diff --git a/rpcs3/Crypto/utils.h b/rpcs3/Crypto/utils.h index b7e4634f0..25cdeb719 100644 --- a/rpcs3/Crypto/utils.h +++ b/rpcs3/Crypto/utils.h @@ -5,7 +5,6 @@ // http://www.gnu.org/licenses/gpl-2.0.txt #include "util/types.hpp" -#include "util/asm.hpp" #include diff --git a/rpcs3/Emu/Audio/AudioBackend.cpp b/rpcs3/Emu/Audio/AudioBackend.cpp index 73c017eef..e0d96c8c2 100644 --- a/rpcs3/Emu/Audio/AudioBackend.cpp +++ b/rpcs3/Emu/Audio/AudioBackend.cpp @@ -1,6 +1,5 @@ #include "stdafx.h" #include "AudioBackend.h" -#include "Emu/system_config.h" #include "Emu/IdManager.h" #include "Emu//Cell/Modules/cellAudioOut.h" diff --git a/rpcs3/Emu/Audio/Cubeb/CubebBackend.h b/rpcs3/Emu/Audio/Cubeb/CubebBackend.h index f8c53e7e8..fac9b90e4 100644 --- a/rpcs3/Emu/Audio/Cubeb/CubebBackend.h +++ b/rpcs3/Emu/Audio/Cubeb/CubebBackend.h @@ -1,7 +1,5 @@ #pragma once -#include -#include "Utilities/mutex.h" #include "util/atomic.hpp" #include "Emu/Audio/AudioBackend.h" diff --git a/rpcs3/Emu/Audio/FAudio/FAudioBackend.cpp b/rpcs3/Emu/Audio/FAudio/FAudioBackend.cpp index 58cd189e7..d0e5728b2 100644 --- a/rpcs3/Emu/Audio/FAudio/FAudioBackend.cpp +++ b/rpcs3/Emu/Audio/FAudio/FAudioBackend.cpp @@ -4,7 +4,6 @@ #include "stdafx.h" #include "FAudioBackend.h" -#include "Emu/system_config.h" #include "Emu/System.h" #include "Emu/Audio/audio_device_enumerator.h" #include "Utilities/StrUtil.h" diff --git a/rpcs3/Emu/Audio/FAudio/FAudioBackend.h b/rpcs3/Emu/Audio/FAudio/FAudioBackend.h index 3f3d6e2ef..734f56156 100644 --- a/rpcs3/Emu/Audio/FAudio/FAudioBackend.h +++ b/rpcs3/Emu/Audio/FAudio/FAudioBackend.h @@ -4,8 +4,6 @@ #error "FAudio support disabled but still being built." #endif -#include -#include "Utilities/mutex.h" #include "Emu/Audio/AudioBackend.h" #include "FAudio.h" diff --git a/rpcs3/Emu/Audio/FAudio/faudio_enumerator.cpp b/rpcs3/Emu/Audio/FAudio/faudio_enumerator.cpp index 7308f54b1..fdbfd2a6a 100644 --- a/rpcs3/Emu/Audio/FAudio/faudio_enumerator.cpp +++ b/rpcs3/Emu/Audio/FAudio/faudio_enumerator.cpp @@ -3,7 +3,6 @@ #endif #include "Emu/Audio/FAudio/faudio_enumerator.h" -#include #include #include "Utilities/StrUtil.h" #include "util/logs.hpp" diff --git a/rpcs3/Emu/Audio/XAudio2/XAudio2Backend.h b/rpcs3/Emu/Audio/XAudio2/XAudio2Backend.h index e03cf6cc5..0312e7f63 100644 --- a/rpcs3/Emu/Audio/XAudio2/XAudio2Backend.h +++ b/rpcs3/Emu/Audio/XAudio2/XAudio2Backend.h @@ -4,8 +4,6 @@ #error "XAudio2 can only be built on Windows." #endif -#include -#include "Utilities/mutex.h" #include "Emu/Audio/AudioBackend.h" #include diff --git a/rpcs3/Emu/CPU/CPUTranslator.cpp b/rpcs3/Emu/CPU/CPUTranslator.cpp index 7c9550ead..f6893358f 100644 --- a/rpcs3/Emu/CPU/CPUTranslator.cpp +++ b/rpcs3/Emu/CPU/CPUTranslator.cpp @@ -3,7 +3,6 @@ #include "CPUTranslator.h" #include "util/v128.hpp" -#include "util/simd.hpp" #include "util/logs.hpp" LOG_CHANNEL(llvm_log, "LLVM"); diff --git a/rpcs3/Emu/CPU/CPUTranslator.h b/rpcs3/Emu/CPU/CPUTranslator.h index 56612b827..7bab6b335 100644 --- a/rpcs3/Emu/CPU/CPUTranslator.h +++ b/rpcs3/Emu/CPU/CPUTranslator.h @@ -21,7 +21,6 @@ #include "llvm/IR/Module.h" #include "llvm/Target/TargetMachine.h" #include "llvm/Support/KnownBits.h" -#include "llvm/Support/ModRef.h" #include "llvm/Analysis/ConstantFolding.h" #include "llvm/Analysis/ValueTracking.h" #include "llvm/IR/IntrinsicsX86.h" @@ -37,7 +36,6 @@ #include "util/types.hpp" #include "util/sysinfo.hpp" #include "Utilities/StrFmt.h" -#include "Utilities/BitField.h" #include "Utilities/JIT.h" #include "util/v128.hpp" diff --git a/rpcs3/Emu/Cell/Modules/HLE_PATCHES.cpp b/rpcs3/Emu/Cell/Modules/HLE_PATCHES.cpp index 0d5fa62f6..8b3ad0b63 100644 --- a/rpcs3/Emu/Cell/Modules/HLE_PATCHES.cpp +++ b/rpcs3/Emu/Cell/Modules/HLE_PATCHES.cpp @@ -4,7 +4,6 @@ #include "Utilities/Thread.h" #include "Emu/Cell/lv2/sys_spu.h" -#include "Emu/Cell/lv2/sys_sync.h" #include diff --git a/rpcs3/Emu/Cell/Modules/cellAudio.cpp b/rpcs3/Emu/Cell/Modules/cellAudio.cpp index ebb5b134e..379c17f11 100644 --- a/rpcs3/Emu/Cell/Modules/cellAudio.cpp +++ b/rpcs3/Emu/Cell/Modules/cellAudio.cpp @@ -3,9 +3,9 @@ #include "Emu/system_config.h" #include "Emu/Audio/audio_utils.h" #include "Emu/Cell/PPUModule.h" +#include "Emu/Cell/timers.hpp" #include "Emu/Cell/lv2/sys_process.h" #include "Emu/Cell/lv2/sys_event.h" -#include "Emu/Cell/Modules/cellAudioOut.h" #include "cellAudio.h" #include "util/video_provider.h" diff --git a/rpcs3/Emu/Cell/Modules/cellAudioIn.h b/rpcs3/Emu/Cell/Modules/cellAudioIn.h index a630ce47c..dc2ca6d13 100644 --- a/rpcs3/Emu/Cell/Modules/cellAudioIn.h +++ b/rpcs3/Emu/Cell/Modules/cellAudioIn.h @@ -1,7 +1,6 @@ #pragma once #include "util/types.hpp" -#include "util/endian.hpp" // Error codes enum CellAudioInError : u32 diff --git a/rpcs3/Emu/Cell/Modules/cellCamera.cpp b/rpcs3/Emu/Cell/Modules/cellCamera.cpp index 39274e816..6c0abcc16 100644 --- a/rpcs3/Emu/Cell/Modules/cellCamera.cpp +++ b/rpcs3/Emu/Cell/Modules/cellCamera.cpp @@ -6,6 +6,7 @@ #include "Emu/Cell/PPUModule.h" #include "Emu/Cell/lv2/sys_event.h" #include "Emu/IdManager.h" +#include "Emu/Cell/timers.hpp" #include diff --git a/rpcs3/Emu/Cell/Modules/cellCamera.h b/rpcs3/Emu/Cell/Modules/cellCamera.h index 28e8a3152..56b8334c4 100644 --- a/rpcs3/Emu/Cell/Modules/cellCamera.h +++ b/rpcs3/Emu/Cell/Modules/cellCamera.h @@ -1,9 +1,9 @@ #pragma once -#include "Utilities/Timer.h" -#include "Emu/Cell/lv2/sys_memory.h" #include "Utilities/Thread.h" #include "Emu/Io/camera_handler_base.h" +#include "Emu/Memory/vm_ptr.h" +#include "Utilities/mutex.h" #include diff --git a/rpcs3/Emu/Cell/Modules/cellDmux.cpp b/rpcs3/Emu/Cell/Modules/cellDmux.cpp index 5c94463ea..d7f6f84f3 100644 --- a/rpcs3/Emu/Cell/Modules/cellDmux.cpp +++ b/rpcs3/Emu/Cell/Modules/cellDmux.cpp @@ -9,6 +9,8 @@ #include "util/asm.hpp" +#include + LOG_CHANNEL(cellDmux); template <> diff --git a/rpcs3/Emu/Cell/Modules/cellDmux.h b/rpcs3/Emu/Cell/Modules/cellDmux.h index 884a3eb05..176716528 100644 --- a/rpcs3/Emu/Cell/Modules/cellDmux.h +++ b/rpcs3/Emu/Cell/Modules/cellDmux.h @@ -1,6 +1,7 @@ #pragma once #include "Emu/Memory/vm_ptr.h" +#include "cellPamf.h" // Error Codes enum CellDmuxError :u32 diff --git a/rpcs3/Emu/Cell/Modules/cellDmuxPamf.cpp b/rpcs3/Emu/Cell/Modules/cellDmuxPamf.cpp index a7b24c397..70162d403 100644 --- a/rpcs3/Emu/Cell/Modules/cellDmuxPamf.cpp +++ b/rpcs3/Emu/Cell/Modules/cellDmuxPamf.cpp @@ -2,7 +2,6 @@ #include "Emu/Cell/PPUModule.h" #include "Emu/IdManager.h" -#include "cellPamf.h" #include "cellDmux.h" #include "cellDmuxPamf.h" diff --git a/rpcs3/Emu/Cell/Modules/cellGame.cpp b/rpcs3/Emu/Cell/Modules/cellGame.cpp index 6534d0767..17e190898 100644 --- a/rpcs3/Emu/Cell/Modules/cellGame.cpp +++ b/rpcs3/Emu/Cell/Modules/cellGame.cpp @@ -6,6 +6,7 @@ #include "Emu/IdManager.h" #include "Emu/Cell/ErrorCodes.h" #include "Emu/Cell/PPUModule.h" +#include "Emu/Cell/timers.hpp" #include "Emu/Cell/lv2/sys_fs.h" #include "Emu/Cell/lv2/sys_sync.h" diff --git a/rpcs3/Emu/Cell/Modules/cellGem.cpp b/rpcs3/Emu/Cell/Modules/cellGem.cpp index ad50282de..f051b6713 100644 --- a/rpcs3/Emu/Cell/Modules/cellGem.cpp +++ b/rpcs3/Emu/Cell/Modules/cellGem.cpp @@ -3,6 +3,7 @@ #include "cellCamera.h" #include "Emu/Cell/lv2/sys_event.h" +#include "Emu/Cell/lv2/sys_memory.h" #include "Emu/Cell/PPUModule.h" #include "Emu/Cell/timers.hpp" #include "Emu/Io/MouseHandler.h" diff --git a/rpcs3/Emu/Cell/Modules/cellGifDec.cpp b/rpcs3/Emu/Cell/Modules/cellGifDec.cpp index 80242686c..9a49e03ec 100644 --- a/rpcs3/Emu/Cell/Modules/cellGifDec.cpp +++ b/rpcs3/Emu/Cell/Modules/cellGifDec.cpp @@ -9,8 +9,6 @@ #include "Emu/Cell/lv2/sys_fs.h" #include "cellGifDec.h" -#include "util/asm.hpp" - LOG_CHANNEL(cellGifDec); // Temporarily diff --git a/rpcs3/Emu/Cell/Modules/cellJpgDec.cpp b/rpcs3/Emu/Cell/Modules/cellJpgDec.cpp index 124531826..be72ce429 100644 --- a/rpcs3/Emu/Cell/Modules/cellJpgDec.cpp +++ b/rpcs3/Emu/Cell/Modules/cellJpgDec.cpp @@ -9,8 +9,6 @@ #include "Emu/Cell/lv2/sys_fs.h" #include "cellJpgDec.h" -#include "util/asm.hpp" - LOG_CHANNEL(cellJpgDec); // Temporarily diff --git a/rpcs3/Emu/Cell/Modules/cellKey2char.cpp b/rpcs3/Emu/Cell/Modules/cellKey2char.cpp index bbe7e186f..ba09a702b 100644 --- a/rpcs3/Emu/Cell/Modules/cellKey2char.cpp +++ b/rpcs3/Emu/Cell/Modules/cellKey2char.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "Emu/Cell/PPUModule.h" -#include "cellKb.h" +#include "Emu/Io/Keyboard.h" LOG_CHANNEL(cellKey2char); diff --git a/rpcs3/Emu/Cell/Modules/cellL10n.cpp b/rpcs3/Emu/Cell/Modules/cellL10n.cpp index 0dd3a8fd9..6b3ffc444 100644 --- a/rpcs3/Emu/Cell/Modules/cellL10n.cpp +++ b/rpcs3/Emu/Cell/Modules/cellL10n.cpp @@ -16,8 +16,6 @@ typedef const char *HostCode; #include "cellL10n.h" -#include "util/asm.hpp" - LOG_CHANNEL(cellL10n); // Translate code id to code name. some codepage may has another name. diff --git a/rpcs3/Emu/Cell/Modules/cellMic.cpp b/rpcs3/Emu/Cell/Modules/cellMic.cpp index a26050d87..86e4b8baf 100644 --- a/rpcs3/Emu/Cell/Modules/cellMic.cpp +++ b/rpcs3/Emu/Cell/Modules/cellMic.cpp @@ -1,5 +1,4 @@ #include "stdafx.h" -#include "Emu/System.h" #include "Emu/system_config.h" #include "Emu/Cell/PPUModule.h" #include "Utilities/StrUtil.h" @@ -10,6 +9,8 @@ #include +#include "3rdparty/OpenAL/openal-soft/include/AL/alext.h" + LOG_CHANNEL(cellMic); template<> diff --git a/rpcs3/Emu/Cell/Modules/cellMic.h b/rpcs3/Emu/Cell/Modules/cellMic.h index 3fbe5fba1..b00848218 100644 --- a/rpcs3/Emu/Cell/Modules/cellMic.h +++ b/rpcs3/Emu/Cell/Modules/cellMic.h @@ -1,9 +1,8 @@ #pragma once #include "Utilities/Thread.h" -#include "Emu/Cell/timers.hpp" - -#include "3rdparty/OpenAL/openal-soft/include/AL/alext.h" +#include "3rdparty/OpenAL/openal-soft/include/AL/alc.h" +#include "Utilities/mutex.h" // Error Codes enum CellMicInError : u32 diff --git a/rpcs3/Emu/Cell/Modules/cellMouse.cpp b/rpcs3/Emu/Cell/Modules/cellMouse.cpp index 8b8d54715..8bf550a63 100644 --- a/rpcs3/Emu/Cell/Modules/cellMouse.cpp +++ b/rpcs3/Emu/Cell/Modules/cellMouse.cpp @@ -1,6 +1,5 @@ #include "stdafx.h" #include "Emu/IdManager.h" -#include "Emu/System.h" #include "Emu/Cell/PPUModule.h" #include "Emu/Io/MouseHandler.h" diff --git a/rpcs3/Emu/Cell/Modules/cellMusicDecode.cpp b/rpcs3/Emu/Cell/Modules/cellMusicDecode.cpp index 673bed1de..c938f723b 100644 --- a/rpcs3/Emu/Cell/Modules/cellMusicDecode.cpp +++ b/rpcs3/Emu/Cell/Modules/cellMusicDecode.cpp @@ -12,9 +12,6 @@ #include "cellSysutil.h" #include "util/media_utils.h" -#include - - LOG_CHANNEL(cellMusicDecode); template<> diff --git a/rpcs3/Emu/Cell/Modules/cellMusicExport.cpp b/rpcs3/Emu/Cell/Modules/cellMusicExport.cpp index 752d7db39..c01d4b7a5 100644 --- a/rpcs3/Emu/Cell/Modules/cellMusicExport.cpp +++ b/rpcs3/Emu/Cell/Modules/cellMusicExport.cpp @@ -2,7 +2,6 @@ #include "Emu/Cell/PPUModule.h" #include "Emu/IdManager.h" #include "Emu/VFS.h" -#include "Utilities/StrUtil.h" #include "cellSysutil.h" LOG_CHANNEL(cellMusicExport); diff --git a/rpcs3/Emu/Cell/Modules/cellNetCtl.cpp b/rpcs3/Emu/Cell/Modules/cellNetCtl.cpp index e4b4fc82f..97375c4e6 100644 --- a/rpcs3/Emu/Cell/Modules/cellNetCtl.cpp +++ b/rpcs3/Emu/Cell/Modules/cellNetCtl.cpp @@ -2,7 +2,6 @@ #include "Emu/system_config.h" #include "Emu/Cell/PPUModule.h" #include "Emu/IdManager.h" -#include "Emu/Cell/lv2/sys_sync.h" #include "cellGame.h" #include "cellSysutil.h" diff --git a/rpcs3/Emu/Cell/Modules/cellOskDialog.cpp b/rpcs3/Emu/Cell/Modules/cellOskDialog.cpp index ecf20643a..5b2c45e99 100644 --- a/rpcs3/Emu/Cell/Modules/cellOskDialog.cpp +++ b/rpcs3/Emu/Cell/Modules/cellOskDialog.cpp @@ -1,6 +1,5 @@ #include "stdafx.h" #include "Emu/System.h" -#include "Emu/system_config.h" #include "Emu/Cell/PPUModule.h" #include "Emu/Io/interception.h" #include "Emu/Io/Keyboard.h" diff --git a/rpcs3/Emu/Cell/Modules/cellPad.cpp b/rpcs3/Emu/Cell/Modules/cellPad.cpp index 74b3c5fc6..39ee7d035 100644 --- a/rpcs3/Emu/Cell/Modules/cellPad.cpp +++ b/rpcs3/Emu/Cell/Modules/cellPad.cpp @@ -3,7 +3,6 @@ #include "Emu/system_config.h" #include "Emu/Cell/PPUModule.h" #include "Emu/Cell/lv2/sys_process.h" -#include "Emu/Cell/lv2/sys_sync.h" #include "Emu/Io/pad_types.h" #include "Emu/RSX/Overlays/overlay_debug_overlay.h" #include "Input/pad_thread.h" diff --git a/rpcs3/Emu/Cell/Modules/cellPhotoDecode.cpp b/rpcs3/Emu/Cell/Modules/cellPhotoDecode.cpp index 843a0adc2..5cef4ba87 100644 --- a/rpcs3/Emu/Cell/Modules/cellPhotoDecode.cpp +++ b/rpcs3/Emu/Cell/Modules/cellPhotoDecode.cpp @@ -1,6 +1,5 @@ #include "stdafx.h" #include "Emu/Cell/PPUModule.h" -#include "Emu/IdManager.h" #include "Emu/VFS.h" #include "Emu/System.h" #include "cellSysutil.h" diff --git a/rpcs3/Emu/Cell/Modules/cellPhotoExport.cpp b/rpcs3/Emu/Cell/Modules/cellPhotoExport.cpp index 34a156215..8a264bc72 100644 --- a/rpcs3/Emu/Cell/Modules/cellPhotoExport.cpp +++ b/rpcs3/Emu/Cell/Modules/cellPhotoExport.cpp @@ -2,7 +2,6 @@ #include "Emu/Cell/PPUModule.h" #include "Emu/IdManager.h" #include "Emu/VFS.h" -#include "Utilities/StrUtil.h" #include "cellSysutil.h" LOG_CHANNEL(cellPhotoExport); diff --git a/rpcs3/Emu/Cell/Modules/cellPhotoImport.cpp b/rpcs3/Emu/Cell/Modules/cellPhotoImport.cpp index d1cbdc2b5..d56db1f06 100644 --- a/rpcs3/Emu/Cell/Modules/cellPhotoImport.cpp +++ b/rpcs3/Emu/Cell/Modules/cellPhotoImport.cpp @@ -1,5 +1,6 @@ #include "stdafx.h" #include "Emu/Cell/PPUModule.h" +#include "Emu/IdManager.h" #include "Emu/Cell/lv2/sys_fs.h" #include "Emu/RSX/Overlays/overlay_media_list_dialog.h" #include "Emu/VFS.h" diff --git a/rpcs3/Emu/Cell/Modules/cellPngEnc.cpp b/rpcs3/Emu/Cell/Modules/cellPngEnc.cpp index f723ddf88..c6da0c4e9 100644 --- a/rpcs3/Emu/Cell/Modules/cellPngEnc.cpp +++ b/rpcs3/Emu/Cell/Modules/cellPngEnc.cpp @@ -2,7 +2,6 @@ #include "Emu/Cell/PPUModule.h" #include "Emu/IdManager.h" #include "cellPngEnc.h" -#include "png.h" LOG_CHANNEL(cellPngEnc); diff --git a/rpcs3/Emu/Cell/Modules/cellResc.cpp b/rpcs3/Emu/Cell/Modules/cellResc.cpp index a3cc052d6..065039b7f 100644 --- a/rpcs3/Emu/Cell/Modules/cellResc.cpp +++ b/rpcs3/Emu/Cell/Modules/cellResc.cpp @@ -3,6 +3,7 @@ #include "Emu/Cell/PPUModule.h" #include "Emu/RSX/GCM.h" +#include "Emu/RSX/gcm_enums.h" #include "cellResc.h" #include "cellVideoOut.h" diff --git a/rpcs3/Emu/Cell/Modules/cellSail.h b/rpcs3/Emu/Cell/Modules/cellSail.h index 7cad924f6..2b34e015b 100644 --- a/rpcs3/Emu/Cell/Modules/cellSail.h +++ b/rpcs3/Emu/Cell/Modules/cellSail.h @@ -2,8 +2,6 @@ #include "cellVpost.h" -#include "Emu/Memory/vm_ptr.h" - // Error Codes enum CellSailError : u32 { diff --git a/rpcs3/Emu/Cell/Modules/cellSailRec.cpp b/rpcs3/Emu/Cell/Modules/cellSailRec.cpp index e6d7d58e5..c7a3cba54 100644 --- a/rpcs3/Emu/Cell/Modules/cellSailRec.cpp +++ b/rpcs3/Emu/Cell/Modules/cellSailRec.cpp @@ -1,6 +1,5 @@ #include "stdafx.h" #include "Emu/Cell/PPUModule.h" -#include "cellSail.h" LOG_CHANNEL(cellSailRec); diff --git a/rpcs3/Emu/Cell/Modules/cellSaveData.cpp b/rpcs3/Emu/Cell/Modules/cellSaveData.cpp index 4ce8be031..be7583074 100644 --- a/rpcs3/Emu/Cell/Modules/cellSaveData.cpp +++ b/rpcs3/Emu/Cell/Modules/cellSaveData.cpp @@ -8,6 +8,7 @@ #include "Emu/Cell/lv2/sys_sync.h" #include "Emu/Cell/lv2/sys_process.h" #include "Emu/Cell/PPUModule.h" +#include "Emu/Cell/timers.hpp" #include "Emu/Cell/Modules/cellSysutil.h" #include "Emu/Cell/Modules/cellUserInfo.h" #include "Emu/RSX/Overlays/overlay_message.h" @@ -19,6 +20,7 @@ #include "Loader/PSF.h" #include "Utilities/StrUtil.h" #include "Utilities/date_time.h" +#include "Utilities/sema.h" #include #include diff --git a/rpcs3/Emu/Cell/Modules/cellSaveData.h b/rpcs3/Emu/Cell/Modules/cellSaveData.h index c88a4a3f9..73b0af4f0 100644 --- a/rpcs3/Emu/Cell/Modules/cellSaveData.h +++ b/rpcs3/Emu/Cell/Modules/cellSaveData.h @@ -1,7 +1,6 @@ #pragma once #include "util/types.hpp" -#include "util/endian.hpp" #include "Emu/Memory/vm_ptr.h" #include #include diff --git a/rpcs3/Emu/Cell/Modules/cellSpurs.cpp b/rpcs3/Emu/Cell/Modules/cellSpurs.cpp index 8f3469e03..e35d154ee 100644 --- a/rpcs3/Emu/Cell/Modules/cellSpurs.cpp +++ b/rpcs3/Emu/Cell/Modules/cellSpurs.cpp @@ -1,7 +1,6 @@ #include "stdafx.h" #include "Emu/System.h" #include "Emu/system_config.h" -#include "Emu/IdManager.h" #include "Emu/Memory/vm_reservation.h" #include "Emu/Cell/PPUModule.h" #include "Emu/Cell/SPUThread.h" diff --git a/rpcs3/Emu/Cell/Modules/cellSpurs.h b/rpcs3/Emu/Cell/Modules/cellSpurs.h index b06cbd079..f4be6d84d 100644 --- a/rpcs3/Emu/Cell/Modules/cellSpurs.h +++ b/rpcs3/Emu/Cell/Modules/cellSpurs.h @@ -4,6 +4,10 @@ #include "util/v128.hpp" +#include "Emu/Cell/lv2/sys_lwmutex.h" +#include "Emu/Cell/lv2/sys_lwcond.h" +#include "Emu/Cell/lv2/sys_spu.h" + struct CellSpurs; struct CellSpursTaskset; diff --git a/rpcs3/Emu/Cell/Modules/cellSpursJq.cpp b/rpcs3/Emu/Cell/Modules/cellSpursJq.cpp index dfbc3e096..b2cb3e486 100644 --- a/rpcs3/Emu/Cell/Modules/cellSpursJq.cpp +++ b/rpcs3/Emu/Cell/Modules/cellSpursJq.cpp @@ -1,9 +1,6 @@ #include "stdafx.h" #include "Emu/Cell/PPUModule.h" -#include "Emu/Cell/lv2/sys_spu.h" -#include "cellSpursJq.h" - LOG_CHANNEL(cellSpursJq); error_code cellSpursJobQueueAttributeInitialize() diff --git a/rpcs3/Emu/Cell/Modules/cellSpursSpu.cpp b/rpcs3/Emu/Cell/Modules/cellSpursSpu.cpp index 435fa1636..43b3e04c8 100644 --- a/rpcs3/Emu/Cell/Modules/cellSpursSpu.cpp +++ b/rpcs3/Emu/Cell/Modules/cellSpursSpu.cpp @@ -4,9 +4,6 @@ #include "Emu/Memory/vm_reservation.h" #include "Emu/Cell/SPUThread.h" #include "Emu/Cell/SPURecompiler.h" -#include "Emu/Cell/lv2/sys_lwmutex.h" -#include "Emu/Cell/lv2/sys_lwcond.h" -#include "Emu/Cell/lv2/sys_spu.h" #include "cellSpurs.h" #include "util/asm.hpp" diff --git a/rpcs3/Emu/Cell/Modules/cellVideoExport.cpp b/rpcs3/Emu/Cell/Modules/cellVideoExport.cpp index 8ee6238c6..8c0ed9377 100644 --- a/rpcs3/Emu/Cell/Modules/cellVideoExport.cpp +++ b/rpcs3/Emu/Cell/Modules/cellVideoExport.cpp @@ -2,7 +2,6 @@ #include "Emu/Cell/PPUModule.h" #include "Emu/IdManager.h" #include "Emu/VFS.h" -#include "Utilities/StrUtil.h" #include "cellSysutil.h" LOG_CHANNEL(cellVideoExport); diff --git a/rpcs3/Emu/Cell/Modules/cellVoice.h b/rpcs3/Emu/Cell/Modules/cellVoice.h index 80fac88c2..2b269f50c 100644 --- a/rpcs3/Emu/Cell/Modules/cellVoice.h +++ b/rpcs3/Emu/Cell/Modules/cellVoice.h @@ -1,8 +1,5 @@ #pragma once -#include -#include - // libvoice = 0x80310801 - 0x803108ff // libvoice version 100 diff --git a/rpcs3/Emu/Cell/Modules/cellWebBrowser.cpp b/rpcs3/Emu/Cell/Modules/cellWebBrowser.cpp index 8a9991b08..7f560c9ca 100644 --- a/rpcs3/Emu/Cell/Modules/cellWebBrowser.cpp +++ b/rpcs3/Emu/Cell/Modules/cellWebBrowser.cpp @@ -4,6 +4,8 @@ #include "cellWebBrowser.h" #include "Emu/IdManager.h" +#include "cellSysutil.h" + LOG_CHANNEL(cellSysutil); struct browser_info diff --git a/rpcs3/Emu/Cell/Modules/cellWebBrowser.h b/rpcs3/Emu/Cell/Modules/cellWebBrowser.h index 7a66f5b42..6c46c581b 100644 --- a/rpcs3/Emu/Cell/Modules/cellWebBrowser.h +++ b/rpcs3/Emu/Cell/Modules/cellWebBrowser.h @@ -1,7 +1,5 @@ #pragma once -#include "cellSysutil.h" - #include "Emu/Memory/vm_ptr.h" //events diff --git a/rpcs3/Emu/Cell/Modules/sceNp.cpp b/rpcs3/Emu/Cell/Modules/sceNp.cpp index fb9f46a36..9a8e0dba6 100644 --- a/rpcs3/Emu/Cell/Modules/sceNp.cpp +++ b/rpcs3/Emu/Cell/Modules/sceNp.cpp @@ -1,7 +1,6 @@ #include "stdafx.h" #include "Emu/System.h" #include "Emu/system_utils.hpp" -#include "Emu/VFS.h" #include "Emu/Cell/PPUModule.h" #include "Emu/Cell/Modules/cellUserInfo.h" #include "Emu/Io/interception.h" @@ -15,6 +14,7 @@ #include "sceNp.h" #include "cellSysutil.h" +#include "Emu/Cell/timers.hpp" #include "Emu/Cell/lv2/sys_time.h" #include "Emu/Cell/lv2/sys_fs.h" #include "Emu/Cell/lv2/sys_sync.h" @@ -22,6 +22,7 @@ #include "Emu/NP/np_contexts.h" #include "Emu/NP/np_helpers.h" #include "Emu/NP/np_structs_extra.h" +#include "Emu/NP/signaling_handler.h" #include "Emu/system_config.h" #include "Emu/RSX/Overlays/overlay_manager.h" diff --git a/rpcs3/Emu/Cell/Modules/sceNp.h b/rpcs3/Emu/Cell/Modules/sceNp.h index e6a1bdc7e..0d425df15 100644 --- a/rpcs3/Emu/Cell/Modules/sceNp.h +++ b/rpcs3/Emu/Cell/Modules/sceNp.h @@ -2,6 +2,7 @@ #include "cellRtc.h" #include "Emu/Cell/ErrorCodes.h" +#include "util/shared_ptr.hpp" #include diff --git a/rpcs3/Emu/Cell/Modules/sceNp2.cpp b/rpcs3/Emu/Cell/Modules/sceNp2.cpp index 174a9ec0c..ed4655ccd 100644 --- a/rpcs3/Emu/Cell/Modules/sceNp2.cpp +++ b/rpcs3/Emu/Cell/Modules/sceNp2.cpp @@ -7,6 +7,7 @@ #include "Emu/NP/np_handler.h" #include "Emu/NP/np_contexts.h" #include "Emu/NP/np_helpers.h" +#include "Emu/NP/signaling_handler.h" #include "cellSysutil.h" LOG_CHANNEL(sceNp2); diff --git a/rpcs3/Emu/Cell/Modules/sceNpTrophy.cpp b/rpcs3/Emu/Cell/Modules/sceNpTrophy.cpp index 3be057105..0fc2cc505 100644 --- a/rpcs3/Emu/Cell/Modules/sceNpTrophy.cpp +++ b/rpcs3/Emu/Cell/Modules/sceNpTrophy.cpp @@ -4,6 +4,7 @@ #include "Emu/VFS.h" #include "Emu/IdManager.h" #include "Emu/Cell/PPUModule.h" +#include "Emu/Cell/timers.hpp" #include "Emu/Cell/Modules/cellMsgDialog.h" #include "Utilities/rXml.h" diff --git a/rpcs3/Emu/Cell/Modules/sceNpTrophy.h b/rpcs3/Emu/Cell/Modules/sceNpTrophy.h index f97050c96..dfea517fe 100644 --- a/rpcs3/Emu/Cell/Modules/sceNpTrophy.h +++ b/rpcs3/Emu/Cell/Modules/sceNpTrophy.h @@ -1,10 +1,10 @@ #pragma once #include "util/types.hpp" -#include "util/endian.hpp" #include "Emu/Memory/vm_ptr.h" #include "Emu/Cell/ErrorCodes.h" #include +#include // Error codes enum SceNpTrophyError : u32 diff --git a/rpcs3/Emu/Cell/Modules/sys_heap.cpp b/rpcs3/Emu/Cell/Modules/sys_heap.cpp index a502e2648..c0ba4fb2d 100644 --- a/rpcs3/Emu/Cell/Modules/sys_heap.cpp +++ b/rpcs3/Emu/Cell/Modules/sys_heap.cpp @@ -2,8 +2,6 @@ #include "Emu/IdManager.h" #include "Emu/Cell/PPUModule.h" -#include "sysPrxForUser.h" - LOG_CHANNEL(sysPrxForUser); struct HeapInfo diff --git a/rpcs3/Emu/Cell/Modules/sys_lwmutex_.cpp b/rpcs3/Emu/Cell/Modules/sys_lwmutex_.cpp index a9ec0b5b3..098761b25 100644 --- a/rpcs3/Emu/Cell/Modules/sys_lwmutex_.cpp +++ b/rpcs3/Emu/Cell/Modules/sys_lwmutex_.cpp @@ -2,7 +2,7 @@ #include "Emu/System.h" #include "Emu/system_config.h" #include "Emu/Cell/PPUModule.h" - +#include "Emu/Cell/timers.hpp" #include "Emu/Cell/lv2/sys_lwmutex.h" #include "Emu/Cell/lv2/sys_mutex.h" #include "sysPrxForUser.h" diff --git a/rpcs3/Emu/Cell/Modules/sys_mempool.cpp b/rpcs3/Emu/Cell/Modules/sys_mempool.cpp index b7ffa7298..2446619d3 100644 --- a/rpcs3/Emu/Cell/Modules/sys_mempool.cpp +++ b/rpcs3/Emu/Cell/Modules/sys_mempool.cpp @@ -7,8 +7,6 @@ #include "Emu/Cell/lv2/sys_mutex.h" #include "Emu/Cell/lv2/sys_cond.h" -#include "sysPrxForUser.h" - LOG_CHANNEL(sysPrxForUser); using sys_mempool_t = u32; diff --git a/rpcs3/Emu/Cell/Modules/sys_net_.cpp b/rpcs3/Emu/Cell/Modules/sys_net_.cpp index f566bd207..9e487aa8e 100644 --- a/rpcs3/Emu/Cell/Modules/sys_net_.cpp +++ b/rpcs3/Emu/Cell/Modules/sys_net_.cpp @@ -1,7 +1,5 @@ #include "stdafx.h" #include "Emu/Cell/PPUModule.h" -#include "Emu/IdManager.h" - #include "sys_net_.h" LOG_CHANNEL(libnet); diff --git a/rpcs3/Emu/Cell/Modules/sys_net_.h b/rpcs3/Emu/Cell/Modules/sys_net_.h index c49a65e26..9ee344b97 100644 --- a/rpcs3/Emu/Cell/Modules/sys_net_.h +++ b/rpcs3/Emu/Cell/Modules/sys_net_.h @@ -1,7 +1,6 @@ #pragma once #include "Emu/Cell/lv2/sys_net.h" -#include "Emu/Memory/vm.h" struct sys_net_sockinfo_t { diff --git a/rpcs3/Emu/Cell/Modules/sys_ppu_thread_.cpp b/rpcs3/Emu/Cell/Modules/sys_ppu_thread_.cpp index cb3f5f62d..033242e87 100644 --- a/rpcs3/Emu/Cell/Modules/sys_ppu_thread_.cpp +++ b/rpcs3/Emu/Cell/Modules/sys_ppu_thread_.cpp @@ -1,7 +1,5 @@ #include "stdafx.h" #include "Emu/Cell/PPUModule.h" -#include "Emu/IdManager.h" - #include "Emu/Cell/lv2/sys_ppu_thread.h" #include "Emu/Cell/lv2/sys_interrupt.h" #include "Emu/Cell/lv2/sys_lwmutex.h" diff --git a/rpcs3/Emu/Cell/Modules/sys_rsxaudio_.cpp b/rpcs3/Emu/Cell/Modules/sys_rsxaudio_.cpp index d68634573..071a9debb 100644 --- a/rpcs3/Emu/Cell/Modules/sys_rsxaudio_.cpp +++ b/rpcs3/Emu/Cell/Modules/sys_rsxaudio_.cpp @@ -1,8 +1,6 @@ #include "stdafx.h" #include "Emu/Cell/PPUModule.h" -#include "sysPrxForUser.h" - LOG_CHANNEL(sysPrxForUser); error_code sys_rsxaudio_close_connection() diff --git a/rpcs3/Emu/Cell/Modules/sys_spinlock.cpp b/rpcs3/Emu/Cell/Modules/sys_spinlock.cpp index e49998029..00a71de06 100644 --- a/rpcs3/Emu/Cell/Modules/sys_spinlock.cpp +++ b/rpcs3/Emu/Cell/Modules/sys_spinlock.cpp @@ -1,8 +1,6 @@ #include "stdafx.h" #include "Emu/Cell/PPUModule.h" -#include "sysPrxForUser.h" - LOG_CHANNEL(sysPrxForUser); void sys_spinlock_initialize(vm::ptr> lock) diff --git a/rpcs3/Emu/Cell/Modules/sys_spu_.cpp b/rpcs3/Emu/Cell/Modules/sys_spu_.cpp index 2c584a7fe..2bbbaee4a 100644 --- a/rpcs3/Emu/Cell/Modules/sys_spu_.cpp +++ b/rpcs3/Emu/Cell/Modules/sys_spu_.cpp @@ -3,7 +3,6 @@ #include "Emu/Cell/PPUModule.h" #include "Emu/Cell/lv2/sys_spu.h" -#include "Crypto/unself.h" #include "Loader/ELF.h" #include "sysPrxForUser.h" diff --git a/rpcs3/Emu/Cell/PPUAnalyser.h b/rpcs3/Emu/Cell/PPUAnalyser.h index 9282ac1ba..5d9053847 100644 --- a/rpcs3/Emu/Cell/PPUAnalyser.h +++ b/rpcs3/Emu/Cell/PPUAnalyser.h @@ -2,11 +2,9 @@ #include #include -#include #include #include #include "util/types.hpp" -#include "util/endian.hpp" #include "util/asm.hpp" #include "util/to_endian.hpp" diff --git a/rpcs3/Emu/Cell/PPUModule.cpp b/rpcs3/Emu/Cell/PPUModule.cpp index 3ecb55e32..d95737ba5 100644 --- a/rpcs3/Emu/Cell/PPUModule.cpp +++ b/rpcs3/Emu/Cell/PPUModule.cpp @@ -15,6 +15,7 @@ #include "Emu/Cell/PPUOpcodes.h" #include "Emu/Cell/SPUThread.h" #include "Emu/Cell/PPUAnalyser.h" +#include "Emu/Cell/timers.hpp" #include "Emu/Cell/lv2/sys_process.h" #include "Emu/Cell/lv2/sys_prx.h" diff --git a/rpcs3/Emu/Cell/PPUThread.cpp b/rpcs3/Emu/Cell/PPUThread.cpp index 4502ca361..65467b168 100644 --- a/rpcs3/Emu/Cell/PPUThread.cpp +++ b/rpcs3/Emu/Cell/PPUThread.cpp @@ -12,9 +12,9 @@ #include "Emu/Memory/vm_locking.h" #include "Emu/RSX/Core/RSXReservationLock.hpp" #include "Emu/VFS.h" -#include "Emu/vfs_config.h" #include "Emu/system_progress.hpp" #include "Emu/system_utils.hpp" +#include "Emu/System.h" #include "PPUThread.h" #include "PPUInterpreter.h" #include "PPUAnalyser.h" @@ -65,6 +65,8 @@ #include "util/simd.hpp" #include "util/sysinfo.hpp" +#include "Utilities/sema.h" + #ifdef __APPLE__ #include #endif diff --git a/rpcs3/Emu/Cell/PPUTranslator.cpp b/rpcs3/Emu/Cell/PPUTranslator.cpp index 66cac9f5b..8962cc284 100644 --- a/rpcs3/Emu/Cell/PPUTranslator.cpp +++ b/rpcs3/Emu/Cell/PPUTranslator.cpp @@ -1,4 +1,3 @@ -#include #ifdef LLVM_AVAILABLE #include "Emu/system_config.h" diff --git a/rpcs3/Emu/Cell/RawSPUThread.cpp b/rpcs3/Emu/Cell/RawSPUThread.cpp index dd621ae08..01041555e 100644 --- a/rpcs3/Emu/Cell/RawSPUThread.cpp +++ b/rpcs3/Emu/Cell/RawSPUThread.cpp @@ -3,7 +3,7 @@ #include "Loader/ELF.h" #include "util/asm.hpp" -#include "Emu/Cell/RawSPUThread.h" +#include "SPUThread.h" inline void try_start(spu_thread& spu) { diff --git a/rpcs3/Emu/Cell/RawSPUThread.h b/rpcs3/Emu/Cell/RawSPUThread.h index 921db8f1f..6f70f09be 100644 --- a/rpcs3/Emu/Cell/RawSPUThread.h +++ b/rpcs3/Emu/Cell/RawSPUThread.h @@ -1,3 +1 @@ #pragma once - -#include "SPUThread.h" diff --git a/rpcs3/Emu/Cell/SPUASMJITRecompiler.cpp b/rpcs3/Emu/Cell/SPUASMJITRecompiler.cpp index 3a3ef1cda..3eb75082a 100644 --- a/rpcs3/Emu/Cell/SPUASMJITRecompiler.cpp +++ b/rpcs3/Emu/Cell/SPUASMJITRecompiler.cpp @@ -5,15 +5,12 @@ #include "Emu/IdManager.h" #include "Emu/Cell/timers.hpp" -#include "SPUDisAsm.h" #include "SPUThread.h" #include "SPUInterpreter.h" -#include "PPUAnalyser.h" #include "Crypto/sha1.h" #include "util/asm.hpp" #include "util/v128.hpp" -#include "util/simd.hpp" #include "util/sysinfo.hpp" #include diff --git a/rpcs3/Emu/Cell/SPUAnalyser.h b/rpcs3/Emu/Cell/SPUAnalyser.h index faa85a5a4..103c655a9 100644 --- a/rpcs3/Emu/Cell/SPUAnalyser.h +++ b/rpcs3/Emu/Cell/SPUAnalyser.h @@ -1,7 +1,5 @@ #pragma once -#include "util/types.hpp" - // SPU Instruction Type struct spu_itype { diff --git a/rpcs3/Emu/Cell/SPUInterpreter.cpp b/rpcs3/Emu/Cell/SPUInterpreter.cpp index 3d69d5f9e..a781da5e8 100644 --- a/rpcs3/Emu/Cell/SPUInterpreter.cpp +++ b/rpcs3/Emu/Cell/SPUInterpreter.cpp @@ -3,7 +3,6 @@ #include "Utilities/JIT.h" #include "SPUThread.h" -#include "Emu/Cell/Common.h" #include "Emu/Cell/SPUAnalyser.h" #include "Emu/system_config.h" @@ -13,7 +12,6 @@ #include "util/sysinfo.hpp" #include -#include #if !defined(_MSC_VER) #pragma GCC diagnostic push diff --git a/rpcs3/Emu/Cell/SPUThread.cpp b/rpcs3/Emu/Cell/SPUThread.cpp index 54679dee4..4248fb84f 100644 --- a/rpcs3/Emu/Cell/SPUThread.cpp +++ b/rpcs3/Emu/Cell/SPUThread.cpp @@ -8,6 +8,7 @@ #include "Loader/ELF.h" #include "Emu/VFS.h" #include "Emu/IdManager.h" +#include "Emu/System.h" #include "Emu/perf_meter.hpp" #include "Emu/Cell/PPUThread.h" #include "Emu/Cell/ErrorCodes.h" @@ -23,7 +24,6 @@ #include "Emu/Cell/timers.hpp" #include "Emu/RSX/Core/RSXReservationLock.hpp" -#include "Emu/RSX/RSXThread.h" #include #include diff --git a/rpcs3/Emu/Cell/SPUThread.h b/rpcs3/Emu/Cell/SPUThread.h index 9c45e9efe..37cf1cf07 100644 --- a/rpcs3/Emu/Cell/SPUThread.h +++ b/rpcs3/Emu/Cell/SPUThread.h @@ -10,6 +10,8 @@ #include "util/logs.hpp" #include "util/to_endian.hpp" +#include "Utilities/mutex.h" + #include "Loader/ELF.h" #include diff --git a/rpcs3/Emu/Cell/lv2/lv2.cpp b/rpcs3/Emu/Cell/lv2/lv2.cpp index 6349bd60c..e5c00fab9 100644 --- a/rpcs3/Emu/Cell/lv2/lv2.cpp +++ b/rpcs3/Emu/Cell/lv2/lv2.cpp @@ -9,7 +9,6 @@ #include "Emu/Cell/PPUThread.h" #include "Emu/Cell/SPUThread.h" #include "Emu/Cell/ErrorCodes.h" -#include "Emu/Cell/MFC.h" #include "sys_sync.h" #include "sys_lwmutex.h" #include "sys_lwcond.h" @@ -56,7 +55,7 @@ #include #include #include -#include +#include #include "util/tsc.hpp" #include "util/sysinfo.hpp" #include "util/init_mutex.hpp" diff --git a/rpcs3/Emu/Cell/lv2/sys_bdemu.cpp b/rpcs3/Emu/Cell/lv2/sys_bdemu.cpp index 4dfc6eb3f..51d8e4884 100644 --- a/rpcs3/Emu/Cell/lv2/sys_bdemu.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_bdemu.cpp @@ -1,5 +1,4 @@ #include "stdafx.h" -#include "Emu/Memory/vm.h" #include "Emu/Cell/ErrorCodes.h" diff --git a/rpcs3/Emu/Cell/lv2/sys_cond.cpp b/rpcs3/Emu/Cell/lv2/sys_cond.cpp index 4387d2730..401ed3bd6 100644 --- a/rpcs3/Emu/Cell/lv2/sys_cond.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_cond.cpp @@ -2,7 +2,6 @@ #include "util/serialization.hpp" #include "Emu/IdManager.h" -#include "Emu/IPC.h" #include "Emu/System.h" #include "Emu/Cell/ErrorCodes.h" diff --git a/rpcs3/Emu/Cell/lv2/sys_config.cpp b/rpcs3/Emu/Cell/lv2/sys_config.cpp index 6740759d3..0179a6b7f 100644 --- a/rpcs3/Emu/Cell/lv2/sys_config.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_config.cpp @@ -1,6 +1,4 @@ #include "stdafx.h" -#include "Emu/System.h" -#include "Emu/Memory/vm.h" #include "Emu/IdManager.h" #include "Emu/Cell/lv2/sys_event.h" diff --git a/rpcs3/Emu/Cell/lv2/sys_config.h b/rpcs3/Emu/Cell/lv2/sys_config.h index ea9b9da76..080467114 100644 --- a/rpcs3/Emu/Cell/lv2/sys_config.h +++ b/rpcs3/Emu/Cell/lv2/sys_config.h @@ -1,11 +1,8 @@ #pragma once -#include -#include - #include "util/atomic.hpp" #include "util/shared_ptr.hpp" - +#include "Emu/Cell/timers.hpp" /* * sys_config is a "subscription-based data storage API" diff --git a/rpcs3/Emu/Cell/lv2/sys_event_flag.cpp b/rpcs3/Emu/Cell/lv2/sys_event_flag.cpp index 971408e04..c28efaf71 100644 --- a/rpcs3/Emu/Cell/lv2/sys_event_flag.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_event_flag.cpp @@ -2,13 +2,10 @@ #include "sys_event_flag.h" #include "Emu/IdManager.h" -#include "Emu/IPC.h" #include "Emu/Cell/ErrorCodes.h" #include "Emu/Cell/PPUThread.h" -#include - #include "util/asm.hpp" LOG_CHANNEL(sys_event_flag); diff --git a/rpcs3/Emu/Cell/lv2/sys_fs.cpp b/rpcs3/Emu/Cell/lv2/sys_fs.cpp index 3cb8e8eb2..1f76bb709 100644 --- a/rpcs3/Emu/Cell/lv2/sys_fs.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_fs.cpp @@ -2,8 +2,8 @@ #include "sys_sync.h" #include "sys_fs.h" #include "sys_memory.h" +#include "util/asm.hpp" -#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUThread.h" #include "Crypto/unedat.h" #include "Emu/System.h" diff --git a/rpcs3/Emu/Cell/lv2/sys_fs.h b/rpcs3/Emu/Cell/lv2/sys_fs.h index 825140d7a..e64a2b4ed 100644 --- a/rpcs3/Emu/Cell/lv2/sys_fs.h +++ b/rpcs3/Emu/Cell/lv2/sys_fs.h @@ -6,7 +6,6 @@ #include "Utilities/StrUtil.h" #include -#include // Open Flags enum : s32 diff --git a/rpcs3/Emu/Cell/lv2/sys_game.cpp b/rpcs3/Emu/Cell/lv2/sys_game.cpp index 6e69b9175..1164dbd21 100644 --- a/rpcs3/Emu/Cell/lv2/sys_game.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_game.cpp @@ -10,6 +10,7 @@ #include "Utilities/StrUtil.h" #include "Utilities/Thread.h" +#include "Emu/Cell/timers.hpp" #include "sys_game.h" LOG_CHANNEL(sys_game); diff --git a/rpcs3/Emu/Cell/lv2/sys_hid.cpp b/rpcs3/Emu/Cell/lv2/sys_hid.cpp index e5b5a310a..05f87895a 100644 --- a/rpcs3/Emu/Cell/lv2/sys_hid.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_hid.cpp @@ -1,7 +1,6 @@ #include "stdafx.h" #include "sys_hid.h" -#include "Emu/Memory/vm.h" #include "Emu/Memory/vm_var.h" #include "Emu/Cell/PPUThread.h" diff --git a/rpcs3/Emu/Cell/lv2/sys_memory.cpp b/rpcs3/Emu/Cell/lv2/sys_memory.cpp index 6cfc3a186..9f726e994 100644 --- a/rpcs3/Emu/Cell/lv2/sys_memory.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_memory.cpp @@ -7,7 +7,6 @@ #include "Emu/Cell/SPUThread.h" #include "Emu/IdManager.h" -#include "util/vm.hpp" #include "util/asm.hpp" LOG_CHANNEL(sys_memory); diff --git a/rpcs3/Emu/Cell/lv2/sys_mutex.cpp b/rpcs3/Emu/Cell/lv2/sys_mutex.cpp index f2d23291f..92bf877a8 100644 --- a/rpcs3/Emu/Cell/lv2/sys_mutex.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_mutex.cpp @@ -1,7 +1,6 @@ #include "stdafx.h" #include "Emu/IdManager.h" -#include "Emu/IPC.h" #include "Emu/Cell/ErrorCodes.h" #include "Emu/Cell/PPUThread.h" diff --git a/rpcs3/Emu/Cell/lv2/sys_net.cpp b/rpcs3/Emu/Cell/lv2/sys_net.cpp index aae245461..2eb0e037f 100644 --- a/rpcs3/Emu/Cell/lv2/sys_net.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_net.cpp @@ -15,7 +15,6 @@ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wold-style-cast" #endif -#include #include #include #include @@ -33,9 +32,7 @@ #include "Emu/NP/np_handler.h" #include "Emu/NP/np_helpers.h" -#include "Emu/NP/np_dnshook.h" - -#include +#include "Emu/Cell/timers.hpp" #include #include "sys_net/network_context.h" diff --git a/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_native.h b/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_native.h index 808529356..1f7e3be90 100644 --- a/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_native.h +++ b/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_native.h @@ -9,7 +9,6 @@ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wold-style-cast" #endif -#include #include #include #include diff --git a/rpcs3/Emu/Cell/lv2/sys_overlay.h b/rpcs3/Emu/Cell/lv2/sys_overlay.h index 1c950a4d0..1a204ba9e 100644 --- a/rpcs3/Emu/Cell/lv2/sys_overlay.h +++ b/rpcs3/Emu/Cell/lv2/sys_overlay.h @@ -3,7 +3,6 @@ #include "Emu/Cell/PPUAnalyser.h" #include "Emu/Memory/vm_ptr.h" #include "sys_sync.h" -#include struct lv2_overlay final : ppu_module { diff --git a/rpcs3/Emu/Cell/lv2/sys_ppu_thread.cpp b/rpcs3/Emu/Cell/lv2/sys_ppu_thread.cpp index 80e91bbd0..1aa9409f4 100644 --- a/rpcs3/Emu/Cell/lv2/sys_ppu_thread.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_ppu_thread.cpp @@ -3,7 +3,6 @@ #include "Emu/System.h" #include "Emu/IdManager.h" -#include "Emu/perf_meter.hpp" #include "Emu/Cell/ErrorCodes.h" #include "Emu/Cell/PPUThread.h" @@ -17,6 +16,8 @@ #include "util/asm.hpp" +#include + LOG_CHANNEL(sys_ppu_thread); // Simple structure to cleanup previous thread, because can't remove its own thread diff --git a/rpcs3/Emu/Cell/lv2/sys_rsx.cpp b/rpcs3/Emu/Cell/lv2/sys_rsx.cpp index 896dd0b00..87176ae03 100644 --- a/rpcs3/Emu/Cell/lv2/sys_rsx.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_rsx.cpp @@ -1,6 +1,7 @@ #include "stdafx.h" #include "sys_rsx.h" +#include "Emu/System.h" #include "Emu/Cell/PPUModule.h" #include "Emu/Cell/ErrorCodes.h" #include "Emu/Cell/timers.hpp" diff --git a/rpcs3/Emu/Cell/lv2/sys_rsx.h b/rpcs3/Emu/Cell/lv2/sys_rsx.h index c681a2dcb..5188453c5 100644 --- a/rpcs3/Emu/Cell/lv2/sys_rsx.h +++ b/rpcs3/Emu/Cell/lv2/sys_rsx.h @@ -1,6 +1,5 @@ #pragma once -#include "Utilities/mutex.h" #include "Emu/Memory/vm_ptr.h" #include "Emu/Cell/ErrorCodes.h" diff --git a/rpcs3/Emu/Cell/lv2/sys_rsxaudio.cpp b/rpcs3/Emu/Cell/lv2/sys_rsxaudio.cpp index 290f46794..9fa3a890a 100644 --- a/rpcs3/Emu/Cell/lv2/sys_rsxaudio.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_rsxaudio.cpp @@ -4,10 +4,8 @@ #include "Emu/System.h" #include "Emu/system_config.h" #include "Emu//Audio/audio_utils.h" -#include "Emu//Cell/Modules/cellAudioOut.h" #include "util/video_provider.h" -#include "sys_process.h" #include "sys_rsxaudio.h" #include diff --git a/rpcs3/Emu/Cell/lv2/sys_rwlock.cpp b/rpcs3/Emu/Cell/lv2/sys_rwlock.cpp index 173fe68a7..c2abd4028 100644 --- a/rpcs3/Emu/Cell/lv2/sys_rwlock.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_rwlock.cpp @@ -2,7 +2,6 @@ #include "sys_rwlock.h" #include "Emu/IdManager.h" -#include "Emu/IPC.h" #include "Emu/Cell/ErrorCodes.h" #include "Emu/Cell/PPUThread.h" diff --git a/rpcs3/Emu/Cell/lv2/sys_semaphore.cpp b/rpcs3/Emu/Cell/lv2/sys_semaphore.cpp index 02e40522e..7440cf2de 100644 --- a/rpcs3/Emu/Cell/lv2/sys_semaphore.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_semaphore.cpp @@ -2,7 +2,6 @@ #include "sys_semaphore.h" #include "Emu/IdManager.h" -#include "Emu/IPC.h" #include "Emu/Cell/ErrorCodes.h" #include "Emu/Cell/PPUThread.h" diff --git a/rpcs3/Emu/Cell/lv2/sys_sm.cpp b/rpcs3/Emu/Cell/lv2/sys_sm.cpp index 5700be9ae..50a9b1c67 100644 --- a/rpcs3/Emu/Cell/lv2/sys_sm.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_sm.cpp @@ -1,5 +1,4 @@ #include "stdafx.h" -#include "Emu/Memory/vm.h" #include "Emu/System.h" #include "Emu/Cell/ErrorCodes.h" diff --git a/rpcs3/Emu/Cell/lv2/sys_spu.cpp b/rpcs3/Emu/Cell/lv2/sys_spu.cpp index 61a5ee80d..2c6bd6f3a 100644 --- a/rpcs3/Emu/Cell/lv2/sys_spu.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_spu.cpp @@ -2,8 +2,6 @@ #include "sys_spu.h" #include "Emu/System.h" -#include "Emu/system_config.h" -#include "Emu/VFS.h" #include "Emu/IdManager.h" #include "Crypto/unself.h" #include "Crypto/unedat.h" @@ -13,7 +11,6 @@ #include "Emu/Cell/ErrorCodes.h" #include "Emu/Cell/PPUThread.h" -#include "Emu/Cell/RawSPUThread.h" #include "Emu/Cell/timers.hpp" #include "Emu/Memory/vm_reservation.h" #include "sys_interrupt.h" diff --git a/rpcs3/Emu/Cell/lv2/sys_ss.cpp b/rpcs3/Emu/Cell/lv2/sys_ss.cpp index 67f4e7014..7eb36d4e1 100644 --- a/rpcs3/Emu/Cell/lv2/sys_ss.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_ss.cpp @@ -3,7 +3,6 @@ #include "sys_process.h" #include "Emu/IdManager.h" -#include "Emu/Cell/PPUThread.h" #include "Emu/Cell/timers.hpp" #include "Emu/system_config.h" #include "util/sysinfo.hpp" diff --git a/rpcs3/Emu/Cell/lv2/sys_storage.cpp b/rpcs3/Emu/Cell/lv2/sys_storage.cpp index d83a5b2d3..d5ee3bbda 100644 --- a/rpcs3/Emu/Cell/lv2/sys_storage.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_storage.cpp @@ -1,5 +1,4 @@ #include "stdafx.h" -#include "Emu/Memory/vm.h" #include "Emu/IdManager.h" #include "Emu/Cell/ErrorCodes.h" diff --git a/rpcs3/Emu/Cell/lv2/sys_sync.h b/rpcs3/Emu/Cell/lv2/sys_sync.h index bd6004dfa..bf99bcb05 100644 --- a/rpcs3/Emu/Cell/lv2/sys_sync.h +++ b/rpcs3/Emu/Cell/lv2/sys_sync.h @@ -1,19 +1,14 @@ #pragma once #include "Utilities/mutex.h" -#include "Utilities/sema.h" #include "Emu/CPU/CPUThread.h" #include "Emu/Cell/ErrorCodes.h" -#include "Emu/Cell/timers.hpp" -#include "Emu/Memory/vm_reservation.h" #include "Emu/IdManager.h" #include "Emu/IPC.h" #include "util/shared_ptr.hpp" -#include - // attr_protocol (waiting scheduling policy) enum lv2_protocol : u8 { diff --git a/rpcs3/Emu/Cell/lv2/sys_time.cpp b/rpcs3/Emu/Cell/lv2/sys_time.cpp index b04be640b..1413304a8 100644 --- a/rpcs3/Emu/Cell/lv2/sys_time.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_time.cpp @@ -5,13 +5,17 @@ #include "Emu/system_config.h" #include "Emu/Cell/ErrorCodes.h" #include "Emu/Cell/timers.hpp" +#include "util/tsc.hpp" -#include "util/asm.hpp" #include "util/sysinfo.hpp" static u64 timebase_offset; static u64 systemtime_offset; +#ifndef __linux__ +#include "util/asm.hpp" +#endif + #ifdef _WIN32 #include diff --git a/rpcs3/Emu/Cell/lv2/sys_timer.h b/rpcs3/Emu/Cell/lv2/sys_timer.h index 14e1f31f8..8a0b2eda8 100644 --- a/rpcs3/Emu/Cell/lv2/sys_timer.h +++ b/rpcs3/Emu/Cell/lv2/sys_timer.h @@ -1,8 +1,6 @@ #pragma once #include "sys_event.h" - -#include "Utilities/Thread.h" #include "Emu/Memory/vm_ptr.h" diff --git a/rpcs3/Emu/Cell/lv2/sys_usbd.cpp b/rpcs3/Emu/Cell/lv2/sys_usbd.cpp index 10590d111..67fde17d8 100644 --- a/rpcs3/Emu/Cell/lv2/sys_usbd.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_usbd.cpp @@ -6,12 +6,12 @@ #include #include "Emu/System.h" #include "Emu/system_config.h" -#include "Emu/Memory/vm.h" #include "Emu/IdManager.h" #include "Emu/vfs_config.h" #include "Emu/Cell/PPUThread.h" #include "Emu/Cell/ErrorCodes.h" +#include "Emu/Cell/timers.hpp" #include "Emu/Io/usb_device.h" #include "Emu/Io/usb_vfs.h" diff --git a/rpcs3/Emu/Cell/lv2/sys_vm.cpp b/rpcs3/Emu/Cell/lv2/sys_vm.cpp index 2591824b1..2a224d233 100644 --- a/rpcs3/Emu/Cell/lv2/sys_vm.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_vm.cpp @@ -6,7 +6,6 @@ #include "Emu/Cell/ErrorCodes.h" #include "Emu/Cell/PPUThread.h" #include "Emu/Cell/timers.hpp" -#include "Emu/Memory/vm_locking.h" sys_vm_t::sys_vm_t(u32 _addr, u32 vsize, lv2_memory_container* ct, u32 psize) : ct(ct) diff --git a/rpcs3/Emu/GDB.cpp b/rpcs3/Emu/GDB.cpp index dc01e4e3f..1a4724d47 100644 --- a/rpcs3/Emu/GDB.cpp +++ b/rpcs3/Emu/GDB.cpp @@ -34,6 +34,8 @@ #endif #endif +#include "Emu/Cell/timers.hpp" + #include #include #include diff --git a/rpcs3/Emu/GDB.h b/rpcs3/Emu/GDB.h index 8ba241e11..75d272f9d 100644 --- a/rpcs3/Emu/GDB.h +++ b/rpcs3/Emu/GDB.h @@ -1,7 +1,6 @@ #pragma once #include "Utilities/Thread.h" -#include #include struct gdb_cmd; diff --git a/rpcs3/Emu/IPC.h b/rpcs3/Emu/IPC.h index 26819a3fb..7c9445837 100644 --- a/rpcs3/Emu/IPC.h +++ b/rpcs3/Emu/IPC.h @@ -1,6 +1,5 @@ #pragma once -#include #include #include "Utilities/mutex.h" diff --git a/rpcs3/Emu/IdManager.cpp b/rpcs3/Emu/IdManager.cpp index b8225b07e..2a8f9ffee 100644 --- a/rpcs3/Emu/IdManager.cpp +++ b/rpcs3/Emu/IdManager.cpp @@ -1,6 +1,5 @@ #include "stdafx.h" #include "IdManager.h" -#include "Utilities/Thread.h" shared_mutex id_manager::g_mutex; diff --git a/rpcs3/Emu/IdManager.h b/rpcs3/Emu/IdManager.h index 7846d6f70..3884e439b 100644 --- a/rpcs3/Emu/IdManager.h +++ b/rpcs3/Emu/IdManager.h @@ -5,8 +5,6 @@ #include #include -#include -#include #include #include "util/serialization.hpp" diff --git a/rpcs3/Emu/Io/Dimensions.cpp b/rpcs3/Emu/Io/Dimensions.cpp index 9a61f7abc..a8ef6bc44 100644 --- a/rpcs3/Emu/Io/Dimensions.cpp +++ b/rpcs3/Emu/Io/Dimensions.cpp @@ -2,11 +2,6 @@ #include "Dimensions.h" #include -#include - -#include "Crypto/aes.h" -#include "Crypto/sha1.h" -#include "util/asm.hpp" #include "Emu/Cell/lv2/sys_usbd.h" diff --git a/rpcs3/Emu/Io/Infinity.cpp b/rpcs3/Emu/Io/Infinity.cpp index ca70c9234..ff4ce9e85 100644 --- a/rpcs3/Emu/Io/Infinity.cpp +++ b/rpcs3/Emu/Io/Infinity.cpp @@ -5,7 +5,6 @@ #include "Crypto/aes.h" #include "Crypto/sha1.h" -#include "util/asm.hpp" LOG_CHANNEL(infinity_log, "infinity"); diff --git a/rpcs3/Emu/Io/KeyboardHandler.cpp b/rpcs3/Emu/Io/KeyboardHandler.cpp index 73ef8d069..05ef6ef52 100644 --- a/rpcs3/Emu/Io/KeyboardHandler.cpp +++ b/rpcs3/Emu/Io/KeyboardHandler.cpp @@ -1,6 +1,5 @@ #include "stdafx.h" #include "KeyboardHandler.h" -#include "Utilities/StrUtil.h" LOG_CHANNEL(input_log, "Input"); diff --git a/rpcs3/Emu/Io/PadHandler.cpp b/rpcs3/Emu/Io/PadHandler.cpp index 44648f252..cafb85bd7 100644 --- a/rpcs3/Emu/Io/PadHandler.cpp +++ b/rpcs3/Emu/Io/PadHandler.cpp @@ -1,6 +1,5 @@ #include "stdafx.h" #include "PadHandler.h" -#include "Emu/system_utils.hpp" #include "Emu/system_config.h" #include "Emu/Cell/timers.hpp" #include "Input/pad_thread.h" diff --git a/rpcs3/Emu/Io/PadHandler.h b/rpcs3/Emu/Io/PadHandler.h index eb536fde1..792515c5d 100644 --- a/rpcs3/Emu/Io/PadHandler.h +++ b/rpcs3/Emu/Io/PadHandler.h @@ -9,7 +9,9 @@ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wold-style-cast" #endif -#include "3rdparty/fusion/fusion/Fusion/Fusion.h" +extern "C" { +#include "3rdparty/fusion/fusion/Fusion/FusionAhrs.h" +} #ifndef _MSC_VER #pragma GCC diagnostic pop #endif diff --git a/rpcs3/Emu/Io/Skylander.cpp b/rpcs3/Emu/Io/Skylander.cpp index 0867918fd..974e9a887 100644 --- a/rpcs3/Emu/Io/Skylander.cpp +++ b/rpcs3/Emu/Io/Skylander.cpp @@ -2,8 +2,6 @@ #include "Skylander.h" #include "Emu/Cell/lv2/sys_usbd.h" -#include "util/asm.hpp" - LOG_CHANNEL(skylander_log, "skylander"); sky_portal g_skyportal; diff --git a/rpcs3/Emu/Io/buzz_config.h b/rpcs3/Emu/Io/buzz_config.h index 71f51f972..f340ecd70 100644 --- a/rpcs3/Emu/Io/buzz_config.h +++ b/rpcs3/Emu/Io/buzz_config.h @@ -2,8 +2,6 @@ #include "emulated_pad_config.h" -#include - enum class buzz_btn { red, diff --git a/rpcs3/Emu/Io/gem_config.h b/rpcs3/Emu/Io/gem_config.h index 2be86ff3c..9cfca88dd 100644 --- a/rpcs3/Emu/Io/gem_config.h +++ b/rpcs3/Emu/Io/gem_config.h @@ -2,8 +2,6 @@ #include "emulated_pad_config.h" -#include - enum class gem_btn : u32 { start, diff --git a/rpcs3/Emu/Io/ghltar_config.h b/rpcs3/Emu/Io/ghltar_config.h index 524542fa9..dfe43ea2c 100644 --- a/rpcs3/Emu/Io/ghltar_config.h +++ b/rpcs3/Emu/Io/ghltar_config.h @@ -2,8 +2,6 @@ #include "emulated_pad_config.h" -#include - enum class ghltar_btn { w1, diff --git a/rpcs3/Emu/Io/guncon3_config.h b/rpcs3/Emu/Io/guncon3_config.h index 6224fa856..c2ea82a9f 100644 --- a/rpcs3/Emu/Io/guncon3_config.h +++ b/rpcs3/Emu/Io/guncon3_config.h @@ -2,8 +2,6 @@ #include "emulated_pad_config.h" -#include - enum class guncon3_btn { trigger, diff --git a/rpcs3/Emu/Io/rb3drums_config.cpp b/rpcs3/Emu/Io/rb3drums_config.cpp index 34c289818..76c86252a 100644 --- a/rpcs3/Emu/Io/rb3drums_config.cpp +++ b/rpcs3/Emu/Io/rb3drums_config.cpp @@ -1,6 +1,5 @@ #include "stdafx.h" #include "rb3drums_config.h" -#include LOG_CHANNEL(cfg_log, "CFG"); diff --git a/rpcs3/Emu/Io/recording_config.cpp b/rpcs3/Emu/Io/recording_config.cpp index 357106e07..9b360a24e 100644 --- a/rpcs3/Emu/Io/recording_config.cpp +++ b/rpcs3/Emu/Io/recording_config.cpp @@ -1,6 +1,5 @@ #include "stdafx.h" #include "recording_config.h" -#include LOG_CHANNEL(cfg_log, "CFG"); diff --git a/rpcs3/Emu/Io/topshotelite_config.h b/rpcs3/Emu/Io/topshotelite_config.h index e7a563910..fa9ca952d 100644 --- a/rpcs3/Emu/Io/topshotelite_config.h +++ b/rpcs3/Emu/Io/topshotelite_config.h @@ -2,8 +2,6 @@ #include "emulated_pad_config.h" -#include - enum class topshotelite_btn { trigger, diff --git a/rpcs3/Emu/Io/topshotfearmaster_config.h b/rpcs3/Emu/Io/topshotfearmaster_config.h index ef372c9b6..cd2aadf02 100644 --- a/rpcs3/Emu/Io/topshotfearmaster_config.h +++ b/rpcs3/Emu/Io/topshotfearmaster_config.h @@ -2,8 +2,6 @@ #include "emulated_pad_config.h" -#include - enum class topshotfearmaster_btn { trigger, diff --git a/rpcs3/Emu/Io/turntable_config.h b/rpcs3/Emu/Io/turntable_config.h index 8461cf521..c2237520f 100644 --- a/rpcs3/Emu/Io/turntable_config.h +++ b/rpcs3/Emu/Io/turntable_config.h @@ -2,8 +2,6 @@ #include "emulated_pad_config.h" -#include - enum class turntable_btn { red, diff --git a/rpcs3/Emu/Io/usb_device.cpp b/rpcs3/Emu/Io/usb_device.cpp index a7c3812b4..be35a6146 100644 --- a/rpcs3/Emu/Io/usb_device.cpp +++ b/rpcs3/Emu/Io/usb_device.cpp @@ -1,5 +1,6 @@ #include "stdafx.h" #include "Emu/System.h" +#include "Emu/Cell/timers.hpp" #include "Emu/Cell/lv2/sys_usbd.h" #include "Emu/Io/usb_device.h" #include "Utilities/StrUtil.h" diff --git a/rpcs3/Emu/Io/usio_config.h b/rpcs3/Emu/Io/usio_config.h index 1ca078b2a..4c5fe6f01 100644 --- a/rpcs3/Emu/Io/usio_config.h +++ b/rpcs3/Emu/Io/usio_config.h @@ -2,8 +2,6 @@ #include "emulated_pad_config.h" -#include - enum class usio_btn { test, diff --git a/rpcs3/Emu/Memory/vm.cpp b/rpcs3/Emu/Memory/vm.cpp index 6ab0ecc71..28b8b4e27 100644 --- a/rpcs3/Emu/Memory/vm.cpp +++ b/rpcs3/Emu/Memory/vm.cpp @@ -4,10 +4,8 @@ #include "vm_ref.h" #include "vm_reservation.h" -#include "Utilities/mutex.h" #include "Utilities/Thread.h" #include "Utilities/address_range.h" -#include "Utilities/JIT.h" #include "Emu/CPU/CPUThread.h" #include "Emu/RSX/RSXThread.h" #include "Emu/Cell/SPURecompiler.h" @@ -20,6 +18,8 @@ #include "util/simd.hpp" #include "util/serialization.hpp" +#include + LOG_CHANNEL(vm_log, "VM"); void ppu_remove_hle_instructions(u32 addr, u32 size); diff --git a/rpcs3/Emu/Memory/vm.h b/rpcs3/Emu/Memory/vm.h index b76e8a89d..9680187cd 100644 --- a/rpcs3/Emu/Memory/vm.h +++ b/rpcs3/Emu/Memory/vm.h @@ -5,7 +5,6 @@ #include "util/types.hpp" #include "util/atomic.hpp" #include "util/auto_typemap.hpp" -#include "Utilities/StrFmt.h" #include "util/to_endian.hpp" diff --git a/rpcs3/Emu/NP/fb_helpers.cpp b/rpcs3/Emu/NP/fb_helpers.cpp index 04a92d77e..434a90298 100644 --- a/rpcs3/Emu/NP/fb_helpers.cpp +++ b/rpcs3/Emu/NP/fb_helpers.cpp @@ -1,5 +1,4 @@ #include "stdafx.h" -#include "np_handler.h" #include "Emu/Cell/lv2/sys_process.h" #include "fb_helpers.h" diff --git a/rpcs3/Emu/NP/fb_helpers.h b/rpcs3/Emu/NP/fb_helpers.h index 82ab034ea..6b92cfba3 100644 --- a/rpcs3/Emu/NP/fb_helpers.h +++ b/rpcs3/Emu/NP/fb_helpers.h @@ -1,5 +1,10 @@ #pragma once +#include "Emu/Cell/Modules/sceNp.h" +#include "Emu/Cell/Modules/sceNp2.h" +#include "np_event_data.h" +#include "generated/np2_structs_generated.h" + namespace np { void BinAttr_to_SceNpMatching2BinAttr(event_data& edata, const BinAttr* bin_attr, SceNpMatching2BinAttr* binattr_info); diff --git a/rpcs3/Emu/NP/np_contexts.h b/rpcs3/Emu/NP/np_contexts.h index d82410c0a..7b4157024 100644 --- a/rpcs3/Emu/NP/np_contexts.h +++ b/rpcs3/Emu/NP/np_contexts.h @@ -4,17 +4,13 @@ #include #include #include -#include #include "Utilities/mutex.h" - -#include "Emu/IdManager.h" #include "Emu/Memory/vm_ptr.h" #include "Emu/Cell/Modules/sceNp.h" #include "Emu/Cell/Modules/sceNp2.h" #include "Emu/Cell/Modules/sceNpCommerce2.h" #include "Emu/Cell/Modules/sceNpTus.h" -#include "Emu/NP/np_event_data.h" #include "Utilities/Thread.h" // Used By Score and Tus diff --git a/rpcs3/Emu/NP/np_gui_cache.h b/rpcs3/Emu/NP/np_gui_cache.h index f3c4125e2..d742cc574 100644 --- a/rpcs3/Emu/NP/np_gui_cache.h +++ b/rpcs3/Emu/NP/np_gui_cache.h @@ -1,12 +1,8 @@ #pragma once #include -#include - #include "Utilities/mutex.h" - #include "Emu/Cell/Modules/sceNp.h" -#include "Emu/Cell/Modules/sceNp2.h" template <> struct std::less diff --git a/rpcs3/Emu/NP/np_handler.cpp b/rpcs3/Emu/NP/np_handler.cpp index 7c9723a25..5afff4db2 100644 --- a/rpcs3/Emu/NP/np_handler.cpp +++ b/rpcs3/Emu/NP/np_handler.cpp @@ -1,17 +1,18 @@ #include "stdafx.h" #include "Emu/system_config.h" #include "Emu/NP/np_handler.h" -#include "Emu/Cell/PPUModule.h" +#include "Emu/Cell/PPUCallback.h" #include "Emu/Cell/Modules/sceNp.h" #include "Emu/Cell/Modules/sceNp2.h" #include "Emu/Cell/Modules/cellNetCtl.h" +#include "Emu/Cell/timers.hpp" #include "Utilities/StrUtil.h" #include "Emu/IdManager.h" -#include "Emu/NP/np_structs_extra.h" #include "Emu/System.h" #include "Emu/NP/rpcn_config.h" #include "Emu/NP/np_contexts.h" #include "Emu/NP/np_helpers.h" +#include "Emu/NP/signaling_handler.h" #include "Emu/RSX/Overlays/overlay_message.h" #include "Emu/Cell/lv2/sys_net/network_context.h" #include "Emu/Cell/lv2/sys_net/sys_net_helpers.h" @@ -42,7 +43,6 @@ #include #endif -#include "util/asm.hpp" #include "util/yaml.hpp" #include diff --git a/rpcs3/Emu/NP/np_handler.h b/rpcs3/Emu/NP/np_handler.h index e6524ab98..a8b349fd5 100644 --- a/rpcs3/Emu/NP/np_handler.h +++ b/rpcs3/Emu/NP/np_handler.h @@ -10,8 +10,6 @@ #include "Emu/Cell/Modules/cellSysutil.h" #include "Emu/NP/rpcn_client.h" -#include "Emu/NP/generated/np2_structs_generated.h" -#include "Emu/NP/signaling_handler.h" #include "Emu/NP/np_allocator.h" #include "Emu/NP/np_cache.h" #include "Emu/NP/np_gui_cache.h" diff --git a/rpcs3/Emu/NP/np_helpers.cpp b/rpcs3/Emu/NP/np_helpers.cpp index 3576d5c68..be2618b5c 100644 --- a/rpcs3/Emu/NP/np_helpers.cpp +++ b/rpcs3/Emu/NP/np_helpers.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "util/types.hpp" #include "Utilities/StrUtil.h" -#include "np_handler.h" +#include "rpcn_client.h" #ifdef _WIN32 #include diff --git a/rpcs3/Emu/NP/np_helpers.h b/rpcs3/Emu/NP/np_helpers.h index c5375235f..a90f5d144 100644 --- a/rpcs3/Emu/NP/np_helpers.h +++ b/rpcs3/Emu/NP/np_helpers.h @@ -2,7 +2,6 @@ #include "util/types.hpp" #include "Emu/Cell/Modules/sceNp.h" -#include "Emu/Cell/Modules/sceNp2.h" #include "rpcn_client.h" namespace np diff --git a/rpcs3/Emu/NP/np_notifications.cpp b/rpcs3/Emu/NP/np_notifications.cpp index e6b4b547d..160c7f896 100644 --- a/rpcs3/Emu/NP/np_notifications.cpp +++ b/rpcs3/Emu/NP/np_notifications.cpp @@ -1,11 +1,12 @@ #include "stdafx.h" -#include "Emu/Cell/PPUModule.h" +#include "Emu/Cell/PPUCallback.h" #include "Emu/Cell/Modules/cellSysutil.h" #include "Emu/IdManager.h" #include "Emu/NP/np_handler.h" #include "Emu/NP/np_helpers.h" #include "Emu/NP/np_structs_extra.h" #include "Emu/NP/fb_helpers.h" +#include "Emu/NP/signaling_handler.h" LOG_CHANNEL(rpcn_log, "rpcn"); diff --git a/rpcs3/Emu/NP/np_requests.cpp b/rpcs3/Emu/NP/np_requests.cpp index ff124ad15..e213c039f 100644 --- a/rpcs3/Emu/NP/np_requests.cpp +++ b/rpcs3/Emu/NP/np_requests.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "Emu/Cell/PPUModule.h" +#include "Emu/Cell/PPUCallback.h" #include "Emu/Cell/lv2/sys_sync.h" #include "Emu/system_config.h" #include "Emu/Cell/Modules/cellSysutil.h" @@ -10,6 +10,7 @@ #include "np_helpers.h" #include "np_structs_extra.h" #include "fb_helpers.h" +#include "Emu/NP/signaling_handler.h" LOG_CHANNEL(rpcn_log, "rpcn"); diff --git a/rpcs3/Emu/NP/np_requests_gui.cpp b/rpcs3/Emu/NP/np_requests_gui.cpp index f46307b38..88d6a5b60 100644 --- a/rpcs3/Emu/NP/np_requests_gui.cpp +++ b/rpcs3/Emu/NP/np_requests_gui.cpp @@ -1,12 +1,9 @@ #include "stdafx.h" -#include "Emu/Cell/PPUModule.h" -#include "Emu/Cell/lv2/sys_sync.h" -#include "Emu/Cell/Modules/cellSysutil.h" +#include "Emu/Cell/PPUCallback.h" #include "Emu/Memory/vm_ptr.h" #include "Emu/IdManager.h" #include "np_handler.h" #include "np_contexts.h" -#include "np_helpers.h" #include "np_structs_extra.h" #include "fb_helpers.h" diff --git a/rpcs3/Emu/NP/np_structs_extra.cpp b/rpcs3/Emu/NP/np_structs_extra.cpp index 66e7a342f..87b49621f 100644 --- a/rpcs3/Emu/NP/np_structs_extra.cpp +++ b/rpcs3/Emu/NP/np_structs_extra.cpp @@ -1,5 +1,4 @@ #include "stdafx.h" -#include "Emu/System.h" #include #include "np_structs_extra.h" diff --git a/rpcs3/Emu/NP/rpcn_client.cpp b/rpcs3/Emu/NP/rpcn_client.cpp index dc46881b2..e61c9fea4 100644 --- a/rpcs3/Emu/NP/rpcn_client.cpp +++ b/rpcs3/Emu/NP/rpcn_client.cpp @@ -3,12 +3,9 @@ #include #include #include -#include #include "rpcn_client.h" -#include "np_structs_extra.h" #include "Utilities/StrUtil.h" #include "Utilities/Thread.h" -#include "Emu/IdManager.h" #include "Emu/System.h" #include "Emu/NP/rpcn_config.h" #include "Emu/NP/np_helpers.h" @@ -16,8 +13,6 @@ #include "Emu/system_config.h" #include "Emu/RSX/Overlays/overlay_message.h" -#include "util/asm.hpp" - #include "generated/np2_structs_generated.h" #ifdef _WIN32 @@ -28,7 +23,6 @@ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wold-style-cast" #endif -#include #include #include #include diff --git a/rpcs3/Emu/NP/rpcn_client.h b/rpcs3/Emu/NP/rpcn_client.h index fb8921076..e3c9fbec3 100644 --- a/rpcs3/Emu/NP/rpcn_client.h +++ b/rpcs3/Emu/NP/rpcn_client.h @@ -5,9 +5,7 @@ #include #include #include "Utilities/mutex.h" -#include "Emu/localized_string.h" - -#include "util/asm.hpp" +#include "Emu/localized_string_id.h" #ifdef _WIN32 #include @@ -27,8 +25,7 @@ #include "Emu/Cell/Modules/sceNp.h" #include "Emu/Cell/Modules/sceNp2.h" #include "Emu/Cell/Modules/sceNpTus.h" - -#include "generated/np2_structs_generated.h" +#include #ifdef __clang__ #pragma GCC diagnostic push diff --git a/rpcs3/Emu/NP/rpcn_countries.h b/rpcs3/Emu/NP/rpcn_countries.h index 2551ced9c..5c7e00fb4 100644 --- a/rpcs3/Emu/NP/rpcn_countries.h +++ b/rpcs3/Emu/NP/rpcn_countries.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include namespace countries { diff --git a/rpcs3/Emu/NP/signaling_handler.cpp b/rpcs3/Emu/NP/signaling_handler.cpp index d463b1567..0ff4a3738 100644 --- a/rpcs3/Emu/NP/signaling_handler.cpp +++ b/rpcs3/Emu/NP/signaling_handler.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "Emu/Cell/PPUModule.h" +#include "Emu/Cell/PPUCallback.h" #include "signaling_handler.h" #include "Emu/IdManager.h" #include "Emu/Cell/Modules/cellSysutil.h" diff --git a/rpcs3/Emu/NP/signaling_handler.h b/rpcs3/Emu/NP/signaling_handler.h index 209daa9ca..b4ec8229b 100644 --- a/rpcs3/Emu/NP/signaling_handler.h +++ b/rpcs3/Emu/NP/signaling_handler.h @@ -1,9 +1,8 @@ #pragma once -#include "Emu/Memory/vm.h" -#include "Emu/Memory/vm_ptr.h" #include "Emu/Cell/Modules/sceNp.h" #include "Emu/Cell/Modules/sceNp2.h" #include "Utilities/Thread.h" +#include "Utilities/mutex.h" #include #include #include diff --git a/rpcs3/Emu/RSX/Capture/rsx_capture.cpp b/rpcs3/Emu/RSX/Capture/rsx_capture.cpp index 0eeea99db..bfd47df73 100644 --- a/rpcs3/Emu/RSX/Capture/rsx_capture.cpp +++ b/rpcs3/Emu/RSX/Capture/rsx_capture.cpp @@ -2,7 +2,6 @@ #include "rsx_capture.h" #include "Emu/RSX/Common/BufferUtils.h" #include "Emu/RSX/Common/TextureUtils.h" -#include "Emu/RSX/Common/surface_store.h" #include "Emu/RSX/GCM.h" #include "Emu/RSX/RSXThread.h" #include "Emu/Memory/vm.h" diff --git a/rpcs3/Emu/RSX/Capture/rsx_replay.cpp b/rpcs3/Emu/RSX/Capture/rsx_replay.cpp index 1e9a35601..88bd6f902 100644 --- a/rpcs3/Emu/RSX/Capture/rsx_replay.cpp +++ b/rpcs3/Emu/RSX/Capture/rsx_replay.cpp @@ -1,6 +1,7 @@ #include "stdafx.h" #include "rsx_replay.h" +#include "Emu/System.h" #include "Emu/Cell/ErrorCodes.h" #include "Emu/Cell/lv2/sys_rsx.h" #include "Emu/Cell/lv2/sys_memory.h" @@ -8,6 +9,8 @@ #include "util/asm.hpp" +#include + namespace rsx { be_t rsx_replay_thread::allocate_context() diff --git a/rpcs3/Emu/RSX/Common/BufferUtils.cpp b/rpcs3/Emu/RSX/Common/BufferUtils.cpp index ba19fdb46..0250daead 100644 --- a/rpcs3/Emu/RSX/Common/BufferUtils.cpp +++ b/rpcs3/Emu/RSX/Common/BufferUtils.cpp @@ -1,12 +1,8 @@ #include "stdafx.h" #include "BufferUtils.h" -#include "../rsx_methods.h" -#include "../RSXThread.h" - #include "util/to_endian.hpp" #include "util/sysinfo.hpp" #include "Utilities/JIT.h" -#include "util/asm.hpp" #include "util/v128.hpp" #include "util/simd.hpp" diff --git a/rpcs3/Emu/RSX/Common/TextureUtils.h b/rpcs3/Emu/RSX/Common/TextureUtils.h index 243240bce..f03667042 100644 --- a/rpcs3/Emu/RSX/Common/TextureUtils.h +++ b/rpcs3/Emu/RSX/Common/TextureUtils.h @@ -4,7 +4,6 @@ #include "../color_utils.h" #include "../RSXTexture.h" -#include #include #include diff --git a/rpcs3/Emu/RSX/Common/bitfield.hpp b/rpcs3/Emu/RSX/Common/bitfield.hpp index 35906909d..af02792fc 100644 --- a/rpcs3/Emu/RSX/Common/bitfield.hpp +++ b/rpcs3/Emu/RSX/Common/bitfield.hpp @@ -1,5 +1,6 @@ #pragma once +#include "util/atomic.hpp" #include #include diff --git a/rpcs3/Emu/RSX/Common/buffer_stream.hpp b/rpcs3/Emu/RSX/Common/buffer_stream.hpp index c978ccca0..ff68d6008 100644 --- a/rpcs3/Emu/RSX/Common/buffer_stream.hpp +++ b/rpcs3/Emu/RSX/Common/buffer_stream.hpp @@ -1,7 +1,6 @@ #pragma once #include "util/types.hpp" -#include "util/asm.hpp" #if defined(ARCH_X64) #include "emmintrin.h" diff --git a/rpcs3/Emu/RSX/Common/io_buffer.h b/rpcs3/Emu/RSX/Common/io_buffer.h index 88e30f097..29397d113 100644 --- a/rpcs3/Emu/RSX/Common/io_buffer.h +++ b/rpcs3/Emu/RSX/Common/io_buffer.h @@ -2,7 +2,6 @@ #include #include #include -#include #include namespace rsx diff --git a/rpcs3/Emu/RSX/Common/profiling_timer.hpp b/rpcs3/Emu/RSX/Common/profiling_timer.hpp index 88851626c..f5ecacb4e 100644 --- a/rpcs3/Emu/RSX/Common/profiling_timer.hpp +++ b/rpcs3/Emu/RSX/Common/profiling_timer.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "time.hpp" +#include "Emu/Cell/timers.hpp" namespace rsx { diff --git a/rpcs3/Emu/RSX/Common/surface_store.h b/rpcs3/Emu/RSX/Common/surface_store.h index e4d3f2d3f..35813965e 100644 --- a/rpcs3/Emu/RSX/Common/surface_store.h +++ b/rpcs3/Emu/RSX/Common/surface_store.h @@ -10,8 +10,6 @@ #include "util/asm.hpp" -#include - namespace rsx { namespace utility diff --git a/rpcs3/Emu/RSX/Common/surface_utils.h b/rpcs3/Emu/RSX/Common/surface_utils.h index bcecfb8db..2fb55810e 100644 --- a/rpcs3/Emu/RSX/Common/surface_utils.h +++ b/rpcs3/Emu/RSX/Common/surface_utils.h @@ -2,7 +2,6 @@ #include "util/types.hpp" #include "Utilities/geometry.h" -#include "Utilities/address_range.h" #include "TextureUtils.h" #include "../rsx_utils.h" #include "Emu/Memory/vm.h" diff --git a/rpcs3/Emu/RSX/Common/texture_cache.h b/rpcs3/Emu/RSX/Common/texture_cache.h index 2b426e05b..e367d46e6 100644 --- a/rpcs3/Emu/RSX/Common/texture_cache.h +++ b/rpcs3/Emu/RSX/Common/texture_cache.h @@ -9,8 +9,6 @@ #include -#include "Emu/Cell/timers.hpp" - #define RSX_GCM_FORMAT_IGNORED 0 namespace rsx diff --git a/rpcs3/Emu/RSX/Common/texture_cache_checker.h b/rpcs3/Emu/RSX/Common/texture_cache_checker.h index 0325dda59..094220ac3 100644 --- a/rpcs3/Emu/RSX/Common/texture_cache_checker.h +++ b/rpcs3/Emu/RSX/Common/texture_cache_checker.h @@ -1,8 +1,9 @@ #pragma once +#ifdef TEXTURE_CACHE_DEBUG + #include "../rsx_utils.h" -#ifdef TEXTURE_CACHE_DEBUG namespace rsx { class tex_cache_checker_t { diff --git a/rpcs3/Emu/RSX/Common/texture_cache_predictor.h b/rpcs3/Emu/RSX/Common/texture_cache_predictor.h index 7b5421481..a18fc93c7 100644 --- a/rpcs3/Emu/RSX/Common/texture_cache_predictor.h +++ b/rpcs3/Emu/RSX/Common/texture_cache_predictor.h @@ -1,6 +1,5 @@ #pragma once -#include "../rsx_cache.h" #include "../rsx_utils.h" #include "TextureUtils.h" diff --git a/rpcs3/Emu/RSX/Common/texture_cache_utils.h b/rpcs3/Emu/RSX/Common/texture_cache_utils.h index d01660775..3a87deceb 100644 --- a/rpcs3/Emu/RSX/Common/texture_cache_utils.h +++ b/rpcs3/Emu/RSX/Common/texture_cache_utils.h @@ -1,5 +1,6 @@ #pragma once +#include "Emu/System.h" #include "texture_cache_types.h" #include "texture_cache_predictor.h" #include "TextureUtils.h" diff --git a/rpcs3/Emu/RSX/Common/time.hpp b/rpcs3/Emu/RSX/Common/time.hpp index ad3aa5606..db176fb4c 100644 --- a/rpcs3/Emu/RSX/Common/time.hpp +++ b/rpcs3/Emu/RSX/Common/time.hpp @@ -2,5 +2,3 @@ #include #include - -#include "Emu/Cell/timers.hpp" diff --git a/rpcs3/Emu/RSX/GCM.h b/rpcs3/Emu/RSX/GCM.h index 695b0a761..c61e9907a 100644 --- a/rpcs3/Emu/RSX/GCM.h +++ b/rpcs3/Emu/RSX/GCM.h @@ -1,9 +1,6 @@ #pragma once #include "Emu/Memory/vm_ptr.h" -#include "gcm_enums.h" -#include "util/atomic.hpp" - struct CellGcmControl { diff --git a/rpcs3/Emu/RSX/GL/GLDMA.cpp b/rpcs3/Emu/RSX/GL/GLDMA.cpp index 6f1e7f7fb..758205214 100644 --- a/rpcs3/Emu/RSX/GL/GLDMA.cpp +++ b/rpcs3/Emu/RSX/GL/GLDMA.cpp @@ -2,6 +2,7 @@ #include "GLDMA.h" #include "Emu/Memory/vm.h" +#include "Emu/RSX/GL/glutils/common.h" namespace gl { diff --git a/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp b/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp index f6d5d2f3b..173177291 100644 --- a/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp +++ b/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp @@ -3,7 +3,6 @@ #include "Emu/system_config.h" #include "GLCommonDecompiler.h" -#include "../GCM.h" #include "../Program/GLSLCommon.h" #include "../RSXThread.h" diff --git a/rpcs3/Emu/RSX/GL/GLFragmentProgram.h b/rpcs3/Emu/RSX/GL/GLFragmentProgram.h index fa955f22e..c6b524438 100644 --- a/rpcs3/Emu/RSX/GL/GLFragmentProgram.h +++ b/rpcs3/Emu/RSX/GL/GLFragmentProgram.h @@ -1,7 +1,6 @@ #pragma once #include "../Program/FragmentProgramDecompiler.h" #include "../Program/GLSLTypes.h" -#include "GLHelpers.h" #include "glutils/program.h" namespace glsl diff --git a/rpcs3/Emu/RSX/GL/GLGSRender.h b/rpcs3/Emu/RSX/GL/GLGSRender.h index d28898c05..1c8423393 100644 --- a/rpcs3/Emu/RSX/GL/GLGSRender.h +++ b/rpcs3/Emu/RSX/GL/GLGSRender.h @@ -1,15 +1,15 @@ #pragma once #include "Emu/RSX/GSRender.h" -#include "GLHelpers.h" -#include "GLTexture.h" #include "GLTextureCache.h" #include "GLRenderTargets.h" #include "GLProgramBuffer.h" #include "GLOverlays.h" #include "GLShaderInterpreter.h" +#include "Emu/RSX/rsx_cache.h" #include #include +#include #include "glutils/ring_buffer.h" #include "upscalers/upscaling.h" diff --git a/rpcs3/Emu/RSX/GL/GLHelpers.cpp b/rpcs3/Emu/RSX/GL/GLHelpers.cpp index 37ec98f18..da95960f4 100644 --- a/rpcs3/Emu/RSX/GL/GLHelpers.cpp +++ b/rpcs3/Emu/RSX/GL/GLHelpers.cpp @@ -1,10 +1,7 @@ #include "stdafx.h" #include "GLHelpers.h" -#include "GLTexture.h" #include "GLCompute.h" #include "util/logs.hpp" - -#include "../Common/simple_array.hpp" #include namespace gl diff --git a/rpcs3/Emu/RSX/GL/GLOverlays.cpp b/rpcs3/Emu/RSX/GL/GLOverlays.cpp index 44fbe3dd3..b9ea62f2f 100644 --- a/rpcs3/Emu/RSX/GL/GLOverlays.cpp +++ b/rpcs3/Emu/RSX/GL/GLOverlays.cpp @@ -1,8 +1,8 @@ #include "GLOverlays.h" -#include "Emu/system_config.h" -#include "../rsx_utils.h" +#include "Utilities/StrUtil.h" #include "../Program/RSXOverlay.h" +#include "Emu/Cell/timers.hpp" namespace gl { diff --git a/rpcs3/Emu/RSX/GL/GLOverlays.h b/rpcs3/Emu/RSX/GL/GLOverlays.h index 5ad7065fd..f70e885d2 100644 --- a/rpcs3/Emu/RSX/GL/GLOverlays.h +++ b/rpcs3/Emu/RSX/GL/GLOverlays.h @@ -1,6 +1,7 @@ #pragma once #include "Emu/system_config_types.h" +#include "Emu/IdManager.h" #include "util/types.hpp" #include "../Common/simple_array.hpp" #include "../Overlays/overlays.h" diff --git a/rpcs3/Emu/RSX/GL/GLPipelineCompiler.cpp b/rpcs3/Emu/RSX/GL/GLPipelineCompiler.cpp index 445841b44..bdf03c6ff 100644 --- a/rpcs3/Emu/RSX/GL/GLPipelineCompiler.cpp +++ b/rpcs3/Emu/RSX/GL/GLPipelineCompiler.cpp @@ -1,9 +1,6 @@ #include "stdafx.h" #include "GLPipelineCompiler.h" #include "Utilities/Thread.h" - -#include - #include "util/sysinfo.hpp" namespace gl diff --git a/rpcs3/Emu/RSX/GL/GLProgramBuffer.h b/rpcs3/Emu/RSX/GL/GLProgramBuffer.h index fafb7d6f6..2d6f19f27 100644 --- a/rpcs3/Emu/RSX/GL/GLProgramBuffer.h +++ b/rpcs3/Emu/RSX/GL/GLProgramBuffer.h @@ -1,7 +1,6 @@ #pragma once #include "GLVertexProgram.h" #include "GLFragmentProgram.h" -#include "GLHelpers.h" #include "GLPipelineCompiler.h" #include "../Program/ProgramStateCache.h" #include "../rsx_utils.h" diff --git a/rpcs3/Emu/RSX/GL/GLRenderTargets.h b/rpcs3/Emu/RSX/GL/GLRenderTargets.h index 3d573db52..9b01746a8 100644 --- a/rpcs3/Emu/RSX/GL/GLRenderTargets.h +++ b/rpcs3/Emu/RSX/GL/GLRenderTargets.h @@ -1,6 +1,5 @@ #pragma once #include "../Common/surface_store.h" -#include "GLHelpers.h" #include "../rsx_utils.h" #include "glutils/fbo.h" diff --git a/rpcs3/Emu/RSX/GL/GLShaderInterpreter.cpp b/rpcs3/Emu/RSX/GL/GLShaderInterpreter.cpp index 0687798ef..5d30ae5ab 100644 --- a/rpcs3/Emu/RSX/GL/GLShaderInterpreter.cpp +++ b/rpcs3/Emu/RSX/GL/GLShaderInterpreter.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "GLShaderInterpreter.h" -#include "GLGSRender.h" +#include "GLTextureCache.h" #include "GLVertexProgram.h" #include "GLFragmentProgram.h" #include "../rsx_methods.h" diff --git a/rpcs3/Emu/RSX/GL/GLShaderInterpreter.h b/rpcs3/Emu/RSX/GL/GLShaderInterpreter.h index 2c1501019..551fa9a8c 100644 --- a/rpcs3/Emu/RSX/GL/GLShaderInterpreter.h +++ b/rpcs3/Emu/RSX/GL/GLShaderInterpreter.h @@ -1,5 +1,4 @@ #pragma once -#include "GLHelpers.h" #include "glutils/program.h" #include "../Program/ProgramStateCache.h" #include "../Common/TextureUtils.h" diff --git a/rpcs3/Emu/RSX/GL/GLTexture.cpp b/rpcs3/Emu/RSX/GL/GLTexture.cpp index 0bc4e3cb9..74ffd7bf7 100644 --- a/rpcs3/Emu/RSX/GL/GLTexture.cpp +++ b/rpcs3/Emu/RSX/GL/GLTexture.cpp @@ -1,16 +1,13 @@ #include "stdafx.h" #include "GLTexture.h" #include "GLCompute.h" -#include "GLRenderTargets.h" #include "GLOverlays.h" #include "GLGSRender.h" #include "glutils/blitter.h" #include "glutils/ring_buffer.h" -#include "../GCM.h" #include "../RSXThread.h" -#include "../RSXTexture.h" #include "util/asm.hpp" diff --git a/rpcs3/Emu/RSX/GL/GLTexture.h b/rpcs3/Emu/RSX/GL/GLTexture.h index bcf52f21f..dc6d90098 100644 --- a/rpcs3/Emu/RSX/GL/GLTexture.h +++ b/rpcs3/Emu/RSX/GL/GLTexture.h @@ -1,12 +1,9 @@ #pragma once #include "OpenGL.h" -#include "../GCM.h" #include "../Common/TextureUtils.h" #include "GLHelpers.h" -#include - namespace rsx { class vertex_texture; diff --git a/rpcs3/Emu/RSX/GL/GLTextureCache.cpp b/rpcs3/Emu/RSX/GL/GLTextureCache.cpp index a3a06de4f..f3103dac5 100644 --- a/rpcs3/Emu/RSX/GL/GLTextureCache.cpp +++ b/rpcs3/Emu/RSX/GL/GLTextureCache.cpp @@ -1,5 +1,4 @@ #include "stdafx.h" -#include "Emu/RSX/RSXThread.h" #include "GLTexture.h" #include "GLTextureCache.h" #include "../Common/BufferUtils.h" diff --git a/rpcs3/Emu/RSX/GL/GLVertexProgram.cpp b/rpcs3/Emu/RSX/GL/GLVertexProgram.cpp index 23156c87e..79286bd69 100644 --- a/rpcs3/Emu/RSX/GL/GLVertexProgram.cpp +++ b/rpcs3/Emu/RSX/GL/GLVertexProgram.cpp @@ -1,14 +1,11 @@ #include "stdafx.h" #include "GLVertexProgram.h" -#include "Emu/System.h" #include "Emu/system_config.h" #include "GLCommonDecompiler.h" #include "../Program/GLSLCommon.h" -#include - std::string GLVertexDecompilerThread::getFloatTypeName(usz elementCount) { return glsl::getFloatTypeNameImpl(elementCount); diff --git a/rpcs3/Emu/RSX/GL/GLVertexProgram.h b/rpcs3/Emu/RSX/GL/GLVertexProgram.h index 7a630d0cd..631b6ac24 100644 --- a/rpcs3/Emu/RSX/GL/GLVertexProgram.h +++ b/rpcs3/Emu/RSX/GL/GLVertexProgram.h @@ -1,6 +1,5 @@ #pragma once #include "../Program/VertexProgramDecompiler.h" -#include "GLHelpers.h" #include "glutils/program.h" #include diff --git a/rpcs3/Emu/RSX/GL/glutils/blitter.cpp b/rpcs3/Emu/RSX/GL/glutils/blitter.cpp index e7ca554e0..57998b761 100644 --- a/rpcs3/Emu/RSX/GL/glutils/blitter.cpp +++ b/rpcs3/Emu/RSX/GL/glutils/blitter.cpp @@ -3,7 +3,6 @@ #include "state_tracker.hpp" #include "../GLTexture.h" // TODO: This system also needs to be refactored -#include "../GLOverlays.h" namespace gl { diff --git a/rpcs3/Emu/RSX/GL/glutils/buffer_object.cpp b/rpcs3/Emu/RSX/GL/glutils/buffer_object.cpp index 284014f61..d049359b8 100644 --- a/rpcs3/Emu/RSX/GL/glutils/buffer_object.cpp +++ b/rpcs3/Emu/RSX/GL/glutils/buffer_object.cpp @@ -1,5 +1,6 @@ #include "stdafx.h" #include "buffer_object.h" +#include "common.h" namespace gl { diff --git a/rpcs3/Emu/RSX/GL/glutils/buffer_object.h b/rpcs3/Emu/RSX/GL/glutils/buffer_object.h index e559318be..dccb2a314 100644 --- a/rpcs3/Emu/RSX/GL/glutils/buffer_object.h +++ b/rpcs3/Emu/RSX/GL/glutils/buffer_object.h @@ -1,6 +1,6 @@ #pragma once -#include "common.h" +#include "Emu/RSX/GL/OpenGL.h" namespace gl { diff --git a/rpcs3/Emu/RSX/GL/glutils/sampler.cpp b/rpcs3/Emu/RSX/GL/glutils/sampler.cpp index 144aab97d..580caf0dc 100644 --- a/rpcs3/Emu/RSX/GL/glutils/sampler.cpp +++ b/rpcs3/Emu/RSX/GL/glutils/sampler.cpp @@ -2,7 +2,6 @@ #include "sampler.h" #include "Emu/RSX/gcm_enums.h" -#include "Emu/RSX/rsx_utils.h" #include "Emu/RSX/Common/TextureUtils.h" //GLenum wrap_mode(rsx::texture_wrap_mode wrap); diff --git a/rpcs3/Emu/RSX/GL/upscalers/fsr1/fsr_pass.cpp b/rpcs3/Emu/RSX/GL/upscalers/fsr1/fsr_pass.cpp index 940de27d8..cfd7b1cc0 100644 --- a/rpcs3/Emu/RSX/GL/upscalers/fsr1/fsr_pass.cpp +++ b/rpcs3/Emu/RSX/GL/upscalers/fsr1/fsr_pass.cpp @@ -1,5 +1,6 @@ #include "stdafx.h" +#include "../../glutils/fbo.h" #include "../fsr_pass.h" #if defined(__GNUC__) diff --git a/rpcs3/Emu/RSX/GL/upscalers/upscaling.h b/rpcs3/Emu/RSX/GL/upscalers/upscaling.h index 4c9053666..9c8eec643 100644 --- a/rpcs3/Emu/RSX/GL/upscalers/upscaling.h +++ b/rpcs3/Emu/RSX/GL/upscalers/upscaling.h @@ -1,8 +1,5 @@ #pragma once -#include "util/types.hpp" - -#include "../glutils/fbo.h" #include "../glutils/image.h" #include "../glutils/state_tracker.hpp" diff --git a/rpcs3/Emu/RSX/GSFrameBase.h b/rpcs3/Emu/RSX/GSFrameBase.h index fd91244ff..1f426f9ef 100644 --- a/rpcs3/Emu/RSX/GSFrameBase.h +++ b/rpcs3/Emu/RSX/GSFrameBase.h @@ -1,7 +1,6 @@ #pragma once #include "util/types.hpp" -#include "util/atomic.hpp" #include #include "display.h" diff --git a/rpcs3/Emu/RSX/GSRender.cpp b/rpcs3/Emu/RSX/GSRender.cpp index 2025842da..e9e859952 100644 --- a/rpcs3/Emu/RSX/GSRender.cpp +++ b/rpcs3/Emu/RSX/GSRender.cpp @@ -1,5 +1,6 @@ #include "stdafx.h" +#include "Emu/System.h" #include "GSRender.h" GSRender::GSRender(utils::serial* ar) noexcept : rsx::thread(ar) diff --git a/rpcs3/Emu/RSX/NV47/FW/GRAPH_backend.h b/rpcs3/Emu/RSX/NV47/FW/GRAPH_backend.h index ab8a02984..21c78cdaa 100644 --- a/rpcs3/Emu/RSX/NV47/FW/GRAPH_backend.h +++ b/rpcs3/Emu/RSX/NV47/FW/GRAPH_backend.h @@ -2,8 +2,6 @@ #include "../HW/context.h" -#include - namespace rsx { // GRAPH backend class. Wraps RSX acceleration capabilities for the host. diff --git a/rpcs3/Emu/RSX/NV47/HW/nv406e.cpp b/rpcs3/Emu/RSX/NV47/HW/nv406e.cpp index 3c6d6de4e..ced6c3f38 100644 --- a/rpcs3/Emu/RSX/NV47/HW/nv406e.cpp +++ b/rpcs3/Emu/RSX/NV47/HW/nv406e.cpp @@ -1,6 +1,5 @@ #include "stdafx.h" #include "nv406e.h" -#include "common.h" #include "nv47_sync.hpp" #include "Emu/RSX/RSXThread.h" diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_page.h b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_page.h index f4495d8ae..862baf506 100644 --- a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_page.h +++ b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_page.h @@ -1,6 +1,5 @@ #pragma once -#include "Emu/RSX/Overlays/overlays.h" #include "Emu/RSX/Overlays/overlay_list_view.hpp" #include "Emu/RSX/Overlays/HomeMenu/overlay_home_menu_components.h" #include "Emu/RSX/Overlays/HomeMenu/overlay_home_menu_message_box.h" diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.cpp b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.cpp index fe82f8125..daaf5cc8e 100644 --- a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.cpp +++ b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.cpp @@ -1,6 +1,5 @@ #include "stdafx.h" #include "overlay_home_menu_settings.h" -#include "overlay_home_menu_components.h" #include "Emu/system_config.h" namespace rsx diff --git a/rpcs3/Emu/RSX/Overlays/Network/overlay_recvmessage_dialog.cpp b/rpcs3/Emu/RSX/Overlays/Network/overlay_recvmessage_dialog.cpp index 12ccdc0b2..69c3c4167 100644 --- a/rpcs3/Emu/RSX/Overlays/Network/overlay_recvmessage_dialog.cpp +++ b/rpcs3/Emu/RSX/Overlays/Network/overlay_recvmessage_dialog.cpp @@ -3,7 +3,6 @@ #include "overlay_recvmessage_dialog.h" #include "Emu/System.h" #include "Emu/NP/rpcn_client.h" -#include "Utilities/Thread.h" namespace rsx { diff --git a/rpcs3/Emu/RSX/Overlays/Network/overlay_sendmessage_dialog.cpp b/rpcs3/Emu/RSX/Overlays/Network/overlay_sendmessage_dialog.cpp index 4c2ca52e4..25588d3e5 100644 --- a/rpcs3/Emu/RSX/Overlays/Network/overlay_sendmessage_dialog.cpp +++ b/rpcs3/Emu/RSX/Overlays/Network/overlay_sendmessage_dialog.cpp @@ -7,7 +7,6 @@ #include "Emu/Cell/PPUThread.h" // for vm_var #include "Emu/Memory/vm_var.h" #include "Emu/Io/interception.h" -#include "Utilities/Thread.h" namespace rsx { diff --git a/rpcs3/Emu/RSX/Overlays/Shaders/shader_loading_dialog_native.cpp b/rpcs3/Emu/RSX/Overlays/Shaders/shader_loading_dialog_native.cpp index 3546592cf..d3e522df2 100644 --- a/rpcs3/Emu/RSX/Overlays/Shaders/shader_loading_dialog_native.cpp +++ b/rpcs3/Emu/RSX/Overlays/Shaders/shader_loading_dialog_native.cpp @@ -3,6 +3,7 @@ #include "../overlay_manager.h" #include "../overlay_message_dialog.h" #include "../../GSRender.h" +#include "Emu/System.h" #include "Emu/Cell/ErrorCodes.h" namespace rsx diff --git a/rpcs3/Emu/RSX/Overlays/overlay_animated_icon.cpp b/rpcs3/Emu/RSX/Overlays/overlay_animated_icon.cpp index d1af06bab..3177a76a9 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_animated_icon.cpp +++ b/rpcs3/Emu/RSX/Overlays/overlay_animated_icon.cpp @@ -2,7 +2,8 @@ #include "overlay_animated_icon.h" #include "Utilities/File.h" -#include "../Common/time.hpp" + +#include "Emu/Cell/timers.hpp" namespace rsx { diff --git a/rpcs3/Emu/RSX/Overlays/overlay_animated_icon.h b/rpcs3/Emu/RSX/Overlays/overlay_animated_icon.h index 71add8e9c..b4a864d04 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_animated_icon.h +++ b/rpcs3/Emu/RSX/Overlays/overlay_animated_icon.h @@ -1,6 +1,6 @@ #pragma once -#include "overlays.h" +#include "Emu/RSX/Overlays/overlay_controls.h" namespace rsx { diff --git a/rpcs3/Emu/RSX/Overlays/overlay_animation.cpp b/rpcs3/Emu/RSX/Overlays/overlay_animation.cpp index 3bab8b6bc..0d5d8f3ba 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_animation.cpp +++ b/rpcs3/Emu/RSX/Overlays/overlay_animation.cpp @@ -1,7 +1,6 @@ #include "stdafx.h" #include "overlay_animation.h" #include "overlay_controls.h" -#include "Emu/system_config.h" namespace rsx { diff --git a/rpcs3/Emu/RSX/Overlays/overlay_compile_notification.cpp b/rpcs3/Emu/RSX/Overlays/overlay_compile_notification.cpp index da7f58e6d..434226bfa 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_compile_notification.cpp +++ b/rpcs3/Emu/RSX/Overlays/overlay_compile_notification.cpp @@ -1,5 +1,4 @@ #include "stdafx.h" -#include "overlays.h" #include "overlay_message.h" #include "overlay_loading_icon.hpp" diff --git a/rpcs3/Emu/RSX/Overlays/overlay_controls.cpp b/rpcs3/Emu/RSX/Overlays/overlay_controls.cpp index 480967c0c..cf6e18adc 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_controls.cpp +++ b/rpcs3/Emu/RSX/Overlays/overlay_controls.cpp @@ -5,6 +5,7 @@ #include "util/logs.hpp" #include "Utilities/geometry.h" #include "Utilities/File.h" +#include "Emu/Cell/timers.hpp" #ifndef _WIN32 #include diff --git a/rpcs3/Emu/RSX/Overlays/overlay_controls.h b/rpcs3/Emu/RSX/Overlays/overlay_controls.h index f6d36ceaa..45a3fde22 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_controls.h +++ b/rpcs3/Emu/RSX/Overlays/overlay_controls.h @@ -3,7 +3,6 @@ #include "overlay_fonts.h" #include "Emu/localized_string.h" -#include "Emu/Cell/timers.hpp" #include diff --git a/rpcs3/Emu/RSX/Overlays/overlay_cursor.cpp b/rpcs3/Emu/RSX/Overlays/overlay_cursor.cpp index 589bcabbc..e20074d1b 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_cursor.cpp +++ b/rpcs3/Emu/RSX/Overlays/overlay_cursor.cpp @@ -1,6 +1,7 @@ #include "stdafx.h" #include "overlay_cursor.h" #include "overlay_manager.h" +#include "Emu/Cell/timers.hpp" namespace rsx { diff --git a/rpcs3/Emu/RSX/Overlays/overlay_cursor.h b/rpcs3/Emu/RSX/Overlays/overlay_cursor.h index 079346f64..d464c509f 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_cursor.h +++ b/rpcs3/Emu/RSX/Overlays/overlay_cursor.h @@ -1,6 +1,7 @@ #pragma once #include "overlays.h" +#include "Utilities/mutex.h" #include namespace rsx diff --git a/rpcs3/Emu/RSX/Overlays/overlay_fonts.cpp b/rpcs3/Emu/RSX/Overlays/overlay_fonts.cpp index 6de7440e5..8f3c7173b 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_fonts.cpp +++ b/rpcs3/Emu/RSX/Overlays/overlay_fonts.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "overlay_controls.h" +#include "overlay_fonts.h" #include "Emu/System.h" #include "Emu/vfs_config.h" diff --git a/rpcs3/Emu/RSX/Overlays/overlay_manager.h b/rpcs3/Emu/RSX/Overlays/overlay_manager.h index d7a10988c..7146be3dd 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_manager.h +++ b/rpcs3/Emu/RSX/Overlays/overlay_manager.h @@ -5,10 +5,7 @@ #include "Emu/IdManager.h" #include "Utilities/mutex.h" #include "Utilities/Thread.h" -#include "Utilities/Timer.h" - -#include -#include +#include "Utilities/lockless.h" namespace rsx { diff --git a/rpcs3/Emu/RSX/Overlays/overlay_message.cpp b/rpcs3/Emu/RSX/Overlays/overlay_message.cpp index f7a7a8ed7..b00f0cc5b 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_message.cpp +++ b/rpcs3/Emu/RSX/Overlays/overlay_message.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "overlay_message.h" -#include "Emu/RSX/Common/time.hpp" +#include "Emu/Cell/timers.hpp" namespace rsx { diff --git a/rpcs3/Emu/RSX/Overlays/overlay_osk.cpp b/rpcs3/Emu/RSX/Overlays/overlay_osk.cpp index c47b5687c..4bf189e35 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_osk.cpp +++ b/rpcs3/Emu/RSX/Overlays/overlay_osk.cpp @@ -2,10 +2,10 @@ #include "overlay_manager.h" #include "overlay_osk.h" #include "Emu/Cell/Modules/cellSysutil.h" -#include "Emu/Cell/Modules/cellMsgDialog.h" -#include "Emu/Cell/Modules/cellKb.h" +#include "Emu/Io/Keyboard.h" #include "Emu/System.h" #include "Emu/system_config.h" +#include "Emu/Cell/timers.hpp" LOG_CHANNEL(osk, "OSK"); diff --git a/rpcs3/Emu/RSX/Overlays/overlay_perf_metrics.cpp b/rpcs3/Emu/RSX/Overlays/overlay_perf_metrics.cpp index 0bc954b0d..0c4b9beca 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_perf_metrics.cpp +++ b/rpcs3/Emu/RSX/Overlays/overlay_perf_metrics.cpp @@ -7,7 +7,6 @@ #include #include -#include #include "util/cpu_stats.hpp" diff --git a/rpcs3/Emu/RSX/Overlays/overlay_user_list_dialog.cpp b/rpcs3/Emu/RSX/Overlays/overlay_user_list_dialog.cpp index b65f2bdb9..a796d62de 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_user_list_dialog.cpp +++ b/rpcs3/Emu/RSX/Overlays/overlay_user_list_dialog.cpp @@ -4,8 +4,6 @@ #include "Emu/vfs_config.h" #include "Emu/system_utils.hpp" #include "Emu/System.h" -#include "Utilities/StrUtil.h" -#include "Utilities/Thread.h" namespace rsx { diff --git a/rpcs3/Emu/RSX/Overlays/overlays.cpp b/rpcs3/Emu/RSX/Overlays/overlays.cpp index a1fe40d8c..47e7ee3f8 100644 --- a/rpcs3/Emu/RSX/Overlays/overlays.cpp +++ b/rpcs3/Emu/RSX/Overlays/overlays.cpp @@ -1,12 +1,11 @@ #include "stdafx.h" #include "overlays.h" #include "overlay_manager.h" -#include "overlay_message_dialog.h" #include "Input/pad_thread.h" #include "Emu/Io/interception.h" #include "Emu/Io/KeyboardHandler.h" #include "Emu/RSX/RSXThread.h" -#include "Emu/RSX/Common/time.hpp" +#include "Emu/System.h" LOG_CHANNEL(overlays); diff --git a/rpcs3/Emu/RSX/Overlays/overlays.h b/rpcs3/Emu/RSX/Overlays/overlays.h index d706a6e3f..254a47cb7 100644 --- a/rpcs3/Emu/RSX/Overlays/overlays.h +++ b/rpcs3/Emu/RSX/Overlays/overlays.h @@ -2,10 +2,8 @@ #include "overlay_animation.h" #include "overlay_controls.h" -#include "Emu/IdManager.h" #include "Emu/Io/pad_types.h" -#include "Utilities/mutex.h" #include "Utilities/Timer.h" #include "../Common/bitfield.hpp" diff --git a/rpcs3/Emu/RSX/Program/CgBinaryProgram.h b/rpcs3/Emu/RSX/Program/CgBinaryProgram.h index 9e567952b..f63e2adc1 100644 --- a/rpcs3/Emu/RSX/Program/CgBinaryProgram.h +++ b/rpcs3/Emu/RSX/Program/CgBinaryProgram.h @@ -1,6 +1,6 @@ #pragma once -#include "Emu/Memory/vm.h" +#include "util/endian.hpp" #include "Emu/RSX/GL/GLVertexProgram.h" #include "Emu/RSX/GL/GLFragmentProgram.h" #include "Emu/RSX/Program/ProgramStateCache.h" diff --git a/rpcs3/Emu/RSX/Program/CgBinaryVertexProgram.cpp b/rpcs3/Emu/RSX/Program/CgBinaryVertexProgram.cpp index 00b1ca720..c37fcd5a5 100644 --- a/rpcs3/Emu/RSX/Program/CgBinaryVertexProgram.cpp +++ b/rpcs3/Emu/RSX/Program/CgBinaryVertexProgram.cpp @@ -1,7 +1,5 @@ #include "stdafx.h" #include "CgBinaryProgram.h" - -#include "Emu/System.h" #include "RSXVertexProgram.h" void CgBinaryDisasm::AddScaCodeDisasm(const std::string& code) diff --git a/rpcs3/Emu/RSX/Program/FragmentProgramDecompiler.cpp b/rpcs3/Emu/RSX/Program/FragmentProgramDecompiler.cpp index 4a2215d9f..43e4d866a 100644 --- a/rpcs3/Emu/RSX/Program/FragmentProgramDecompiler.cpp +++ b/rpcs3/Emu/RSX/Program/FragmentProgramDecompiler.cpp @@ -1,6 +1,4 @@ #include "stdafx.h" -#include "Emu/System.h" -#include "../rsx_methods.h" #include "FragmentProgramDecompiler.h" #include diff --git a/rpcs3/Emu/RSX/Program/GLSLCommon.cpp b/rpcs3/Emu/RSX/Program/GLSLCommon.cpp index 3f72a3b4a..0a1005eb4 100644 --- a/rpcs3/Emu/RSX/Program/GLSLCommon.cpp +++ b/rpcs3/Emu/RSX/Program/GLSLCommon.cpp @@ -3,7 +3,6 @@ #include "GLSLCommon.h" #include "RSXFragmentProgram.h" -#include "Emu/system_config.h" #include "Emu/RSX/gcm_enums.h" #include "Utilities/StrFmt.h" diff --git a/rpcs3/Emu/RSX/Program/ProgramStateCache.cpp b/rpcs3/Emu/RSX/Program/ProgramStateCache.cpp index 6a1bcffc7..b6c2fba45 100644 --- a/rpcs3/Emu/RSX/Program/ProgramStateCache.cpp +++ b/rpcs3/Emu/RSX/Program/ProgramStateCache.cpp @@ -4,8 +4,6 @@ #include #include "util/v128.hpp" -#include "util/asm.hpp" - #if defined(ARCH_X64) #include "emmintrin.h" diff --git a/rpcs3/Emu/RSX/Program/SPIRVCommon.cpp b/rpcs3/Emu/RSX/Program/SPIRVCommon.cpp index e1aac0bd3..f40ff0616 100644 --- a/rpcs3/Emu/RSX/Program/SPIRVCommon.cpp +++ b/rpcs3/Emu/RSX/Program/SPIRVCommon.cpp @@ -20,7 +20,7 @@ #endif #include "SPIRVCommon.h" -#include "GLSLCommon.h" +#include "Emu/RSX/Program/GLSLTypes.h" namespace spirv { diff --git a/rpcs3/Emu/RSX/Program/VertexProgramDecompiler.cpp b/rpcs3/Emu/RSX/Program/VertexProgramDecompiler.cpp index 151190230..dc9a03499 100644 --- a/rpcs3/Emu/RSX/Program/VertexProgramDecompiler.cpp +++ b/rpcs3/Emu/RSX/Program/VertexProgramDecompiler.cpp @@ -1,6 +1,4 @@ #include "stdafx.h" -#include "Emu/System.h" - #include "VertexProgramDecompiler.h" #include diff --git a/rpcs3/Emu/RSX/RSXDisAsm.h b/rpcs3/Emu/RSX/RSXDisAsm.h index 08143cbfb..445e5290b 100644 --- a/rpcs3/Emu/RSX/RSXDisAsm.h +++ b/rpcs3/Emu/RSX/RSXDisAsm.h @@ -1,6 +1,6 @@ #pragma once -#include "Emu/Cell/PPCDisAsm.h" +#include "Emu/CPU/CPUDisAsm.h" class RSXDisAsm final : public CPUDisAsm { diff --git a/rpcs3/Emu/RSX/RSXFIFO.cpp b/rpcs3/Emu/RSX/RSXFIFO.cpp index 839144a75..3f6889bda 100644 --- a/rpcs3/Emu/RSX/RSXFIFO.cpp +++ b/rpcs3/Emu/RSX/RSXFIFO.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" +#include "Emu/System.h" #include "RSXFIFO.h" #include "RSXThread.h" #include "Capture/rsx_capture.h" -#include "Common/time.hpp" #include "Core/RSXReservationLock.hpp" #include "Emu/Memory/vm_reservation.h" #include "Emu/Cell/lv2/sys_rsx.h" @@ -11,6 +11,7 @@ #include "util/asm.hpp" +#include #include using spu_rdata_t = std::byte[128]; diff --git a/rpcs3/Emu/RSX/RSXOffload.cpp b/rpcs3/Emu/RSX/RSXOffload.cpp index 97a27ae0e..5f8737543 100644 --- a/rpcs3/Emu/RSX/RSXOffload.cpp +++ b/rpcs3/Emu/RSX/RSXOffload.cpp @@ -6,6 +6,8 @@ #include "RSXOffload.h" #include "RSXThread.h" +#include "Utilities/lockless.h" + #include #include "util/asm.hpp" diff --git a/rpcs3/Emu/RSX/RSXTexture.cpp b/rpcs3/Emu/RSX/RSXTexture.cpp index 5951f368e..9b8f4bfb2 100644 --- a/rpcs3/Emu/RSX/RSXTexture.cpp +++ b/rpcs3/Emu/RSX/RSXTexture.cpp @@ -1,7 +1,6 @@ #include "stdafx.h" #include "RSXTexture.h" -#include "rsx_methods.h" #include "rsx_utils.h" #include "Emu/system_config.h" diff --git a/rpcs3/Emu/RSX/RSXThread.cpp b/rpcs3/Emu/RSX/RSXThread.cpp index e12820395..a7d7d260b 100644 --- a/rpcs3/Emu/RSX/RSXThread.cpp +++ b/rpcs3/Emu/RSX/RSXThread.cpp @@ -2,11 +2,7 @@ #include "RSXThread.h" #include "Capture/rsx_capture.h" -#include "Common/BufferUtils.h" -#include "Common/buffer_stream.hpp" -#include "Common/texture_cache.h" #include "Common/surface_store.h" -#include "Common/time.hpp" #include "Core/RSXReservationLock.hpp" #include "Core/RSXEngLock.hpp" #include "Host/MM.h" @@ -18,8 +14,8 @@ #include "gcm_printing.h" #include "RSXDisAsm.h" -#include "Emu/Cell/PPUCallback.h" -#include "Emu/Cell/SPUThread.h" +#include "Emu/System.h" +#include "Emu/Cell/PPUThread.h" #include "Emu/Cell/timers.hpp" #include "Emu/Cell/lv2/sys_event.h" #include "Emu/Cell/lv2/sys_time.h" @@ -27,19 +23,15 @@ #include "util/serialization_ext.hpp" #include "Overlays/overlay_perf_metrics.h" #include "Overlays/overlay_debug_overlay.h" -#include "Overlays/overlay_message.h" +#include "Overlays/overlay_manager.h" #include "Utilities/date_time.h" -#include "Utilities/StrUtil.h" -#include "Crypto/unzip.h" #include "util/asm.hpp" #include -#include #include #include -#include class GSRender; diff --git a/rpcs3/Emu/RSX/RSXThread.h b/rpcs3/Emu/RSX/RSXThread.h index 4da43908c..8b5f2af10 100644 --- a/rpcs3/Emu/RSX/RSXThread.h +++ b/rpcs3/Emu/RSX/RSXThread.h @@ -1,14 +1,8 @@ #pragma once -#include #include #include -#include -#include -#include -#include "GCM.h" -#include "rsx_cache.h" #include "RSXFIFO.h" #include "RSXOffload.h" #include "RSXZCULL.h" @@ -32,7 +26,6 @@ #include "Core/RSXDriverState.h" #include "Core/RSXFrameBuffer.h" #include "Core/RSXContext.h" -#include "Core/RSXIOMap.hpp" #include "Core/RSXVertexTypes.h" #include "NV47/FW/GRAPH_backend.h" diff --git a/rpcs3/Emu/RSX/RSXZCULL.h b/rpcs3/Emu/RSX/RSXZCULL.h index cb072561f..4627fa2ca 100644 --- a/rpcs3/Emu/RSX/RSXZCULL.h +++ b/rpcs3/Emu/RSX/RSXZCULL.h @@ -4,6 +4,8 @@ #include #include +#include "Utilities/mutex.h" + #include "rsx_utils.h" #include diff --git a/rpcs3/Emu/RSX/VK/VKAsyncScheduler.cpp b/rpcs3/Emu/RSX/VK/VKAsyncScheduler.cpp index 7211d50e1..fd4e667ef 100644 --- a/rpcs3/Emu/RSX/VK/VKAsyncScheduler.cpp +++ b/rpcs3/Emu/RSX/VK/VKAsyncScheduler.cpp @@ -1,10 +1,5 @@ #include "VKAsyncScheduler.h" #include "VKHelpers.h" -#include "VKResourceManager.h" - -#include "Emu/IdManager.h" -#include "Utilities/lockless.h" -#include "Utilities/mutex.h" #include diff --git a/rpcs3/Emu/RSX/VK/VKAsyncScheduler.h b/rpcs3/Emu/RSX/VK/VKAsyncScheduler.h index 4613a122d..0b0083080 100644 --- a/rpcs3/Emu/RSX/VK/VKAsyncScheduler.h +++ b/rpcs3/Emu/RSX/VK/VKAsyncScheduler.h @@ -2,8 +2,7 @@ #include "vkutils/commands.h" #include "vkutils/sync.h" - -#include "Utilities/Thread.h" +#include "Utilities/mutex.h" #define VK_MAX_ASYNC_COMPUTE_QUEUES 256 diff --git a/rpcs3/Emu/RSX/VK/VKCompute.cpp b/rpcs3/Emu/RSX/VK/VKCompute.cpp index e7cfb617b..7cda0a8ff 100644 --- a/rpcs3/Emu/RSX/VK/VKCompute.cpp +++ b/rpcs3/Emu/RSX/VK/VKCompute.cpp @@ -2,6 +2,7 @@ #include "VKHelpers.h" #include "VKRenderPass.h" #include "vkutils/buffer_object.h" +#include "VKPipelineCompiler.h" #define VK_MAX_COMPUTE_TASKS 8192 // Max number of jobs per frame diff --git a/rpcs3/Emu/RSX/VK/VKCompute.h b/rpcs3/Emu/RSX/VK/VKCompute.h index faadecfc1..4f9a3f2a3 100644 --- a/rpcs3/Emu/RSX/VK/VKCompute.h +++ b/rpcs3/Emu/RSX/VK/VKCompute.h @@ -1,5 +1,5 @@ #pragma once -#include "VKPipelineCompiler.h" +#include "Emu/RSX/VK/VKProgramPipeline.h" #include "vkutils/descriptors.h" #include "vkutils/buffer_object.h" diff --git a/rpcs3/Emu/RSX/VK/VKDMA.h b/rpcs3/Emu/RSX/VK/VKDMA.h index 44ad62382..e71873364 100644 --- a/rpcs3/Emu/RSX/VK/VKDMA.h +++ b/rpcs3/Emu/RSX/VK/VKDMA.h @@ -1,6 +1,5 @@ #pragma once #include "vkutils/buffer_object.h" -#include "vkutils/commands.h" namespace vk { diff --git a/rpcs3/Emu/RSX/VK/VKFormats.h b/rpcs3/Emu/RSX/VK/VKFormats.h index 65aaab44c..85b52ca56 100644 --- a/rpcs3/Emu/RSX/VK/VKFormats.h +++ b/rpcs3/Emu/RSX/VK/VKFormats.h @@ -1,7 +1,6 @@ #pragma once #include "VulkanAPI.h" #include "../gcm_enums.h" -#include namespace vk { diff --git a/rpcs3/Emu/RSX/VK/VKFragmentProgram.cpp b/rpcs3/Emu/RSX/VK/VKFragmentProgram.cpp index eb57d11f7..dd654a673 100644 --- a/rpcs3/Emu/RSX/VK/VKFragmentProgram.cpp +++ b/rpcs3/Emu/RSX/VK/VKFragmentProgram.cpp @@ -5,7 +5,6 @@ #include "vkutils/device.h" #include "Emu/system_config.h" #include "../Program/GLSLCommon.h" -#include "../GCM.h" std::string VKFragmentDecompilerThread::getFloatTypeName(usz elementCount) { diff --git a/rpcs3/Emu/RSX/VK/VKGSRender.cpp b/rpcs3/Emu/RSX/VK/VKGSRender.cpp index 2305e515e..d37f6d62d 100644 --- a/rpcs3/Emu/RSX/VK/VKGSRender.cpp +++ b/rpcs3/Emu/RSX/VK/VKGSRender.cpp @@ -4,7 +4,6 @@ #include "VKAsyncScheduler.h" #include "VKCommandStream.h" -#include "VKCommonDecompiler.h" #include "VKCommonPipelineLayout.h" #include "VKCompute.h" #include "VKGSRender.h" diff --git a/rpcs3/Emu/RSX/VK/VKGSRender.h b/rpcs3/Emu/RSX/VK/VKGSRender.h index c245a2677..028aa6b17 100644 --- a/rpcs3/Emu/RSX/VK/VKGSRender.h +++ b/rpcs3/Emu/RSX/VK/VKGSRender.h @@ -17,15 +17,10 @@ #include "VKFramebuffer.h" #include "VKShaderInterpreter.h" #include "VKQueryPool.h" -#include "util/asm.hpp" -#include "Emu/RSX/GCM.h" #include "Emu/RSX/GSRender.h" #include "Emu/RSX/Host/RSXDMAWriter.h" -#include -#include - using namespace vk::vmm_allocation_pool_; // clang workaround. using namespace vk::upscaling_flags_; // ditto diff --git a/rpcs3/Emu/RSX/VK/VKHelpers.cpp b/rpcs3/Emu/RSX/VK/VKHelpers.cpp index 45e5e1476..a0d0b643d 100644 --- a/rpcs3/Emu/RSX/VK/VKHelpers.cpp +++ b/rpcs3/Emu/RSX/VK/VKHelpers.cpp @@ -7,12 +7,10 @@ #include "VKResolveHelper.h" #include "VKResourceManager.h" #include "VKDMA.h" -#include "VKCommandStream.h" #include "VKRenderPass.h" #include "vkutils/scratch.h" #include "vkutils/device.h" -#include "Emu/RSX/rsx_methods.h" #include namespace vk diff --git a/rpcs3/Emu/RSX/VK/VKHelpers.h b/rpcs3/Emu/RSX/VK/VKHelpers.h index 281aab5f1..302abfb80 100644 --- a/rpcs3/Emu/RSX/VK/VKHelpers.h +++ b/rpcs3/Emu/RSX/VK/VKHelpers.h @@ -1,17 +1,9 @@ #pragma once #include "util/types.hpp" -#include -#include #include -#include -#include -#include -#include -#include #include "VulkanAPI.h" -#include "vkutils/chip_class.h" #include "Utilities/geometry.h" #include "Emu/RSX/Common/TextureUtils.h" #include "Emu/RSX/rsx_utils.h" diff --git a/rpcs3/Emu/RSX/VK/VKOverlays.cpp b/rpcs3/Emu/RSX/VK/VKOverlays.cpp index 3785b18ef..8f862cb6e 100644 --- a/rpcs3/Emu/RSX/VK/VKOverlays.cpp +++ b/rpcs3/Emu/RSX/VK/VKOverlays.cpp @@ -15,6 +15,8 @@ #include "util/fnv_hash.hpp" +#include "Emu/Cell/timers.hpp" + namespace vk { overlay_pass::overlay_pass() diff --git a/rpcs3/Emu/RSX/VK/VKPipelineCompiler.cpp b/rpcs3/Emu/RSX/VK/VKPipelineCompiler.cpp index 930210f19..52742e124 100644 --- a/rpcs3/Emu/RSX/VK/VKPipelineCompiler.cpp +++ b/rpcs3/Emu/RSX/VK/VKPipelineCompiler.cpp @@ -4,8 +4,6 @@ #include "vkutils/device.h" #include "Utilities/Thread.h" -#include - #include "util/sysinfo.hpp" namespace vk diff --git a/rpcs3/Emu/RSX/VK/VKPipelineCompiler.h b/rpcs3/Emu/RSX/VK/VKPipelineCompiler.h index 5ed3c7b07..836bc5f14 100644 --- a/rpcs3/Emu/RSX/VK/VKPipelineCompiler.h +++ b/rpcs3/Emu/RSX/VK/VKPipelineCompiler.h @@ -1,5 +1,4 @@ #pragma once -#include "../rsx_utils.h" #include "Utilities/lockless.h" #include "VKProgramPipeline.h" #include "vkutils/graphics_pipeline_state.hpp" diff --git a/rpcs3/Emu/RSX/VK/VKPresent.cpp b/rpcs3/Emu/RSX/VK/VKPresent.cpp index f1bcc214f..e8f182c89 100644 --- a/rpcs3/Emu/RSX/VK/VKPresent.cpp +++ b/rpcs3/Emu/RSX/VK/VKPresent.cpp @@ -2,7 +2,6 @@ #include "VKGSRender.h" #include "vkutils/buffer_object.h" #include "Emu/RSX/Overlays/overlay_manager.h" -#include "Emu/RSX/Overlays/overlays.h" #include "Emu/RSX/Overlays/overlay_debug_overlay.h" #include "Emu/Cell/Modules/cellVideoOut.h" diff --git a/rpcs3/Emu/RSX/VK/VKProgramBuffer.h b/rpcs3/Emu/RSX/VK/VKProgramBuffer.h index 975364c72..63db151ab 100644 --- a/rpcs3/Emu/RSX/VK/VKProgramBuffer.h +++ b/rpcs3/Emu/RSX/VK/VKProgramBuffer.h @@ -1,12 +1,9 @@ #pragma once #include "VKVertexProgram.h" #include "VKFragmentProgram.h" -#include "VKRenderPass.h" #include "VKPipelineCompiler.h" #include "../Program/ProgramStateCache.h" -#include "util/fnv_hash.hpp" - namespace vk { struct VKTraits diff --git a/rpcs3/Emu/RSX/VK/VKProgramPipeline.h b/rpcs3/Emu/RSX/VK/VKProgramPipeline.h index 4b7cdd909..06dbaf877 100644 --- a/rpcs3/Emu/RSX/VK/VKProgramPipeline.h +++ b/rpcs3/Emu/RSX/VK/VKProgramPipeline.h @@ -1,7 +1,7 @@ #pragma once #include "VulkanAPI.h" -#include "VKCommonDecompiler.h" +#include "Emu/RSX/Program/GLSLTypes.h" #include "vkutils/descriptors.h" diff --git a/rpcs3/Emu/RSX/VK/VKQueryPool.cpp b/rpcs3/Emu/RSX/VK/VKQueryPool.cpp index 3fd80a8d6..28cb2c227 100644 --- a/rpcs3/Emu/RSX/VK/VKQueryPool.cpp +++ b/rpcs3/Emu/RSX/VK/VKQueryPool.cpp @@ -1,9 +1,11 @@ #include "stdafx.h" +#include "vkutils/query_pool.hpp" #include "VKHelpers.h" #include "VKQueryPool.h" #include "VKRenderPass.h" #include "VKResourceManager.h" #include "util/asm.hpp" +#include "VKGSRender.h" namespace vk { diff --git a/rpcs3/Emu/RSX/VK/VKRenderTargets.cpp b/rpcs3/Emu/RSX/VK/VKRenderTargets.cpp index d09e248f6..11e7747f2 100644 --- a/rpcs3/Emu/RSX/VK/VKRenderTargets.cpp +++ b/rpcs3/Emu/RSX/VK/VKRenderTargets.cpp @@ -1,5 +1,4 @@ -#include "VKCompute.h" -#include "VKDMA.h" +#include "vkutils/data_heap.h" #include "VKRenderTargets.h" #include "VKResourceManager.h" #include "Emu/RSX/rsx_methods.h" diff --git a/rpcs3/Emu/RSX/VK/VKRenderTargets.h b/rpcs3/Emu/RSX/VK/VKRenderTargets.h index 19c9f04f6..e7df9325c 100644 --- a/rpcs3/Emu/RSX/VK/VKRenderTargets.h +++ b/rpcs3/Emu/RSX/VK/VKRenderTargets.h @@ -7,13 +7,10 @@ #include "VKHelpers.h" #include "vkutils/barriers.h" #include "vkutils/buffer_object.h" -#include "vkutils/data_heap.h" #include "vkutils/device.h" #include "vkutils/image.h" #include "vkutils/scratch.h" -#include - namespace vk { namespace surface_cache_utils diff --git a/rpcs3/Emu/RSX/VK/VKResourceManager.h b/rpcs3/Emu/RSX/VK/VKResourceManager.h index 5a7e53896..11e655801 100644 --- a/rpcs3/Emu/RSX/VK/VKResourceManager.h +++ b/rpcs3/Emu/RSX/VK/VKResourceManager.h @@ -1,12 +1,11 @@ #pragma once -#include "vkutils/image.h" +#include "Emu/RSX/VK/vkutils/sync.h" #include "vkutils/garbage_collector.h" #include "vkutils/query_pool.hpp" #include "vkutils/sampler.h" #include "Utilities/mutex.h" -#include #include #include diff --git a/rpcs3/Emu/RSX/VK/VKShaderInterpreter.cpp b/rpcs3/Emu/RSX/VK/VKShaderInterpreter.cpp index f32cbfdf3..b31e8121e 100644 --- a/rpcs3/Emu/RSX/VK/VKShaderInterpreter.cpp +++ b/rpcs3/Emu/RSX/VK/VKShaderInterpreter.cpp @@ -1,13 +1,14 @@ #include "stdafx.h" + #include "VKShaderInterpreter.h" #include "VKCommonPipelineLayout.h" #include "VKVertexProgram.h" #include "VKFragmentProgram.h" -#include "VKGSRender.h" - #include "../Program/GLSLCommon.h" #include "../Program/ShaderInterpreter.h" #include "../rsx_methods.h" +#include "VKHelpers.h" +#include "VKRenderPass.h" namespace vk { diff --git a/rpcs3/Emu/RSX/VK/VKShaderInterpreter.h b/rpcs3/Emu/RSX/VK/VKShaderInterpreter.h index 9dcd10940..0820f7f02 100644 --- a/rpcs3/Emu/RSX/VK/VKShaderInterpreter.h +++ b/rpcs3/Emu/RSX/VK/VKShaderInterpreter.h @@ -1,5 +1,7 @@ #pragma once -#include "VKProgramBuffer.h" +#include "Emu/RSX/VK/VKProgramPipeline.h" +#include "Emu/RSX/Program/ProgramStateCache.h" +#include "Emu/RSX/VK/VKPipelineCompiler.h" #include "vkutils/descriptors.h" #include diff --git a/rpcs3/Emu/RSX/VK/VKTexture.cpp b/rpcs3/Emu/RSX/VK/VKTexture.cpp index c44df5764..1f6be63c7 100644 --- a/rpcs3/Emu/RSX/VK/VKTexture.cpp +++ b/rpcs3/Emu/RSX/VK/VKTexture.cpp @@ -5,7 +5,6 @@ #include "VKHelpers.h" #include "VKFormats.h" #include "VKRenderPass.h" -#include "VKRenderTargets.h" #include "vkutils/data_heap.h" #include "vkutils/image_helpers.h" diff --git a/rpcs3/Emu/RSX/VK/VKTextureCache.cpp b/rpcs3/Emu/RSX/VK/VKTextureCache.cpp index 503474e6a..7107e1f32 100644 --- a/rpcs3/Emu/RSX/VK/VKTextureCache.cpp +++ b/rpcs3/Emu/RSX/VK/VKTextureCache.cpp @@ -1,7 +1,8 @@ #include "stdafx.h" -#include "VKGSRender.h" +#include "Emu/RSX/VK/VKGSRenderTypes.hpp" #include "VKTextureCache.h" #include "VKCompute.h" +#include "VKAsyncScheduler.h" #include "util/asm.hpp" diff --git a/rpcs3/Emu/RSX/VK/VKTextureCache.h b/rpcs3/Emu/RSX/VK/VKTextureCache.h index 4696062c7..d7d3f81e8 100644 --- a/rpcs3/Emu/RSX/VK/VKTextureCache.h +++ b/rpcs3/Emu/RSX/VK/VKTextureCache.h @@ -1,6 +1,5 @@ #pragma once -#include "VKAsyncScheduler.h" #include "VKDMA.h" #include "VKRenderTargets.h" #include "VKResourceManager.h" @@ -10,8 +9,6 @@ #include "../Common/texture_cache.h" #include "../Common/tiled_dma_copy.hpp" -#include "Emu/Cell/timers.hpp" - #include #include diff --git a/rpcs3/Emu/RSX/VK/VKVertexProgram.h b/rpcs3/Emu/RSX/VK/VKVertexProgram.h index 940272d06..1bb6dfd91 100644 --- a/rpcs3/Emu/RSX/VK/VKVertexProgram.h +++ b/rpcs3/Emu/RSX/VK/VKVertexProgram.h @@ -1,7 +1,5 @@ #pragma once #include "../Program/VertexProgramDecompiler.h" -#include "Utilities/Thread.h" -#include "VulkanAPI.h" #include "VKProgramPipeline.h" #include "vkutils/pipeline_binding_table.h" diff --git a/rpcs3/Emu/RSX/VK/upscalers/upscaling.h b/rpcs3/Emu/RSX/VK/upscalers/upscaling.h index 3f5155868..e9ebe3193 100644 --- a/rpcs3/Emu/RSX/VK/upscalers/upscaling.h +++ b/rpcs3/Emu/RSX/VK/upscalers/upscaling.h @@ -1,7 +1,5 @@ #pragma once -#include "util/types.hpp" - #include "../vkutils/commands.h" #include "../vkutils/image.h" diff --git a/rpcs3/Emu/RSX/VK/vkutils/image_helpers.cpp b/rpcs3/Emu/RSX/VK/vkutils/image_helpers.cpp index fdebf35f3..e8d8bc9c0 100644 --- a/rpcs3/Emu/RSX/VK/vkutils/image_helpers.cpp +++ b/rpcs3/Emu/RSX/VK/vkutils/image_helpers.cpp @@ -1,10 +1,8 @@ #include "stdafx.h" #include "image_helpers.h" #include "image.h" -#include "util/logs.hpp" #include "../VKRenderPass.h" #include "../../color_utils.h" -#include "../../gcm_enums.h" namespace vk { diff --git a/rpcs3/Emu/RSX/VK/vkutils/query_pool.hpp b/rpcs3/Emu/RSX/VK/vkutils/query_pool.hpp index 3cf0146c0..0e480c2d0 100644 --- a/rpcs3/Emu/RSX/VK/vkutils/query_pool.hpp +++ b/rpcs3/Emu/RSX/VK/vkutils/query_pool.hpp @@ -2,6 +2,7 @@ #include "../VulkanAPI.h" #include "../../rsx_utils.h" +#include "shared.h" namespace vk { diff --git a/rpcs3/Emu/RSX/VK/vkutils/scratch.cpp b/rpcs3/Emu/RSX/VK/vkutils/scratch.cpp index a34c90091..041067bea 100644 --- a/rpcs3/Emu/RSX/VK/vkutils/scratch.cpp +++ b/rpcs3/Emu/RSX/VK/vkutils/scratch.cpp @@ -1,10 +1,8 @@ #include "barriers.h" #include "buffer_object.h" #include "image.h" -#include "sampler.h" #include "../VKResourceManager.h" -#include "Utilities/address_range.h" #include diff --git a/rpcs3/Emu/RSX/color_utils.h b/rpcs3/Emu/RSX/color_utils.h index 1f78a1820..7d315c66a 100644 --- a/rpcs3/Emu/RSX/color_utils.h +++ b/rpcs3/Emu/RSX/color_utils.h @@ -3,6 +3,7 @@ #include #include #include "gcm_enums.h" +#include "Utilities/StrFmt.h" namespace rsx { diff --git a/rpcs3/Emu/RSX/gcm_enums.cpp b/rpcs3/Emu/RSX/gcm_enums.cpp index b6a0292fd..5c7d88c87 100644 --- a/rpcs3/Emu/RSX/gcm_enums.cpp +++ b/rpcs3/Emu/RSX/gcm_enums.cpp @@ -1,8 +1,6 @@ #include "gcm_enums.h" #include "Utilities/StrFmt.h" -#include "Utilities/Thread.h" - using namespace rsx; template <> diff --git a/rpcs3/Emu/RSX/gcm_enums.h b/rpcs3/Emu/RSX/gcm_enums.h index dcf8b51b2..eaa182171 100644 --- a/rpcs3/Emu/RSX/gcm_enums.h +++ b/rpcs3/Emu/RSX/gcm_enums.h @@ -2,7 +2,6 @@ #include "util/types.hpp" #include "Common/expected.hpp" -#include "Utilities/StrFmt.h" namespace gcm { diff --git a/rpcs3/Emu/RSX/gcm_printing.h b/rpcs3/Emu/RSX/gcm_printing.h index 46c1b7ea1..054234964 100644 --- a/rpcs3/Emu/RSX/gcm_printing.h +++ b/rpcs3/Emu/RSX/gcm_printing.h @@ -2,7 +2,6 @@ #include "util/types.hpp" #include -#include namespace rsx { diff --git a/rpcs3/Emu/RSX/rsx_cache.h b/rpcs3/Emu/RSX/rsx_cache.h index f5eca2c85..4bbec32d9 100644 --- a/rpcs3/Emu/RSX/rsx_cache.h +++ b/rpcs3/Emu/RSX/rsx_cache.h @@ -1,4 +1,5 @@ #pragma once +#include "../system_config.h" #include "Utilities/File.h" #include "Utilities/lockless.h" #include "Utilities/Thread.h" @@ -6,8 +7,8 @@ #include "Common/unordered_map.hpp" #include "Emu/System.h" #include "Emu/cache_utils.hpp" -#include "Program/ProgramStateCache.h" -#include "Common/texture_cache_checker.h" +#include "Emu/RSX/Program/RSXVertexProgram.h" +#include "Emu/RSX/Program/RSXFragmentProgram.h" #include "Overlays/Shaders/shader_loading_dialog.h" #include diff --git a/rpcs3/Emu/RSX/rsx_methods.cpp b/rpcs3/Emu/RSX/rsx_methods.cpp index a54a74399..ac5d92eef 100644 --- a/rpcs3/Emu/RSX/rsx_methods.cpp +++ b/rpcs3/Emu/RSX/rsx_methods.cpp @@ -1,13 +1,11 @@ #include "stdafx.h" #include "rsx_methods.h" #include "RSXThread.h" -#include "rsx_utils.h" -#include "rsx_decode.h" -#include "Common/time.hpp" -#include "Emu/Cell/PPUCallback.h" +#include "Emu/Cell/PPUThread.h" #include "Emu/Cell/lv2/sys_rsx.h" -#include "Emu/RSX/Common/BufferUtils.h" + +#include "Emu/System.h" #include "Emu/RSX/NV47/HW/nv47.h" #include "Emu/RSX/NV47/HW/nv47_sync.hpp" #include "Emu/RSX/NV47/HW/context_accessors.define.h" // TODO: Context objects belong in FW not HW diff --git a/rpcs3/Emu/RSX/rsx_methods.h b/rpcs3/Emu/RSX/rsx_methods.h index d245a443e..dbcb8bb15 100644 --- a/rpcs3/Emu/RSX/rsx_methods.h +++ b/rpcs3/Emu/RSX/rsx_methods.h @@ -6,8 +6,6 @@ #include "rsx_decode.h" #include "RSXTexture.h" #include "rsx_vertex_data.h" -#include "Common/simple_array.hpp" -#include "Emu/Cell/timers.hpp" #include "Program/program_util.h" #include "NV47/FW/draw_call.hpp" diff --git a/rpcs3/Emu/RSX/rsx_utils.cpp b/rpcs3/Emu/RSX/rsx_utils.cpp index 03197d5ac..7ca410a65 100644 --- a/rpcs3/Emu/RSX/rsx_utils.cpp +++ b/rpcs3/Emu/RSX/rsx_utils.cpp @@ -1,9 +1,7 @@ #include "stdafx.h" #include "rsx_utils.h" #include "rsx_methods.h" -#include "Emu/RSX/GCM.h" #include "Emu/Cell/Modules/cellVideoOut.h" -#include "Overlays/overlays.h" #ifdef _MSC_VER #pragma warning(push, 0) diff --git a/rpcs3/Emu/RSX/rsx_utils.h b/rpcs3/Emu/RSX/rsx_utils.h index 513d3c1bb..c5ce6de16 100644 --- a/rpcs3/Emu/RSX/rsx_utils.h +++ b/rpcs3/Emu/RSX/rsx_utils.h @@ -5,10 +5,6 @@ #include "Utilities/geometry.h" #include "gcm_enums.h" -#include -#include -#include - extern "C" { #include diff --git a/rpcs3/Emu/System.cpp b/rpcs3/Emu/System.cpp index 7d60f57cd..7cb2c444a 100644 --- a/rpcs3/Emu/System.cpp +++ b/rpcs3/Emu/System.cpp @@ -10,6 +10,7 @@ #include "Emu/vfs_config.h" #include "Emu/IPC_config.h" #include "Emu/savestate_utils.hpp" +#include "Emu/cache_utils.hpp" #include "Emu/Cell/ErrorCodes.h" #include "Emu/Cell/PPUThread.h" @@ -41,14 +42,12 @@ #include "Utilities/StrUtil.h" #include "../Crypto/unself.h" -#include "../Crypto/unzip.h" #include "util/logs.hpp" #include "util/init_mutex.hpp" +#include "util/sysinfo.hpp" -#include #include #include -#include #include "Utilities/JIT.h" diff --git a/rpcs3/Emu/System.h b/rpcs3/Emu/System.h index f9d054602..83a889af9 100644 --- a/rpcs3/Emu/System.h +++ b/rpcs3/Emu/System.h @@ -12,8 +12,6 @@ #include #include -#include "Emu/Cell/timers.hpp" - void init_fxo_for_exec(utils::serial*, bool); enum class localized_string_id; diff --git a/rpcs3/Emu/perf_meter.cpp b/rpcs3/Emu/perf_meter.cpp index 70cfa6b63..adaed4cf4 100644 --- a/rpcs3/Emu/perf_meter.cpp +++ b/rpcs3/Emu/perf_meter.cpp @@ -5,6 +5,7 @@ #include "util/fence.hpp" #include "util/tsc.hpp" #include "Utilities/Thread.h" +#include "Utilities/mutex.h" #include #include diff --git a/rpcs3/Emu/perf_monitor.cpp b/rpcs3/Emu/perf_monitor.cpp index 5f0c6ad84..15cdcf498 100644 --- a/rpcs3/Emu/perf_monitor.cpp +++ b/rpcs3/Emu/perf_monitor.cpp @@ -2,6 +2,7 @@ #include "perf_monitor.hpp" #include "Emu/System.h" +#include "Emu/Cell/timers.hpp" #include "util/cpu_stats.hpp" #include "Utilities/Thread.h" diff --git a/rpcs3/Emu/perf_monitor.hpp b/rpcs3/Emu/perf_monitor.hpp index 634e891c8..a37b14fd9 100644 --- a/rpcs3/Emu/perf_monitor.hpp +++ b/rpcs3/Emu/perf_monitor.hpp @@ -1,6 +1,7 @@ #pragma once -#include "util/types.hpp" +#include +using namespace std::literals; struct perf_monitor { diff --git a/rpcs3/Emu/savestate_utils.cpp b/rpcs3/Emu/savestate_utils.cpp index c1b5c953f..31b24eba5 100644 --- a/rpcs3/Emu/savestate_utils.cpp +++ b/rpcs3/Emu/savestate_utils.cpp @@ -1,7 +1,6 @@ #include "stdafx.h" #include "util/types.hpp" #include "util/logs.hpp" -#include "util/asm.hpp" #include "util/v128.hpp" #include "util/simd.hpp" #include "Utilities/File.h" @@ -12,7 +11,6 @@ #include "System.h" #include -#include #include LOG_CHANNEL(sys_log, "SYS"); diff --git a/rpcs3/Emu/system_config.h b/rpcs3/Emu/system_config.h index 0ede707df..993294fc9 100644 --- a/rpcs3/Emu/system_config.h +++ b/rpcs3/Emu/system_config.h @@ -1,6 +1,5 @@ #pragma once -#include "config_mode.h" #include "system_config_types.h" #include "Utilities/Config.h" diff --git a/rpcs3/Emu/system_utils.cpp b/rpcs3/Emu/system_utils.cpp index 49439dc3f..2ccb15bd3 100644 --- a/rpcs3/Emu/system_utils.cpp +++ b/rpcs3/Emu/system_utils.cpp @@ -6,7 +6,6 @@ #include "Emu/System.h" #include "util/sysinfo.hpp" #include "Utilities/File.h" -#include "Utilities/StrUtil.h" #include "Utilities/Thread.h" #include "Crypto/unpkg.h" #include "Crypto/unself.h" diff --git a/rpcs3/Emu/vfs_config.cpp b/rpcs3/Emu/vfs_config.cpp index 0d7508a28..bd292f9a2 100644 --- a/rpcs3/Emu/vfs_config.cpp +++ b/rpcs3/Emu/vfs_config.cpp @@ -1,7 +1,6 @@ #include "stdafx.h" #include "vfs_config.h" #include "Utilities/StrUtil.h" -#include "Utilities/StrFmt.h" LOG_CHANNEL(vfs_log, "VFS"); diff --git a/rpcs3/Input/ds3_pad_handler.cpp b/rpcs3/Input/ds3_pad_handler.cpp index 0ea5aad19..c2cf89afe 100644 --- a/rpcs3/Input/ds3_pad_handler.cpp +++ b/rpcs3/Input/ds3_pad_handler.cpp @@ -2,8 +2,6 @@ #include "ds3_pad_handler.h" #include "Emu/Io/pad_config.h" -#include "util/asm.hpp" - LOG_CHANNEL(ds3_log, "DS3"); using namespace reports; diff --git a/rpcs3/Input/evdev_gun_handler.h b/rpcs3/Input/evdev_gun_handler.h index e5d83c391..342fff40d 100644 --- a/rpcs3/Input/evdev_gun_handler.h +++ b/rpcs3/Input/evdev_gun_handler.h @@ -1,7 +1,6 @@ #pragma once #ifdef HAVE_LIBEVDEV -#include #include #include "Utilities/mutex.h" diff --git a/rpcs3/Input/evdev_joystick_handler.cpp b/rpcs3/Input/evdev_joystick_handler.cpp index d101d7417..989e95929 100644 --- a/rpcs3/Input/evdev_joystick_handler.cpp +++ b/rpcs3/Input/evdev_joystick_handler.cpp @@ -8,7 +8,6 @@ #include "evdev_joystick_handler.h" #include "util/logs.hpp" -#include #include #include #include diff --git a/rpcs3/Input/evdev_joystick_handler.h b/rpcs3/Input/evdev_joystick_handler.h index f90fe1203..abf6f0098 100644 --- a/rpcs3/Input/evdev_joystick_handler.h +++ b/rpcs3/Input/evdev_joystick_handler.h @@ -9,7 +9,6 @@ #include #include #include -#include #include struct positive_axis : cfg::node diff --git a/rpcs3/Input/gui_pad_thread.cpp b/rpcs3/Input/gui_pad_thread.cpp index 7b69b2420..08d6b4e9e 100644 --- a/rpcs3/Input/gui_pad_thread.cpp +++ b/rpcs3/Input/gui_pad_thread.cpp @@ -14,7 +14,6 @@ #include "sdl_pad_handler.h" #endif #include "Emu/Io/PadHandler.h" -#include "Emu/System.h" #include "Emu/system_config.h" #include "Utilities/Thread.h" #include "rpcs3qt/gui_settings.h" diff --git a/rpcs3/Input/hid_pad_handler.h b/rpcs3/Input/hid_pad_handler.h index e0e14a0a2..50e7d59e2 100644 --- a/rpcs3/Input/hid_pad_handler.h +++ b/rpcs3/Input/hid_pad_handler.h @@ -6,6 +6,8 @@ #include "hidapi.h" +#include + struct CalibData { s16 bias = 0; diff --git a/rpcs3/Input/pad_thread.cpp b/rpcs3/Input/pad_thread.cpp index f6e402687..a2b91dd10 100644 --- a/rpcs3/Input/pad_thread.cpp +++ b/rpcs3/Input/pad_thread.cpp @@ -26,6 +26,7 @@ #include "Emu/RSX/Overlays/overlay_message.h" #include "Emu/Cell/lv2/sys_usbd.h" #include "Emu/Cell/Modules/cellGem.h" +#include "Emu/Cell/timers.hpp" #include "Utilities/Thread.h" #include "util/atomic.hpp" diff --git a/rpcs3/Input/product_info.cpp b/rpcs3/Input/product_info.cpp index 9ce26e787..825b50d0c 100644 --- a/rpcs3/Input/product_info.cpp +++ b/rpcs3/Input/product_info.cpp @@ -1,5 +1,9 @@ #include "Input/product_info.h" +#include + +#include "Emu/Io/pad_types.h" + namespace input { static const std::map input_products = { diff --git a/rpcs3/Input/product_info.h b/rpcs3/Input/product_info.h index da95fb4c5..82f397d2b 100644 --- a/rpcs3/Input/product_info.h +++ b/rpcs3/Input/product_info.h @@ -1,7 +1,7 @@ #pragma once #include -#include "Emu/Io/pad_types.h" +#include "util/types.hpp" namespace input { diff --git a/rpcs3/Input/ps_move_handler.cpp b/rpcs3/Input/ps_move_handler.cpp index 4acf46cf5..3b5aaec2f 100644 --- a/rpcs3/Input/ps_move_handler.cpp +++ b/rpcs3/Input/ps_move_handler.cpp @@ -2,10 +2,7 @@ #include "ps_move_handler.h" #include "ps_move_calibration.h" #include "Emu/Io/pad_config.h" -#include "Emu/System.h" -#include "Emu/system_config.h" #include "Emu/Cell/Modules/cellGem.h" -#include "Input/ps_move_config.h" LOG_CHANNEL(move_log, "Move"); diff --git a/rpcs3/Input/ps_move_handler.h b/rpcs3/Input/ps_move_handler.h index d8efc463c..9b1da1d58 100644 --- a/rpcs3/Input/ps_move_handler.h +++ b/rpcs3/Input/ps_move_handler.h @@ -2,15 +2,6 @@ #include "hid_pad_handler.h" -#ifndef _MSC_VER -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wold-style-cast" -#endif -#include "3rdparty/fusion/fusion/Fusion/Fusion.h" -#ifndef _MSC_VER -#pragma GCC diagnostic pop -#endif - #include namespace reports diff --git a/rpcs3/Input/ps_move_tracker.h b/rpcs3/Input/ps_move_tracker.h index 5c9b9df9c..a1fa0e893 100644 --- a/rpcs3/Input/ps_move_tracker.h +++ b/rpcs3/Input/ps_move_tracker.h @@ -1,5 +1,7 @@ #pragma once +#include "Emu/Cell/Modules/cellGem.h" + #ifdef HAVE_OPENCV constexpr bool g_ps_move_tracking_supported = true; #else diff --git a/rpcs3/headless_application.cpp b/rpcs3/headless_application.cpp index e82bcc12d..098b84532 100644 --- a/rpcs3/headless_application.cpp +++ b/rpcs3/headless_application.cpp @@ -1,5 +1,6 @@ #include "headless_application.h" +#include "Emu/System.h" #include "Emu/RSX/Null/NullGSRender.h" #include "Emu/Cell/Modules/cellMsgDialog.h" #include "Emu/Cell/Modules/cellOskDialog.h" diff --git a/rpcs3/rpcs3qt/basic_mouse_settings_dialog.h b/rpcs3/rpcs3qt/basic_mouse_settings_dialog.h index c43214318..3de502997 100644 --- a/rpcs3/rpcs3qt/basic_mouse_settings_dialog.h +++ b/rpcs3/rpcs3qt/basic_mouse_settings_dialog.h @@ -1,7 +1,5 @@ #pragma once -#include "Emu/Io/MouseHandler.h" - #include #include #include diff --git a/rpcs3/rpcs3qt/cg_disasm_window.h b/rpcs3/rpcs3qt/cg_disasm_window.h index f1df84e50..dc0a963c8 100644 --- a/rpcs3/rpcs3qt/cg_disasm_window.h +++ b/rpcs3/rpcs3qt/cg_disasm_window.h @@ -1,7 +1,5 @@ #pragma once -#include "util/types.hpp" - #include #include diff --git a/rpcs3/rpcs3qt/cheat_manager.cpp b/rpcs3/rpcs3qt/cheat_manager.cpp index d5af8a1a2..cd7fe6780 100644 --- a/rpcs3/rpcs3qt/cheat_manager.cpp +++ b/rpcs3/rpcs3qt/cheat_manager.cpp @@ -14,11 +14,12 @@ #include "Emu/IdManager.h" #include "Emu/Cell/PPUAnalyser.h" -#include "Emu/Cell/PPUFunction.h" +#include "Emu/Cell/PPUInterpreter.h" #include "Emu/Cell/lv2/sys_sync.h" #include "util/yaml.hpp" #include "util/asm.hpp" +#include "util/logs.hpp" #include "util/to_endian.hpp" #include "Utilities/File.h" #include "Utilities/StrUtil.h" diff --git a/rpcs3/rpcs3qt/curl_handle.cpp b/rpcs3/rpcs3qt/curl_handle.cpp index ff40004de..cb91311d2 100644 --- a/rpcs3/rpcs3qt/curl_handle.cpp +++ b/rpcs3/rpcs3qt/curl_handle.cpp @@ -1,6 +1,5 @@ #include "stdafx.h" #include "curl_handle.h" -#include "Emu/system_utils.hpp" #include "util/logs.hpp" #ifdef _WIN32 diff --git a/rpcs3/rpcs3qt/debugger_list.cpp b/rpcs3/rpcs3qt/debugger_list.cpp index 9123df390..d1e0f9767 100644 --- a/rpcs3/rpcs3qt/debugger_list.cpp +++ b/rpcs3/rpcs3qt/debugger_list.cpp @@ -4,13 +4,14 @@ #include "breakpoint_handler.h" #include "Emu/Cell/SPUThread.h" -#include "Emu/Cell/PPUThread.h" #include "Emu/CPU/CPUDisAsm.h" #include "Emu/CPU/CPUThread.h" #include "Emu/RSX/RSXDisAsm.h" #include "Emu/RSX/RSXThread.h" #include "Emu/System.h" +#include "util/asm.hpp" + #include #include #include diff --git a/rpcs3/rpcs3qt/dimensions_dialog.cpp b/rpcs3/rpcs3qt/dimensions_dialog.cpp index 596d94ae2..378f887f2 100644 --- a/rpcs3/rpcs3qt/dimensions_dialog.cpp +++ b/rpcs3/rpcs3qt/dimensions_dialog.cpp @@ -3,10 +3,6 @@ #include "dimensions_dialog.h" #include "Emu/Io/Dimensions.h" -#include "util/asm.hpp" - -#include - #include #include #include diff --git a/rpcs3/rpcs3qt/elf_memory_dumping_dialog.cpp b/rpcs3/rpcs3qt/elf_memory_dumping_dialog.cpp index b96699197..c191b878d 100644 --- a/rpcs3/rpcs3qt/elf_memory_dumping_dialog.cpp +++ b/rpcs3/rpcs3qt/elf_memory_dumping_dialog.cpp @@ -1,6 +1,4 @@ #include "elf_memory_dumping_dialog.h" -#include "Utilities/Config.h" - #include "Emu/Cell/SPUThread.h" #include "qt_utils.h" diff --git a/rpcs3/rpcs3qt/emu_settings.cpp b/rpcs3/rpcs3qt/emu_settings.cpp index eb6439243..a8a11d398 100644 --- a/rpcs3/rpcs3qt/emu_settings.cpp +++ b/rpcs3/rpcs3qt/emu_settings.cpp @@ -8,7 +8,6 @@ #include "Emu/System.h" #include "Emu/system_config.h" -#include "Emu/vfs_config.h" #include "Emu/system_utils.hpp" #include "Emu/Cell/Modules/cellSysutil.h" #include "Emu/Io/Keyboard.h" diff --git a/rpcs3/rpcs3qt/emulated_pad_settings_dialog.h b/rpcs3/rpcs3qt/emulated_pad_settings_dialog.h index ad1b863d7..490dee3ae 100644 --- a/rpcs3/rpcs3qt/emulated_pad_settings_dialog.h +++ b/rpcs3/rpcs3qt/emulated_pad_settings_dialog.h @@ -1,7 +1,5 @@ #pragma once -#include "Emu/Io/pad_types.h" - #include #include #include diff --git a/rpcs3/rpcs3qt/game_list.h b/rpcs3/rpcs3qt/game_list.h index 1a5ce6b92..3007ee62d 100644 --- a/rpcs3/rpcs3qt/game_list.h +++ b/rpcs3/rpcs3qt/game_list.h @@ -7,7 +7,6 @@ #include #include "game_list_base.h" -#include "util/atomic.hpp" #include diff --git a/rpcs3/rpcs3qt/game_list_frame.cpp b/rpcs3/rpcs3qt/game_list_frame.cpp index 150724dee..2df885271 100644 --- a/rpcs3/rpcs3qt/game_list_frame.cpp +++ b/rpcs3/rpcs3qt/game_list_frame.cpp @@ -2,28 +2,23 @@ #include "qt_utils.h" #include "settings_dialog.h" #include "pad_settings_dialog.h" -#include "custom_table_widget_item.h" #include "input_dialog.h" #include "localized.h" #include "progress_dialog.h" #include "persistent_settings.h" #include "emu_settings.h" #include "gui_settings.h" -#include "game_list_delegate.h" #include "game_list_table.h" #include "game_list_grid.h" #include "game_list_grid_item.h" #include "patch_manager_dialog.h" -#include "Emu/Memory/vm.h" #include "Emu/System.h" #include "Emu/vfs_config.h" #include "Emu/system_utils.hpp" #include "Loader/PSF.h" #include "util/types.hpp" #include "Utilities/File.h" -#include "Utilities/mutex.h" -#include "util/yaml.hpp" #include "util/sysinfo.hpp" #include "Input/pad_thread.h" diff --git a/rpcs3/rpcs3qt/game_list_frame.h b/rpcs3/rpcs3qt/game_list_frame.h index 60c4e0dae..bbef37e37 100644 --- a/rpcs3/rpcs3qt/game_list_frame.h +++ b/rpcs3/rpcs3qt/game_list_frame.h @@ -2,7 +2,6 @@ #include "game_list.h" #include "custom_dock_widget.h" -#include "gui_save.h" #include "shortcut_utils.h" #include "Utilities/lockless.h" #include "Utilities/mutex.h" diff --git a/rpcs3/rpcs3qt/game_list_grid.cpp b/rpcs3/rpcs3qt/game_list_grid.cpp index fd8301a29..5b6e4c341 100644 --- a/rpcs3/rpcs3qt/game_list_grid.cpp +++ b/rpcs3/rpcs3qt/game_list_grid.cpp @@ -1,7 +1,6 @@ #include "stdafx.h" #include "game_list_grid.h" #include "game_list_grid_item.h" -#include "movie_item.h" #include "gui_settings.h" #include "qt_utils.h" #include "Utilities/File.h" diff --git a/rpcs3/rpcs3qt/gs_frame.cpp b/rpcs3/rpcs3qt/gs_frame.cpp index 75f04e339..b24ce33fc 100644 --- a/rpcs3/rpcs3qt/gs_frame.cpp +++ b/rpcs3/rpcs3qt/gs_frame.cpp @@ -12,7 +12,6 @@ #include "Emu/IdManager.h" #include "Emu/Audio/audio_utils.h" #include "Emu/Cell/Modules/cellScreenshot.h" -#include "Emu/Cell/Modules/cellVideoOut.h" #include "Emu/Cell/Modules/cellAudio.h" #include "Emu/Cell/lv2/sys_rsxaudio.h" #include "Emu/RSX/rsx_utils.h" diff --git a/rpcs3/rpcs3qt/gui_application.cpp b/rpcs3/rpcs3qt/gui_application.cpp index 7c0133354..b0a5d5381 100644 --- a/rpcs3/rpcs3qt/gui_application.cpp +++ b/rpcs3/rpcs3qt/gui_application.cpp @@ -21,7 +21,6 @@ #include "Emu/Audio/audio_utils.h" #include "Emu/Io/Null/null_camera_handler.h" #include "Emu/Io/Null/null_music_handler.h" -#include "Emu/Cell/lv2/sys_usbd.h" #include "Emu/vfs_config.h" #include "util/init_mutex.hpp" #include "util/console.h" @@ -57,6 +56,8 @@ #ifdef _WIN32 #include #include + +#include "Emu/Cell/lv2/sys_usbd.h" #endif LOG_CHANNEL(gui_log, "GUI"); diff --git a/rpcs3/rpcs3qt/gui_settings.cpp b/rpcs3/rpcs3qt/gui_settings.cpp index cb258fb5f..8f42a14dd 100644 --- a/rpcs3/rpcs3qt/gui_settings.cpp +++ b/rpcs3/rpcs3qt/gui_settings.cpp @@ -1,7 +1,7 @@ #include "gui_settings.h" #include "qt_utils.h" -#include "localized.h" +#include "category.h" #include "Emu/System.h" @@ -9,8 +9,6 @@ #include #include -#include - LOG_CHANNEL(cfg_log, "CFG"); extern void qt_events_aware_op(int repeat_duration_ms, std::function wrapped_op); diff --git a/rpcs3/rpcs3qt/infinity_dialog.cpp b/rpcs3/rpcs3qt/infinity_dialog.cpp index 18d1cfe24..b172ddad2 100644 --- a/rpcs3/rpcs3qt/infinity_dialog.cpp +++ b/rpcs3/rpcs3qt/infinity_dialog.cpp @@ -1,15 +1,10 @@ #include "stdafx.h" #include "Utilities/File.h" -#include "Crypto/md5.h" #include "Crypto/aes.h" #include "Crypto/sha1.h" #include "infinity_dialog.h" #include "Emu/Io/Infinity.h" -#include "util/asm.hpp" - -#include - #include #include #include diff --git a/rpcs3/rpcs3qt/kernel_explorer.cpp b/rpcs3/rpcs3qt/kernel_explorer.cpp index e30fdff64..3b50f9ea9 100644 --- a/rpcs3/rpcs3qt/kernel_explorer.cpp +++ b/rpcs3/rpcs3qt/kernel_explorer.cpp @@ -7,6 +7,7 @@ #include #include "Emu/IdManager.h" +#include "Emu/System.h" #include "Emu/Cell/PPUThread.h" #include "Emu/Cell/SPUThread.h" #include "Emu/Cell/lv2/sys_lwmutex.h" diff --git a/rpcs3/rpcs3qt/log_frame.cpp b/rpcs3/rpcs3qt/log_frame.cpp index a318a9c03..d01bd1bf4 100644 --- a/rpcs3/rpcs3qt/log_frame.cpp +++ b/rpcs3/rpcs3qt/log_frame.cpp @@ -2,8 +2,6 @@ #include "qt_utils.h" #include "gui_settings.h" -#include "rpcs3_version.h" -#include "Utilities/mutex.h" #include "Utilities/lockless.h" #include "util/asm.hpp" @@ -14,7 +12,6 @@ #include #include -#include #include #include diff --git a/rpcs3/rpcs3qt/main_window.cpp b/rpcs3/rpcs3qt/main_window.cpp index a67af2cc6..1f7eceba0 100644 --- a/rpcs3/rpcs3qt/main_window.cpp +++ b/rpcs3/rpcs3qt/main_window.cpp @@ -39,12 +39,10 @@ #include "system_cmd_dialog.h" #include "emulated_pad_settings_dialog.h" #include "basic_mouse_settings_dialog.h" -#include "raw_mouse_settings_dialog.h" #include "vfs_tool_dialog.h" #include "welcome_dialog.h" #include -#include #include #include @@ -65,6 +63,7 @@ #include "Emu/system_utils.hpp" #include "Emu/system_config.h" #include "Emu/savestate_utils.hpp" +#include "Emu/Cell/timers.hpp" #include "Crypto/unpkg.h" #include "Crypto/unself.h" @@ -92,6 +91,10 @@ #include #endif +#ifdef _WIN32 +#include "raw_mouse_settings_dialog.h" +#endif + LOG_CHANNEL(gui_log, "GUI"); extern atomic_t g_user_asked_for_frame_capture; diff --git a/rpcs3/rpcs3qt/memory_string_searcher.cpp b/rpcs3/rpcs3qt/memory_string_searcher.cpp index fc56509a1..c55cb8144 100644 --- a/rpcs3/rpcs3qt/memory_string_searcher.cpp +++ b/rpcs3/rpcs3qt/memory_string_searcher.cpp @@ -1,9 +1,9 @@ #include "memory_viewer_panel.h" #include "Emu/Memory/vm.h" + #include "Emu/Memory/vm_reservation.h" #include "Emu/CPU/CPUDisAsm.h" #include "Emu/Cell/SPUDisAsm.h" -#include "Emu/IdManager.h" #include "Utilities/Thread.h" #include "Utilities/StrUtil.h" @@ -11,7 +11,6 @@ #include #include -#include #include #include "util/logs.hpp" diff --git a/rpcs3/rpcs3qt/memory_viewer_panel.cpp b/rpcs3/rpcs3qt/memory_viewer_panel.cpp index f9f246fbd..c1ae7a0a0 100644 --- a/rpcs3/rpcs3qt/memory_viewer_panel.cpp +++ b/rpcs3/rpcs3qt/memory_viewer_panel.cpp @@ -1,4 +1,3 @@ -#include "Utilities/mutex.h" #include "Emu/Memory/vm_locking.h" #include "Emu/Memory/vm.h" @@ -6,7 +5,6 @@ #include "Emu/Cell/SPUThread.h" #include "Emu/CPU/CPUDisAsm.h" -#include "Emu/Cell/SPUDisAsm.h" #include "Emu/RSX/RSXThread.h" #include "Emu/RSX/rsx_utils.h" #include "Emu/IdManager.h" @@ -26,7 +24,6 @@ #include "util/logs.hpp" #include "util/asm.hpp" -#include "util/vm.hpp" LOG_CHANNEL(gui_log, "GUI"); diff --git a/rpcs3/rpcs3qt/microphone_creator.cpp b/rpcs3/rpcs3qt/microphone_creator.cpp index 8f56bcae4..daf9116ef 100644 --- a/rpcs3/rpcs3qt/microphone_creator.cpp +++ b/rpcs3/rpcs3qt/microphone_creator.cpp @@ -1,10 +1,10 @@ #include "stdafx.h" #include "microphone_creator.h" -#include "Utilities/StrFmt.h" #include "Utilities/StrUtil.h" -#include "3rdparty/OpenAL/openal-soft/include/AL/alext.h" +#include "3rdparty/OpenAL/openal-soft/include/AL/al.h" +#include "3rdparty/OpenAL/openal-soft/include/AL/alc.h" LOG_CHANNEL(cfg_log, "CFG"); diff --git a/rpcs3/rpcs3qt/osk_dialog_frame.cpp b/rpcs3/rpcs3qt/osk_dialog_frame.cpp index 8e9b38527..4e4c89318 100644 --- a/rpcs3/rpcs3qt/osk_dialog_frame.cpp +++ b/rpcs3/rpcs3qt/osk_dialog_frame.cpp @@ -1,8 +1,7 @@ #include "osk_dialog_frame.h" #include "custom_dialog.h" -#include "Emu/Cell/Modules/cellMsgDialog.h" -#include "util/asm.hpp" +#include "util/bless.hpp" #include #include diff --git a/rpcs3/rpcs3qt/pad_motion_settings_dialog.h b/rpcs3/rpcs3qt/pad_motion_settings_dialog.h index eeb413453..f2c7713c6 100644 --- a/rpcs3/rpcs3qt/pad_motion_settings_dialog.h +++ b/rpcs3/rpcs3qt/pad_motion_settings_dialog.h @@ -13,6 +13,7 @@ #include #include +#include namespace Ui { diff --git a/rpcs3/rpcs3qt/pad_settings_dialog.cpp b/rpcs3/rpcs3qt/pad_settings_dialog.cpp index 9591514dc..c20510c92 100644 --- a/rpcs3/rpcs3qt/pad_settings_dialog.cpp +++ b/rpcs3/rpcs3qt/pad_settings_dialog.cpp @@ -16,8 +16,6 @@ #include "Emu/System.h" #include "Emu/system_utils.hpp" -#include "Emu/Io/Null/NullPadHandler.h" -#include "Utilities/File.h" #include "Input/pad_thread.h" #include "Input/gui_pad_thread.h" diff --git a/rpcs3/rpcs3qt/patch_manager_dialog.cpp b/rpcs3/rpcs3qt/patch_manager_dialog.cpp index a504e5790..47cc29916 100644 --- a/rpcs3/rpcs3qt/patch_manager_dialog.cpp +++ b/rpcs3/rpcs3qt/patch_manager_dialog.cpp @@ -14,7 +14,6 @@ #include "ui_patch_manager_dialog.h" #include "patch_manager_dialog.h" -#include "table_item_delegate.h" #include "gui_settings.h" #include "downloader.h" #include "qt_utils.h" diff --git a/rpcs3/rpcs3qt/ps_move_tracker_dialog.h b/rpcs3/rpcs3qt/ps_move_tracker_dialog.h index c7a8641e7..fe3b043b2 100644 --- a/rpcs3/rpcs3qt/ps_move_tracker_dialog.h +++ b/rpcs3/rpcs3qt/ps_move_tracker_dialog.h @@ -1,9 +1,7 @@ #pragma once -#include "Utilities/mutex.h" #include "Utilities/Thread.h" #include "Input/pad_thread.h" -#include "Emu/Cell/Modules/cellGem.h" #include #include diff --git a/rpcs3/rpcs3qt/qt_camera_video_sink.h b/rpcs3/rpcs3qt/qt_camera_video_sink.h index 94946c177..e3f405b55 100644 --- a/rpcs3/rpcs3qt/qt_camera_video_sink.h +++ b/rpcs3/rpcs3qt/qt_camera_video_sink.h @@ -7,6 +7,7 @@ #include #include +#include class qt_camera_video_sink final : public QVideoSink { diff --git a/rpcs3/rpcs3qt/recvmessage_dialog_frame.cpp b/rpcs3/rpcs3qt/recvmessage_dialog_frame.cpp index b617d74d9..7a805a572 100644 --- a/rpcs3/rpcs3qt/recvmessage_dialog_frame.cpp +++ b/rpcs3/rpcs3qt/recvmessage_dialog_frame.cpp @@ -7,6 +7,7 @@ #include "recvmessage_dialog_frame.h" #include "Emu/IdManager.h" #include "Emu/System.h" +#include "Emu/NP/rpcn_client.h" #include "util/logs.hpp" diff --git a/rpcs3/rpcs3qt/recvmessage_dialog_frame.h b/rpcs3/rpcs3qt/recvmessage_dialog_frame.h index 28255253d..10b9bd87e 100644 --- a/rpcs3/rpcs3qt/recvmessage_dialog_frame.h +++ b/rpcs3/rpcs3qt/recvmessage_dialog_frame.h @@ -4,8 +4,9 @@ #include #include "util/types.hpp" +#include "util/shared_ptr.hpp" #include "custom_dialog.h" -#include "Emu/NP/rpcn_client.h" +#include "Emu/Cell/Modules/sceNp.h" struct recvmessage_signal_struct { diff --git a/rpcs3/rpcs3qt/register_editor_dialog.h b/rpcs3/rpcs3qt/register_editor_dialog.h index 814d64cf3..c5ac750d8 100644 --- a/rpcs3/rpcs3qt/register_editor_dialog.h +++ b/rpcs3/rpcs3qt/register_editor_dialog.h @@ -1,7 +1,5 @@ #pragma once -#include "util/types.hpp" - #include #include #include diff --git a/rpcs3/rpcs3qt/render_creator.cpp b/rpcs3/rpcs3qt/render_creator.cpp index 8e16e66d9..b85336bf8 100644 --- a/rpcs3/rpcs3qt/render_creator.cpp +++ b/rpcs3/rpcs3qt/render_creator.cpp @@ -11,7 +11,6 @@ #include #include #include -#include #include LOG_CHANNEL(cfg_log, "CFG"); diff --git a/rpcs3/rpcs3qt/rpcn_settings_dialog.cpp b/rpcs3/rpcs3qt/rpcn_settings_dialog.cpp index 499e1e2cc..dfa9b4906 100644 --- a/rpcs3/rpcs3qt/rpcn_settings_dialog.cpp +++ b/rpcs3/rpcs3qt/rpcn_settings_dialog.cpp @@ -8,8 +8,6 @@ #include #include -#include - #include "qt_utils.h" #include "rpcn_settings_dialog.h" diff --git a/rpcs3/rpcs3qt/rsx_debugger.cpp b/rpcs3/rpcs3qt/rsx_debugger.cpp index e8d8bec3e..809ce3752 100644 --- a/rpcs3/rpcs3qt/rsx_debugger.cpp +++ b/rpcs3/rpcs3qt/rsx_debugger.cpp @@ -4,7 +4,7 @@ #include "table_item_delegate.h" #include "Emu/RSX/RSXThread.h" #include "Emu/RSX/gcm_printing.h" -#include "util/asm.hpp" +#include "Utilities/File.h" #include #include diff --git a/rpcs3/rpcs3qt/save_data_dialog.cpp b/rpcs3/rpcs3qt/save_data_dialog.cpp index 20e9f78cf..105fd7d27 100644 --- a/rpcs3/rpcs3qt/save_data_dialog.cpp +++ b/rpcs3/rpcs3qt/save_data_dialog.cpp @@ -8,7 +8,6 @@ #include "Emu/RSX/Overlays/overlay_save_dialog.h" #include "Emu/Cell/Modules/cellSysutil.h" -#include "Utilities/Thread.h" #include "util/logs.hpp" LOG_CHANNEL(cellSaveData); diff --git a/rpcs3/rpcs3qt/save_data_dialog.h b/rpcs3/rpcs3qt/save_data_dialog.h index fa31b1533..b33b16b77 100644 --- a/rpcs3/rpcs3qt/save_data_dialog.h +++ b/rpcs3/rpcs3qt/save_data_dialog.h @@ -1,7 +1,6 @@ #pragma once #include "util/types.hpp" -#include "Emu/Memory/vm.h" #include "Emu/Cell/Modules/cellSaveData.h" class save_data_dialog : public SaveDialogBase diff --git a/rpcs3/rpcs3qt/save_data_list_dialog.h b/rpcs3/rpcs3qt/save_data_list_dialog.h index 334b45ca4..13052ebbc 100644 --- a/rpcs3/rpcs3qt/save_data_list_dialog.h +++ b/rpcs3/rpcs3qt/save_data_list_dialog.h @@ -1,7 +1,6 @@ #pragma once #include "util/types.hpp" -#include "Emu/Memory/vm.h" #include "Emu/Cell/Modules/cellSaveData.h" #include "Emu/RSX/Overlays/overlays.h" diff --git a/rpcs3/rpcs3qt/screenshot_manager_dialog.cpp b/rpcs3/rpcs3qt/screenshot_manager_dialog.cpp index b93f9398a..3825dfd74 100644 --- a/rpcs3/rpcs3qt/screenshot_manager_dialog.cpp +++ b/rpcs3/rpcs3qt/screenshot_manager_dialog.cpp @@ -5,7 +5,6 @@ #include "flow_widget.h" #include "qt_utils.h" #include "Utilities/File.h" -#include "Emu/VFS.h" #include "Emu/system_utils.hpp" #include diff --git a/rpcs3/rpcs3qt/sendmessage_dialog_frame.cpp b/rpcs3/rpcs3qt/sendmessage_dialog_frame.cpp index ce8f50003..8e2350a79 100644 --- a/rpcs3/rpcs3qt/sendmessage_dialog_frame.cpp +++ b/rpcs3/rpcs3qt/sendmessage_dialog_frame.cpp @@ -6,6 +6,7 @@ #include "sendmessage_dialog_frame.h" #include "Emu/IdManager.h" +#include "Emu/NP/rpcn_client.h" #include "Emu/System.h" #include "util/logs.hpp" diff --git a/rpcs3/rpcs3qt/sendmessage_dialog_frame.h b/rpcs3/rpcs3qt/sendmessage_dialog_frame.h index 1a74eddba..40da17f5c 100644 --- a/rpcs3/rpcs3qt/sendmessage_dialog_frame.h +++ b/rpcs3/rpcs3qt/sendmessage_dialog_frame.h @@ -5,7 +5,8 @@ #include "util/types.hpp" #include "custom_dialog.h" -#include "Emu/NP/rpcn_client.h" + +#include "Emu/Cell/Modules/sceNp.h" class sendmessage_dialog_frame : public QObject, public SendMessageDialogBase { diff --git a/rpcs3/rpcs3qt/settings.cpp b/rpcs3/rpcs3qt/settings.cpp index 74901561c..c87918d46 100644 --- a/rpcs3/rpcs3qt/settings.cpp +++ b/rpcs3/rpcs3qt/settings.cpp @@ -1,7 +1,5 @@ #include "settings.h" -#include "qt_utils.h" - #include "Utilities/File.h" settings::settings(QObject* parent) : QObject(parent), diff --git a/rpcs3/rpcs3qt/settings_dialog.cpp b/rpcs3/rpcs3qt/settings_dialog.cpp index 02bc57a3a..9dabd04cc 100644 --- a/rpcs3/rpcs3qt/settings_dialog.cpp +++ b/rpcs3/rpcs3qt/settings_dialog.cpp @@ -36,8 +36,6 @@ #include "Loader/PSF.h" #include -#include -#include #include "util/sysinfo.hpp" #include "util/asm.hpp" diff --git a/rpcs3/rpcs3qt/shortcut_handler.cpp b/rpcs3/rpcs3qt/shortcut_handler.cpp index 9d70aa026..9eb8fa3ea 100644 --- a/rpcs3/rpcs3qt/shortcut_handler.cpp +++ b/rpcs3/rpcs3qt/shortcut_handler.cpp @@ -1,6 +1,5 @@ #include "stdafx.h" #include "shortcut_handler.h" -#include "Emu/System.h" LOG_CHANNEL(shortcut_log, "Shortcuts"); diff --git a/rpcs3/rpcs3qt/shortcut_utils.cpp b/rpcs3/rpcs3qt/shortcut_utils.cpp index 1c9a3d759..6c16cdff0 100644 --- a/rpcs3/rpcs3qt/shortcut_utils.cpp +++ b/rpcs3/rpcs3qt/shortcut_utils.cpp @@ -1,9 +1,7 @@ #include "stdafx.h" #include "shortcut_utils.h" #include "qt_utils.h" -#include "Emu/system_utils.hpp" #include "Emu/VFS.h" -#include "Emu/vfs_config.h" #include "Utilities/File.h" #include "Utilities/StrUtil.h" @@ -16,6 +14,8 @@ #include #include #include + +#include "Emu/system_utils.hpp" #else #include #include diff --git a/rpcs3/rpcs3qt/skylander_dialog.cpp b/rpcs3/rpcs3qt/skylander_dialog.cpp index 7ed79d740..beebb8a96 100644 --- a/rpcs3/rpcs3qt/skylander_dialog.cpp +++ b/rpcs3/rpcs3qt/skylander_dialog.cpp @@ -1,12 +1,8 @@ #include "stdafx.h" #include "Utilities/File.h" -#include "Crypto/md5.h" -#include "Crypto/aes.h" #include "skylander_dialog.h" #include "Emu/Io/Skylander.h" -#include "util/asm.hpp" - #include #include #include diff --git a/rpcs3/rpcs3qt/update_manager.cpp b/rpcs3/rpcs3qt/update_manager.cpp index 9c4e2104d..92c5416d8 100644 --- a/rpcs3/rpcs3qt/update_manager.cpp +++ b/rpcs3/rpcs3qt/update_manager.cpp @@ -4,10 +4,8 @@ #include "rpcs3_version.h" #include "downloader.h" #include "gui_settings.h" -#include "Utilities/StrUtil.h" #include "Utilities/File.h" #include "Emu/System.h" -#include "Emu/system_utils.hpp" #include "Crypto/utils.h" #include "util/logs.hpp" #include "util/types.hpp" @@ -41,6 +39,7 @@ #define PATH_MAX MAX_PATH #endif +#include "Utilities/StrUtil.h" #else #include #include diff --git a/rpcs3/rpcs3qt/user_manager_dialog.cpp b/rpcs3/rpcs3qt/user_manager_dialog.cpp index 24336bd08..b8ccebdf4 100644 --- a/rpcs3/rpcs3qt/user_manager_dialog.cpp +++ b/rpcs3/rpcs3qt/user_manager_dialog.cpp @@ -22,7 +22,6 @@ #include "Emu/System.h" #include "Emu/system_utils.hpp" -#include "Utilities/StrUtil.h" #include "Utilities/File.h" #include "util/logs.hpp" diff --git a/rpcs3/rpcs3qt/vfs_dialog_path_widget.cpp b/rpcs3/rpcs3qt/vfs_dialog_path_widget.cpp index 878fb0476..090e97ee6 100644 --- a/rpcs3/rpcs3qt/vfs_dialog_path_widget.cpp +++ b/rpcs3/rpcs3qt/vfs_dialog_path_widget.cpp @@ -1,5 +1,4 @@ #include "vfs_dialog_path_widget.h" -#include "Utilities/Config.h" #include #include diff --git a/rpcs3/rpcs3qt/vfs_dialog_path_widget.h b/rpcs3/rpcs3qt/vfs_dialog_path_widget.h index ea09a6e67..a90a43d37 100644 --- a/rpcs3/rpcs3qt/vfs_dialog_path_widget.h +++ b/rpcs3/rpcs3qt/vfs_dialog_path_widget.h @@ -1,6 +1,5 @@ #pragma once -#include "util/types.hpp" #include "gui_settings.h" #include diff --git a/rpcs3/rpcs3qt/vfs_dialog_usb_tab.h b/rpcs3/rpcs3qt/vfs_dialog_usb_tab.h index 65cea0a2c..02d7a25c8 100644 --- a/rpcs3/rpcs3qt/vfs_dialog_usb_tab.h +++ b/rpcs3/rpcs3qt/vfs_dialog_usb_tab.h @@ -1,7 +1,5 @@ #pragma once -#include "util/types.hpp" - #include "gui_settings.h" #include diff --git a/rpcs3/util/atomic.hpp b/rpcs3/util/atomic.hpp index 2d4946a04..4c3ab8959 100644 --- a/rpcs3/util/atomic.hpp +++ b/rpcs3/util/atomic.hpp @@ -2,7 +2,6 @@ #include "util/types.hpp" #include -#include #ifndef _MSC_VER #pragma GCC diagnostic push diff --git a/rpcs3/util/cpu_stats.cpp b/rpcs3/util/cpu_stats.cpp index 6e69f645d..de1d3b133 100644 --- a/rpcs3/util/cpu_stats.cpp +++ b/rpcs3/util/cpu_stats.cpp @@ -2,12 +2,12 @@ #include "util/cpu_stats.hpp" #include "util/sysinfo.hpp" #include "util/logs.hpp" -#include "util/asm.hpp" #include "Utilities/StrUtil.h" #include #ifdef _WIN32 +#include "util/asm.hpp" #include "windows.h" #include "tlhelp32.h" #ifdef _MSC_VER @@ -18,8 +18,6 @@ #include "sstream" #include "stdlib.h" #include "sys/times.h" -#include "sys/types.h" -#include "unistd.h" #endif #ifdef __APPLE__ diff --git a/rpcs3/util/media_utils.cpp b/rpcs3/util/media_utils.cpp index 4ba78cb75..73bc86ef4 100644 --- a/rpcs3/util/media_utils.cpp +++ b/rpcs3/util/media_utils.cpp @@ -3,6 +3,7 @@ #include "Emu/System.h" #include +#include #ifdef _MSC_VER #pragma warning(push, 0) diff --git a/rpcs3/util/media_utils.h b/rpcs3/util/media_utils.h index 9666e53d8..471bda63a 100644 --- a/rpcs3/util/media_utils.h +++ b/rpcs3/util/media_utils.h @@ -2,13 +2,11 @@ #include "Utilities/StrUtil.h" #include "Utilities/Thread.h" -#include "util/video_provider.h" +#include "util/video_sink.h" #include "Emu/Cell/Modules/cellMusic.h" #include #include -#include -#include namespace utils { diff --git a/rpcs3/util/serialization_ext.cpp b/rpcs3/util/serialization_ext.cpp index 62874d9b7..508cd7916 100644 --- a/rpcs3/util/serialization_ext.cpp +++ b/rpcs3/util/serialization_ext.cpp @@ -1,9 +1,8 @@ #include "util/types.hpp" #include "util/logs.hpp" #include "util/asm.hpp" -#include "util/simd.hpp" +#include "util/sysinfo.hpp" #include "util/endian.hpp" - #include "Utilities/lockless.h" #include "Utilities/File.h" #include "Utilities/StrFmt.h" diff --git a/rpcs3/util/shared_ptr.hpp b/rpcs3/util/shared_ptr.hpp index e9bdf83b3..29e4150c2 100644 --- a/rpcs3/util/shared_ptr.hpp +++ b/rpcs3/util/shared_ptr.hpp @@ -1,6 +1,5 @@ #pragma once // No BOM and only basic ASCII in this header, or a neko will die -#include #include #include #include "atomic.hpp" diff --git a/rpcs3/util/simd.hpp b/rpcs3/util/simd.hpp index 750bb97fd..ff4e0eed7 100644 --- a/rpcs3/util/simd.hpp +++ b/rpcs3/util/simd.hpp @@ -24,7 +24,6 @@ #include #include #include -#include #if defined(__clang__) #pragma clang diagnostic push diff --git a/rpcs3/util/typeindices.hpp b/rpcs3/util/typeindices.hpp index cb9b3b274..c6f6190ba 100644 --- a/rpcs3/util/typeindices.hpp +++ b/rpcs3/util/typeindices.hpp @@ -1,9 +1,6 @@ #pragma once #include "util/types.hpp" -#include "util/shared_ptr.hpp" - -#include #ifndef _MSC_VER #define ATTR_PURE __attribute__((pure)) diff --git a/rpcs3/util/video_provider.cpp b/rpcs3/util/video_provider.cpp index 1e5b747d5..70888447f 100644 --- a/rpcs3/util/video_provider.cpp +++ b/rpcs3/util/video_provider.cpp @@ -1,6 +1,7 @@ #include "stdafx.h" #include "video_provider.h" #include "Emu/RSX/Overlays/overlay_message.h" +#include "Emu/Cell/timers.hpp" extern "C" { diff --git a/rpcs3/util/vm_native.cpp b/rpcs3/util/vm_native.cpp index b1ffc726f..1aac9c102 100644 --- a/rpcs3/util/vm_native.cpp +++ b/rpcs3/util/vm_native.cpp @@ -1,5 +1,4 @@ #include "stdafx.h" -#include "util/logs.hpp" #include "util/vm.hpp" #include "util/asm.hpp" #ifdef _WIN32