Misc: Slim down some header includes

data/resources/gamedb.yaml

@@ -30721,6 +30721,9 @@ SLES-02495:
     linkCable: false
 SCPS-10003:
   name: "Crime Crackers (Japan)"
+  compatibility:
+    rating: NoIssues
+    versionTested: "0.1-7272-g143acca03"
   controllers:
     - DigitalController
   settings:
@@ -31038,10 +31041,16 @@ SLUS-00530:
     linkCable: false
 SLED-02119:
   name: "Croc 2 (Europe) (Demo)"
+  compatibility:
+    rating: NoIssues
+    versionTested: "0.1-7272-g143acca03"
   traits:
     - ForcePGXPCPUMode
 SLES-02088:
   name: "Croc 2 (Europe) (En,Fr,De,Es,It,Nl,Sv)"
+  compatibility:
+    rating: NoIssues
+    versionTested: "0.1-7272-g143acca03"
   controllers:
     - AnalogController
     - DigitalController
@@ -56420,6 +56429,9 @@ SCES-00867:
       - SCES-00867
       - SCES-10867
       - SCES-20867
+  compatibility:
+    rating: NoIssues
+    versionTested: "0.1-7272-g143acca03"
   controllers:
     - DigitalController
   traits:
@@ -56449,6 +56461,9 @@ SCES-10867:
       - SCES-00867
       - SCES-10867
       - SCES-20867
+  compatibility:
+    rating: NoIssues
+    versionTested: "0.1-7272-g143acca03"
   controllers:
     - DigitalController
   traits:
@@ -56478,6 +56493,9 @@ SCES-20867:
       - SCES-00867
       - SCES-10867
       - SCES-20867
+  compatibility:
+    rating: NoIssues
+    versionTested: "0.1-7272-g143acca03"
   controllers:
     - DigitalController
   traits:
@@ -56507,6 +56525,9 @@ SCES-00868:
       - SCES-00868
       - SCES-10868
       - SCES-20868
+  compatibility:
+    rating: NoIssues
+    versionTested: "0.1-7272-g143acca03"
   controllers:
     - DigitalController
   traits:
@@ -56536,6 +56557,9 @@ SCES-10868:
       - SCES-00868
       - SCES-10868
       - SCES-20868
+  compatibility:
+    rating: NoIssues
+    versionTested: "0.1-7272-g143acca03"
   controllers:
     - DigitalController
   traits:
@@ -56565,6 +56589,9 @@ SCES-20868:
       - SCES-00868
       - SCES-10868
       - SCES-20868
+  compatibility:
+    rating: NoIssues
+    versionTested: "0.1-7272-g143acca03"
   controllers:
     - DigitalController
   traits:
@@ -56594,6 +56621,9 @@ SCES-00869:
       - SCES-00869
       - SCES-10869
       - SCES-20869
+  compatibility:
+    rating: NoIssues
+    versionTested: "0.1-7272-g143acca03"
   controllers:
     - DigitalController
   traits:
@@ -56623,6 +56653,9 @@ SCES-10869:
       - SCES-00869
       - SCES-10869
       - SCES-20869
+  compatibility:
+    rating: NoIssues
+    versionTested: "0.1-7272-g143acca03"
   controllers:
     - DigitalController
   traits:
@@ -56652,6 +56685,9 @@ SCES-20869:
       - SCES-00869
       - SCES-10869
       - SCES-20869
+  compatibility:
+    rating: NoIssues
+    versionTested: "0.1-7272-g143acca03"
   controllers:
     - DigitalController
   traits:
@@ -56711,6 +56747,9 @@ SLPS-00701:
       - SLPS-00700
       - SLPS-00701
       - SLPS-00702
+  compatibility:
+    rating: NoIssues
+    versionTested: "0.1-841-g777809b"
   controllers:
     - DigitalController
   traits:
@@ -56738,6 +56777,9 @@ SLPS-00702:
       - SLPS-00700
       - SLPS-00701
       - SLPS-00702
+  compatibility:
+    rating: NoIssues
+    versionTested: "0.1-841-g777809b"
   controllers:
     - DigitalController
   traits:
@@ -58208,9 +58250,8 @@ SCES-03884:
 SLPS-00148:
   name: "Firemen 2, The - Pete & Danny (Japan)"
   compatibility:
