Header cleanup

src/xenia/app/emulator_window.cc

@@ -9,13 +9,6 @@
 
 #include "xenia/app/emulator_window.h"
 
-#include <filesystem>
-#include <functional>
-#include <memory>
-#include <mutex>
-#include <string>
-#include <utility>
-
 #include "third_party/imgui/imgui.h"
 #include "third_party/stb/stb_image_write.h"
 #include "third_party/tomlplusplus/toml.hpp"

src/xenia/app/profile_dialogs.cc

@@ -6,11 +6,8 @@
  * Released under the BSD license - see LICENSE in the root for more details. *
  ******************************************************************************
  */
-
-#include <algorithm>
-
-#include "xenia/app/emulator_window.h"
 #include "xenia/app/profile_dialogs.h"
+#include "xenia/app/emulator_window.h"
 #include "xenia/base/png_utils.h"
 #include "xenia/base/system.h"
 #include "xenia/kernel/util/shim_utils.h"
@@ -302,4 +299,4 @@ void ProfileConfigDialog::OnDraw(ImGuiIO& io) {
 }
 
 }  // namespace app
-}  // namespace xe
+}  // namespace xe

src/xenia/app/xenia_main.cc

@@ -13,7 +13,6 @@
 #include <memory>
 #include <string>
 #include <thread>
-#include <vector>
 
 #include "xenia/app/discord/discord_presence.h"
 #include "xenia/app/emulator_window.h"

src/xenia/apu/sdl/sdl_audio_driver.cc

@@ -9,7 +9,6 @@
 
 #include "xenia/apu/sdl/sdl_audio_driver.h"
 
-#include <array>
 #include <cstring>
 
 #include "xenia/apu/apu_flags.h"

src/xenia/apu/xma_context.cc

@@ -9,7 +9,6 @@
 
 #include "xenia/apu/xma_context.h"
 
-#include <algorithm>
 #include <cstring>
 
 #include "xenia/apu/xma_decoder.h"

src/xenia/apu/xma_context.h

@@ -14,7 +14,6 @@
 #include <atomic>
 #include <mutex>
 #include <queue>
-// #include <vector>
 
 #include "xenia/memory.h"
 #include "xenia/xbox.h"

src/xenia/apu/xma_context_new.cc

@@ -10,8 +10,6 @@
 #include "xenia/apu/xma_context_new.h"
 #include "xenia/apu/xma_helpers.h"
 
-#include <algorithm>
-
 #include "xenia/base/logging.h"
 #include "xenia/base/platform.h"
 #include "xenia/base/profiling.h"
@@ -691,4 +689,4 @@ bool XmaContextNew::DecodePacket(AVCodecContext* av_context,
 }
 
 }  // namespace apu
-}  // namespace xe
+}  // namespace xe

src/xenia/apu/xma_context_old.cc

@@ -9,7 +9,6 @@
 
 #include "xenia/apu/xma_context_old.h"
 
-#include <algorithm>
 #include <cstring>
 
 #include "xenia/apu/xma_decoder.h"

src/xenia/base/arena.cc

@@ -10,7 +10,6 @@
 #include "xenia/base/arena.h"
 
 #include <cstring>
-#include <memory>
 
 #include "xenia/base/assert.h"
 #include "xenia/base/math.h"

src/xenia/base/clock.cc

@@ -9,8 +9,6 @@
 
 #include "xenia/base/clock.h"
 
-#include <algorithm>
-#include <limits>
 #include <mutex>
 
 #include "xenia/base/assert.h"

src/xenia/base/console_app_main_posix.cc

@@ -7,9 +7,6 @@
  ******************************************************************************
  */
 
-#include <string>
-#include <vector>
-
 #include "xenia/base/console_app_main.h"
 #include "xenia/base/cvar.h"
 #include "xenia/base/logging.h"

src/xenia/base/console_app_main_win.cc

@@ -8,7 +8,6 @@
  */
 
 #include <cstdlib>
-#include <vector>
 
 #include "xenia/base/console_app_main.h"
 #include "xenia/base/main_win.h"

src/xenia/base/exception_handler_posix.cc

@@ -10,7 +10,6 @@
 #include "xenia/base/exception_handler.h"
 
 #include <signal.h>
-#include <ucontext.h>
 #include <cstdint>
 
 #include "xenia/base/assert.h"

src/xenia/base/filesystem.cc

