Headers cleanup

Utilities/File.cpp

@@ -1,8 +1,6 @@
 #include "File.h"
 #include "mutex.h"
 #include "StrFmt.h"
-#include "StrUtil.h"
-#include "Crypto/sha1.h"
 
 #include <span>
 #include <unordered_map>
@@ -18,6 +16,8 @@ using namespace std::literals::string_literals;
 
 #ifdef _WIN32
 
+#include "Utilities/StrUtil.h"
+
 #include <cwchar>
 #include <Windows.h>
 

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

Utilities/Thread.h

@@ -5,10 +5,6 @@
 #include "util/shared_ptr.hpp"
 
 #include <string>
-#include <concepts>
-
-#include "mutex.h"
-#include "lockless.h"
 
 // Hardware core layout
 enum class native_core_arrangement : u32

Utilities/cfmt.h

@@ -2,7 +2,6 @@
 
 #include "util/types.hpp"
 #include <string>
-#include <vector>
 #include <algorithm>
 #include "util/asm.hpp"
 

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

Utilities/cond.cpp

@@ -1,5 +1,4 @@
 #include "cond.h"
-#include "sync.h"
 
 // use constants, increase signal space
 

Utilities/ppu_patch.h

@@ -2,7 +2,6 @@
 
 #include <util/types.hpp>
 #include <unordered_set>
-#include <vector>
 #include <string>
 
 // Patch utilities specific to PPU code

Utilities/sync.h

@@ -12,18 +12,12 @@
 #include <Windows.h>
 #include <ctime>
 #elif __linux__
-#include <errno.h>
 #include <sys/syscall.h>
 #include <linux/futex.h>
 #include <sys/time.h>
 #include <unistd.h>
 #include <fcntl.h>
 #endif
-#include <algorithm>
-#include <chrono>
-#include <mutex>
-#include <condition_variable>
-#include <unordered_map>
 
 #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 <condition_variable>
+
 enum
 {
 	FUTEX_PRIVATE_FLAG = 0,

Utilities/transactional_storage.h

@@ -1,6 +1,7 @@
 #include "util/types.hpp"
 #include <vector>
 #include <mutex>
+#include "Emu/Cell/timers.hpp"
 
 // Thread-safe object pool with garbage collection
 class universal_pool

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 <cstring>
 
 static inline int bn_compare(u8* a, u8* b, u32 n)

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 <string.h>
 #include "lz.h"
 
 void decode_range(unsigned int *range, unsigned int *code, unsigned char **src)

rpcs3/Crypto/lz.h

@@ -6,8 +6,6 @@
 
 // Reverse-engineered custom Lempel–Ziv–Markov based compression.
 
-#include <string.h>
-
 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);

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"
 

rpcs3/Crypto/unedat.h

@@ -1,9 +1,6 @@
 #pragma once
 
 #include <array>
-
-#include "utils.h"
-
 #include "Utilities/File.h"
 
 constexpr u32 SDAT_FLAG = 0x01000000;

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"

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 <algorithm>
-
 inline u8 Read8(const fs::file& f)
 {
 	u8 ret;

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 <stdlib.h>
 

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"
 

rpcs3/Emu/Audio/Cubeb/CubebBackend.h

@@ -1,7 +1,5 @@
 #pragma once
 
-#include <memory>
-#include "Utilities/mutex.h"
 #include "util/atomic.hpp"
 #include "Emu/Audio/AudioBackend.h"
 

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"