-    rating: GraphicalAudioIssues
+    rating: NoIssues
-    versionTested: "0.1-4693-gbbcf1c67"
+    versionTested: "0.1-7272-g143acca03"
-    comments: "Dialogue in certain cutscenes ends too early or is missing entirely (Issue #575)"
   controllers:
     - DigitalController
   codes:
@@ -71234,8 +71275,8 @@ SLUS-00830:
 SLUS-01244:
   name: "High Heat Major League Baseball 2002 (USA)"
   compatibility:
-    rating: GraphicalAudioIssues
+    rating: NoIssues
-    versionTested: "0.1-4693-gbbcf1c67"
+    versionTested: "0.1-7272-g143acca03"
   controllers:
     - AnalogController
     - DigitalController

src/core/achievements.cpp

@@ -26,6 +26,7 @@
 #include "common/scoped_guard.h"
 #include "common/small_string.h"
 #include "common/string_util.h"
+#include "common/timer.h"
 
 #include "util/cd_image.h"
 #include "util/http_downloader.h"
@@ -39,7 +40,6 @@
 #include "fmt/format.h"
 #include "imgui.h"
 #include "imgui_internal.h"
-#include "imgui_stdlib.h"
 #include "rc_client.h"
 
 #include <algorithm>

src/core/analog_controller.h

@@ -1,12 +1,13 @@
-// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin <stenzek@gmail.com> and contributors.
+// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin <stenzek@gmail.com> and contributors.
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
 #pragma once
+
 #include "controller.h"
+
 #include <array>
 #include <memory>
 #include <optional>