@@ -9,8 +9,6 @@
 
 #include "xenia/base/filesystem.h"
 
-#include <algorithm>
-
 namespace xe {
 namespace filesystem {
 

src/xenia/base/filesystem_posix.cc

@@ -16,14 +16,12 @@
 #include <dirent.h>
 #include <fcntl.h>
 #include <ftw.h>
-#include <libgen.h>
 #include <pwd.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <iostream>
 
 namespace xe {
 

src/xenia/base/filesystem_wildcard.cc

@@ -9,8 +9,6 @@
 
 #include "xenia/base/filesystem_wildcard.h"
 
-#include <algorithm>
-
 #include "xenia/base/assert.h"
 #include "xenia/base/string.h"
 

src/xenia/base/fuzzy.cc

@@ -11,7 +11,6 @@
 
 #include <cctype>
 #include <cstring>
-#include <iostream>
 
 // TODO(gibbed): UTF8 support.
 

src/xenia/base/logging.cc

@@ -10,11 +10,8 @@
 #include "xenia/base/logging.h"
 
 #include <algorithm>
-#include <atomic>
 #include <cstdlib>
 #include <cstring>
-#include <mutex>
-#include <vector>
 
 #include "third_party/disruptorplus/include/disruptorplus/multi_threaded_claim_strategy.hpp"
 #include "third_party/disruptorplus/include/disruptorplus/ring_buffer.hpp"

src/xenia/base/main_win.cc

@@ -7,7 +7,6 @@
  ******************************************************************************
  */
 
-#include <malloc.h>
 #include <cstring>
 
 #include "xenia/base/cvar.h"

src/xenia/base/mapped_memory_win.cc

@@ -7,9 +7,7 @@
  ******************************************************************************
  */
 
-#include <memory>
 #include <mutex>
-#include <vector>
 
 #include "third_party/fmt/include/fmt/format.h"
 #include "xenia/base/logging.h"

src/xenia/base/memory.cc

@@ -16,8 +16,6 @@
 #include <arm_neon.h>
 #endif
 
-#include <algorithm>
-
 DEFINE_bool(
     writable_executable_memory, true,
     "Allow mapping memory with both write and execute access, for simulating "

src/xenia/base/profiling.cc

@@ -7,9 +7,6 @@
  ******************************************************************************
  */
 
-#include <algorithm>
-#include <string>
-
 // NOTE: this must be included before microprofile as macro expansion needs
 // XELOGI.
 #include "xenia/base/logging.h"

src/xenia/base/ring_buffer.cc

@@ -8,7 +8,6 @@
  */
 
 #include "xenia/base/ring_buffer.h"
-#include <algorithm>
 #include <cstring>
 
 namespace xe {

src/xenia/base/socket_win.cc

@@ -10,7 +10,6 @@
 #include "xenia/base/socket.h"
 
 #include <mutex>
-#include <thread>
 
 #include "xenia/base/logging.h"
 #include "xenia/base/platform_win.h"

src/xenia/base/string.cc

@@ -10,8 +10,6 @@
 #include "xenia/base/string.h"
 
 #include <string.h>
-#include <algorithm>
-#include <locale>
 
 #include "xenia/base/platform.h"
 #if XE_PLATFORM_WIN32

src/xenia/base/string_buffer.cc

@@ -9,7 +9,6 @@
 
 #include "xenia/base/string_buffer.h"
 
-#include <algorithm>
 #include <cstdarg>
 
 #include "xenia/base/assert.h"

src/xenia/base/threading_posix.cc

@@ -17,15 +17,11 @@
 #include <pthread.h>
 #include <sched.h>
 #include <signal.h>
-#include <sys/eventfd.h>
 #include <sys/syscall.h>
-#include <sys/time.h>
-#include <sys/types.h>
 #include <unistd.h>
 #include <array>
 #include <cstddef>
 #include <ctime>
-#include <memory>
 
 #include "logging.h"
 

src/xenia/base/threading_timer_queue.cc

@@ -7,7 +7,6 @@
  ******************************************************************************
  */
 
-#include <algorithm>
 #include <forward_list>
 
 #include "third_party/disruptorplus/include/disruptorplus/blocking_wait_strategy.hpp"

src/xenia/base/utf8.cc

@@ -11,9 +11,6 @@
 
 #include <algorithm>
 #include <cstdint>
-#include <locale>
-#include <numeric>
-#include <tuple>
 
 #define UTF_CPP_CPLUSPLUS 202002L
 #include "third_party/utfcpp/source/utf8.h"

src/xenia/base/vec128.cc

@@ -7,7 +7,6 @@
  ******************************************************************************
  */
 
-#include <cstddef>
 #include <ostream>
 #include <string>
 

src/xenia/cpu/backend/x64/x64_backend.cc

@@ -9,7 +9,6 @@
 
 #include "xenia/cpu/backend/x64/x64_backend.h"
 
-#include <algorithm>
 #include <cstddef>
 #include "third_party/capstone/include/capstone/capstone.h"
 #include "third_party/capstone/include/capstone/x86.h"

src/xenia/cpu/backend/x64/x64_seq_memory.cc

@@ -9,7 +9,6 @@
 
 #include "xenia/cpu/backend/x64/x64_sequences.h"
 
-#include <algorithm>
 #include <cstring>
 
 #include "xenia/base/cvar.h"

src/xenia/cpu/backend/x64/x64_sequences.cc

@@ -24,9 +24,7 @@
 
 #include "xenia/cpu/backend/x64/x64_sequences.h"
 
-#include <algorithm>
 #include <cstring>
-#include <unordered_map>
 
 #include "xenia/base/assert.h"
 #include "xenia/base/clock.h"

src/xenia/cpu/backend/x64/x64_tracers.cc

@@ -9,8 +9,6 @@
 
 #include "xenia/cpu/backend/x64/x64_tracers.h"
 
-#include <cinttypes>
-
 #include "xenia/base/logging.h"
 #include "xenia/base/vec128.h"
 #include "xenia/cpu/backend/x64/x64_emitter.h"

src/xenia/cpu/compiler/passes/register_allocation_pass.cc

@@ -9,7 +9,6 @@
 
 #include "xenia/cpu/compiler/passes/register_allocation_pass.h"
 
-#include <algorithm>
 #include <cstring>
 
 #include "xenia/base/assert.h"

src/xenia/cpu/elf_module.cc

@@ -9,9 +9,6 @@
 
 #include "xenia/cpu/elf_module.h"
 
-#include <algorithm>
-#include <memory>
-
 #include "xenia/base/byte_order.h"
 #include "xenia/base/logging.h"
 #include "xenia/cpu/processor.h"

src/xenia/cpu/hir/hir_builder.cc

@@ -9,7 +9,6 @@
 
 #include "xenia/cpu/hir/hir_builder.h"
 
-#include <cinttypes>
 #include <cstdarg>
 #include <cstring>
 

src/xenia/cpu/mmio_handler.cc

@@ -9,9 +9,7 @@
 
 #include "xenia/cpu/mmio_handler.h"
 
-#include <algorithm>
 #include <cstring>
-#include <utility>
 
 #include "xenia/base/assert.h"
 #include "xenia/base/byte_order.h"

src/xenia/cpu/module.cc

@@ -9,11 +9,6 @@
 
 #include "xenia/cpu/module.h"
 
-#include <algorithm>
-#include <fstream>
-#include <sstream>  // NOLINT(readability/streams): should be replaced.
-#include <string>
-
 #include "xenia/base/profiling.h"
 #include "xenia/base/threading.h"
 #include "xenia/cpu/processor.h"

src/xenia/cpu/ppc/ppc_context.cc

@@ -9,7 +9,6 @@
 
 #include "xenia/cpu/ppc/ppc_context.h"
 
-#include <cinttypes>
 #include <cstdlib>
 
 #include "xenia/base/assert.h"

src/xenia/cpu/ppc/ppc_scanner.cc

@@ -9,9 +9,6 @@
 
 #include "xenia/cpu/ppc/ppc_scanner.h"
 
-#include <algorithm>
-#include <map>
-
 #include "xenia/base/logging.h"
 #include "xenia/base/memory.h"
 #include "xenia/base/profiling.h"

src/xenia/cpu/xex_module.cc

@@ -9,8 +9,6 @@
 
 #include "xenia/cpu/xex_module.h"
 
-#include <algorithm>
-
 #include "third_party/fmt/include/fmt/format.h"
 
 #include "xenia/base/byte_order.h"

src/xenia/debug/ui/debug_window.cc

@@ -9,9 +9,7 @@
 
 #include "xenia/debug/ui/debug_window.h"
 
-#include <algorithm>
 #include <cinttypes>
-#include <utility>
 
 #include "third_party/capstone/include/capstone/capstone.h"
 #include "third_party/capstone/include/capstone/x86.h"

src/xenia/emulator.cc

@@ -9,9 +9,6 @@
 
 #include "xenia/emulator.h"
 
-#include <algorithm>
-#include <cinttypes>
-
 #include "config.h"
 #include "third_party/fmt/include/fmt/format.h"
 #include "third_party/tabulate/single_include/tabulate/tabulate.hpp"

src/xenia/gpu/command_processor.cc

@@ -9,8 +9,6 @@
 
 #include "xenia/gpu/command_processor.h"
 
-#include <cinttypes>
-
 #include "third_party/fmt/include/fmt/format.h"
 #include "xenia/base/byte_stream.h"
 #include "xenia/base/cvar.h"
@@ -801,4 +799,4 @@ void CommandProcessor::InitializeTrace() {
 #define COMMAND_PROCESSOR CommandProcessor
 #include "pm4_command_processor_implement.h"
 }  // namespace gpu
-}  // namespace xe
+}  // namespace xe

src/xenia/gpu/d3d12/d3d12_command_processor.cc

@@ -8,10 +8,7 @@
  */
 
 #include "xenia/gpu/d3d12/d3d12_command_processor.h"
-#include <algorithm>
 #include <cstring>
-#include <sstream>
-#include <utility>
 #include "xenia/base/assert.h"
 #include "xenia/base/byte_order.h"
 #include "xenia/base/cvar.h"
@@ -5131,4 +5128,4 @@ void D3D12CommandProcessor::WriteGammaRampSRV(
 #undef COMMAND_PROCESSOR
 }  // namespace d3d12
 }  // namespace gpu
-}  // namespace xe
+}  // namespace xe

