diff options
134 files changed, 8 insertions, 219 deletions
| diff --git a/src/core/arm/dynarmic/arm_dynarmic_32.h b/src/core/arm/dynarmic/arm_dynarmic_32.h index 063605b46..5d47b600d 100644 --- a/src/core/arm/dynarmic/arm_dynarmic_32.h +++ b/src/core/arm/dynarmic/arm_dynarmic_32.h @@ -9,7 +9,6 @@  #include <dynarmic/interface/A32/a32.h>  #include <dynarmic/interface/A64/a64.h> -#include <dynarmic/interface/exclusive_monitor.h>  #include "common/common_types.h"  #include "common/hash.h"  #include "core/arm/arm_interface.h" diff --git a/src/core/arm/dynarmic/arm_dynarmic_64.cpp b/src/core/arm/dynarmic/arm_dynarmic_64.cpp index 4fd15f111..4e73cc03a 100644 --- a/src/core/arm/dynarmic/arm_dynarmic_64.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic_64.cpp @@ -18,7 +18,6 @@  #include "core/core_timing.h"  #include "core/hardware_properties.h"  #include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/k_scheduler.h"  #include "core/hle/kernel/svc.h"  #include "core/memory.h" diff --git a/src/core/arm/dynarmic/arm_dynarmic_cp15.cpp b/src/core/arm/dynarmic/arm_dynarmic_cp15.cpp index ebd506121..a043e6735 100644 --- a/src/core/arm/dynarmic/arm_dynarmic_cp15.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic_cp15.cpp @@ -8,7 +8,6 @@  #include "core/arm/dynarmic/arm_dynarmic_cp15.h"  #include "core/core.h"  #include "core/core_timing.h" -#include "core/core_timing_util.h"  using Callback = Dynarmic::A32::Coprocessor::Callback;  using CallbackOrAccessOneWord = Dynarmic::A32::Coprocessor::CallbackOrAccessOneWord; diff --git a/src/core/arm/dynarmic/arm_dynarmic_cp15.h b/src/core/arm/dynarmic/arm_dynarmic_cp15.h index 7c7ede79e..f271b2070 100644 --- a/src/core/arm/dynarmic/arm_dynarmic_cp15.h +++ b/src/core/arm/dynarmic/arm_dynarmic_cp15.h @@ -4,7 +4,6 @@  #pragma once -#include <memory>  #include <optional>  #include <dynarmic/interface/A32/coprocessor.h> diff --git a/src/core/arm/dynarmic/arm_exclusive_monitor.cpp b/src/core/arm/dynarmic/arm_exclusive_monitor.cpp index 9426a3edf..397d054a8 100644 --- a/src/core/arm/dynarmic/arm_exclusive_monitor.cpp +++ b/src/core/arm/dynarmic/arm_exclusive_monitor.cpp @@ -2,8 +2,6 @@  // Licensed under GPLv2 or any later version  // Refer to the license.txt file included. -#include <cinttypes> -#include <memory>  #include "core/arm/dynarmic/arm_exclusive_monitor.h"  #include "core/memory.h" diff --git a/src/core/arm/dynarmic/arm_exclusive_monitor.h b/src/core/arm/dynarmic/arm_exclusive_monitor.h index 73d41f223..265c4ecef 100644 --- a/src/core/arm/dynarmic/arm_exclusive_monitor.h +++ b/src/core/arm/dynarmic/arm_exclusive_monitor.h @@ -4,7 +4,6 @@  #pragma once -#include <memory>  #include <unordered_map>  #include <dynarmic/interface/exclusive_monitor.h> diff --git a/src/core/core.cpp b/src/core/core.cpp index c3a0f9dae..85485773f 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -19,20 +19,16 @@  #include "core/cpu_manager.h"  #include "core/device_memory.h"  #include "core/file_sys/bis_factory.h" -#include "core/file_sys/card_image.h"  #include "core/file_sys/mode.h"  #include "core/file_sys/patch_manager.h"  #include "core/file_sys/registered_cache.h"  #include "core/file_sys/romfs_factory.h"  #include "core/file_sys/savedata_factory.h" -#include "core/file_sys/sdmc_factory.h"  #include "core/file_sys/vfs_concat.h"  #include "core/file_sys/vfs_real.h"  #include "core/hardware_interrupt_manager.h" -#include "core/hle/kernel/k_client_port.h"  #include "core/hle/kernel/k_process.h"  #include "core/hle/kernel/k_scheduler.h" -#include "core/hle/kernel/k_thread.h"  #include "core/hle/kernel/kernel.h"  #include "core/hle/kernel/physical_core.h"  #include "core/hle/service/am/applets/applets.h" diff --git a/src/core/core_timing.h b/src/core/core_timing.h index b64caacda..888828fd0 100644 --- a/src/core/core_timing.h +++ b/src/core/core_timing.h @@ -8,7 +8,6 @@  #include <chrono>  #include <functional>  #include <memory> -#include <mutex>  #include <optional>  #include <string>  #include <thread> diff --git a/src/core/cpu_manager.cpp b/src/core/cpu_manager.cpp index 77efcabf0..5d43c6e5d 100644 --- a/src/core/cpu_manager.cpp +++ b/src/core/cpu_manager.cpp @@ -6,7 +6,6 @@  #include "common/microprofile.h"  #include "common/scope_exit.h"  #include "common/thread.h" -#include "core/arm/exclusive_monitor.h"  #include "core/core.h"  #include "core/core_timing.h"  #include "core/cpu_manager.h" diff --git a/src/core/crypto/ctr_encryption_layer.cpp b/src/core/crypto/ctr_encryption_layer.cpp index 1231da8e3..3a2af4f50 100644 --- a/src/core/crypto/ctr_encryption_layer.cpp +++ b/src/core/crypto/ctr_encryption_layer.cpp @@ -4,7 +4,6 @@  #include <algorithm>  #include <cstring> -#include "common/assert.h"  #include "core/crypto/ctr_encryption_layer.h"  namespace Core::Crypto { diff --git a/src/core/crypto/key_manager.cpp b/src/core/crypto/key_manager.cpp index a98daed89..9244907b5 100644 --- a/src/core/crypto/key_manager.cpp +++ b/src/core/crypto/key_manager.cpp @@ -10,14 +10,12 @@  #include <locale>  #include <map>  #include <sstream> -#include <string_view>  #include <tuple>  #include <vector>  #include <mbedtls/bignum.h>  #include <mbedtls/cipher.h>  #include <mbedtls/cmac.h>  #include <mbedtls/sha256.h> -#include "common/common_funcs.h"  #include "common/fs/file.h"  #include "common/fs/fs.h"  #include "common/fs/path_util.h" @@ -30,7 +28,6 @@  #include "core/crypto/partition_data_manager.h"  #include "core/file_sys/content_archive.h"  #include "core/file_sys/nca_metadata.h" -#include "core/file_sys/partition_filesystem.h"  #include "core/file_sys/registered_cache.h"  #include "core/hle/service/filesystem/filesystem.h"  #include "core/loader/loader.h" diff --git a/src/core/crypto/key_manager.h b/src/core/crypto/key_manager.h index e771625e1..ac1eb8962 100644 --- a/src/core/crypto/key_manager.h +++ b/src/core/crypto/key_manager.h @@ -15,7 +15,6 @@  #include "common/common_funcs.h"  #include "common/common_types.h"  #include "core/crypto/partition_data_manager.h" -#include "core/file_sys/vfs_types.h"  namespace Common::FS {  class IOFile; diff --git a/src/core/crypto/partition_data_manager.cpp b/src/core/crypto/partition_data_manager.cpp index 5f1c86a09..d18252a54 100644 --- a/src/core/crypto/partition_data_manager.cpp +++ b/src/core/crypto/partition_data_manager.cpp @@ -12,7 +12,6 @@  #include <cctype>  #include <cstring>  #include <mbedtls/sha256.h> -#include "common/assert.h"  #include "common/common_funcs.h"  #include "common/common_types.h"  #include "common/hex_util.h" diff --git a/src/core/crypto/xts_encryption_layer.cpp b/src/core/crypto/xts_encryption_layer.cpp index 8f0ba4ee7..c2b7ea309 100644 --- a/src/core/crypto/xts_encryption_layer.cpp +++ b/src/core/crypto/xts_encryption_layer.cpp @@ -4,7 +4,6 @@  #include <algorithm>  #include <cstring> -#include "common/assert.h"  #include "core/crypto/xts_encryption_layer.h"  namespace Core::Crypto { diff --git a/src/core/file_sys/card_image.cpp b/src/core/file_sys/card_image.cpp index 755d3303e..c6300be59 100644 --- a/src/core/file_sys/card_image.cpp +++ b/src/core/file_sys/card_image.cpp @@ -14,7 +14,6 @@  #include "core/file_sys/nca_metadata.h"  #include "core/file_sys/partition_filesystem.h"  #include "core/file_sys/submission_package.h" -#include "core/file_sys/vfs_concat.h"  #include "core/file_sys/vfs_offset.h"  #include "core/file_sys/vfs_vector.h"  #include "core/loader/loader.h" diff --git a/src/core/file_sys/control_metadata.h b/src/core/file_sys/control_metadata.h index af2b723df..3e0b45630 100644 --- a/src/core/file_sys/control_metadata.h +++ b/src/core/file_sys/control_metadata.h @@ -5,7 +5,6 @@  #pragma once  #include <array> -#include <memory>  #include <string>  #include "common/common_funcs.h"  #include "common/common_types.h" diff --git a/src/core/file_sys/directory.h b/src/core/file_sys/directory.h index 0d73eecc9..21c7aefc8 100644 --- a/src/core/file_sys/directory.h +++ b/src/core/file_sys/directory.h @@ -6,7 +6,6 @@  #include <cstddef>  #include <iterator> -#include <string_view>  #include "common/common_funcs.h"  #include "common/common_types.h" diff --git a/src/core/file_sys/nca_metadata.h b/src/core/file_sys/nca_metadata.h index ce1138a17..75c74ae28 100644 --- a/src/core/file_sys/nca_metadata.h +++ b/src/core/file_sys/nca_metadata.h @@ -5,7 +5,6 @@  #pragma once  #include <array> -#include <memory>  #include <vector>  #include "common/common_funcs.h"  #include "common/common_types.h" diff --git a/src/core/file_sys/romfs_factory.cpp b/src/core/file_sys/romfs_factory.cpp index 3d9ce863b..291b746b6 100644 --- a/src/core/file_sys/romfs_factory.cpp +++ b/src/core/file_sys/romfs_factory.cpp @@ -6,7 +6,6 @@  #include "common/assert.h"  #include "common/common_types.h"  #include "common/logging/log.h" -#include "core/file_sys/card_image.h"  #include "core/file_sys/common_funcs.h"  #include "core/file_sys/content_archive.h"  #include "core/file_sys/nca_metadata.h" diff --git a/src/core/file_sys/romfs_factory.h b/src/core/file_sys/romfs_factory.h index 39db09e4e..2c93a49a5 100644 --- a/src/core/file_sys/romfs_factory.h +++ b/src/core/file_sys/romfs_factory.h @@ -5,8 +5,9 @@  #pragma once  #include <memory> +  #include "common/common_types.h" -#include "core/file_sys/vfs.h" +#include "core/file_sys/vfs_types.h"  #include "core/hle/result.h"  namespace Loader { diff --git a/src/core/file_sys/savedata_factory.h b/src/core/file_sys/savedata_factory.h index 1d8dc981f..de415b0c4 100644 --- a/src/core/file_sys/savedata_factory.h +++ b/src/core/file_sys/savedata_factory.h @@ -8,7 +8,6 @@  #include <string>  #include "common/common_funcs.h"  #include "common/common_types.h" -#include "common/swap.h"  #include "core/file_sys/vfs.h"  #include "core/hle/result.h" diff --git a/src/core/file_sys/submission_package.cpp b/src/core/file_sys/submission_package.cpp index f192dffa5..f03124e3d 100644 --- a/src/core/file_sys/submission_package.cpp +++ b/src/core/file_sys/submission_package.cpp @@ -4,7 +4,6 @@  #include <algorithm>  #include <cstring> -#include <string_view>  #include <fmt/ostream.h> diff --git a/src/core/file_sys/system_archive/time_zone_binary.h b/src/core/file_sys/system_archive/time_zone_binary.h index ed2b78227..266c23537 100644 --- a/src/core/file_sys/system_archive/time_zone_binary.h +++ b/src/core/file_sys/system_archive/time_zone_binary.h @@ -4,7 +4,6 @@  #pragma once -#include <string>  #include "core/file_sys/vfs_types.h"  namespace FileSys::SystemArchive { diff --git a/src/core/file_sys/vfs.h b/src/core/file_sys/vfs.h index ff6935da6..3e625fad6 100644 --- a/src/core/file_sys/vfs.h +++ b/src/core/file_sys/vfs.h @@ -9,7 +9,6 @@  #include <memory>  #include <optional>  #include <string> -#include <string_view>  #include <type_traits>  #include <vector> diff --git a/src/core/file_sys/vfs_concat.h b/src/core/file_sys/vfs_concat.h index cd32960a5..bd091451e 100644 --- a/src/core/file_sys/vfs_concat.h +++ b/src/core/file_sys/vfs_concat.h @@ -6,7 +6,6 @@  #include <map>  #include <memory> -#include <string_view>  #include "core/file_sys/vfs.h"  namespace FileSys { diff --git a/src/core/file_sys/vfs_offset.h b/src/core/file_sys/vfs_offset.h index 42f78b3d9..7ce1eb336 100644 --- a/src/core/file_sys/vfs_offset.h +++ b/src/core/file_sys/vfs_offset.h @@ -5,7 +5,6 @@  #pragma once  #include <memory> -#include <string_view>  #include "core/file_sys/vfs.h" diff --git a/src/core/frontend/applets/general_frontend.h b/src/core/frontend/applets/general_frontend.h index b713b14ee..1647aa975 100644 --- a/src/core/frontend/applets/general_frontend.h +++ b/src/core/frontend/applets/general_frontend.h @@ -5,7 +5,6 @@  #pragma once  #include <functional> -#include <optional>  #include "common/common_types.h"  namespace Core::Frontend { diff --git a/src/core/frontend/applets/software_keyboard.h b/src/core/frontend/applets/software_keyboard.h index 228a548d4..29109306b 100644 --- a/src/core/frontend/applets/software_keyboard.h +++ b/src/core/frontend/applets/software_keyboard.h @@ -5,7 +5,6 @@  #pragma once  #include <functional> -#include <thread>  #include "common/common_types.h" diff --git a/src/core/frontend/applets/web_browser.h b/src/core/frontend/applets/web_browser.h index 915dde677..b6a60c994 100644 --- a/src/core/frontend/applets/web_browser.h +++ b/src/core/frontend/applets/web_browser.h @@ -5,7 +5,6 @@  #pragma once  #include <functional> -#include <string_view>  #include "core/hle/service/am/applets/applet_web_browser_types.h" diff --git a/src/core/frontend/emu_window.cpp b/src/core/frontend/emu_window.cpp index e11ec0b0b..e1f7e5886 100644 --- a/src/core/frontend/emu_window.cpp +++ b/src/core/frontend/emu_window.cpp @@ -2,7 +2,6 @@  // Licensed under GPLv2 or any later version  // Refer to the license.txt file included. -#include <cmath>  #include <mutex>  #include "common/settings.h"  #include "core/frontend/emu_window.h" diff --git a/src/core/frontend/emu_window.h b/src/core/frontend/emu_window.h index 076148698..8a86a1d27 100644 --- a/src/core/frontend/emu_window.h +++ b/src/core/frontend/emu_window.h @@ -5,7 +5,6 @@  #pragma once  #include <memory> -#include <tuple>  #include <utility>  #include "common/common_types.h"  #include "core/frontend/framebuffer_layout.h" diff --git a/src/core/hle/kernel/board/nintendo/nx/secure_monitor.h b/src/core/hle/kernel/board/nintendo/nx/secure_monitor.h index 0c366b252..f77a91dec 100644 --- a/src/core/hle/kernel/board/nintendo/nx/secure_monitor.h +++ b/src/core/hle/kernel/board/nintendo/nx/secure_monitor.h @@ -4,8 +4,6 @@  #pragma once -#include "common/common_types.h" -  namespace Kernel::Board::Nintendo::Nx::Smc {  enum MemorySize { diff --git a/src/core/hle/kernel/code_set.h b/src/core/hle/kernel/code_set.h index d8ad54030..5cc3b9829 100644 --- a/src/core/hle/kernel/code_set.h +++ b/src/core/hle/kernel/code_set.h @@ -5,7 +5,6 @@  #pragma once  #include <cstddef> -#include <vector>  #include "common/common_types.h"  #include "core/hle/kernel/physical_memory.h" diff --git a/src/core/hle/kernel/hle_ipc.cpp b/src/core/hle/kernel/hle_ipc.cpp index cee96dd9b..e19544c54 100644 --- a/src/core/hle/kernel/hle_ipc.cpp +++ b/src/core/hle/kernel/hle_ipc.cpp @@ -5,7 +5,6 @@  #include <algorithm>  #include <array>  #include <sstream> -#include <utility>  #include <boost/range/algorithm_ext/erase.hpp> @@ -19,14 +18,9 @@  #include "core/hle/kernel/k_handle_table.h"  #include "core/hle/kernel/k_process.h"  #include "core/hle/kernel/k_readable_event.h" -#include "core/hle/kernel/k_scheduler.h" -#include "core/hle/kernel/k_scoped_scheduler_lock_and_sleep.h"  #include "core/hle/kernel/k_server_session.h"  #include "core/hle/kernel/k_thread.h" -#include "core/hle/kernel/k_writable_event.h"  #include "core/hle/kernel/kernel.h" -#include "core/hle/kernel/svc_results.h" -#include "core/hle/kernel/time_manager.h"  #include "core/memory.h"  namespace Kernel { diff --git a/src/core/hle/kernel/init/init_slab_setup.cpp b/src/core/hle/kernel/init/init_slab_setup.cpp index 10edede17..8ff0f695d 100644 --- a/src/core/hle/kernel/init/init_slab_setup.cpp +++ b/src/core/hle/kernel/init/init_slab_setup.cpp @@ -20,8 +20,6 @@  #include "core/hle/kernel/k_system_control.h"  #include "core/hle/kernel/k_thread.h"  #include "core/hle/kernel/k_transfer_memory.h" -#include "core/hle/kernel/memory_types.h" -#include "core/memory.h"  namespace Kernel::Init { diff --git a/src/core/hle/kernel/k_auto_object_container.h b/src/core/hle/kernel/k_auto_object_container.h index 459953450..4eadfe99d 100644 --- a/src/core/hle/kernel/k_auto_object_container.h +++ b/src/core/hle/kernel/k_auto_object_container.h @@ -4,14 +4,9 @@  #pragma once -#include <atomic> -  #include <boost/intrusive/rbtree.hpp> -#include "common/assert.h"  #include "common/common_funcs.h" -#include "common/common_types.h" -#include "common/intrusive_red_black_tree.h"  #include "core/hle/kernel/k_auto_object.h"  #include "core/hle/kernel/k_light_lock.h" diff --git a/src/core/hle/kernel/k_class_token.h b/src/core/hle/kernel/k_class_token.h index c28db49ec..980010150 100644 --- a/src/core/hle/kernel/k_class_token.h +++ b/src/core/hle/kernel/k_class_token.h @@ -6,7 +6,6 @@  #include <atomic> -#include "common/assert.h"  #include "common/bit_util.h"  #include "common/common_types.h" diff --git a/src/core/hle/kernel/k_client_session.cpp b/src/core/hle/kernel/k_client_session.cpp index 8ad1be762..242582f8f 100644 --- a/src/core/hle/kernel/k_client_session.cpp +++ b/src/core/hle/kernel/k_client_session.cpp @@ -7,7 +7,6 @@  #include "core/hle/kernel/k_server_session.h"  #include "core/hle/kernel/k_session.h"  #include "core/hle/kernel/k_thread.h" -#include "core/hle/kernel/svc_results.h"  #include "core/hle/result.h"  namespace Kernel { diff --git a/src/core/hle/kernel/k_client_session.h b/src/core/hle/kernel/k_client_session.h index 230e3b6b8..ad6cc4ed1 100644 --- a/src/core/hle/kernel/k_client_session.h +++ b/src/core/hle/kernel/k_client_session.h @@ -4,11 +4,9 @@  #pragma once -#include <memory>  #include <string>  #include "core/hle/kernel/k_auto_object.h" -#include "core/hle/kernel/k_synchronization_object.h"  #include "core/hle/kernel/slab_helpers.h"  #include "core/hle/result.h" diff --git a/src/core/hle/kernel/k_condition_variable.cpp b/src/core/hle/kernel/k_condition_variable.cpp index ef14ad1d2..7fa9b8cc3 100644 --- a/src/core/hle/kernel/k_condition_variable.cpp +++ b/src/core/hle/kernel/k_condition_variable.cpp @@ -2,8 +2,6 @@  // Licensed under GPLv2 or any later version  // Refer to the license.txt file included. -#include <vector> -  #include "core/arm/exclusive_monitor.h"  #include "core/core.h"  #include "core/hle/kernel/k_condition_variable.h" diff --git a/src/core/hle/kernel/k_handle_table.h b/src/core/hle/kernel/k_handle_table.h index 2ff6aa160..95ec905ae 100644 --- a/src/core/hle/kernel/k_handle_table.h +++ b/src/core/hle/kernel/k_handle_table.h @@ -8,7 +8,6 @@  #include "common/assert.h"  #include "common/bit_field.h" -#include "common/bit_util.h"  #include "common/common_types.h"  #include "core/hle/kernel/k_auto_object.h"  #include "core/hle/kernel/k_spin_lock.h" diff --git a/src/core/hle/kernel/k_light_condition_variable.h b/src/core/hle/kernel/k_light_condition_variable.h index a95fa41f3..fb0ad783a 100644 --- a/src/core/hle/kernel/k_light_condition_variable.h +++ b/src/core/hle/kernel/k_light_condition_variable.h @@ -10,7 +10,6 @@  #include "common/common_types.h"  #include "core/hle/kernel/k_scheduler.h"  #include "core/hle/kernel/k_scoped_scheduler_lock_and_sleep.h" -#include "core/hle/kernel/k_thread_queue.h"  #include "core/hle/kernel/time_manager.h"  namespace Kernel { diff --git a/src/core/hle/kernel/k_light_lock.h b/src/core/hle/kernel/k_light_lock.h index f4c45f76a..ad853661d 100644 --- a/src/core/hle/kernel/k_light_lock.h +++ b/src/core/hle/kernel/k_light_lock.h @@ -6,7 +6,6 @@  #include <atomic> -#include "common/common_types.h"  #include "core/hle/kernel/k_scoped_lock.h"  namespace Kernel { diff --git a/src/core/hle/kernel/k_memory_manager.h b/src/core/hle/kernel/k_memory_manager.h index ac840b3d0..39badc5f1 100644 --- a/src/core/hle/kernel/k_memory_manager.h +++ b/src/core/hle/kernel/k_memory_manager.h @@ -8,7 +8,6 @@  #include <mutex>  #include <tuple> -#include "common/common_funcs.h"  #include "common/common_types.h"  #include "core/hle/kernel/k_page_heap.h"  #include "core/hle/result.h" diff --git a/src/core/hle/kernel/k_page_heap.cpp b/src/core/hle/kernel/k_page_heap.cpp index 07e062922..29d996d62 100644 --- a/src/core/hle/kernel/k_page_heap.cpp +++ b/src/core/hle/kernel/k_page_heap.cpp @@ -4,7 +4,6 @@  #include "core/core.h"  #include "core/hle/kernel/k_page_heap.h" -#include "core/memory.h"  namespace Kernel { diff --git a/src/core/hle/kernel/k_page_heap.h b/src/core/hle/kernel/k_page_heap.h index de5d6a189..8d9f30523 100644 --- a/src/core/hle/kernel/k_page_heap.h +++ b/src/core/hle/kernel/k_page_heap.h @@ -5,12 +5,9 @@  #pragma once  #include <array> -#include <bit>  #include <vector>  #include "common/alignment.h" -#include "common/assert.h" -#include "common/common_funcs.h"  #include "common/common_types.h"  #include "core/hle/kernel/k_page_bitmap.h"  #include "core/hle/kernel/memory_types.h" diff --git a/src/core/hle/kernel/k_port.h b/src/core/hle/kernel/k_port.h index 4018ea2df..b6e4a1fcd 100644 --- a/src/core/hle/kernel/k_port.h +++ b/src/core/hle/kernel/k_port.h @@ -4,7 +4,6 @@  #pragma once -#include <memory>  #include <string>  #include "common/common_types.h" diff --git a/src/core/hle/kernel/k_process.h b/src/core/hle/kernel/k_process.h index 1a53e2be7..76ece119f 100644 --- a/src/core/hle/kernel/k_process.h +++ b/src/core/hle/kernel/k_process.h @@ -8,7 +8,6 @@  #include <cstddef>  #include <list>  #include <string> -#include <unordered_map>  #include <vector>  #include "common/common_types.h"  #include "core/hle/kernel/k_address_arbiter.h" diff --git a/src/core/hle/kernel/k_scheduler_lock.h b/src/core/hle/kernel/k_scheduler_lock.h index 47e315555..c571f2992 100644 --- a/src/core/hle/kernel/k_scheduler_lock.h +++ b/src/core/hle/kernel/k_scheduler_lock.h @@ -5,7 +5,6 @@  #pragma once  #include "common/assert.h" -#include "core/hardware_properties.h"  #include "core/hle/kernel/k_spin_lock.h"  #include "core/hle/kernel/k_thread.h"  #include "core/hle/kernel/kernel.h" diff --git a/src/core/hle/kernel/k_scoped_lock.h b/src/core/hle/kernel/k_scoped_lock.h index 4fb180fc6..89a7ffe49 100644 --- a/src/core/hle/kernel/k_scoped_lock.h +++ b/src/core/hle/kernel/k_scoped_lock.h @@ -7,7 +7,8 @@  #pragma once -#include "common/common_types.h" +#include <concepts> +#include <type_traits>  namespace Kernel { diff --git a/src/core/hle/kernel/k_scoped_scheduler_lock_and_sleep.h b/src/core/hle/kernel/k_scoped_scheduler_lock_and_sleep.h index f6c75f2d9..61dc2858f 100644 --- a/src/core/hle/kernel/k_scoped_scheduler_lock_and_sleep.h +++ b/src/core/hle/kernel/k_scoped_scheduler_lock_and_sleep.h @@ -8,7 +8,6 @@  #pragma once  #include "common/common_types.h" -#include "core/hle/kernel/k_handle_table.h"  #include "core/hle/kernel/k_thread.h"  #include "core/hle/kernel/kernel.h"  #include "core/hle/kernel/time_manager.h" diff --git a/src/core/hle/kernel/k_server_port.cpp b/src/core/hle/kernel/k_server_port.cpp index c5dc58387..433fc98e1 100644 --- a/src/core/hle/kernel/k_server_port.cpp +++ b/src/core/hle/kernel/k_server_port.cpp @@ -10,7 +10,6 @@  #include "core/hle/kernel/k_server_port.h"  #include "core/hle/kernel/k_server_session.h"  #include "core/hle/kernel/k_thread.h" -#include "core/hle/kernel/svc_results.h"  namespace Kernel { diff --git a/src/core/hle/kernel/k_server_port.h b/src/core/hle/kernel/k_server_port.h index 67a36da40..6302d5e61 100644 --- a/src/core/hle/kernel/k_server_port.h +++ b/src/core/hle/kernel/k_server_port.h @@ -7,14 +7,11 @@  #include <memory>  #include <string>  #include <utility> -#include <vector>  #include <boost/intrusive/list.hpp> -#include "common/common_types.h"  #include "core/hle/kernel/k_server_session.h"  #include "core/hle/kernel/k_synchronization_object.h" -#include "core/hle/result.h"  namespace Kernel { diff --git a/src/core/hle/kernel/k_server_session.cpp b/src/core/hle/kernel/k_server_session.cpp index b9f24475c..2bd53ccbd 100644 --- a/src/core/hle/kernel/k_server_session.cpp +++ b/src/core/hle/kernel/k_server_session.cpp @@ -14,7 +14,6 @@  #include "core/hle/kernel/hle_ipc.h"  #include "core/hle/kernel/k_client_port.h"  #include "core/hle/kernel/k_handle_table.h" -#include "core/hle/kernel/k_port.h"  #include "core/hle/kernel/k_process.h"  #include "core/hle/kernel/k_scheduler.h"  #include "core/hle/kernel/k_server_port.h" @@ -22,6 +21,7 @@  #include "core/hle/kernel/k_session.h"  #include "core/hle/kernel/k_thread.h"  #include "core/hle/kernel/kernel.h" +#include "core/hle/kernel/service_thread.h"  #include "core/memory.h"  namespace Kernel { diff --git a/src/core/hle/kernel/k_server_session.h b/src/core/hle/kernel/k_server_session.h index d44bc9d4f..5b76bf17c 100644 --- a/src/core/hle/kernel/k_server_session.h +++ b/src/core/hle/kernel/k_server_session.h @@ -7,14 +7,11 @@  #include <memory>  #include <string>  #include <utility> -#include <vector>  #include <boost/intrusive/list.hpp> -#include "common/threadsafe_queue.h"  #include "core/hle/kernel/hle_ipc.h"  #include "core/hle/kernel/k_synchronization_object.h" -#include "core/hle/kernel/service_thread.h"  #include "core/hle/result.h"  namespace Core::Memory { diff --git a/src/core/hle/kernel/k_session.cpp b/src/core/hle/kernel/k_session.cpp index 940878e03..a64b56b9e 100644 --- a/src/core/hle/kernel/k_session.cpp +++ b/src/core/hle/kernel/k_session.cpp @@ -2,7 +2,6 @@  // Licensed under GPLv2 or any later version  // Refer to the license.txt file included. -#include "common/assert.h"  #include "core/hle/kernel/k_client_port.h"  #include "core/hle/kernel/k_client_session.h"  #include "core/hle/kernel/k_scoped_resource_reservation.h" diff --git a/src/core/hle/kernel/k_shared_memory.h b/src/core/hle/kernel/k_shared_memory.h index e9815f90b..81de36136 100644 --- a/src/core/hle/kernel/k_shared_memory.h +++ b/src/core/hle/kernel/k_shared_memory.h @@ -4,7 +4,6 @@  #pragma once -#include <memory>  #include <string>  #include "common/common_types.h" diff --git a/src/core/hle/kernel/k_shared_memory_info.h b/src/core/hle/kernel/k_shared_memory_info.h index bf97a0184..20bc19f46 100644 --- a/src/core/hle/kernel/k_shared_memory_info.h +++ b/src/core/hle/kernel/k_shared_memory_info.h @@ -4,12 +4,8 @@  #pragma once -#include <memory> -#include <string> -  #include <boost/intrusive/list.hpp> -#include "common/assert.h"  #include "core/hle/kernel/slab_helpers.h"  namespace Kernel { diff --git a/src/core/hle/kernel/k_thread.cpp b/src/core/hle/kernel/k_thread.cpp index 9f1d3156b..db65ce79a 100644 --- a/src/core/hle/kernel/k_thread.cpp +++ b/src/core/hle/kernel/k_thread.cpp @@ -13,8 +13,6 @@  #include "common/common_types.h"  #include "common/fiber.h"  #include "common/logging/log.h" -#include "common/scope_exit.h" -#include "common/thread_queue_list.h"  #include "core/core.h"  #include "core/cpu_manager.h"  #include "core/hardware_properties.h" @@ -31,11 +29,9 @@  #include "core/hle/kernel/svc_results.h"  #include "core/hle/kernel/time_manager.h"  #include "core/hle/result.h" -#include "core/memory.h"  #ifdef ARCHITECTURE_x86_64  #include "core/arm/dynarmic/arm_dynarmic_32.h" -#include "core/arm/dynarmic/arm_dynarmic_64.h"  #endif  namespace { diff --git a/src/core/hle/kernel/k_trace.h b/src/core/hle/kernel/k_trace.h index 79391bccb..d3fed1888 100644 --- a/src/core/hle/kernel/k_trace.h +++ b/src/core/hle/kernel/k_trace.h @@ -4,8 +4,6 @@  #pragma once -#include "common/common_funcs.h" -  namespace Kernel {  using namespace Common::Literals; diff --git a/src/core/hle/kernel/k_transfer_memory.h b/src/core/hle/kernel/k_transfer_memory.h index 31029a5c2..cb7521823 100644 --- a/src/core/hle/kernel/k_transfer_memory.h +++ b/src/core/hle/kernel/k_transfer_memory.h @@ -4,8 +4,6 @@  #pragma once -#include <memory> -  #include "core/hle/kernel/slab_helpers.h"  #include "core/hle/kernel/svc_types.h"  #include "core/hle/result.h" diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 4a139c5e7..e42a6d36f 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp @@ -39,9 +39,7 @@  #include "core/hle/kernel/kernel.h"  #include "core/hle/kernel/physical_core.h"  #include "core/hle/kernel/service_thread.h" -#include "core/hle/kernel/svc_results.h"  #include "core/hle/kernel/time_manager.h" -#include "core/hle/lock.h"  #include "core/hle/result.h"  #include "core/hle/service/sm/sm.h"  #include "core/memory.h" diff --git a/src/core/hle/kernel/physical_core.h b/src/core/hle/kernel/physical_core.h index 901f7e3b0..16a032e89 100644 --- a/src/core/hle/kernel/physical_core.h +++ b/src/core/hle/kernel/physical_core.h @@ -4,7 +4,6 @@  #pragma once -#include <array>  #include <cstddef>  #include <memory> diff --git a/src/core/hle/kernel/service_thread.cpp b/src/core/hle/kernel/service_thread.cpp index 2ae80beca..6721b6276 100644 --- a/src/core/hle/kernel/service_thread.cpp +++ b/src/core/hle/kernel/service_thread.cpp @@ -9,15 +9,11 @@  #include <vector>  #include <queue> -#include "common/assert.h"  #include "common/scope_exit.h"  #include "common/thread.h" -#include "core/core.h"  #include "core/hle/kernel/k_session.h"  #include "core/hle/kernel/kernel.h"  #include "core/hle/kernel/service_thread.h" -#include "core/hle/lock.h" -#include "video_core/renderer_base.h"  namespace Kernel { diff --git a/src/core/hle/kernel/slab_helpers.h b/src/core/hle/kernel/slab_helpers.h index 0c5995db0..f1c11256e 100644 --- a/src/core/hle/kernel/slab_helpers.h +++ b/src/core/hle/kernel/slab_helpers.h @@ -4,16 +4,8 @@  #pragma once -#include <atomic> - -#include "common/assert.h" -#include "common/common_funcs.h" -#include "common/common_types.h" -#include "common/intrusive_red_black_tree.h"  #include "core/hle/kernel/k_auto_object.h"  #include "core/hle/kernel/k_auto_object_container.h" -#include "core/hle/kernel/k_light_lock.h" -#include "core/hle/kernel/k_slab_heap.h"  #include "core/hle/kernel/kernel.h"  namespace Kernel { diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index f328ce111..fbfe6fc1a 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp @@ -13,18 +13,11 @@  #include "common/common_funcs.h"  #include "common/fiber.h"  #include "common/logging/log.h" -#include "common/microprofile.h"  #include "common/scope_exit.h" -#include "common/string_util.h" -#include "core/arm/exclusive_monitor.h"  #include "core/core.h"  #include "core/core_timing.h" -#include "core/core_timing_util.h" -#include "core/cpu_manager.h" -#include "core/hle/kernel/k_address_arbiter.h"  #include "core/hle/kernel/k_client_port.h"  #include "core/hle/kernel/k_client_session.h" -#include "core/hle/kernel/k_condition_variable.h"  #include "core/hle/kernel/k_event.h"  #include "core/hle/kernel/k_handle_table.h"  #include "core/hle/kernel/k_memory_block.h" @@ -35,7 +28,6 @@  #include "core/hle/kernel/k_resource_limit.h"  #include "core/hle/kernel/k_scheduler.h"  #include "core/hle/kernel/k_scoped_resource_reservation.h" -#include "core/hle/kernel/k_scoped_scheduler_lock_and_sleep.h"  #include "core/hle/kernel/k_shared_memory.h"  #include "core/hle/kernel/k_synchronization_object.h"  #include "core/hle/kernel/k_thread.h" @@ -47,10 +39,8 @@  #include "core/hle/kernel/svc_results.h"  #include "core/hle/kernel/svc_types.h"  #include "core/hle/kernel/svc_wrap.h" -#include "core/hle/kernel/time_manager.h"  #include "core/hle/lock.h"  #include "core/hle/result.h" -#include "core/hle/service/service.h"  #include "core/memory.h"  #include "core/reporter.h" diff --git a/src/core/hle/kernel/time_manager.cpp b/src/core/hle/kernel/time_manager.cpp index ae9b4be2f..8cd7279a3 100644 --- a/src/core/hle/kernel/time_manager.cpp +++ b/src/core/hle/kernel/time_manager.cpp @@ -5,10 +5,7 @@  #include "common/assert.h"  #include "core/core.h"  #include "core/core_timing.h" -#include "core/core_timing_util.h" -#include "core/hle/kernel/k_scheduler.h"  #include "core/hle/kernel/k_thread.h" -#include "core/hle/kernel/kernel.h"  #include "core/hle/kernel/time_manager.h"  namespace Kernel { diff --git a/src/core/hle/kernel/time_manager.h b/src/core/hle/kernel/time_manager.h index 2d175a9c4..b1fa26e8c 100644 --- a/src/core/hle/kernel/time_manager.h +++ b/src/core/hle/kernel/time_manager.h @@ -6,7 +6,6 @@  #include <memory>  #include <mutex> -#include <unordered_map>  namespace Core {  class System; diff --git a/src/core/hle/service/acc/acc.cpp b/src/core/hle/service/acc/acc.cpp index e1d01e5b4..4af2c3a8d 100644 --- a/src/core/hle/service/acc/acc.cpp +++ b/src/core/hle/service/acc/acc.cpp @@ -26,9 +26,7 @@  #include "core/hle/service/acc/async_context.h"  #include "core/hle/service/acc/errors.h"  #include "core/hle/service/acc/profile_manager.h" -#include "core/hle/service/glue/arp.h"  #include "core/hle/service/glue/glue_manager.h" -#include "core/hle/service/sm/sm.h"  #include "core/loader/loader.h"  namespace Service::Account { diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp index eccdcc20d..99bf1d84d 100644 --- a/src/core/hle/service/am/am.cpp +++ b/src/core/hle/service/am/am.cpp @@ -17,13 +17,11 @@  #include "core/hle/kernel/k_event.h"  #include "core/hle/kernel/k_process.h"  #include "core/hle/kernel/k_transfer_memory.h" -#include "core/hle/kernel/kernel.h"  #include "core/hle/service/acc/profile_manager.h"  #include "core/hle/service/am/am.h"  #include "core/hle/service/am/applet_ae.h"  #include "core/hle/service/am/applet_oe.h"  #include "core/hle/service/am/applets/applet_profile_select.h" -#include "core/hle/service/am/applets/applet_software_keyboard.h"  #include "core/hle/service/am/applets/applet_web_browser.h"  #include "core/hle/service/am/applets/applets.h"  #include "core/hle/service/am/idle.h" @@ -37,7 +35,6 @@  #include "core/hle/service/ns/ns.h"  #include "core/hle/service/nvflinger/nvflinger.h"  #include "core/hle/service/pm/pm.h" -#include "core/hle/service/set/set.h"  #include "core/hle/service/sm/sm.h"  #include "core/hle/service/vi/vi.h"  #include "core/memory.h" diff --git a/src/core/hle/service/am/applets/applet_general_backend.cpp b/src/core/hle/service/am/applets/applet_general_backend.cpp index 0f413f9a0..770a8eef2 100644 --- a/src/core/hle/service/am/applets/applet_general_backend.cpp +++ b/src/core/hle/service/am/applets/applet_general_backend.cpp @@ -2,8 +2,6 @@  // Licensed under GPLv2 or any later version  // Refer to the license.txt file included. -#include <string_view> -  #include "common/assert.h"  #include "common/hex_util.h"  #include "common/logging/log.h" diff --git a/src/core/hle/service/am/applets/applet_software_keyboard.h b/src/core/hle/service/am/applets/applet_software_keyboard.h index 9aef1bf11..6009c10c7 100644 --- a/src/core/hle/service/am/applets/applet_software_keyboard.h +++ b/src/core/hle/service/am/applets/applet_software_keyboard.h @@ -4,7 +4,6 @@  #pragma once -#include "common/common_funcs.h"  #include "common/common_types.h"  #include "core/hle/result.h"  #include "core/hle/service/am/applets/applet_software_keyboard_types.h" diff --git a/src/core/hle/service/am/applets/applet_web_browser.h b/src/core/hle/service/am/applets/applet_web_browser.h index 4f9e81b79..b3364ee06 100644 --- a/src/core/hle/service/am/applets/applet_web_browser.h +++ b/src/core/hle/service/am/applets/applet_web_browser.h @@ -7,7 +7,6 @@  #include <filesystem>  #include <optional> -#include "common/common_funcs.h"  #include "common/common_types.h"  #include "core/file_sys/vfs_types.h"  #include "core/hle/result.h" diff --git a/src/core/hle/service/aoc/aoc_u.cpp b/src/core/hle/service/aoc/aoc_u.cpp index 4c54066c6..9565f76d4 100644 --- a/src/core/hle/service/aoc/aoc_u.cpp +++ b/src/core/hle/service/aoc/aoc_u.cpp @@ -18,7 +18,6 @@  #include "core/hle/ipc_helpers.h"  #include "core/hle/kernel/k_event.h"  #include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/kernel.h"  #include "core/hle/service/aoc/aoc_u.h"  #include "core/loader/loader.h" diff --git a/src/core/hle/service/apm/apm.cpp b/src/core/hle/service/apm/apm.cpp index f5ebfe8d6..243ea15b8 100644 --- a/src/core/hle/service/apm/apm.cpp +++ b/src/core/hle/service/apm/apm.cpp @@ -3,7 +3,6 @@  // Refer to the license.txt file included.  #include "core/core.h" -#include "core/hle/ipc_helpers.h"  #include "core/hle/service/apm/apm.h"  #include "core/hle/service/apm/apm_interface.h" diff --git a/src/core/hle/service/audio/audout_u.cpp b/src/core/hle/service/audio/audout_u.cpp index 81adbfe09..affa7971c 100644 --- a/src/core/hle/service/audio/audout_u.cpp +++ b/src/core/hle/service/audio/audout_u.cpp @@ -14,7 +14,6 @@  #include "core/core.h"  #include "core/hle/ipc_helpers.h"  #include "core/hle/kernel/k_event.h" -#include "core/hle/kernel/kernel.h"  #include "core/hle/service/audio/audout_u.h"  #include "core/hle/service/audio/errors.h"  #include "core/hle/service/kernel_helpers.h" diff --git a/src/core/hle/service/audio/audren_u.cpp b/src/core/hle/service/audio/audren_u.cpp index cdb2a9521..f45e5cecc 100644 --- a/src/core/hle/service/audio/audren_u.cpp +++ b/src/core/hle/service/audio/audren_u.cpp @@ -2,10 +2,8 @@  // Licensed under GPLv2 or any later version  // Refer to the license.txt file included. -#include <algorithm>  #include <array>  #include <memory> -#include <string_view>  #include "audio_core/audio_renderer.h"  #include "common/alignment.h" @@ -16,7 +14,6 @@  #include "core/core.h"  #include "core/hle/ipc_helpers.h"  #include "core/hle/kernel/k_event.h" -#include "core/hle/kernel/kernel.h"  #include "core/hle/service/audio/audren_u.h"  #include "core/hle/service/audio/errors.h" diff --git a/src/core/hle/service/bcat/backend/backend.h b/src/core/hle/service/bcat/backend/backend.h index 749e046c7..59c6d4740 100644 --- a/src/core/hle/service/bcat/backend/backend.h +++ b/src/core/hle/service/bcat/backend/backend.h @@ -7,7 +7,6 @@  #include <functional>  #include <optional>  #include <string> -#include <string_view>  #include "common/common_types.h"  #include "core/file_sys/vfs_types.h" diff --git a/src/core/hle/service/bcat/bcat_module.cpp b/src/core/hle/service/bcat/bcat_module.cpp index 27e9b8df8..36bd2a052 100644 --- a/src/core/hle/service/bcat/bcat_module.cpp +++ b/src/core/hle/service/bcat/bcat_module.cpp @@ -13,7 +13,6 @@  #include "core/hle/ipc_helpers.h"  #include "core/hle/kernel/k_process.h"  #include "core/hle/kernel/k_readable_event.h" -#include "core/hle/kernel/k_writable_event.h"  #include "core/hle/service/bcat/backend/backend.h"  #include "core/hle/service/bcat/bcat.h"  #include "core/hle/service/bcat/bcat_module.h" diff --git a/src/core/hle/service/btdrv/btdrv.cpp b/src/core/hle/service/btdrv/btdrv.cpp index 088a1a18a..0787f43f4 100644 --- a/src/core/hle/service/btdrv/btdrv.cpp +++ b/src/core/hle/service/btdrv/btdrv.cpp @@ -6,7 +6,6 @@  #include "core/core.h"  #include "core/hle/ipc_helpers.h"  #include "core/hle/kernel/k_event.h" -#include "core/hle/kernel/kernel.h"  #include "core/hle/service/btdrv/btdrv.h"  #include "core/hle/service/kernel_helpers.h"  #include "core/hle/service/service.h" diff --git a/src/core/hle/service/btm/btm.cpp b/src/core/hle/service/btm/btm.cpp index 7aabacc19..d337fd317 100644 --- a/src/core/hle/service/btm/btm.cpp +++ b/src/core/hle/service/btm/btm.cpp @@ -8,7 +8,6 @@  #include "core/core.h"  #include "core/hle/ipc_helpers.h"  #include "core/hle/kernel/k_event.h" -#include "core/hle/kernel/kernel.h"  #include "core/hle/service/btm/btm.h"  #include "core/hle/service/kernel_helpers.h"  #include "core/hle/service/service.h" diff --git a/src/core/hle/service/filesystem/filesystem.cpp b/src/core/hle/service/filesystem/filesystem.cpp index 42e468ce2..6422dec4e 100644 --- a/src/core/hle/service/filesystem/filesystem.cpp +++ b/src/core/hle/service/filesystem/filesystem.cpp @@ -13,7 +13,6 @@  #include "core/file_sys/control_metadata.h"  #include "core/file_sys/errors.h"  #include "core/file_sys/mode.h" -#include "core/file_sys/partition_filesystem.h"  #include "core/file_sys/patch_manager.h"  #include "core/file_sys/registered_cache.h"  #include "core/file_sys/romfs_factory.h" diff --git a/src/core/hle/service/glue/arp.cpp b/src/core/hle/service/glue/arp.cpp index 70cd63c6b..6c8ea7f0b 100644 --- a/src/core/hle/service/glue/arp.cpp +++ b/src/core/hle/service/glue/arp.cpp @@ -6,7 +6,6 @@  #include "common/logging/log.h"  #include "core/core.h" -#include "core/file_sys/control_metadata.h"  #include "core/hle/ipc_helpers.h"  #include "core/hle/kernel/k_process.h"  #include "core/hle/kernel/kernel.h" diff --git a/src/core/hle/service/glue/glue_manager.h b/src/core/hle/service/glue/glue_manager.h index a7f5ce3ee..4bc5297c6 100644 --- a/src/core/hle/service/glue/glue_manager.h +++ b/src/core/hle/service/glue/glue_manager.h @@ -7,7 +7,6 @@  #include <map>  #include <vector>  #include "common/common_types.h" -#include "core/file_sys/control_metadata.h"  #include "core/file_sys/romfs_factory.h"  #include "core/hle/result.h" diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp index b7f551e40..196876810 100644 --- a/src/core/hle/service/hid/controllers/npad.cpp +++ b/src/core/hle/service/hid/controllers/npad.cpp @@ -16,7 +16,6 @@  #include "core/hle/kernel/k_event.h"  #include "core/hle/kernel/k_readable_event.h"  #include "core/hle/kernel/k_writable_event.h" -#include "core/hle/kernel/kernel.h"  #include "core/hle/service/hid/controllers/npad.h"  #include "core/hle/service/kernel_helpers.h" diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp index 043320d50..10c64d41a 100644 --- a/src/core/hle/service/hid/hid.cpp +++ b/src/core/hle/service/hid/hid.cpp @@ -8,13 +8,11 @@  #include "common/settings.h"  #include "core/core.h"  #include "core/core_timing.h" -#include "core/frontend/emu_window.h"  #include "core/frontend/input.h"  #include "core/hle/ipc_helpers.h"  #include "core/hle/kernel/k_readable_event.h"  #include "core/hle/kernel/k_shared_memory.h"  #include "core/hle/kernel/k_transfer_memory.h" -#include "core/hle/kernel/k_writable_event.h"  #include "core/hle/kernel/kernel.h"  #include "core/hle/service/hid/errors.h"  #include "core/hle/service/hid/hid.h" diff --git a/src/core/hle/service/hid/irs.cpp b/src/core/hle/service/hid/irs.cpp index 4a92c6234..8812b8ecb 100644 --- a/src/core/hle/service/hid/irs.cpp +++ b/src/core/hle/service/hid/irs.cpp @@ -2,7 +2,6 @@  // Licensed under GPLv2 or any later version  // Refer to the license.txt file included. -#include "common/swap.h"  #include "core/core.h"  #include "core/core_timing.h"  #include "core/hle/ipc_helpers.h" diff --git a/src/core/hle/service/lm/lm.cpp b/src/core/hle/service/lm/lm.cpp index 794504314..e40383134 100644 --- a/src/core/hle/service/lm/lm.cpp +++ b/src/core/hle/service/lm/lm.cpp @@ -2,19 +2,16 @@  // Licensed under GPLv2 or any later version  // Refer to the license.txt file included. -#include <sstream>  #include <string>  #include <optional>  #include <unordered_map>  #include <boost/container_hash/hash.hpp>  #include "common/logging/log.h" -#include "common/scope_exit.h"  #include "core/core.h"  #include "core/hle/ipc_helpers.h"  #include "core/hle/service/lm/lm.h"  #include "core/hle/service/service.h" -#include "core/memory.h"  namespace Service::LM {  enum class LogSeverity : u8 { diff --git a/src/core/hle/service/mii/raw_data.h b/src/core/hle/service/mii/raw_data.h index a0d2b9d3a..bd90c2162 100644 --- a/src/core/hle/service/mii/raw_data.h +++ b/src/core/hle/service/mii/raw_data.h @@ -6,7 +6,6 @@  #include <array> -#include "common/common_types.h"  #include "core/hle/service/mii/mii_manager.h"  namespace Service::Mii::RawData { diff --git a/src/core/hle/service/nfp/nfp.cpp b/src/core/hle/service/nfp/nfp.cpp index 6791f20a5..693ffc71a 100644 --- a/src/core/hle/service/nfp/nfp.cpp +++ b/src/core/hle/service/nfp/nfp.cpp @@ -9,8 +9,6 @@  #include "core/core.h"  #include "core/hle/ipc_helpers.h"  #include "core/hle/kernel/k_event.h" -#include "core/hle/kernel/k_thread.h" -#include "core/hle/kernel/kernel.h"  #include "core/hle/lock.h"  #include "core/hle/service/nfp/nfp.h"  #include "core/hle/service/nfp/nfp_user.h" diff --git a/src/core/hle/service/nifm/nifm.cpp b/src/core/hle/service/nifm/nifm.cpp index f13dc8b0d..a253dd066 100644 --- a/src/core/hle/service/nifm/nifm.cpp +++ b/src/core/hle/service/nifm/nifm.cpp @@ -2,7 +2,6 @@  // Licensed under GPLv2 or any later version  // Refer to the license.txt file included. -#include "common/settings.h"  #include "core/core.h"  #include "core/hle/ipc_helpers.h"  #include "core/hle/kernel/k_event.h" diff --git a/src/core/hle/service/nim/nim.cpp b/src/core/hle/service/nim/nim.cpp index 30fb060b8..196f274e1 100644 --- a/src/core/hle/service/nim/nim.cpp +++ b/src/core/hle/service/nim/nim.cpp @@ -7,7 +7,6 @@  #include "core/core.h"  #include "core/hle/ipc_helpers.h"  #include "core/hle/kernel/k_event.h" -#include "core/hle/kernel/kernel.h"  #include "core/hle/service/kernel_helpers.h"  #include "core/hle/service/nim/nim.h"  #include "core/hle/service/service.h" diff --git a/src/core/hle/service/ns/language.h b/src/core/hle/service/ns/language.h index d84c3f277..2cc8e4806 100644 --- a/src/core/hle/service/ns/language.h +++ b/src/core/hle/service/ns/language.h @@ -5,7 +5,6 @@  #pragma once  #include <optional> -#include <string>  #include "common/common_types.h"  namespace Service::Set { @@ -43,4 +42,4 @@ constexpr u32 GetSupportedLanguageFlag(const ApplicationLanguage lang) {  const ApplicationLanguagePriorityList* GetApplicationLanguagePriorityList(ApplicationLanguage lang);  std::optional<ApplicationLanguage> ConvertToApplicationLanguage(Set::LanguageCode language_code);  std::optional<Set::LanguageCode> ConvertToLanguageCode(ApplicationLanguage lang); -} // namespace Service::NS
\ No newline at end of file +} // namespace Service::NS diff --git a/src/core/hle/service/nvdrv/devices/nvdevice.h b/src/core/hle/service/nvdrv/devices/nvdevice.h index 5b73a5a34..3d874243a 100644 --- a/src/core/hle/service/nvdrv/devices/nvdevice.h +++ b/src/core/hle/service/nvdrv/devices/nvdevice.h @@ -5,11 +5,8 @@  #pragma once  #include <vector> -#include "common/bit_field.h"  #include "common/common_types.h" -#include "common/swap.h"  #include "core/hle/service/nvdrv/nvdata.h" -#include "core/hle/service/service.h"  namespace Core {  class System; diff --git a/src/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp b/src/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp index 4ee8c5733..68f1e9060 100644 --- a/src/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp +++ b/src/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp @@ -10,7 +10,6 @@  #include "core/hle/service/nvdrv/devices/nvmap.h"  #include "core/perf_stats.h"  #include "video_core/gpu.h" -#include "video_core/renderer_base.h"  namespace Service::Nvidia::Devices { diff --git a/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp b/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp index 7dc41d875..85170cdb3 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp @@ -10,10 +10,8 @@  #include "core/core.h"  #include "core/hle/service/nvdrv/devices/nvhost_as_gpu.h"  #include "core/hle/service/nvdrv/devices/nvmap.h" -#include "core/memory.h"  #include "video_core/memory_manager.h"  #include "video_core/rasterizer_interface.h" -#include "video_core/renderer_base.h"  namespace Service::Nvidia::Devices { diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp b/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp index d8b684f4f..05b4e2151 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp @@ -7,7 +7,6 @@  #include "common/logging/log.h"  #include "core/core.h"  #include "core/core_timing.h" -#include "core/core_timing_util.h"  #include "core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.h"  namespace Service::Nvidia::Devices { diff --git a/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp b/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp index 54ac105d5..0a043e386 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp @@ -10,7 +10,6 @@  #include "core/hle/service/nvdrv/syncpoint_manager.h"  #include "core/memory.h"  #include "video_core/gpu.h" -#include "video_core/memory_manager.h"  namespace Service::Nvidia::Devices {  namespace { diff --git a/src/core/hle/service/nvdrv/devices/nvhost_nvdec.cpp b/src/core/hle/service/nvdrv/devices/nvhost_nvdec.cpp index 6c1edce33..0d7d4ad03 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_nvdec.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_nvdec.cpp @@ -6,7 +6,6 @@  #include "common/logging/log.h"  #include "core/core.h"  #include "core/hle/service/nvdrv/devices/nvhost_nvdec.h" -#include "video_core/memory_manager.h"  #include "video_core/renderer_base.h"  namespace Service::Nvidia::Devices { diff --git a/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.h b/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.h index ae4199b79..351625c17 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.h +++ b/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.h @@ -4,7 +4,6 @@  #pragma once -#include <map>  #include <vector>  #include "common/common_types.h"  #include "common/swap.h" diff --git a/src/core/hle/service/nvdrv/devices/nvhost_vic.cpp b/src/core/hle/service/nvdrv/devices/nvhost_vic.cpp index 21d101e8a..eac4dd530 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_vic.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_vic.cpp @@ -6,7 +6,6 @@  #include "common/logging/log.h"  #include "core/core.h"  #include "core/hle/service/nvdrv/devices/nvhost_vic.h" -#include "video_core/memory_manager.h"  #include "video_core/renderer_base.h"  namespace Service::Nvidia::Devices { diff --git a/src/core/hle/service/nvdrv/nvdrv.cpp b/src/core/hle/service/nvdrv/nvdrv.cpp index ff405099a..aa7e47cbf 100644 --- a/src/core/hle/service/nvdrv/nvdrv.cpp +++ b/src/core/hle/service/nvdrv/nvdrv.cpp @@ -8,7 +8,6 @@  #include "core/core.h"  #include "core/hle/ipc_helpers.h"  #include "core/hle/kernel/k_event.h" -#include "core/hle/kernel/k_readable_event.h"  #include "core/hle/kernel/k_writable_event.h"  #include "core/hle/service/nvdrv/devices/nvdevice.h"  #include "core/hle/service/nvdrv/devices/nvdisp_disp0.h" diff --git a/src/core/hle/service/nvdrv/nvdrv_interface.cpp b/src/core/hle/service/nvdrv/nvdrv_interface.cpp index d61fb73dc..c16babe14 100644 --- a/src/core/hle/service/nvdrv/nvdrv_interface.cpp +++ b/src/core/hle/service/nvdrv/nvdrv_interface.cpp @@ -7,9 +7,6 @@  #include "core/core.h"  #include "core/hle/ipc_helpers.h"  #include "core/hle/kernel/k_readable_event.h" -#include "core/hle/kernel/k_thread.h" -#include "core/hle/kernel/k_writable_event.h" -#include "core/hle/kernel/kernel.h"  #include "core/hle/service/nvdrv/nvdata.h"  #include "core/hle/service/nvdrv/nvdrv.h"  #include "core/hle/service/nvdrv/nvdrv_interface.h" diff --git a/src/core/hle/service/nvflinger/buffer_queue.h b/src/core/hle/service/nvflinger/buffer_queue.h index 78de3f354..7b7baeaea 100644 --- a/src/core/hle/service/nvflinger/buffer_queue.h +++ b/src/core/hle/service/nvflinger/buffer_queue.h @@ -8,7 +8,6 @@  #include <list>  #include <mutex>  #include <optional> -#include <vector>  #include "common/common_funcs.h"  #include "common/math_util.h" diff --git a/src/core/hle/service/ptm/psm.cpp b/src/core/hle/service/ptm/psm.cpp index 22ff5269c..5d248f671 100644 --- a/src/core/hle/service/ptm/psm.cpp +++ b/src/core/hle/service/ptm/psm.cpp @@ -8,7 +8,6 @@  #include "core/core.h"  #include "core/hle/ipc_helpers.h"  #include "core/hle/kernel/k_event.h" -#include "core/hle/kernel/kernel.h"  #include "core/hle/service/kernel_helpers.h"  #include "core/hle/service/ptm/psm.h"  #include "core/hle/service/service.h" diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp index 065133166..f54e6fe56 100644 --- a/src/core/hle/service/service.cpp +++ b/src/core/hle/service/service.cpp @@ -2,19 +2,15 @@  // Licensed under GPLv2 or any later version  // Refer to the license.txt file included. -#include <algorithm>  #include <fmt/format.h>  #include "common/assert.h"  #include "common/logging/log.h"  #include "common/settings.h" -#include "common/string_util.h"  #include "core/core.h"  #include "core/hle/ipc.h"  #include "core/hle/ipc_helpers.h" -#include "core/hle/kernel/k_client_port.h"  #include "core/hle/kernel/k_process.h"  #include "core/hle/kernel/k_server_port.h" -#include "core/hle/kernel/k_thread.h"  #include "core/hle/kernel/kernel.h"  #include "core/hle/service/acc/acc.h"  #include "core/hle/service/am/am.h" diff --git a/src/core/hle/service/sm/sm.cpp b/src/core/hle/service/sm/sm.cpp index 41abb146c..eaa172595 100644 --- a/src/core/hle/service/sm/sm.cpp +++ b/src/core/hle/service/sm/sm.cpp @@ -12,8 +12,6 @@  #include "core/hle/kernel/k_port.h"  #include "core/hle/kernel/k_scoped_resource_reservation.h"  #include "core/hle/kernel/k_server_port.h" -#include "core/hle/kernel/k_server_session.h" -#include "core/hle/kernel/k_session.h"  #include "core/hle/result.h"  #include "core/hle/service/sm/sm.h"  #include "core/hle/service/sm/sm_controller.h" diff --git a/src/core/hle/service/sm/sm.h b/src/core/hle/service/sm/sm.h index 068c78588..021eb51b4 100644 --- a/src/core/hle/service/sm/sm.h +++ b/src/core/hle/service/sm/sm.h @@ -6,7 +6,6 @@  #include <memory>  #include <string> -#include <type_traits>  #include <unordered_map>  #include "common/concepts.h" diff --git a/src/core/hle/service/sm/sm_controller.cpp b/src/core/hle/service/sm/sm_controller.cpp index b5fbc4569..09f9ecee1 100644 --- a/src/core/hle/service/sm/sm_controller.cpp +++ b/src/core/hle/service/sm/sm_controller.cpp @@ -7,10 +7,8 @@  #include "core/core.h"  #include "core/hle/ipc_helpers.h"  #include "core/hle/kernel/k_client_port.h" -#include "core/hle/kernel/k_client_session.h"  #include "core/hle/kernel/k_port.h"  #include "core/hle/kernel/k_scoped_resource_reservation.h" -#include "core/hle/kernel/k_server_port.h"  #include "core/hle/kernel/k_server_session.h"  #include "core/hle/kernel/k_session.h"  #include "core/hle/service/sm/sm_controller.h" diff --git a/src/core/hle/service/sockets/bsd.cpp b/src/core/hle/service/sockets/bsd.cpp index b9e765f1d..f83272633 100644 --- a/src/core/hle/service/sockets/bsd.cpp +++ b/src/core/hle/service/sockets/bsd.cpp @@ -4,7 +4,6 @@  #include <array>  #include <memory> -#include <string>  #include <utility>  #include <vector> diff --git a/src/core/hle/service/time/local_system_clock_context_writer.h b/src/core/hle/service/time/local_system_clock_context_writer.h index 6be617392..ac6c7b4b1 100644 --- a/src/core/hle/service/time/local_system_clock_context_writer.h +++ b/src/core/hle/service/time/local_system_clock_context_writer.h @@ -4,7 +4,6 @@  #pragma once -#include "core/hle/service/time/errors.h"  #include "core/hle/service/time/system_clock_context_update_callback.h"  #include "core/hle/service/time/time_sharedmemory.h" diff --git a/src/core/hle/service/time/standard_steady_clock_core.cpp b/src/core/hle/service/time/standard_steady_clock_core.cpp index 59a272f4a..a1ffdd524 100644 --- a/src/core/hle/service/time/standard_steady_clock_core.cpp +++ b/src/core/hle/service/time/standard_steady_clock_core.cpp @@ -4,7 +4,6 @@  #include "core/core.h"  #include "core/core_timing.h" -#include "core/core_timing_util.h"  #include "core/hardware_properties.h"  #include "core/hle/service/time/standard_steady_clock_core.h" diff --git a/src/core/hle/service/time/tick_based_steady_clock_core.cpp b/src/core/hle/service/time/tick_based_steady_clock_core.cpp index 8baaa2a6a..47d4ab980 100644 --- a/src/core/hle/service/time/tick_based_steady_clock_core.cpp +++ b/src/core/hle/service/time/tick_based_steady_clock_core.cpp @@ -4,7 +4,6 @@  #include "core/core.h"  #include "core/core_timing.h" -#include "core/core_timing_util.h"  #include "core/hardware_properties.h"  #include "core/hle/service/time/tick_based_steady_clock_core.h" diff --git a/src/core/hle/service/time/time.cpp b/src/core/hle/service/time/time.cpp index d84a111c2..4d8823b5a 100644 --- a/src/core/hle/service/time/time.cpp +++ b/src/core/hle/service/time/time.cpp @@ -5,10 +5,8 @@  #include "common/logging/log.h"  #include "core/core.h"  #include "core/core_timing.h" -#include "core/core_timing_util.h"  #include "core/hardware_properties.h"  #include "core/hle/ipc_helpers.h" -#include "core/hle/kernel/k_scheduler.h"  #include "core/hle/kernel/kernel.h"  #include "core/hle/service/time/time.h"  #include "core/hle/service/time/time_interface.h" diff --git a/src/core/hle/service/time/time_manager.cpp b/src/core/hle/service/time/time_manager.cpp index 9c4c960ef..c1e4e6cce 100644 --- a/src/core/hle/service/time/time_manager.cpp +++ b/src/core/hle/service/time/time_manager.cpp @@ -8,8 +8,10 @@  #include "common/settings.h"  #include "common/time_zone.h"  #include "core/hle/service/time/ephemeral_network_system_clock_context_writer.h" +#include "core/hle/service/time/ephemeral_network_system_clock_core.h"  #include "core/hle/service/time/local_system_clock_context_writer.h"  #include "core/hle/service/time/network_system_clock_context_writer.h" +#include "core/hle/service/time/tick_based_steady_clock_core.h"  #include "core/hle/service/time/time_manager.h"  namespace Service::Time { diff --git a/src/core/hle/service/time/time_manager.h b/src/core/hle/service/time/time_manager.h index 3af868d87..2404067c0 100644 --- a/src/core/hle/service/time/time_manager.h +++ b/src/core/hle/service/time/time_manager.h @@ -5,15 +5,12 @@  #pragma once  #include "common/common_types.h" -#include "common/time_zone.h"  #include "core/file_sys/vfs_types.h"  #include "core/hle/service/time/clock_types.h" -#include "core/hle/service/time/ephemeral_network_system_clock_core.h"  #include "core/hle/service/time/standard_local_system_clock_core.h"  #include "core/hle/service/time/standard_network_system_clock_core.h"  #include "core/hle/service/time/standard_steady_clock_core.h"  #include "core/hle/service/time/standard_user_system_clock_core.h" -#include "core/hle/service/time/tick_based_steady_clock_core.h"  #include "core/hle/service/time/time_sharedmemory.h"  #include "core/hle/service/time/time_zone_content_manager.h" diff --git a/src/core/hle/service/time/time_sharedmemory.cpp b/src/core/hle/service/time/time_sharedmemory.cpp index 176ad0eee..ed9f75ed6 100644 --- a/src/core/hle/service/time/time_sharedmemory.cpp +++ b/src/core/hle/service/time/time_sharedmemory.cpp @@ -4,7 +4,6 @@  #include "core/core.h"  #include "core/core_timing.h" -#include "core/core_timing_util.h"  #include "core/hardware_properties.h"  #include "core/hle/kernel/kernel.h"  #include "core/hle/service/time/clock_types.h" diff --git a/src/core/hle/service/time/time_sharedmemory.h b/src/core/hle/service/time/time_sharedmemory.h index d471b5d18..9307ea795 100644 --- a/src/core/hle/service/time/time_sharedmemory.h +++ b/src/core/hle/service/time/time_sharedmemory.h @@ -7,7 +7,6 @@  #include "common/common_types.h"  #include "common/uuid.h"  #include "core/hle/kernel/k_shared_memory.h" -#include "core/hle/kernel/k_thread.h"  #include "core/hle/service/time/clock_types.h"  namespace Service::Time { diff --git a/src/core/hle/service/time/time_zone_manager.cpp b/src/core/hle/service/time/time_zone_manager.cpp index 6da893790..2989cee5e 100644 --- a/src/core/hle/service/time/time_zone_manager.cpp +++ b/src/core/hle/service/time/time_zone_manager.cpp @@ -9,8 +9,6 @@  #include "core/file_sys/content_archive.h"  #include "core/file_sys/nca_metadata.h"  #include "core/file_sys/registered_cache.h" -#include "core/file_sys/romfs.h" -#include "core/file_sys/system_archive/system_archive.h"  #include "core/hle/service/time/time_zone_manager.h"  namespace Service::Time::TimeZone { diff --git a/src/core/hle/service/vi/vi.cpp b/src/core/hle/service/vi/vi.cpp index 760b528b9..63d5242c4 100644 --- a/src/core/hle/service/vi/vi.cpp +++ b/src/core/hle/service/vi/vi.cpp @@ -21,9 +21,7 @@  #include "core/hle/ipc_helpers.h"  #include "core/hle/kernel/k_readable_event.h"  #include "core/hle/kernel/k_thread.h" -#include "core/hle/kernel/k_writable_event.h"  #include "core/hle/service/nvdrv/nvdata.h" -#include "core/hle/service/nvdrv/nvdrv.h"  #include "core/hle/service/nvflinger/buffer_queue.h"  #include "core/hle/service/nvflinger/nvflinger.h"  #include "core/hle/service/service.h" diff --git a/src/core/loader/deconstructed_rom_directory.cpp b/src/core/loader/deconstructed_rom_directory.cpp index a19bb220a..1b5aca65d 100644 --- a/src/core/loader/deconstructed_rom_directory.cpp +++ b/src/core/loader/deconstructed_rom_directory.cpp @@ -2,9 +2,7 @@  // Licensed under GPLv2 or any later version  // Refer to the license.txt file included. -#include <cinttypes>  #include <cstring> -#include "common/common_funcs.h"  #include "common/logging/log.h"  #include "core/core.h"  #include "core/file_sys/content_archive.h" @@ -13,7 +11,6 @@  #include "core/file_sys/romfs_factory.h"  #include "core/hle/kernel/k_page_table.h"  #include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/kernel.h"  #include "core/hle/service/filesystem/filesystem.h"  #include "core/loader/deconstructed_rom_directory.h"  #include "core/loader/nso.h" diff --git a/src/core/loader/elf.cpp b/src/core/loader/elf.cpp index 3d9276f15..d0250bdb4 100644 --- a/src/core/loader/elf.cpp +++ b/src/core/loader/elf.cpp @@ -4,7 +4,6 @@  #include <cstring>  #include <memory> -#include <string>  #include "common/common_funcs.h"  #include "common/common_types.h"  #include "common/logging/log.h" diff --git a/src/core/loader/elf.h b/src/core/loader/elf.h index 890299a20..bff51ec17 100644 --- a/src/core/loader/elf.h +++ b/src/core/loader/elf.h @@ -4,8 +4,6 @@  #pragma once -#include <string> -#include "common/common_types.h"  #include "core/loader/loader.h"  namespace Core { diff --git a/src/core/loader/nax.cpp b/src/core/loader/nax.cpp index aceb66414..3375dab7c 100644 --- a/src/core/loader/nax.cpp +++ b/src/core/loader/nax.cpp @@ -2,7 +2,6 @@  // Licensed under GPLv2 or any later version  // Refer to the license.txt file included. -#include "common/logging/log.h"  #include "core/file_sys/content_archive.h"  #include "core/file_sys/romfs.h"  #include "core/file_sys/xts_archive.h" diff --git a/src/core/loader/nca.cpp b/src/core/loader/nca.cpp index aa51b0daa..219bbeaf5 100644 --- a/src/core/loader/nca.cpp +++ b/src/core/loader/nca.cpp @@ -4,7 +4,6 @@  #include <utility> -#include "common/logging/log.h"  #include "core/core.h"  #include "core/file_sys/content_archive.h"  #include "core/file_sys/romfs_factory.h" diff --git a/src/core/loader/nca.h b/src/core/loader/nca.h index f2ff080bb..c0db8c740 100644 --- a/src/core/loader/nca.h +++ b/src/core/loader/nca.h @@ -5,7 +5,6 @@  #pragma once  #include "common/common_types.h" -#include "core/file_sys/vfs.h"  #include "core/loader/loader.h"  namespace Core { diff --git a/src/core/loader/nsp.cpp b/src/core/loader/nsp.cpp index 8b167ad3c..f7ccc678d 100644 --- a/src/core/loader/nsp.cpp +++ b/src/core/loader/nsp.cpp @@ -6,7 +6,6 @@  #include "common/common_types.h"  #include "core/core.h" -#include "core/file_sys/card_image.h"  #include "core/file_sys/content_archive.h"  #include "core/file_sys/control_metadata.h"  #include "core/file_sys/nca_metadata.h" diff --git a/src/core/loader/nsp.h b/src/core/loader/nsp.h index 50406a92e..378e4077a 100644 --- a/src/core/loader/nsp.h +++ b/src/core/loader/nsp.h @@ -6,7 +6,6 @@  #include <memory>  #include "common/common_types.h" -#include "core/file_sys/vfs.h"  #include "core/loader/loader.h"  namespace FileSys { diff --git a/src/core/loader/xci.cpp b/src/core/loader/xci.cpp index 269603eef..8c6c1a3fd 100644 --- a/src/core/loader/xci.cpp +++ b/src/core/loader/xci.cpp @@ -11,7 +11,6 @@  #include "core/file_sys/control_metadata.h"  #include "core/file_sys/patch_manager.h"  #include "core/file_sys/registered_cache.h" -#include "core/file_sys/romfs.h"  #include "core/file_sys/submission_package.h"  #include "core/hle/kernel/k_process.h"  #include "core/hle/service/filesystem/filesystem.h" diff --git a/src/core/loader/xci.h b/src/core/loader/xci.h index 30caaf90e..6e3810e48 100644 --- a/src/core/loader/xci.h +++ b/src/core/loader/xci.h @@ -6,7 +6,6 @@  #include <memory>  #include "common/common_types.h" -#include "core/file_sys/vfs.h"  #include "core/loader/loader.h"  namespace FileSys { diff --git a/src/core/memory/cheat_engine.cpp b/src/core/memory/cheat_engine.cpp index 46a7e09b4..863dc0769 100644 --- a/src/core/memory/cheat_engine.cpp +++ b/src/core/memory/cheat_engine.cpp @@ -8,8 +8,6 @@  #include "common/swap.h"  #include "core/core.h"  #include "core/core_timing.h" -#include "core/core_timing_util.h" -#include "core/hardware_properties.h"  #include "core/hle/kernel/k_page_table.h"  #include "core/hle/kernel/k_process.h"  #include "core/hle/service/hid/controllers/npad.h" diff --git a/src/core/network/network.h b/src/core/network/network.h index fdd3e4655..e85df3ab7 100644 --- a/src/core/network/network.h +++ b/src/core/network/network.h @@ -6,7 +6,6 @@  #include <array>  #include <optional> -#include <utility>  #include "common/common_funcs.h"  #include "common/common_types.h" diff --git a/src/core/perf_stats.cpp b/src/core/perf_stats.cpp index c9ded49d0..52c43c857 100644 --- a/src/core/perf_stats.cpp +++ b/src/core/perf_stats.cpp @@ -14,7 +14,6 @@  #include "common/fs/file.h"  #include "common/fs/fs.h"  #include "common/fs/path_util.h" -#include "common/math_util.h"  #include "common/settings.h"  #include "core/perf_stats.h" diff --git a/src/core/tools/freezer.cpp b/src/core/tools/freezer.cpp index 2e09faa6d..032c71aff 100644 --- a/src/core/tools/freezer.cpp +++ b/src/core/tools/freezer.cpp @@ -6,8 +6,6 @@  #include "common/logging/log.h"  #include "core/core.h"  #include "core/core_timing.h" -#include "core/core_timing_util.h" -#include "core/hardware_properties.h"  #include "core/memory.h"  #include "core/tools/freezer.h" | 