-#include <string_view>
 
 class AnalogController final : public Controller
 {

src/core/analog_joystick.cpp

@@ -15,8 +15,6 @@
 #include "IconsFontAwesome5.h"
 #include "IconsPromptFont.h"
 
-#include <cmath>
-
 Log_SetChannel(AnalogJoystick);
 
 AnalogJoystick::AnalogJoystick(u32 index) : Controller(index)

src/core/analog_joystick.h

@@ -1,12 +1,13 @@
-// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin <stenzek@gmail.com> and contributors.
+// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin <stenzek@gmail.com> and contributors.
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
 #pragma once
+
 #include "controller.h"
+
 #include <array>
 #include <memory>
 #include <optional>
-#include <string_view>
 
 class AnalogJoystick final : public Controller
 {

src/core/bios.cpp

@@ -13,8 +13,6 @@
 #include "common/md5_digest.h"
 #include "common/path.h"
 
-#include <cerrno>
-
 Log_SetChannel(BIOS);
 
 namespace BIOS {

src/core/cdrom.cpp

@@ -10,6 +10,7 @@
 #include "settings.h"
 #include "spu.h"
 #include "system.h"
+#include "timing_event.h"
 
 #include "util/cd_image.h"
 #include "util/imgui_manager.h"

src/core/cheats.cpp

@@ -4,12 +4,10 @@
 #include "cheats.h"
 #include "bus.h"
 #include "controller.h"
-#include "cpu_code_cache.h"
 #include "cpu_core.h"
 #include "host.h"
 #include "system.h"
 
-#include "common/assert.h"
 #include "common/file_system.h"
 #include "common/log.h"
 #include "common/small_string.h"
@@ -19,7 +17,9 @@
 #include <iomanip>
 #include <sstream>
 #include <type_traits>
+
 Log_SetChannel(Cheats);
+
 static std::array<u32, 256> cht_register; // Used for D7 ,51 & 52 cheat types
 
 using KeyValuePairVector = std::vector<std::pair<std::string, std::string>>;

src/core/cheats.h

@@ -1,9 +1,12 @@
-// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin <stenzek@gmail.com> and contributors.
+// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin <stenzek@gmail.com> and contributors.
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
 #pragma once
+
 #include "common/bitfield.h"
+
 #include "types.h"
+
 #include <optional>
 #include <string>
 #include <vector>

src/core/cpu_code_cache.cpp

@@ -12,6 +12,8 @@
 #include "system.h"
 #include "timing_event.h"
 
+#include "util/page_fault_handler.h"
+
 #include "common/assert.h"
 #include "common/error.h"
 #include "common/intrin.h"

src/core/cpu_code_cache_private.h

@@ -10,13 +10,8 @@
 #include "cpu_core_private.h"
 #include "cpu_types.h"
 
-#include "util/page_fault_handler.h"
-
 #include <array>
-#include <map>
-#include <memory>
 #include <unordered_map>
-#include <vector>
 
 namespace CPU::CodeCache {
 

src/core/cpu_recompiler_code_generator.h

@@ -2,10 +2,6 @@
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
 #pragma once
-#include <array>
-#include <initializer_list>
-#include <utility>
-#include <vector>
 
 #include "cpu_code_cache_private.h"
 #include "cpu_recompiler_register_cache.h"
@@ -13,6 +9,9 @@
 #include "cpu_recompiler_types.h"
 #include "cpu_types.h"
 
+#include <array>
+#include <utility>
+
 namespace CPU::Recompiler {
 
 enum class Condition : u8

src/core/digital_controller.h

@@ -1,11 +1,11 @@
-// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin <stenzek@gmail.com> and contributors.
+// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin <stenzek@gmail.com> and contributors.
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
 #pragma once
+
 #include "controller.h"
+
 #include <memory>
-#include <optional>
-#include <string_view>
 
 class DigitalController final : public Controller
 {

src/core/dma.cpp

@@ -4,7 +4,6 @@
 #include "dma.h"
 #include "bus.h"
 #include "cdrom.h"
-#include "cpu_code_cache.h"
 #include "cpu_core.h"
 #include "gpu.h"
 #include "host.h"

src/core/fullscreen_ui.cpp

@@ -8,12 +8,9 @@
 #include "bios.h"
 #include "cheats.h"
 #include "controller.h"
-#include "core/memory_card_image.h"
-#include "cpu_core.h"
 #include "game_list.h"
 #include "gpu.h"
 #include "host.h"
-#include "resources.h"
 #include "settings.h"
 #include "system.h"
 
@@ -33,15 +30,13 @@
 #include "common/path.h"
 #include "common/small_string.h"
 #include "common/string_util.h"
-#include "common/threading.h"
+#include "common/timer.h"
 
 #include "IconsFontAwesome5.h"
 #include "IconsPromptFont.h"
 #include "fmt/chrono.h"
-#include "fmt/format.h"
 #include "imgui.h"
 #include "imgui_internal.h"
-#include "imgui_stdlib.h"
 
 #include <atomic>
 #include <bitset>

src/core/fullscreen_ui.h

@@ -1,5 +1,4 @@
 // SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin <stenzek@gmail.com>
-// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin <stenzek@gmail.com>
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
 #pragma once

src/core/game_list.cpp

@@ -15,7 +15,6 @@
 #include "util/image.h"
 #include "util/ini_settings_interface.h"
 
-#include "common/assert.h"
 #include "common/binary_reader_writer.h"
 #include "common/error.h"
 #include "common/file_system.h"
@@ -24,10 +23,10 @@
 #include "common/path.h"
 #include "common/progress_callback.h"
 #include "common/string_util.h"
+#include "common/timer.h"
 
 #include <algorithm>
 #include <array>
-#include <cctype>
 #include <ctime>
 #include <string_view>
 #include <type_traits>

src/core/gpu.cpp

@@ -22,7 +22,6 @@
 #include "common/error.h"
 #include "common/file_system.h"
 #include "common/gsvector_formatter.h"
-#include "common/heap_array.h"
 #include "common/log.h"
 #include "common/path.h"
 #include "common/small_string.h"

src/core/gpu_backend.h

@@ -2,14 +2,16 @@
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
 #pragma once
+
+#include "gpu_types.h"
+
 #include "common/heap_array.h"
 #include "common/threading.h"
-#include "gpu_types.h"
+
 #include <atomic>
 #include <condition_variable>
 #include <memory>
 #include <mutex>
-#include <thread>
 
 #ifdef _MSC_VER
 #pragma warning(push)

src/core/gpu_commands.cpp

@@ -1,13 +1,15 @@
-// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin <stenzek@gmail.com>
+// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin <stenzek@gmail.com>
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
-#include "common/assert.h"
-#include "common/log.h"
-#include "common/string_util.h"
 #include "gpu.h"
 #include "interrupt_controller.h"
 #include "system.h"
 #include "texture_replacements.h"
+
+#include "common/assert.h"
+#include "common/log.h"
+#include "common/string_util.h"
+
 Log_SetChannel(GPU);
 
 #define CHECK_COMMAND_SIZE(num_words)                                                                                  \

src/core/gpu_hw.cpp

@@ -21,6 +21,7 @@
 #include "common/log.h"
 #include "common/scoped_guard.h"
 #include "common/string_util.h"
+#include "common/timer.h"
 
 #include "IconsFontAwesome5.h"
 #include "imgui.h"

src/core/gpu_hw.h

@@ -10,12 +10,10 @@
 
 #include "common/dimensional_array.h"
 #include "common/gsvector.h"
-#include "common/heap_array.h"
 
 #include <limits>
 #include <tuple>
 #include <utility>
-#include <vector>
 
 class Error;
 

src/core/gpu_hw_shadergen.cpp

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
 #include "gpu_hw_shadergen.h"
+
 #include "common/assert.h"
-#include <cstdio>
 
 GPU_HW_ShaderGen::GPU_HW_ShaderGen(RenderAPI render_api, u32 resolution_scale, u32 multisamples,
                                    bool per_sample_shading, bool true_color, bool scaled_dithering,

src/core/gpu_hw_shadergen.h

@@ -2,7 +2,9 @@
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
 #pragma once
+
 #include "gpu_hw.h"
+
 #include "util/shadergen.h"
 
 class GPU_HW_ShaderGen : public ShaderGen

src/core/gpu_sw.h

@@ -1,7 +1,8 @@
-// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin <stenzek@gmail.com>
+// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin <stenzek@gmail.com>
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
 #pragma once
+
 #include "gpu.h"
 #include "gpu_sw_backend.h"
 
@@ -9,9 +10,7 @@
 
 #include "common/heap_array.h"
 
-#include <array>
 #include <memory>
-#include <vector>
 
 namespace Threading {
 class Thread;

src/core/gpu_sw_backend.h

@@ -7,8 +7,6 @@
 #include "gpu_backend.h"
 
 #include <array>
-#include <memory>
-#include <vector>
 
 class GPU_SW_Backend final : public GPUBackend
 {

src/core/gpu_types.h

@@ -2,10 +2,13 @@
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
 #pragma once
+
+#include "types.h"
+
 #include "common/bitfield.h"
 #include "common/bitutils.h"
 #include "common/gsvector.h"
-#include "types.h"
+
 #include <array>
 
 enum : u32

src/core/gte.cpp

@@ -7,7 +7,6 @@
 #include "cpu_core_private.h"
 #include "cpu_pgxp.h"
 #include "settings.h"
-#include "timing_event.h"
 
 #include "util/gpu_device.h"
 #include "util/state_wrapper.h"

src/core/guncon.h

@@ -1,11 +1,11 @@
-// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin <stenzek@gmail.com>
+// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin <stenzek@gmail.com>
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
 #pragma once
+
 #include "controller.h"
+
 #include <memory>
-#include <optional>
-#include <string_view>
 
 class GunCon final : public Controller
 {

src/core/host.h

@@ -8,11 +8,8 @@
 #include "common/small_string.h"
 #include "common/types.h"
 
-#include <ctime>
 #include <functional>
-#include <memory>
 #include <mutex>
-#include <optional>
 #include <span>
 #include <string>
 #include <string_view>

src/core/hotkeys.cpp

@@ -20,6 +20,7 @@
 
 #include "common/error.h"
 #include "common/file_system.h"
+#include "common/timer.h"
 
 #include "IconsFontAwesome5.h"
 

src/core/imgui_overlays.cpp

@@ -12,12 +12,10 @@
 #include "gpu.h"
 #include "host.h"
 #include "mdec.h"
-#include "resources.h"
 #include "settings.h"
 #include "spu.h"
 #include "system.h"
 
-#include "util/audio_stream.h"
 #include "util/gpu_device.h"
 #include "util/imgui_animated.h"
 #include "util/imgui_fullscreen.h"
@@ -25,8 +23,6 @@
 #include "util/input_manager.h"
 
 #include "common/align.h"
-#include "common/assert.h"
-#include "common/easing.h"
 #include "common/error.h"
 #include "common/file_system.h"
 #include "common/gsvector.h"
@@ -38,7 +34,6 @@
 
 #include "IconsFontAwesome5.h"
 #include "fmt/chrono.h"
-#include "fmt/format.h"
 #include "imgui.h"
 #include "imgui_internal.h"
 
@@ -48,7 +43,6 @@
 #include <deque>
 #include <mutex>
 #include <span>
-#include <unordered_map>
 
 Log_SetChannel(ImGuiManager);
 

src/core/justifier.cpp

@@ -5,7 +5,6 @@
 #include "gpu.h"
 #include "host.h"
 #include "interrupt_controller.h"
-#include "resources.h"
 #include "system.h"
 
 #include "util/imgui_manager.h"

src/core/justifier.h

@@ -7,8 +7,6 @@
 #include "timing_event.h"
 
 #include <memory>
-#include <optional>
-#include <string_view>
 
 class TimingEvent;
 

src/core/mdec.cpp

@@ -1,12 +1,12 @@
-// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin <stenzek@gmail.com>
+// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin <stenzek@gmail.com>
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
 #include "mdec.h"
 #include "cpu_core.h"
 #include "dma.h"
 #include "host.h"
-#include "interrupt_controller.h"
 #include "system.h"
+#include "timing_event.h"
 
 #include "util/imgui_manager.h"
 #include "util/state_wrapper.h"

src/core/memory_card.cpp

@@ -17,8 +17,6 @@
 
 #include "IconsFontAwesome5.h"
 
-#include <cstdio>
-
 Log_SetChannel(MemoryCard);
 
 MemoryCard::MemoryCard()

src/core/multitap.cpp

@@ -1,13 +1,16 @@
-// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin <stenzek@gmail.com> and contributors.
+// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin <stenzek@gmail.com> and contributors.
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
 #include "multitap.h"
-#include "common/log.h"
-#include "common/types.h"
 #include "controller.h"
 #include "memory_card.h"
 #include "pad.h"
+
 #include "util/state_wrapper.h"
+
+#include "common/log.h"
+#include "common/types.h"
+
 Log_SetChannel(Multitap);
 
 Multitap::Multitap()

src/core/multitap.h

@@ -1,11 +1,12 @@
-// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin <stenzek@gmail.com> and contributors.
+// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin <stenzek@gmail.com> and contributors.
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
 #pragma once
-#include "common/types.h"
+
 #include "controller.h"
-#include "memory_card.h"
+
-#include "util/state_wrapper.h"
+#include "common/types.h"
+
 #include <array>
 
 class Multitap final

src/core/negcon.h

@@ -1,12 +1,13 @@
-// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin <stenzek@gmail.com> and contributors.
+// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin <stenzek@gmail.com> and contributors.
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
 #pragma once
+
 #include "controller.h"
+
 #include <array>
 #include <memory>
 #include <optional>
-#include <string_view>
 
 class NeGcon final : public Controller
 {

src/core/negcon_rumble.h

@@ -1,12 +1,13 @@
-// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin <stenzek@gmail.com> and contributors.
+// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin <stenzek@gmail.com> and contributors.
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
 #pragma once
+
 #include "controller.h"
+
 #include <array>
 #include <memory>
 #include <optional>
-#include <string_view>
 
 class NeGconRumble final : public Controller
 {

src/core/pad.h

@@ -2,7 +2,9 @@
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
 #pragma once
+
 #include "types.h"
+
 #include <memory>
 
 class StateWrapper;

src/core/pcdrv.cpp

@@ -1,13 +1,15 @@
-// SPDX-FileCopyrightText: 2023 Connor McLaughlin <stenzek@gmail.com>
+// SPDX-FileCopyrightText: 2023-2024 Connor McLaughlin <stenzek@gmail.com>
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
 #include "pcdrv.h"
+#include "cpu_core.h"
+#include "settings.h"
+
 #include "common/file_system.h"
 #include "common/log.h"
 #include "common/path.h"
 #include "common/string_util.h"
-#include "cpu_core.h"
+
-#include "settings.h"
 Log_SetChannel(PCDrv);
 
 static constexpr u32 MAX_FILES = 100;

src/core/pcdrv.h

@@ -1,9 +1,9 @@
-// SPDX-FileCopyrightText: 2023 Connor McLaughlin <stenzek@gmail.com>
+// SPDX-FileCopyrightText: 2023-2024 Connor McLaughlin <stenzek@gmail.com>
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
 #pragma once
+
 #include "cpu_types.h"
-#include "types.h"
 
 //////////////////////////////////////////////////////////////////////////
 // HLE Implementation of PCDrv

src/core/pine_server.cpp

@@ -9,7 +9,6 @@
 
 #include "scmversion/scmversion.h"
 
-#include "util/platform_misc.h"
 #include "util/sockets.h"
 
 #include "common/binary_reader_writer.h"

src/core/playstation_mouse.h

@@ -1,11 +1,11 @@
-// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin <stenzek@gmail.com>
+// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin <stenzek@gmail.com>
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
 #pragma once
+
 #include "controller.h"
+
 #include <memory>
-#include <optional>
-#include <string_view>
 
 class PlayStationMouse final : public Controller
 {

src/core/psf_loader.cpp

@@ -6,7 +6,6 @@
 #include "bus.h"
 #include "system.h"
 
-#include "common/assert.h"
 #include "common/error.h"
 #include "common/file_system.h"
 #include "common/log.h"
@@ -14,7 +13,6 @@
 
 #include "zlib.h"
 
-#include <cctype>
 #include <cstring>
 
 Log_SetChannel(PSFLoader);

src/core/psf_loader.h

@@ -8,7 +8,6 @@
 #include <map>
 #include <optional>
 #include <string>
-#include <string_view>
 #include <vector>
 
 class Error;

src/core/save_state_version.h

@@ -2,7 +2,8 @@
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
 #pragma once
-#include "types.h"
+
+#include "common/types.h"
 
 static constexpr u32 SAVE_STATE_MAGIC = 0x43435544;
 static constexpr u32 SAVE_STATE_VERSION = 69;

src/core/shader_cache_version.h

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
 #pragma once
+
 #include "common/types.h"
 
 static constexpr u32 SHADER_CACHE_VERSION = 18;

src/core/sio.cpp

@@ -1,16 +1,13 @@
-// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin <stenzek@gmail.com>
+// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin <stenzek@gmail.com>
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
 #include "sio.h"
 #include "controller.h"
-#include "interrupt_controller.h"
-#include "memory_card.h"
 
 #include "util/state_wrapper.h"
 
 #include "common/bitfield.h"
 #include "common/bitutils.h"
-#include "common/fifo_queue.h"
 #include "common/log.h"
 
 #include <array>

src/core/sio.h

@@ -2,7 +2,8 @@
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
 #pragma once
-#include "types.h"
+
+#include "common/types.h"
 
 class StateWrapper;
 

src/core/spu.cpp

@@ -8,6 +8,7 @@
 #include "imgui.h"
 #include "interrupt_controller.h"
 #include "system.h"
+#include "timing_event.h"
 
 #include "util/audio_stream.h"
 #include "util/imgui_manager.h"

src/core/spu.h

@@ -1,8 +1,10 @@
-// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin <stenzek@gmail.com>
+// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin <stenzek@gmail.com>
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
 #pragma once
+
 #include "types.h"
+
 #include <array>
 
 class StateWrapper;

src/core/system.h

@@ -4,18 +4,13 @@
 #pragma once
 
 #include "settings.h"
-#include "timing_event.h"
 #include "types.h"
 
 #include "util/image.h"
 
-#include "common/timer.h"
-
 #include <memory>
 #include <optional>
-#include <span>
 #include <string>
-#include <utility>
 
 class ByteStream;
 class CDImage;
@@ -32,7 +27,6 @@ struct CheatCode;
 class CheatList;
 
 class GPUTexture;
-class GrowableMemoryByteStream;
 
 namespace BIOS {
 struct ImageInfo;

src/core/timers.h

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
 #pragma once
+
 #include "types.h"
 
 class StateWrapper;

src/util/audio_stream.cpp

@@ -10,7 +10,6 @@
 #include "common/gsvector.h"
 #include "common/log.h"
 #include "common/settings_interface.h"
-#include "common/small_string.h"
 #include "common/timer.h"
 
 #include "soundtouch/SoundTouch.h"

src/util/cd_image.cpp

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
 #include "cd_image.h"
+
 #include "common/assert.h"
 #include "common/bitutils.h"
 #include "common/error.h"
@@ -9,7 +10,9 @@
 #include "common/log.h"
 #include "common/path.h"
 #include "common/string_util.h"
+
 #include <array>
+
 Log_SetChannel(CDImage);
 
 CDImage::CDImage() = default;

src/util/cd_image.h

@@ -1,11 +1,13 @@
-// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin <stenzek@gmail.com>
+// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin <stenzek@gmail.com>
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
 #pragma once
+
 #include "common/bitfield.h"
 #include "common/bitutils.h"
 #include "common/progress_callback.h"
 #include "common/types.h"
+
 #include <array>
 #include <memory>
 #include <string>