src/xenia/gpu/d3d12/d3d12_graphics_system.cc

@@ -9,8 +9,6 @@
 
 #include "xenia/gpu/d3d12/d3d12_graphics_system.h"
 
-#include <algorithm>
-
 #include "xenia/base/logging.h"
 #include "xenia/base/math.h"
 #include "xenia/gpu/d3d12/d3d12_command_processor.h"

src/xenia/gpu/d3d12/d3d12_primitive_processor.cc

@@ -9,10 +9,7 @@
 
 #include "xenia/gpu/d3d12/d3d12_primitive_processor.h"
 
-#include <algorithm>
 #include <cstdint>
-#include <memory>
-#include <utility>
 
 #include "xenia/base/assert.h"
 #include "xenia/base/logging.h"

src/xenia/gpu/d3d12/d3d12_render_target_cache.cc

@@ -9,15 +9,8 @@
 
 #include "xenia/gpu/d3d12/d3d12_render_target_cache.h"
 
-#include <algorithm>
-#include <array>
 #include <cstdint>
 #include <cstring>
-#include <iterator>
-#include <memory>
-#include <string>
-#include <tuple>
-#include <utility>
 
 #include "third_party/dxbc/DXBCChecksum.h"
 #include "third_party/fmt/include/fmt/xchar.h"

src/xenia/gpu/d3d12/d3d12_shader.cc

@@ -10,7 +10,6 @@
 #include "xenia/gpu/d3d12/d3d12_shader.h"
 
 #include <cstring>
-#include <utility>
 
 #include "xenia/base/assert.h"
 #include "xenia/base/logging.h"

src/xenia/gpu/d3d12/d3d12_shared_memory.cc

@@ -10,8 +10,6 @@
 #include "xenia/gpu/d3d12/d3d12_shared_memory.h"
 
 #include <cstring>
-#include <utility>
-#include <vector>
 
 #include "xenia/base/assert.h"
 #include "xenia/base/cvar.h"

src/xenia/gpu/d3d12/d3d12_texture_cache.cc

@@ -9,12 +9,9 @@
 
 #include "xenia/gpu/d3d12/d3d12_texture_cache.h"
 
-#include <algorithm>
 #include <array>
 #include <cfloat>
 #include <cstring>
-#include <memory>
-#include <utility>
 
 #include "xenia/base/assert.h"
 #include "xenia/base/logging.h"

src/xenia/gpu/d3d12/d3d12_trace_viewer_main.cc

@@ -7,9 +7,6 @@
  ******************************************************************************
  */
 
-#include <memory>
-#include <string>
-
 #include "xenia/base/logging.h"
 #include "xenia/gpu/d3d12/d3d12_command_processor.h"
 #include "xenia/gpu/d3d12/d3d12_graphics_system.h"

src/xenia/gpu/d3d12/pipeline_cache.cc

@@ -9,16 +9,8 @@
 
 #include "xenia/gpu/d3d12/pipeline_cache.h"
 
-#include <algorithm>
-#include <atomic>
-#include <cinttypes>
 #include <cmath>
 #include <cstring>
-#include <deque>
-#include <mutex>
-#include <set>
-#include <utility>
-#include <vector>
 
 #include "third_party/dxbc/DXBCChecksum.h"
 #include "third_party/fmt/include/fmt/format.h"

src/xenia/gpu/draw_extent_estimator.cc

@@ -9,9 +9,7 @@
 
 #include "xenia/gpu/draw_extent_estimator.h"
 
-#include <algorithm>
 #include <cfloat>
-#include <cstdint>
 
 #include "xenia/base/assert.h"
 #include "xenia/base/cvar.h"
@@ -368,4 +366,4 @@ uint32_t DrawExtentEstimator::EstimateMaxY(bool try_to_estimate_vertex_max_y,
 }
 
 }  // namespace gpu
-}  // namespace xe
+}  // namespace xe

src/xenia/gpu/dxbc_shader_translator.cc

@@ -9,10 +9,7 @@
 
 #include "xenia/gpu/dxbc_shader_translator.h"
 
-#include <algorithm>
-#include <atomic>
 #include <cstring>
-#include <memory>
 
 #include "third_party/dxbc/DXBCChecksum.h"
 

src/xenia/gpu/dxbc_shader_translator_fetch.cc

@@ -7,10 +7,7 @@
  ******************************************************************************
  */
 
-#include <algorithm>
 #include <cmath>
-#include <memory>
-#include <sstream>
 
 #include "third_party/fmt/include/fmt/format.h"
 #include "xenia/base/assert.h"

src/xenia/gpu/dxbc_shader_translator_memexport.cc

@@ -7,9 +7,7 @@
  ******************************************************************************
  */
 
-#include <array>
 #include <cstdint>
-#include <functional>
 
 #include "xenia/base/assert.h"
 #include "xenia/base/math.h"

src/xenia/gpu/graphics_system.cc

@@ -7,16 +7,8 @@
  ******************************************************************************
  */
 
-#include <algorithm>
-
 #include "xenia/gpu/graphics_system.h"
 
-#include <cstdint>
-#include <functional>
-#include <memory>
-#include <mutex>
-#include <utility>
-
 #include "xenia/base/byte_stream.h"
 #include "xenia/base/clock.h"
 #include "xenia/base/logging.h"

src/xenia/gpu/primitive_processor.cc

@@ -9,10 +9,7 @@
 
 #include "xenia/gpu/primitive_processor.h"
 
-#include <algorithm>
 #include <cstring>
-#include <functional>
-#include <utility>
 
 #include "xenia/base/assert.h"
 #include "xenia/base/byte_order.h"

src/xenia/gpu/register_file.cc

@@ -9,7 +9,6 @@
 
 #include "xenia/gpu/register_file.h"
 #include <array>
-#include <cstring>
 
 #include "xenia/base/math.h"
 

src/xenia/gpu/render_target_cache.cc

@@ -9,13 +9,8 @@
 
 #include "xenia/gpu/render_target_cache.h"
 
-#include <algorithm>
 #include <cmath>
 #include <cstring>
-#include <iterator>
-#include <tuple>
-#include <unordered_set>
-#include <utility>
 
 #include "xenia/base/assert.h"
 #include "xenia/base/cvar.h"

src/xenia/gpu/sampler_info.cc

@@ -10,7 +10,6 @@
 #include "xenia/gpu/sampler_info.h"
 
 #include <cstring>
-#include <memory>
 
 #include "xenia/base/xxhash.h"
 

src/xenia/gpu/shader.cc

@@ -9,9 +9,7 @@
 
 #include "xenia/gpu/shader.h"
 
-#include <cinttypes>
 #include <cstring>
-#include <utility>
 
 #include "third_party/fmt/include/fmt/format.h"
 #include "xenia/base/filesystem.h"

src/xenia/gpu/shader_compiler_main.cc

@@ -7,12 +7,10 @@
  ******************************************************************************
  */
 
-#include <cinttypes>
 #include <cstring>
 #include <sstream>
 #include <string>
 #include <utility>
-#include <vector>
 
 #include "third_party/glslang/SPIRV/disassemble.h"
 #include "xenia/base/assert.h"

src/xenia/gpu/shader_translator_disasm.cc

@@ -10,8 +10,6 @@
 #include "xenia/gpu/shader_translator.h"
 
 #include <cstdarg>
-#include <set>
-#include <string>
 
 #include "xenia/base/math.h"
 

src/xenia/gpu/shared_memory.cc

@@ -9,8 +9,6 @@
 
 #include "xenia/gpu/shared_memory.h"
 
-#include <algorithm>
-
 #include "xenia/base/assert.h"
 #include "xenia/base/bit_range.h"
 #include "xenia/base/logging.h"

src/xenia/gpu/spirv_builder.cc

@@ -9,10 +9,6 @@
 
 #include "xenia/gpu/spirv_builder.h"
 
-#include <memory>
-#include <utility>
-#include <vector>
-
 #include "xenia/base/assert.h"
 
 namespace xe {

src/xenia/gpu/spirv_shader_translator.cc

@@ -9,13 +9,8 @@
 
 #include "xenia/gpu/spirv_shader_translator.h"
 
-#include <algorithm>
 #include <cstddef>
 #include <cstdint>
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
 
 #include "third_party/fmt/include/fmt/format.h"
 #include "third_party/glslang/SPIRV/GLSL.std.450.h"

src/xenia/gpu/spirv_shader_translator_alu.cc

@@ -12,7 +12,6 @@
 #include <cfloat>
 #include <cmath>
 #include <cstdint>
-#include <memory>
 
 #include "third_party/glslang/SPIRV/GLSL.std.450.h"
 #include "xenia/base/assert.h"

src/xenia/gpu/spirv_shader_translator_fetch.cc

@@ -11,9 +11,6 @@
 
 #include <climits>
 #include <cmath>
-#include <memory>
-#include <sstream>
-#include <utility>
 
 #include "third_party/fmt/include/fmt/format.h"
 #include "third_party/glslang/SPIRV/GLSL.std.450.h"

src/xenia/gpu/spirv_shader_translator_memexport.cc

@@ -9,13 +9,6 @@
 
 #include "xenia/gpu/spirv_shader_translator.h"
 
-#include <array>
-#include <cstdint>
-#include <functional>
-#include <memory>
-#include <optional>
-#include <utility>
-
 #include "third_party/glslang/SPIRV/GLSL.std.450.h"
 #include "xenia/base/assert.h"
 #include "xenia/base/math.h"

src/xenia/gpu/spirv_shader_translator_rb.cc

@@ -10,8 +10,6 @@
 #include "xenia/gpu/spirv_shader_translator.h"
 
 #include <cstdint>
-#include <memory>
-#include <utility>
 
 #include "third_party/glslang/SPIRV/GLSL.std.450.h"
 #include "xenia/base/assert.h"

src/xenia/gpu/texture_conversion.cc

@@ -9,10 +9,8 @@
 
 #include "xenia/gpu/texture_conversion.h"
 
-#include <algorithm>
 #include <cmath>
 #include <cstring>
-#include <functional>
 
 #include "xenia/base/logging.h"
 #include "xenia/base/math.h"

src/xenia/gpu/texture_extent.cc

@@ -9,7 +9,6 @@
 
 #include "xenia/gpu/texture_info.h"
 
-#include <algorithm>
 #include <cmath>
 
 #include "xenia/base/math.h"

src/xenia/gpu/trace_player.cc

@@ -9,8 +9,6 @@
 
 #include "xenia/gpu/trace_player.h"
 
-#include <memory>
-
 #include "xenia/gpu/command_processor.h"
 #include "xenia/gpu/graphics_system.h"
 #include "xenia/gpu/registers.h"

src/xenia/gpu/trace_reader.cc

@@ -9,8 +9,6 @@
 
 #include "xenia/gpu/trace_reader.h"
 
-#include <cinttypes>
-
 #include "third_party/snappy/snappy.h"
 #include "xenia/base/filesystem.h"
 #include "xenia/base/logging.h"

src/xenia/gpu/trace_viewer.cc

@@ -10,7 +10,6 @@
 #include "xenia/gpu/trace_viewer.h"
 
 #include <cinttypes>
-#include <string>
 
 #include "third_party/half/include/half.hpp"
 #include "third_party/imgui/imgui.h"

src/xenia/gpu/trace_writer.cc

@@ -10,7 +10,6 @@
 #include "xenia/gpu/trace_writer.h"
 
 #include <cstring>
-#include <memory>
 
 #include "third_party/snappy/snappy-sinksource.h"
 #include "third_party/snappy/snappy.h"

src/xenia/gpu/vulkan/deferred_command_buffer.cc

@@ -9,8 +9,6 @@
 
 #include "xenia/gpu/vulkan/deferred_command_buffer.h"
 
-#include <cstddef>
-#include <cstdint>
 #include <cstring>
 
 #include "xenia/base/assert.h"

src/xenia/gpu/vulkan/vulkan_command_processor.cc

@@ -9,13 +9,8 @@
 
 #include "xenia/gpu/vulkan/vulkan_command_processor.h"
 
-#include <algorithm>
-#include <array>
 #include <cstdint>
 #include <cstring>
-#include <iterator>
-#include <tuple>
-#include <utility>
 
 #include "xenia/base/assert.h"
 #include "xenia/base/byte_order.h"

src/xenia/gpu/vulkan/vulkan_pipeline_cache.cc

@@ -9,13 +9,8 @@
 
 #include "xenia/gpu/vulkan/vulkan_pipeline_cache.h"
 
-#include <algorithm>
-#include <array>
 #include <cstdint>
 #include <cstring>
-#include <memory>
-#include <utility>
-#include <vector>
 
 #include "third_party/fmt/include/fmt/format.h"
 #include "xenia/base/assert.h"

src/xenia/gpu/vulkan/vulkan_primitive_processor.cc

@@ -9,9 +9,7 @@
 
 #include "xenia/gpu/vulkan/vulkan_primitive_processor.h"
 
-#include <algorithm>
 #include <cstdint>
-#include <memory>
 
 #include "xenia/base/assert.h"
 #include "xenia/base/logging.h"

src/xenia/gpu/vulkan/vulkan_render_target_cache.cc

@@ -9,15 +9,9 @@
 
 #include "xenia/gpu/vulkan/vulkan_render_target_cache.h"
 
-#include <algorithm>
-#include <array>
 #include <cstddef>
 #include <cstdint>
 #include <cstring>
-#include <memory>
-#include <tuple>
-#include <utility>
-#include <vector>
 
 #include "third_party/glslang/SPIRV/GLSL.std.450.h"
 #include "xenia/base/assert.h"

src/xenia/gpu/vulkan/vulkan_shader.cc

@@ -9,8 +9,6 @@
 
 #include "xenia/gpu/vulkan/vulkan_shader.h"
 
-#include <cstdint>
-
 #include "xenia/base/logging.h"
 #include "xenia/ui/vulkan/vulkan_provider.h"
 

src/xenia/gpu/vulkan/vulkan_shared_memory.cc

@@ -9,10 +9,7 @@
 
 #include "xenia/gpu/vulkan/vulkan_shared_memory.h"
 
-#include <algorithm>
 #include <cstring>
-#include <utility>
-#include <vector>
 
 #include "xenia/base/assert.h"
 #include "xenia/base/cvar.h"

src/xenia/gpu/vulkan/vulkan_texture_cache.cc

@@ -9,10 +9,6 @@
 
 #include "xenia/gpu/vulkan/vulkan_texture_cache.h"
 
-#include <algorithm>
-#include <array>
-#include <utility>
-
 #include "xenia/base/assert.h"
 #include "xenia/base/logging.h"
 #include "xenia/base/math.h"

src/xenia/gpu/vulkan/vulkan_trace_viewer_main.cc

@@ -7,9 +7,6 @@
  ******************************************************************************
  */
 
-#include <memory>
-#include <string>
-
 #include "xenia/base/logging.h"
 #include "xenia/gpu/trace_viewer.h"
 #include "xenia/gpu/vulkan/vulkan_command_processor.h"

src/xenia/hid/sdl/sdl_input_driver.cc

@@ -9,8 +9,6 @@
 
 #include "xenia/hid/sdl/sdl_input_driver.h"
 
-#include <array>
-
 #if XE_PLATFORM_WIN32
 #include "xenia/base/platform_win.h"
 #endif  // XE_PLATFORM_WIN32

src/xenia/kernel/user_module.cc

@@ -9,8 +9,6 @@
 
 #include "xenia/kernel/user_module.h"
 
-#include <vector>
-
 #include "xenia/base/byte_stream.h"
 #include "xenia/base/logging.h"
 #include "xenia/base/xxhash.h"

src/xenia/kernel/util/crypto_utils.cc

@@ -127,4 +127,4 @@ void RC4(const uint8_t* key, uint32_t key_size_in, const uint8_t* data,
 
 }  // namespace util
 }  // namespace kernel
-}  // namespace xe
+}  // namespace xe

src/xenia/kernel/xam/content_manager.cc

@@ -9,10 +9,6 @@
 
 #include "xenia/kernel/xam/content_manager.h"
 
-#include <array>
-#include <string>
-#include <unordered_set>
-
 #include "third_party/fmt/include/fmt/format.h"
 #include "xenia/base/filesystem.h"
 #include "xenia/base/logging.h"

src/xenia/kernel/xam/profile_manager.cc

@@ -9,8 +9,6 @@
 
 #include "xenia/kernel/xam/profile_manager.h"
 
-#include <filesystem>
-
 #include "xenia/base/logging.h"
 #include "xenia/emulator.h"
 #include "xenia/hid/input_system.h"
@@ -625,4 +623,4 @@ bool ProfileManager::IsGamertagValid(const std::string gamertag) {
 
 }  // namespace xam
 }  // namespace kernel
-}  // namespace xe
+}  // namespace xe

src/xenia/kernel/xam/user_profile.cc

@@ -9,8 +9,6 @@
 
 #include "xenia/kernel/xam/user_profile.h"
 
-#include <ranges>
-
 #include "third_party/fmt/include/fmt/format.h"
 #include "xenia/kernel/kernel_state.h"
 #include "xenia/kernel/util/shim_utils.h"

src/xenia/kernel/xam/user_tracker.cc

@@ -10,9 +10,6 @@
 #include "xenia/emulator.h"
 #include "xenia/kernel/xam/user_profile.h"
 
-#include <ranges>
-#include <sstream>
-
 #include "third_party/fmt/include/fmt/format.h"
 #include "third_party/stb/stb_image.h"
 #include "xenia/kernel/kernel_state.h"
@@ -848,4 +845,4 @@ void UserTracker::RefreshTitleSummary(uint64_t xuid, uint32_t title_id) {
 
 }  // namespace xam
 }  // namespace kernel
-}  // namespace xe
+}  // namespace xe

src/xenia/kernel/xam/xam_module.cc

@@ -9,8 +9,6 @@
 
 #include "xenia/kernel/xam/xam_module.h"
 
-#include <vector>
-
 #include "xenia/base/math.h"
 #include "xenia/kernel/kernel_state.h"
 #include "xenia/kernel/xam/xam_private.h"

src/xenia/kernel/xam/xdbf/gpd_info.cc

@@ -11,9 +11,6 @@
 #include "xenia/kernel/util/shim_utils.h"
 #include "xenia/kernel/xam/user_settings.h"
 
-#include <map>
-#include <ranges>
-
 namespace xe {
 namespace kernel {
 namespace xam {
@@ -306,4 +303,4 @@ void GpdInfo::MarkSpaceAsFree(uint32_t offset, uint32_t size) {
 
 }  // namespace xam
 }  // namespace kernel
-}  // namespace xe
+}  // namespace xe

src/xenia/kernel/xam/xdbf/gpd_info_profile.cc

@@ -111,4 +111,4 @@ void GpdInfoProfile::UpdateTitleInfo(const uint32_t title_id,
 
 }  // namespace xam
 }  // namespace kernel
-}  // namespace xe
+}  // namespace xe

src/xenia/kernel/xam/xdbf/gpd_info_title.cc

@@ -193,4 +193,4 @@ uint32_t GpdInfoTitle::GetUnlockedAchievementCount() {
 
 }  // namespace xam
 }  // namespace kernel
-}  // namespace xe
+}  // namespace xe

src/xenia/kernel/xbdm/xbdm_module.cc

@@ -9,8 +9,6 @@
 
 #include "xenia/kernel/xbdm/xbdm_module.h"
 
-#include <vector>
-
 #include "xenia/base/math.h"
 #include "xenia/kernel/kernel_state.h"
 #include "xenia/kernel/xbdm/xbdm_private.h"