From 30f7effa73384f6b39af11904fe28acd2797dac6 Mon Sep 17 00:00:00 2001 From: Ben Vanik Date: Sat, 2 May 2015 01:25:59 -0700 Subject: [PATCH] Code cleanup: removing common.h --- src/poly/platform.h | 5 +++++ src/poly/string.h | 6 ----- src/xenia/apu/audio_driver.h | 1 - src/xenia/apu/audio_system.cc | 2 ++ src/xenia/apu/audio_system.h | 1 - src/xenia/apu/nop/nop_apu-private.h | 8 +------ src/xenia/apu/nop/nop_apu.h | 8 ++----- src/xenia/apu/nop/nop_audio_system.h | 11 +++------- src/xenia/apu/xaudio2/xaudio2_apu-private.h | 8 +------ src/xenia/apu/xaudio2/xaudio2_apu.h | 8 ++----- src/xenia/apu/xaudio2/xaudio2_audio_driver.cc | 1 + src/xenia/apu/xaudio2/xaudio2_audio_driver.h | 1 - src/xenia/apu/xaudio2/xaudio2_audio_system.h | 8 +++---- src/xenia/common.h | 22 ------------------- .../compiler/passes/context_promotion_pass.h | 1 + .../passes/data_flow_analysis_pass.cc | 1 + .../compiler/passes/value_reduction_pass.cc | 1 + src/xenia/cpu/processor.cc | 2 ++ src/xenia/cpu/processor.h | 1 - src/xenia/cpu/runtime.h | 1 - src/xenia/cpu/thread_state.h | 1 - src/xenia/cpu/xex_module.cc | 1 + src/xenia/cpu/xex_module.h | 1 - src/xenia/debug_agent.cc | 5 ++++- src/xenia/debug_agent.h | 2 +- src/xenia/emulator.h | 1 - src/xenia/export_resolver.cc | 1 + src/xenia/export_resolver.h | 1 - src/xenia/gpu/gl4/command_processor.cc | 2 ++ src/xenia/gpu/gl4/draw_batcher.cc | 1 + src/xenia/gpu/gl4/draw_batcher.h | 1 - src/xenia/gpu/gl4/gl4_gpu-private.h | 1 - src/xenia/gpu/gl4/gl4_gpu.h | 1 - src/xenia/gpu/gl4/gl4_graphics_system.cc | 1 + src/xenia/gpu/gl4/gl4_graphics_system.h | 1 - src/xenia/gpu/gl4/gl4_profiler_display.cc | 1 + src/xenia/gpu/gl4/gl4_profiler_display.h | 1 - src/xenia/gpu/gl4/gl4_shader.cc | 1 + src/xenia/gpu/gl4/gl4_shader.h | 1 - src/xenia/gpu/gl4/gl4_shader_translator.cc | 2 ++ src/xenia/gpu/gl4/gl4_shader_translator.h | 1 - src/xenia/gpu/gl4/gl_context.cc | 2 ++ src/xenia/gpu/gl4/texture_cache.cc | 2 ++ src/xenia/gpu/graphics_system.cc | 1 + src/xenia/gpu/graphics_system.h | 1 - src/xenia/gpu/register_file.h | 2 +- src/xenia/gpu/sampler_info.cc | 2 ++ src/xenia/gpu/shader.cc | 1 + src/xenia/gpu/texture_info.h | 3 +++ src/xenia/gpu/trace_viewer_main.cc | 2 ++ src/xenia/gpu/ucode.h | 4 +++- src/xenia/gpu/ucode_disassembler.cc | 2 ++ src/xenia/gpu/xenos.h | 3 ++- src/xenia/hid/input_driver.h | 1 - src/xenia/hid/input_system.cc | 1 + src/xenia/hid/input_system.h | 1 - src/xenia/hid/nop/nop_hid-private.h | 1 - src/xenia/hid/nop/nop_hid.h | 4 +--- src/xenia/hid/nop/nop_input_driver.h | 1 - src/xenia/hid/winkey/winkey_hid-private.h | 1 - src/xenia/hid/winkey/winkey_hid.h | 4 +--- src/xenia/hid/winkey/winkey_input_driver.h | 1 - src/xenia/hid/xinput/xinput_hid-private.h | 1 - src/xenia/hid/xinput/xinput_hid.h | 4 +--- src/xenia/hid/xinput/xinput_input_driver.h | 1 - src/xenia/kernel/app.h | 1 - src/xenia/kernel/apps/apps.h | 1 - src/xenia/kernel/apps/xgi_app.cc | 1 + src/xenia/kernel/apps/xgi_app.h | 1 - src/xenia/kernel/apps/xlivebase_app.cc | 1 + src/xenia/kernel/apps/xlivebase_app.h | 1 - src/xenia/kernel/apps/xmp_app.cc | 1 + src/xenia/kernel/apps/xmp_app.h | 1 - src/xenia/kernel/async_request.h | 1 - src/xenia/kernel/content_manager.h | 1 - src/xenia/kernel/dispatcher.h | 1 - src/xenia/kernel/fs/device.h | 1 - .../kernel/fs/devices/disc_image_device.cc | 1 + .../kernel/fs/devices/disc_image_device.h | 1 - .../kernel/fs/devices/disc_image_entry.h | 1 - src/xenia/kernel/fs/devices/disc_image_file.h | 1 - .../kernel/fs/devices/host_path_device.cc | 1 + .../kernel/fs/devices/host_path_device.h | 1 - .../kernel/fs/devices/host_path_entry.cc | 1 + src/xenia/kernel/fs/devices/host_path_entry.h | 1 - src/xenia/kernel/fs/devices/host_path_file.h | 1 - .../fs/devices/stfs_container_device.cc | 1 + .../kernel/fs/devices/stfs_container_device.h | 1 - .../kernel/fs/devices/stfs_container_entry.h | 1 - .../kernel/fs/devices/stfs_container_file.h | 1 - src/xenia/kernel/fs/entry.cc | 2 ++ src/xenia/kernel/fs/entry.h | 1 - src/xenia/kernel/fs/filesystem.cc | 3 ++- src/xenia/kernel/fs/filesystem.h | 1 - src/xenia/kernel/fs/gdfx.h | 1 - src/xenia/kernel/fs/stfs.cc | 2 ++ src/xenia/kernel/fs/stfs.h | 1 - src/xenia/kernel/kernel_state.h | 1 - src/xenia/kernel/native_list.h | 1 - src/xenia/kernel/object_table.h | 1 - src/xenia/kernel/objects/xkernel_module.cc | 1 + src/xenia/kernel/objects/xthread.cc | 2 ++ src/xenia/kernel/objects/xtimer.cc | 1 + src/xenia/kernel/objects/xuser_module.cc | 1 + src/xenia/kernel/user_profile.h | 1 - src/xenia/kernel/util/shim_utils.h | 1 - src/xenia/kernel/util/xex2.cc | 7 +++++- src/xenia/kernel/util/xex2.h | 1 - src/xenia/kernel/util/xex2_info.h | 2 +- src/xenia/kernel/xam_content.cc | 2 +- src/xenia/kernel/xam_info.cc | 2 +- src/xenia/kernel/xam_input.cc | 2 +- src/xenia/kernel/xam_module.h | 1 - src/xenia/kernel/xam_msg.cc | 2 +- src/xenia/kernel/xam_net.cc | 2 +- src/xenia/kernel/xam_notify.cc | 2 +- src/xenia/kernel/xam_ordinals.h | 1 - src/xenia/kernel/xam_private.h | 1 - src/xenia/kernel/xam_ui.cc | 2 +- src/xenia/kernel/xam_user.cc | 2 +- src/xenia/kernel/xam_video.cc | 1 - src/xenia/kernel/xam_voice.cc | 2 +- src/xenia/kernel/xboxkrnl_audio.cc | 2 +- src/xenia/kernel/xboxkrnl_audio_xma.cc | 2 +- src/xenia/kernel/xboxkrnl_debug.cc | 2 +- src/xenia/kernel/xboxkrnl_hal.cc | 2 +- src/xenia/kernel/xboxkrnl_io.cc | 2 +- src/xenia/kernel/xboxkrnl_memory.cc | 2 +- src/xenia/kernel/xboxkrnl_misc.cc | 2 +- src/xenia/kernel/xboxkrnl_module.cc | 1 + src/xenia/kernel/xboxkrnl_module.h | 1 - src/xenia/kernel/xboxkrnl_modules.cc | 2 +- src/xenia/kernel/xboxkrnl_ob.cc | 2 +- src/xenia/kernel/xboxkrnl_ordinals.h | 1 - src/xenia/kernel/xboxkrnl_private.h | 1 - src/xenia/kernel/xboxkrnl_rtl.cc | 1 + src/xenia/kernel/xboxkrnl_rtl.h | 1 - src/xenia/kernel/xboxkrnl_strings.cc | 2 +- src/xenia/kernel/xboxkrnl_threading.cc | 2 +- src/xenia/kernel/xboxkrnl_usbcam.cc | 2 +- src/xenia/kernel/xboxkrnl_video.cc | 2 +- src/xenia/memory.cc | 1 + src/xenia/memory.h | 3 +-- src/xenia/sources.gypi | 1 - src/xenia/ui/main_window.cc | 1 + src/xenia/xbox.h | 1 - src/xenia/xenia_main.cc | 2 ++ 147 files changed, 120 insertions(+), 170 deletions(-) delete mode 100644 src/xenia/common.h diff --git a/src/poly/platform.h b/src/poly/platform.h index c576e6066..9dc5de3ab 100644 --- a/src/poly/platform.h +++ b/src/poly/platform.h @@ -152,6 +152,11 @@ XE_CPU: 32BIT | 64BIT | BIGENDIAN | LITTLEENDIAN #include #endif // XE_COMPILER_MSVC +#if XE_LIKE_WIN32 +#define strcasecmp _stricmp +#define strncasecmp _strnicmp +#endif // XE_LIKE_WIN32 + namespace poly { #if XE_LIKE_WIN32 diff --git a/src/poly/string.h b/src/poly/string.h index 07b2e4c3a..fa36155b2 100644 --- a/src/poly/string.h +++ b/src/poly/string.h @@ -16,12 +16,6 @@ #include "poly/platform.h" -#if XE_LIKE_WIN32 -#define strcasecmp _stricmp -#define strncasecmp _strnicmp -#define snprintf _snprintf -#endif // XE_LIKE_WIN32 - namespace poly { std::string to_string(const std::wstring& source); diff --git a/src/xenia/apu/audio_driver.h b/src/xenia/apu/audio_driver.h index 1ffaf9006..d3401e447 100644 --- a/src/xenia/apu/audio_driver.h +++ b/src/xenia/apu/audio_driver.h @@ -10,7 +10,6 @@ #ifndef XENIA_APU_AUDIO_DRIVER_H_ #define XENIA_APU_AUDIO_DRIVER_H_ -#include "xenia/common.h" #include "xenia/emulator.h" #include "xenia/xbox.h" diff --git a/src/xenia/apu/audio_system.cc b/src/xenia/apu/audio_system.cc index 632ddf244..06fad509a 100644 --- a/src/xenia/apu/audio_system.cc +++ b/src/xenia/apu/audio_system.cc @@ -14,6 +14,8 @@ #include "xenia/emulator.h" #include "xenia/cpu/processor.h" #include "xenia/cpu/thread_state.h" +#include "xenia/logging.h" +#include "xenia/profiling.h" // As with normal Microsoft, there are like twelve different ways to access // the audio APIs. Early games use XMA*() methods almost exclusively to touch diff --git a/src/xenia/apu/audio_system.h b/src/xenia/apu/audio_system.h index 4e96244e3..b385f90a2 100644 --- a/src/xenia/apu/audio_system.h +++ b/src/xenia/apu/audio_system.h @@ -15,7 +15,6 @@ #include #include -#include "xenia/common.h" #include "xenia/emulator.h" #include "xenia/xbox.h" diff --git a/src/xenia/apu/nop/nop_apu-private.h b/src/xenia/apu/nop/nop_apu-private.h index 5f3b08dfc..a9a0e2c4e 100644 --- a/src/xenia/apu/nop/nop_apu-private.h +++ b/src/xenia/apu/nop/nop_apu-private.h @@ -10,22 +10,16 @@ #ifndef XENIA_APU_NOP_NOP_APU_PRIVATE_H_ #define XENIA_APU_NOP_NOP_APU_PRIVATE_H_ -#include "xenia/common.h" - #include "xenia/apu/nop/nop_apu.h" - namespace xe { namespace apu { namespace nop { - - - +// } // namespace nop } // namespace apu } // namespace xe - #endif // XENIA_APU_NOP_NOP_APU_PRIVATE_H_ diff --git a/src/xenia/apu/nop/nop_apu.h b/src/xenia/apu/nop/nop_apu.h index 9827551ae..0a7d5a4bf 100644 --- a/src/xenia/apu/nop/nop_apu.h +++ b/src/xenia/apu/nop/nop_apu.h @@ -12,15 +12,11 @@ #include -#include "xenia/common.h" - -namespace xe { -class Emulator; -} // namespace xe +#include "xenia/apu/audio_system.h" +#include "xenia/emulator.h" namespace xe { namespace apu { -class AudioSystem; namespace nop { std::unique_ptr Create(Emulator* emulator); diff --git a/src/xenia/apu/nop/nop_audio_system.h b/src/xenia/apu/nop/nop_audio_system.h index e806ebe49..9b629b39e 100644 --- a/src/xenia/apu/nop/nop_audio_system.h +++ b/src/xenia/apu/nop/nop_audio_system.h @@ -10,30 +10,25 @@ #ifndef XENIA_APU_NOP_NOP_AUDIO_SYSTEM_H_ #define XENIA_APU_NOP_NOP_AUDIO_SYSTEM_H_ -#include "xenia/common.h" - #include "xenia/apu/audio_system.h" #include "xenia/apu/nop/nop_apu-private.h" - namespace xe { namespace apu { namespace nop { - class NopAudioSystem : public AudioSystem { -public: + public: NopAudioSystem(Emulator* emulator); virtual ~NopAudioSystem(); - virtual X_STATUS CreateDriver(size_t index, HANDLE wait_handle, AudioDriver** out_driver); + virtual X_STATUS CreateDriver(size_t index, HANDLE wait_handle, + AudioDriver** out_driver); virtual void DestroyDriver(AudioDriver* driver); }; - } // namespace nop } // namespace apu } // namespace xe - #endif // XENIA_APU_NOP_NOP_AUDIO_SYSTEM_H_ diff --git a/src/xenia/apu/xaudio2/xaudio2_apu-private.h b/src/xenia/apu/xaudio2/xaudio2_apu-private.h index 37190bba6..9730bb0fc 100644 --- a/src/xenia/apu/xaudio2/xaudio2_apu-private.h +++ b/src/xenia/apu/xaudio2/xaudio2_apu-private.h @@ -10,22 +10,16 @@ #ifndef XENIA_APU_XAUDIO2_XAUDIO2_APU_PRIVATE_H_ #define XENIA_APU_XAUDIO2_XAUDIO2_APU_PRIVATE_H_ -#include "xenia/common.h" - #include "xenia/apu/xaudio2/xaudio2_apu.h" - namespace xe { namespace apu { namespace xaudio2 { - - - +// } // namespace xaudio2 } // namespace apu } // namespace xe - #endif // XENIA_APU_XAUDIO2_XAUDIO2_APU_PRIVATE_H_ diff --git a/src/xenia/apu/xaudio2/xaudio2_apu.h b/src/xenia/apu/xaudio2/xaudio2_apu.h index e9fbabda9..8f602c778 100644 --- a/src/xenia/apu/xaudio2/xaudio2_apu.h +++ b/src/xenia/apu/xaudio2/xaudio2_apu.h @@ -12,15 +12,11 @@ #include -#include "xenia/common.h" - -namespace xe { -class Emulator; -} // namespace xe +#include "xenia/apu/audio_system.h" +#include "xenia/emulator.h" namespace xe { namespace apu { -class AudioSystem; namespace xaudio2 { std::unique_ptr Create(Emulator* emulator); diff --git a/src/xenia/apu/xaudio2/xaudio2_audio_driver.cc b/src/xenia/apu/xaudio2/xaudio2_audio_driver.cc index 00d79bd64..0d988788b 100644 --- a/src/xenia/apu/xaudio2/xaudio2_audio_driver.cc +++ b/src/xenia/apu/xaudio2/xaudio2_audio_driver.cc @@ -11,6 +11,7 @@ #include "xenia/apu/apu-private.h" #include "xenia/emulator.h" +#include "xenia/logging.h" namespace xe { namespace apu { diff --git a/src/xenia/apu/xaudio2/xaudio2_audio_driver.h b/src/xenia/apu/xaudio2/xaudio2_audio_driver.h index d5b9bc374..d8bbc3232 100644 --- a/src/xenia/apu/xaudio2/xaudio2_audio_driver.h +++ b/src/xenia/apu/xaudio2/xaudio2_audio_driver.h @@ -12,7 +12,6 @@ #include -#include "xenia/common.h" #include "xenia/apu/audio_driver.h" #include "xenia/apu/xaudio2/xaudio2_apu-private.h" diff --git a/src/xenia/apu/xaudio2/xaudio2_audio_system.h b/src/xenia/apu/xaudio2/xaudio2_audio_system.h index 8cbc87d1f..b0e75f1da 100644 --- a/src/xenia/apu/xaudio2/xaudio2_audio_system.h +++ b/src/xenia/apu/xaudio2/xaudio2_audio_system.h @@ -12,7 +12,6 @@ #include -#include "xenia/common.h" #include "xenia/apu/audio_system.h" #include "xenia/apu/xaudio2/xaudio2_apu-private.h" @@ -21,14 +20,15 @@ namespace apu { namespace xaudio2 { class XAudio2AudioSystem : public AudioSystem { -public: + public: XAudio2AudioSystem(Emulator* emulator); virtual ~XAudio2AudioSystem(); - virtual X_RESULT CreateDriver(size_t index, HANDLE wait, AudioDriver** out_driver); + virtual X_RESULT CreateDriver(size_t index, HANDLE wait, + AudioDriver** out_driver); virtual void DestroyDriver(AudioDriver* driver); -protected: + protected: virtual void Initialize(); }; diff --git a/src/xenia/common.h b/src/xenia/common.h deleted file mode 100644 index 9a19845e1..000000000 --- a/src/xenia/common.h +++ /dev/null @@ -1,22 +0,0 @@ -/** - ****************************************************************************** - * Xenia : Xbox 360 Emulator Research Project * - ****************************************************************************** - * Copyright 2013 Ben Vanik. All rights reserved. * - * Released under the BSD license - see LICENSE in the root for more details. * - ****************************************************************************** - */ - -#ifndef XENIA_COMMON_H_ -#define XENIA_COMMON_H_ - -#include "poly/assert.h" -#include "poly/atomic.h" -#include "poly/byte_order.h" -#include "poly/memory.h" -#include "poly/string.h" - -#include "xenia/logging.h" -#include "xenia/profiling.h" - -#endif // XENIA_COMMON_H_ diff --git a/src/xenia/cpu/compiler/passes/context_promotion_pass.h b/src/xenia/cpu/compiler/passes/context_promotion_pass.h index 875da9464..ae384853a 100644 --- a/src/xenia/cpu/compiler/passes/context_promotion_pass.h +++ b/src/xenia/cpu/compiler/passes/context_promotion_pass.h @@ -10,6 +10,7 @@ #ifndef XENIA_COMPILER_PASSES_CONTEXT_PROMOTION_PASS_H_ #define XENIA_COMPILER_PASSES_CONTEXT_PROMOTION_PASS_H_ +#include "poly/platform.h" #include "xenia/cpu/compiler/compiler_pass.h" #if XE_COMPILER_MSVC diff --git a/src/xenia/cpu/compiler/passes/data_flow_analysis_pass.cc b/src/xenia/cpu/compiler/passes/data_flow_analysis_pass.cc index 15b8fa4a8..eba6a31b2 100644 --- a/src/xenia/cpu/compiler/passes/data_flow_analysis_pass.cc +++ b/src/xenia/cpu/compiler/passes/data_flow_analysis_pass.cc @@ -9,6 +9,7 @@ #include "xenia/cpu/compiler/passes/data_flow_analysis_pass.h" +#include "poly/platform.h" #include "xenia/cpu/backend/backend.h" #include "xenia/cpu/compiler/compiler.h" #include "xenia/cpu/runtime.h" diff --git a/src/xenia/cpu/compiler/passes/value_reduction_pass.cc b/src/xenia/cpu/compiler/passes/value_reduction_pass.cc index 95c0cc5e0..3cdfa1ffc 100644 --- a/src/xenia/cpu/compiler/passes/value_reduction_pass.cc +++ b/src/xenia/cpu/compiler/passes/value_reduction_pass.cc @@ -9,6 +9,7 @@ #include "xenia/cpu/compiler/passes/value_reduction_pass.h" +#include "poly/platform.h" #include "xenia/cpu/backend/backend.h" #include "xenia/cpu/compiler/compiler.h" #include "xenia/cpu/runtime.h" diff --git a/src/xenia/cpu/processor.cc b/src/xenia/cpu/processor.cc index ed38615bf..80526dbd0 100644 --- a/src/xenia/cpu/processor.cc +++ b/src/xenia/cpu/processor.cc @@ -13,6 +13,8 @@ #include "xenia/cpu/runtime.h" #include "xenia/cpu/xex_module.h" #include "xenia/export_resolver.h" +#include "xenia/logging.h" +#include "xenia/profiling.h" namespace xe { namespace cpu { diff --git a/src/xenia/cpu/processor.h b/src/xenia/cpu/processor.h index 4c125ff5e..ee675781a 100644 --- a/src/xenia/cpu/processor.h +++ b/src/xenia/cpu/processor.h @@ -13,7 +13,6 @@ #include #include -#include "xenia/common.h" #include "xenia/export_resolver.h" #include "xenia/memory.h" diff --git a/src/xenia/cpu/runtime.h b/src/xenia/cpu/runtime.h index 917d3f3ab..c4493e03d 100644 --- a/src/xenia/cpu/runtime.h +++ b/src/xenia/cpu/runtime.h @@ -10,7 +10,6 @@ #ifndef XENIA_CPU_RUNTIME_H_ #define XENIA_CPU_RUNTIME_H_ -#include "xenia/common.h" #include "xenia/cpu/backend/backend.h" #include "xenia/cpu/debugger.h" #include "xenia/cpu/entry_table.h" diff --git a/src/xenia/cpu/thread_state.h b/src/xenia/cpu/thread_state.h index feab50691..54f9d9323 100644 --- a/src/xenia/cpu/thread_state.h +++ b/src/xenia/cpu/thread_state.h @@ -12,7 +12,6 @@ #include "xenia/cpu/frontend/ppc_context.h" #include "xenia/cpu/thread_state.h" -#include "xenia/common.h" #include "xenia/memory.h" namespace xdb { diff --git a/src/xenia/cpu/xex_module.cc b/src/xenia/cpu/xex_module.cc index 4845182d1..63961ac09 100644 --- a/src/xenia/cpu/xex_module.cc +++ b/src/xenia/cpu/xex_module.cc @@ -15,6 +15,7 @@ #include "xenia/cpu/cpu-private.h" #include "xenia/cpu/runtime.h" #include "xenia/export_resolver.h" +#include "xenia/logging.h" namespace xe { namespace cpu { diff --git a/src/xenia/cpu/xex_module.h b/src/xenia/cpu/xex_module.h index 1be8eac8c..6e5de3c45 100644 --- a/src/xenia/cpu/xex_module.h +++ b/src/xenia/cpu/xex_module.h @@ -13,7 +13,6 @@ #include #include "xenia/cpu/module.h" -#include "xenia/common.h" #include "xenia/kernel/util/xex2.h" namespace xe { diff --git a/src/xenia/debug_agent.cc b/src/xenia/debug_agent.cc index e1df194de..8a1403a74 100644 --- a/src/xenia/debug_agent.cc +++ b/src/xenia/debug_agent.cc @@ -9,9 +9,12 @@ #include "xenia/debug_agent.h" -#include "poly/string.h" #include +#include "poly/memory.h" +#include "poly/string.h" +#include "xenia/logging.h" + DEFINE_string(trace_file, "", "Trace to the given file."); DEFINE_uint64(trace_capacity, 0x40000000, "Trace file capacity to allocate."); diff --git a/src/xenia/debug_agent.h b/src/xenia/debug_agent.h index 6fd1f9d8d..bfc1c9bb1 100644 --- a/src/xenia/debug_agent.h +++ b/src/xenia/debug_agent.h @@ -12,7 +12,7 @@ #include -#include "xenia/common.h" +#include "poly/platform.h" namespace xe { diff --git a/src/xenia/emulator.h b/src/xenia/emulator.h index a55d24616..a5bd6cd36 100644 --- a/src/xenia/emulator.h +++ b/src/xenia/emulator.h @@ -12,7 +12,6 @@ #include -#include "xenia/common.h" #include "xenia/debug_agent.h" #include "xenia/kernel/kernel_state.h" #include "xenia/memory.h" diff --git a/src/xenia/export_resolver.cc b/src/xenia/export_resolver.cc index 91b982c78..1a1dbf6db 100644 --- a/src/xenia/export_resolver.cc +++ b/src/xenia/export_resolver.cc @@ -9,6 +9,7 @@ #include "xenia/export_resolver.h" +#include "poly/assert.h" #include "poly/math.h" namespace xe { diff --git a/src/xenia/export_resolver.h b/src/xenia/export_resolver.h index 984346f7c..b094bb597 100644 --- a/src/xenia/export_resolver.h +++ b/src/xenia/export_resolver.h @@ -10,7 +10,6 @@ #ifndef XENIA_EXPORT_RESOLVER_H_ #define XENIA_EXPORT_RESOLVER_H_ -#include "xenia/common.h" #include #include diff --git a/src/xenia/gpu/gl4/command_processor.cc b/src/xenia/gpu/gl4/command_processor.cc index da4451e3a..1dda44c81 100644 --- a/src/xenia/gpu/gl4/command_processor.cc +++ b/src/xenia/gpu/gl4/command_processor.cc @@ -19,6 +19,8 @@ #include "xenia/gpu/sampler_info.h" #include "xenia/gpu/texture_info.h" #include "xenia/gpu/xenos.h" +#include "xenia/logging.h" +#include "xenia/profiling.h" #include "third_party/xxhash/xxhash.h" diff --git a/src/xenia/gpu/gl4/draw_batcher.cc b/src/xenia/gpu/gl4/draw_batcher.cc index bf7de6ee7..374291fe4 100644 --- a/src/xenia/gpu/gl4/draw_batcher.cc +++ b/src/xenia/gpu/gl4/draw_batcher.cc @@ -13,6 +13,7 @@ #include "poly/math.h" #include "xenia/gpu/gl4/gl4_gpu-private.h" #include "xenia/gpu/gpu-private.h" +#include "xenia/logging.h" namespace xe { namespace gpu { diff --git a/src/xenia/gpu/gl4/draw_batcher.h b/src/xenia/gpu/gl4/draw_batcher.h index 99d9121fb..61328b3bf 100644 --- a/src/xenia/gpu/gl4/draw_batcher.h +++ b/src/xenia/gpu/gl4/draw_batcher.h @@ -10,7 +10,6 @@ #ifndef XENIA_GPU_GL4_GL4_STATE_DATA_BUILDER_H_ #define XENIA_GPU_GL4_GL4_STATE_DATA_BUILDER_H_ -#include "xenia/common.h" #include "xenia/gpu/gl4/circular_buffer.h" #include "xenia/gpu/gl4/gl_context.h" #include "xenia/gpu/gl4/gl4_shader.h" diff --git a/src/xenia/gpu/gl4/gl4_gpu-private.h b/src/xenia/gpu/gl4/gl4_gpu-private.h index e6af6e3f8..19269aefc 100644 --- a/src/xenia/gpu/gl4/gl4_gpu-private.h +++ b/src/xenia/gpu/gl4/gl4_gpu-private.h @@ -12,7 +12,6 @@ #include -#include "xenia/common.h" #include "xenia/gpu/gl4/gl4_gpu.h" DECLARE_bool(thread_safe_gl); diff --git a/src/xenia/gpu/gl4/gl4_gpu.h b/src/xenia/gpu/gl4/gl4_gpu.h index 67512bdda..761cc3b2d 100644 --- a/src/xenia/gpu/gl4/gl4_gpu.h +++ b/src/xenia/gpu/gl4/gl4_gpu.h @@ -12,7 +12,6 @@ #include -#include "xenia/common.h" #include "xenia/gpu/graphics_system.h" namespace xe { diff --git a/src/xenia/gpu/gl4/gl4_graphics_system.cc b/src/xenia/gpu/gl4/gl4_graphics_system.cc index c169c4112..a3ba93c14 100644 --- a/src/xenia/gpu/gl4/gl4_graphics_system.cc +++ b/src/xenia/gpu/gl4/gl4_graphics_system.cc @@ -15,6 +15,7 @@ #include "xenia/gpu/gl4/gl4_profiler_display.h" #include "xenia/gpu/gpu-private.h" #include "xenia/gpu/tracing.h" +#include "xenia/logging.h" namespace xe { namespace gpu { diff --git a/src/xenia/gpu/gl4/gl4_graphics_system.h b/src/xenia/gpu/gl4/gl4_graphics_system.h index 69fb022c6..d1af6bcf0 100644 --- a/src/xenia/gpu/gl4/gl4_graphics_system.h +++ b/src/xenia/gpu/gl4/gl4_graphics_system.h @@ -12,7 +12,6 @@ #include -#include "xenia/common.h" #include "xenia/gpu/gl4/command_processor.h" #include "xenia/gpu/gl4/wgl_control.h" #include "xenia/gpu/graphics_system.h" diff --git a/src/xenia/gpu/gl4/gl4_profiler_display.cc b/src/xenia/gpu/gl4/gl4_profiler_display.cc index e79c56d40..cc8fb84af 100644 --- a/src/xenia/gpu/gl4/gl4_profiler_display.cc +++ b/src/xenia/gpu/gl4/gl4_profiler_display.cc @@ -11,6 +11,7 @@ #include "third_party/microprofile/microprofileui.h" +#include "poly/assert.h" #include "poly/cxx_compat.h" #include "poly/math.h" #include "xenia/gpu/gpu-private.h" diff --git a/src/xenia/gpu/gl4/gl4_profiler_display.h b/src/xenia/gpu/gl4/gl4_profiler_display.h index c7d7ea338..637c7f63c 100644 --- a/src/xenia/gpu/gl4/gl4_profiler_display.h +++ b/src/xenia/gpu/gl4/gl4_profiler_display.h @@ -10,7 +10,6 @@ #ifndef XENIA_GPU_GL4_GL4_PROFILER_DISPLAY_H_ #define XENIA_GPU_GL4_GL4_PROFILER_DISPLAY_H_ -#include "xenia/common.h" #include "xenia/gpu/gl4/circular_buffer.h" #include "xenia/gpu/gl4/gl_context.h" #include "xenia/gpu/gl4/wgl_control.h" diff --git a/src/xenia/gpu/gl4/gl4_shader.cc b/src/xenia/gpu/gl4/gl4_shader.cc index 125315e5e..1428ca8d9 100644 --- a/src/xenia/gpu/gl4/gl4_shader.cc +++ b/src/xenia/gpu/gl4/gl4_shader.cc @@ -14,6 +14,7 @@ #include "xenia/gpu/gl4/gl4_gpu-private.h" #include "xenia/gpu/gl4/gl4_shader_translator.h" #include "xenia/gpu/gpu-private.h" +#include "xenia/logging.h" namespace xe { namespace gpu { diff --git a/src/xenia/gpu/gl4/gl4_shader.h b/src/xenia/gpu/gl4/gl4_shader.h index 3c7e203a0..9b6ba3c4a 100644 --- a/src/xenia/gpu/gl4/gl4_shader.h +++ b/src/xenia/gpu/gl4/gl4_shader.h @@ -12,7 +12,6 @@ #include -#include "xenia/common.h" #include "xenia/gpu/gl4/gl_context.h" #include "xenia/gpu/shader.h" diff --git a/src/xenia/gpu/gl4/gl4_shader_translator.cc b/src/xenia/gpu/gl4/gl4_shader_translator.cc index ec48a6319..ebf030e40 100644 --- a/src/xenia/gpu/gl4/gl4_shader_translator.cc +++ b/src/xenia/gpu/gl4/gl4_shader_translator.cc @@ -9,8 +9,10 @@ #include "xenia/gpu/gl4/gl4_shader_translator.h" +#include "poly/assert.h" #include "poly/math.h" #include "xenia/gpu/gpu-private.h" +#include "xenia/logging.h" namespace xe { namespace gpu { diff --git a/src/xenia/gpu/gl4/gl4_shader_translator.h b/src/xenia/gpu/gl4/gl4_shader_translator.h index ef6032680..211ec52b8 100644 --- a/src/xenia/gpu/gl4/gl4_shader_translator.h +++ b/src/xenia/gpu/gl4/gl4_shader_translator.h @@ -13,7 +13,6 @@ #include #include "poly/string_buffer.h" -#include "xenia/common.h" #include "xenia/gpu/gl4/gl_context.h" #include "xenia/gpu/gl4/gl4_shader.h" #include "xenia/gpu/ucode.h" diff --git a/src/xenia/gpu/gl4/gl_context.cc b/src/xenia/gpu/gl4/gl_context.cc index ac64739b0..dba464afc 100644 --- a/src/xenia/gpu/gl4/gl_context.cc +++ b/src/xenia/gpu/gl4/gl_context.cc @@ -16,6 +16,8 @@ #include "poly/logging.h" #include "poly/math.h" #include "xenia/gpu/gl4/gl4_gpu-private.h" +#include "xenia/logging.h" +#include "xenia/profiling.h" namespace xe { namespace gpu { diff --git a/src/xenia/gpu/gl4/texture_cache.cc b/src/xenia/gpu/gl4/texture_cache.cc index e873415b8..8ddd18809 100644 --- a/src/xenia/gpu/gl4/texture_cache.cc +++ b/src/xenia/gpu/gl4/texture_cache.cc @@ -11,7 +11,9 @@ #include "poly/assert.h" #include "poly/math.h" +#include "poly/memory.h" #include "xenia/gpu/gpu-private.h" +#include "xenia/logging.h" namespace xe { namespace gpu { diff --git a/src/xenia/gpu/graphics_system.cc b/src/xenia/gpu/graphics_system.cc index bb64d0e44..ce12aaee8 100644 --- a/src/xenia/gpu/graphics_system.cc +++ b/src/xenia/gpu/graphics_system.cc @@ -12,6 +12,7 @@ #include "poly/poly.h" #include "xenia/cpu/processor.h" #include "xenia/gpu/gpu-private.h" +#include "xenia/logging.h" namespace xe { namespace gpu { diff --git a/src/xenia/gpu/graphics_system.h b/src/xenia/gpu/graphics_system.h index 6a78f5732..8d0a74b82 100644 --- a/src/xenia/gpu/graphics_system.h +++ b/src/xenia/gpu/graphics_system.h @@ -13,7 +13,6 @@ #include #include -#include "xenia/common.h" #include "xenia/cpu/processor.h" #include "xenia/memory.h" #include "xenia/ui/main_window.h" diff --git a/src/xenia/gpu/register_file.h b/src/xenia/gpu/register_file.h index 068cac3cc..f6d28d13f 100644 --- a/src/xenia/gpu/register_file.h +++ b/src/xenia/gpu/register_file.h @@ -10,7 +10,7 @@ #ifndef XENIA_GPU_REGISTER_FILE_H_ #define XENIA_GPU_REGISTER_FILE_H_ -#include "xenia/common.h" +#include namespace xe { namespace gpu { diff --git a/src/xenia/gpu/sampler_info.cc b/src/xenia/gpu/sampler_info.cc index e7d6dcf9c..5140db71d 100644 --- a/src/xenia/gpu/sampler_info.cc +++ b/src/xenia/gpu/sampler_info.cc @@ -9,6 +9,8 @@ #include "xenia/gpu/sampler_info.h" +#include + #include "third_party/xxhash/xxhash.h" namespace xe { diff --git a/src/xenia/gpu/shader.cc b/src/xenia/gpu/shader.cc index a1421a504..3a262e873 100644 --- a/src/xenia/gpu/shader.cc +++ b/src/xenia/gpu/shader.cc @@ -10,6 +10,7 @@ #include "xenia/gpu/shader.h" #include "poly/math.h" +#include "poly/memory.h" #include "xenia/gpu/ucode_disassembler.h" namespace xe { diff --git a/src/xenia/gpu/texture_info.h b/src/xenia/gpu/texture_info.h index d6823fdfc..6ef340cb5 100644 --- a/src/xenia/gpu/texture_info.h +++ b/src/xenia/gpu/texture_info.h @@ -10,6 +10,9 @@ #ifndef XENIA_GPU_TEXTURE_INFO_H_ #define XENIA_GPU_TEXTURE_INFO_H_ +#include + +#include "poly/assert.h" #include "xenia/gpu/ucode.h" #include "xenia/gpu/xenos.h" diff --git a/src/xenia/gpu/trace_viewer_main.cc b/src/xenia/gpu/trace_viewer_main.cc index de960fc72..9681a7396 100644 --- a/src/xenia/gpu/trace_viewer_main.cc +++ b/src/xenia/gpu/trace_viewer_main.cc @@ -19,6 +19,8 @@ #include "xenia/gpu/tracing.h" #include "xenia/gpu/xenos.h" #include "xenia/emulator.h" +#include "xenia/logging.h" +#include "xenia/profiling.h" #include "xenia/ui/main_window.h" // HACK: until we have another impl, we just use gl4 directly. diff --git a/src/xenia/gpu/ucode.h b/src/xenia/gpu/ucode.h index 32e7441b6..8d05cac49 100644 --- a/src/xenia/gpu/ucode.h +++ b/src/xenia/gpu/ucode.h @@ -10,7 +10,9 @@ #ifndef XENIA_GPU_UCODE_H_ #define XENIA_GPU_UCODE_H_ -#include "xenia/common.h" +#include + +#include "poly/platform.h" namespace xe { namespace gpu { diff --git a/src/xenia/gpu/ucode_disassembler.cc b/src/xenia/gpu/ucode_disassembler.cc index af3cab469..80471ea34 100644 --- a/src/xenia/gpu/ucode_disassembler.cc +++ b/src/xenia/gpu/ucode_disassembler.cc @@ -37,6 +37,8 @@ #include #include +#include "poly/assert.h" + namespace xe { namespace gpu { diff --git a/src/xenia/gpu/xenos.h b/src/xenia/gpu/xenos.h index 235795dcf..f81f4510e 100644 --- a/src/xenia/gpu/xenos.h +++ b/src/xenia/gpu/xenos.h @@ -10,7 +10,8 @@ #ifndef XENIA_GPU_XENOS_H_ #define XENIA_GPU_XENOS_H_ -#include "xenia/common.h" +#include "poly/assert.h" +#include "poly/byte_order.h" #include "xenia/gpu/ucode.h" namespace xe { diff --git a/src/xenia/hid/input_driver.h b/src/xenia/hid/input_driver.h index cac274ceb..913a40a18 100644 --- a/src/xenia/hid/input_driver.h +++ b/src/xenia/hid/input_driver.h @@ -10,7 +10,6 @@ #ifndef XENIA_HID_INPUT_DRIVER_H_ #define XENIA_HID_INPUT_DRIVER_H_ -#include "xenia/common.h" #include "xenia/xbox.h" namespace xe { diff --git a/src/xenia/hid/input_system.cc b/src/xenia/hid/input_system.cc index dd1f72db2..cf5b945e8 100644 --- a/src/xenia/hid/input_system.cc +++ b/src/xenia/hid/input_system.cc @@ -12,6 +12,7 @@ #include "xenia/emulator.h" #include "xenia/cpu/processor.h" #include "xenia/hid/input_driver.h" +#include "xenia/profiling.h" namespace xe { namespace hid { diff --git a/src/xenia/hid/input_system.h b/src/xenia/hid/input_system.h index adcac38ff..7d1016c1e 100644 --- a/src/xenia/hid/input_system.h +++ b/src/xenia/hid/input_system.h @@ -13,7 +13,6 @@ #include #include -#include "xenia/common.h" #include "xenia/emulator.h" #include "xenia/xbox.h" diff --git a/src/xenia/hid/nop/nop_hid-private.h b/src/xenia/hid/nop/nop_hid-private.h index 6205b8e4a..7dbc18541 100644 --- a/src/xenia/hid/nop/nop_hid-private.h +++ b/src/xenia/hid/nop/nop_hid-private.h @@ -10,7 +10,6 @@ #ifndef XENIA_HID_NOP_NOP_HID_PRIVATE_H_ #define XENIA_HID_NOP_NOP_HID_PRIVATE_H_ -#include "xenia/common.h" #include "xenia/hid/nop/nop_hid.h" namespace xe { diff --git a/src/xenia/hid/nop/nop_hid.h b/src/xenia/hid/nop/nop_hid.h index 11571dabd..9c65c1e36 100644 --- a/src/xenia/hid/nop/nop_hid.h +++ b/src/xenia/hid/nop/nop_hid.h @@ -12,12 +12,10 @@ #include -#include "xenia/common.h" +#include "xenia/hid/input_system.h" namespace xe { namespace hid { -class InputDriver; -class InputSystem; namespace nop { std::unique_ptr Create(InputSystem* input_system); diff --git a/src/xenia/hid/nop/nop_input_driver.h b/src/xenia/hid/nop/nop_input_driver.h index 7203d9d55..41001a113 100644 --- a/src/xenia/hid/nop/nop_input_driver.h +++ b/src/xenia/hid/nop/nop_input_driver.h @@ -10,7 +10,6 @@ #ifndef XENIA_HID_NOP_NOP_INPUT_DRIVER_H_ #define XENIA_HID_NOP_NOP_INPUT_DRIVER_H_ -#include "xenia/common.h" #include "xenia/hid/input_driver.h" #include "xenia/hid/nop/nop_hid-private.h" diff --git a/src/xenia/hid/winkey/winkey_hid-private.h b/src/xenia/hid/winkey/winkey_hid-private.h index c51f1b3ab..36dfb816e 100644 --- a/src/xenia/hid/winkey/winkey_hid-private.h +++ b/src/xenia/hid/winkey/winkey_hid-private.h @@ -10,7 +10,6 @@ #ifndef XENIA_HID_WINKEY_WINKEY_HID_PRIVATE_H_ #define XENIA_HID_WINKEY_WINKEY_HID_PRIVATE_H_ -#include "xenia/common.h" #include "xenia/hid/winkey/winkey_hid.h" namespace xe { diff --git a/src/xenia/hid/winkey/winkey_hid.h b/src/xenia/hid/winkey/winkey_hid.h index 9339bf356..540885bfa 100644 --- a/src/xenia/hid/winkey/winkey_hid.h +++ b/src/xenia/hid/winkey/winkey_hid.h @@ -12,12 +12,10 @@ #include -#include "xenia/common.h" +#include "xenia/hid/input_system.h" namespace xe { namespace hid { -class InputDriver; -class InputSystem; namespace winkey { std::unique_ptr Create(InputSystem* input_system); diff --git a/src/xenia/hid/winkey/winkey_input_driver.h b/src/xenia/hid/winkey/winkey_input_driver.h index 60ef6d1bc..cf67ac82e 100644 --- a/src/xenia/hid/winkey/winkey_input_driver.h +++ b/src/xenia/hid/winkey/winkey_input_driver.h @@ -10,7 +10,6 @@ #ifndef XENIA_HID_WINKEY_WINKEY_DRIVER_H_ #define XENIA_HID_WINKEY_WINKEY_DRIVER_H_ -#include "xenia/common.h" #include "xenia/hid/input_driver.h" #include "xenia/hid/nop/nop_hid-private.h" diff --git a/src/xenia/hid/xinput/xinput_hid-private.h b/src/xenia/hid/xinput/xinput_hid-private.h index b6beed6f4..2bd110a1b 100644 --- a/src/xenia/hid/xinput/xinput_hid-private.h +++ b/src/xenia/hid/xinput/xinput_hid-private.h @@ -10,7 +10,6 @@ #ifndef XENIA_HID_XINPUT_XINPUT_HID_PRIVATE_H_ #define XENIA_HID_XINPUT_XINPUT_HID_PRIVATE_H_ -#include "xenia/common.h" #include "xenia/hid/xinput/xinput_hid.h" namespace xe { diff --git a/src/xenia/hid/xinput/xinput_hid.h b/src/xenia/hid/xinput/xinput_hid.h index 859ef88ab..a63b66350 100644 --- a/src/xenia/hid/xinput/xinput_hid.h +++ b/src/xenia/hid/xinput/xinput_hid.h @@ -12,12 +12,10 @@ #include -#include "xenia/common.h" +#include "xenia/hid/input_system.h" namespace xe { namespace hid { -class InputDriver; -class InputSystem; namespace xinput { std::unique_ptr Create(InputSystem* input_system); diff --git a/src/xenia/hid/xinput/xinput_input_driver.h b/src/xenia/hid/xinput/xinput_input_driver.h index e8a83c830..d7ad76c89 100644 --- a/src/xenia/hid/xinput/xinput_input_driver.h +++ b/src/xenia/hid/xinput/xinput_input_driver.h @@ -10,7 +10,6 @@ #ifndef XENIA_HID_XINPUT_XINPUT_DRIVER_H_ #define XENIA_HID_XINPUT_XINPUT_DRIVER_H_ -#include "xenia/common.h" #include "xenia/hid/input_driver.h" #include "xenia/hid/nop/nop_hid-private.h" diff --git a/src/xenia/kernel/app.h b/src/xenia/kernel/app.h index 01d7f2349..bb6fb8c5d 100644 --- a/src/xenia/kernel/app.h +++ b/src/xenia/kernel/app.h @@ -13,7 +13,6 @@ #include #include -#include "xenia/common.h" #include "xenia/memory.h" #include "xenia/xbox.h" diff --git a/src/xenia/kernel/apps/apps.h b/src/xenia/kernel/apps/apps.h index fa6be30b0..f9eb65603 100644 --- a/src/xenia/kernel/apps/apps.h +++ b/src/xenia/kernel/apps/apps.h @@ -10,7 +10,6 @@ #ifndef XENIA_KERNEL_XBOXKRNL_APPS_APPS_H_ #define XENIA_KERNEL_XBOXKRNL_APPS_APPS_H_ -#include "xenia/common.h" #include "xenia/kernel/app.h" #include "xenia/kernel/kernel_state.h" diff --git a/src/xenia/kernel/apps/xgi_app.cc b/src/xenia/kernel/apps/xgi_app.cc index e99d36e94..eb55331ed 100644 --- a/src/xenia/kernel/apps/xgi_app.cc +++ b/src/xenia/kernel/apps/xgi_app.cc @@ -10,6 +10,7 @@ #include "xenia/kernel/apps/xgi_app.h" #include "poly/threading.h" +#include "xenia/logging.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/apps/xgi_app.h b/src/xenia/kernel/apps/xgi_app.h index d376e6add..e1e7b649a 100644 --- a/src/xenia/kernel/apps/xgi_app.h +++ b/src/xenia/kernel/apps/xgi_app.h @@ -10,7 +10,6 @@ #ifndef XENIA_KERNEL_XBOXKRNL_APPS_XGI_APP_H_ #define XENIA_KERNEL_XBOXKRNL_APPS_XGI_APP_H_ -#include "xenia/common.h" #include "xenia/kernel/app.h" #include "xenia/kernel/kernel_state.h" diff --git a/src/xenia/kernel/apps/xlivebase_app.cc b/src/xenia/kernel/apps/xlivebase_app.cc index 7488a7ad3..909d503b0 100644 --- a/src/xenia/kernel/apps/xlivebase_app.cc +++ b/src/xenia/kernel/apps/xlivebase_app.cc @@ -10,6 +10,7 @@ #include "xenia/kernel/apps/xlivebase_app.h" #include "poly/threading.h" +#include "xenia/logging.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/apps/xlivebase_app.h b/src/xenia/kernel/apps/xlivebase_app.h index 8a069f17a..ecf7d914f 100644 --- a/src/xenia/kernel/apps/xlivebase_app.h +++ b/src/xenia/kernel/apps/xlivebase_app.h @@ -10,7 +10,6 @@ #ifndef XENIA_KERNEL_XBOXKRNL_APPS_XLIVEBASE_APP_H_ #define XENIA_KERNEL_XBOXKRNL_APPS_XLIVEBASE_APP_H_ -#include "xenia/common.h" #include "xenia/kernel/app.h" #include "xenia/kernel/kernel_state.h" diff --git a/src/xenia/kernel/apps/xmp_app.cc b/src/xenia/kernel/apps/xmp_app.cc index 361de7274..8344969d2 100644 --- a/src/xenia/kernel/apps/xmp_app.cc +++ b/src/xenia/kernel/apps/xmp_app.cc @@ -10,6 +10,7 @@ #include "xenia/kernel/apps/xmp_app.h" #include "poly/threading.h" +#include "xenia/logging.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/apps/xmp_app.h b/src/xenia/kernel/apps/xmp_app.h index 3c2b50640..66a1a00b7 100644 --- a/src/xenia/kernel/apps/xmp_app.h +++ b/src/xenia/kernel/apps/xmp_app.h @@ -16,7 +16,6 @@ #include #include -#include "xenia/common.h" #include "xenia/kernel/app.h" #include "xenia/kernel/kernel_state.h" diff --git a/src/xenia/kernel/async_request.h b/src/xenia/kernel/async_request.h index a75a0f8a5..a6c1de290 100644 --- a/src/xenia/kernel/async_request.h +++ b/src/xenia/kernel/async_request.h @@ -12,7 +12,6 @@ #include -#include "xenia/common.h" #include "xenia/xbox.h" namespace xe { diff --git a/src/xenia/kernel/content_manager.h b/src/xenia/kernel/content_manager.h index 45128aff5..c7d6436f4 100644 --- a/src/xenia/kernel/content_manager.h +++ b/src/xenia/kernel/content_manager.h @@ -17,7 +17,6 @@ #include #include "poly/memory.h" -#include "xenia/common.h" #include "xenia/xbox.h" namespace xe { diff --git a/src/xenia/kernel/dispatcher.h b/src/xenia/kernel/dispatcher.h index 7e5875612..0c165ca07 100644 --- a/src/xenia/kernel/dispatcher.h +++ b/src/xenia/kernel/dispatcher.h @@ -12,7 +12,6 @@ #include -#include "xenia/common.h" #include "xenia/xbox.h" namespace xe { diff --git a/src/xenia/kernel/fs/device.h b/src/xenia/kernel/fs/device.h index 52afeadf8..e08b59a67 100644 --- a/src/xenia/kernel/fs/device.h +++ b/src/xenia/kernel/fs/device.h @@ -13,7 +13,6 @@ #include #include -#include "xenia/common.h" #include "xenia/kernel/fs/entry.h" namespace xe { diff --git a/src/xenia/kernel/fs/devices/disc_image_device.cc b/src/xenia/kernel/fs/devices/disc_image_device.cc index 11ab1dfe7..91d9856ce 100644 --- a/src/xenia/kernel/fs/devices/disc_image_device.cc +++ b/src/xenia/kernel/fs/devices/disc_image_device.cc @@ -12,6 +12,7 @@ #include "poly/math.h" #include "xenia/kernel/fs/gdfx.h" #include "xenia/kernel/fs/devices/disc_image_entry.h" +#include "xenia/logging.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/fs/devices/disc_image_device.h b/src/xenia/kernel/fs/devices/disc_image_device.h index 5f398982f..346cf7683 100644 --- a/src/xenia/kernel/fs/devices/disc_image_device.h +++ b/src/xenia/kernel/fs/devices/disc_image_device.h @@ -14,7 +14,6 @@ #include #include "poly/mapped_memory.h" -#include "xenia/common.h" #include "xenia/kernel/fs/device.h" namespace xe { diff --git a/src/xenia/kernel/fs/devices/disc_image_entry.h b/src/xenia/kernel/fs/devices/disc_image_entry.h index ece0afa65..4f4062d9a 100644 --- a/src/xenia/kernel/fs/devices/disc_image_entry.h +++ b/src/xenia/kernel/fs/devices/disc_image_entry.h @@ -13,7 +13,6 @@ #include #include "poly/mapped_memory.h" -#include "xenia/common.h" #include "xenia/kernel/fs/entry.h" #include "poly/fs.h" #include "xenia/kernel/fs/gdfx.h" diff --git a/src/xenia/kernel/fs/devices/disc_image_file.h b/src/xenia/kernel/fs/devices/disc_image_file.h index 04926a8eb..cb041d15f 100644 --- a/src/xenia/kernel/fs/devices/disc_image_file.h +++ b/src/xenia/kernel/fs/devices/disc_image_file.h @@ -10,7 +10,6 @@ #ifndef XENIA_KERNEL_FS_DEVICES_DISC_IMAGE_FILE_H_ #define XENIA_KERNEL_FS_DEVICES_DISC_IMAGE_FILE_H_ -#include "xenia/common.h" #include "xenia/kernel/objects/xfile.h" namespace xe { diff --git a/src/xenia/kernel/fs/devices/host_path_device.cc b/src/xenia/kernel/fs/devices/host_path_device.cc index e0fba64ee..d48ed91e9 100644 --- a/src/xenia/kernel/fs/devices/host_path_device.cc +++ b/src/xenia/kernel/fs/devices/host_path_device.cc @@ -12,6 +12,7 @@ #include "poly/fs.h" #include "xenia/kernel/fs/devices/host_path_entry.h" #include "xenia/kernel/objects/xfile.h" +#include "xenia/logging.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/fs/devices/host_path_device.h b/src/xenia/kernel/fs/devices/host_path_device.h index adbd1d572..ccb228798 100644 --- a/src/xenia/kernel/fs/devices/host_path_device.h +++ b/src/xenia/kernel/fs/devices/host_path_device.h @@ -12,7 +12,6 @@ #include -#include "xenia/common.h" #include "xenia/kernel/fs/device.h" namespace xe { diff --git a/src/xenia/kernel/fs/devices/host_path_entry.cc b/src/xenia/kernel/fs/devices/host_path_entry.cc index 459206093..5c1060d55 100644 --- a/src/xenia/kernel/fs/devices/host_path_entry.cc +++ b/src/xenia/kernel/fs/devices/host_path_entry.cc @@ -10,6 +10,7 @@ #include "xenia/kernel/fs/devices/host_path_entry.h" #include "poly/mapped_memory.h" +#include "poly/string.h" #include "xenia/kernel/fs/devices/host_path_file.h" namespace xe { diff --git a/src/xenia/kernel/fs/devices/host_path_entry.h b/src/xenia/kernel/fs/devices/host_path_entry.h index a495c535e..c023a14be 100644 --- a/src/xenia/kernel/fs/devices/host_path_entry.h +++ b/src/xenia/kernel/fs/devices/host_path_entry.h @@ -10,7 +10,6 @@ #ifndef XENIA_KERNEL_FS_DEVICES_HOST_PATH_ENTRY_H_ #define XENIA_KERNEL_FS_DEVICES_HOST_PATH_ENTRY_H_ -#include "xenia/common.h" #include "xenia/kernel/fs/entry.h" namespace xe { diff --git a/src/xenia/kernel/fs/devices/host_path_file.h b/src/xenia/kernel/fs/devices/host_path_file.h index e30437090..0921059ec 100644 --- a/src/xenia/kernel/fs/devices/host_path_file.h +++ b/src/xenia/kernel/fs/devices/host_path_file.h @@ -12,7 +12,6 @@ #include -#include "xenia/common.h" #include "xenia/kernel/objects/xfile.h" namespace xe { diff --git a/src/xenia/kernel/fs/devices/stfs_container_device.cc b/src/xenia/kernel/fs/devices/stfs_container_device.cc index 774d499e4..4a8b350cd 100644 --- a/src/xenia/kernel/fs/devices/stfs_container_device.cc +++ b/src/xenia/kernel/fs/devices/stfs_container_device.cc @@ -13,6 +13,7 @@ #include "xenia/kernel/fs/stfs.h" #include "xenia/kernel/fs/devices/stfs_container_entry.h" #include "xenia/kernel/objects/xfile.h" +#include "xenia/logging.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/fs/devices/stfs_container_device.h b/src/xenia/kernel/fs/devices/stfs_container_device.h index 99b6de654..ce3c14802 100644 --- a/src/xenia/kernel/fs/devices/stfs_container_device.h +++ b/src/xenia/kernel/fs/devices/stfs_container_device.h @@ -14,7 +14,6 @@ #include #include "poly/mapped_memory.h" -#include "xenia/common.h" #include "xenia/kernel/fs/device.h" namespace xe { diff --git a/src/xenia/kernel/fs/devices/stfs_container_entry.h b/src/xenia/kernel/fs/devices/stfs_container_entry.h index b4de95570..5d5dbbadf 100644 --- a/src/xenia/kernel/fs/devices/stfs_container_entry.h +++ b/src/xenia/kernel/fs/devices/stfs_container_entry.h @@ -14,7 +14,6 @@ #include #include "poly/mapped_memory.h" -#include "xenia/common.h" #include "xenia/kernel/fs/entry.h" #include "poly/fs.h" #include "xenia/kernel/fs/stfs.h" diff --git a/src/xenia/kernel/fs/devices/stfs_container_file.h b/src/xenia/kernel/fs/devices/stfs_container_file.h index 64bff0c80..7c91092cd 100644 --- a/src/xenia/kernel/fs/devices/stfs_container_file.h +++ b/src/xenia/kernel/fs/devices/stfs_container_file.h @@ -10,7 +10,6 @@ #ifndef XENIA_KERNEL_FS_DEVICES_STFS_CONTAINER_FILE_H_ #define XENIA_KERNEL_FS_DEVICES_STFS_CONTAINER_FILE_H_ -#include "xenia/common.h" #include "xenia/kernel/objects/xfile.h" namespace xe { diff --git a/src/xenia/kernel/fs/entry.cc b/src/xenia/kernel/fs/entry.cc index 490487bda..af2f11415 100644 --- a/src/xenia/kernel/fs/entry.cc +++ b/src/xenia/kernel/fs/entry.cc @@ -8,6 +8,8 @@ */ #include "xenia/kernel/fs/entry.h" + +#include "poly/string.h" #include "xenia/kernel/fs/device.h" namespace xe { diff --git a/src/xenia/kernel/fs/entry.h b/src/xenia/kernel/fs/entry.h index 436f7f03b..441dcd981 100644 --- a/src/xenia/kernel/fs/entry.h +++ b/src/xenia/kernel/fs/entry.h @@ -13,7 +13,6 @@ #include #include -#include "xenia/common.h" #include "xenia/xbox.h" namespace xe { diff --git a/src/xenia/kernel/fs/filesystem.cc b/src/xenia/kernel/fs/filesystem.cc index 9ea573c4f..44b29ad43 100644 --- a/src/xenia/kernel/fs/filesystem.cc +++ b/src/xenia/kernel/fs/filesystem.cc @@ -9,11 +9,12 @@ #include "xenia/kernel/fs/filesystem.h" +#include "poly/fs.h" #include "poly/string.h" #include "xenia/kernel/fs/devices/disc_image_device.h" #include "xenia/kernel/fs/devices/host_path_device.h" #include "xenia/kernel/fs/devices/stfs_container_device.h" -#include "poly/fs.h" +#include "xenia/logging.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/fs/filesystem.h b/src/xenia/kernel/fs/filesystem.h index 6c87e6455..7b4e7ecbc 100644 --- a/src/xenia/kernel/fs/filesystem.h +++ b/src/xenia/kernel/fs/filesystem.h @@ -15,7 +15,6 @@ #include #include -#include "xenia/common.h" #include "xenia/kernel/fs/entry.h" namespace xe { diff --git a/src/xenia/kernel/fs/gdfx.h b/src/xenia/kernel/fs/gdfx.h index 2caedd780..450934397 100644 --- a/src/xenia/kernel/fs/gdfx.h +++ b/src/xenia/kernel/fs/gdfx.h @@ -13,7 +13,6 @@ #include #include "poly/mapped_memory.h" -#include "xenia/common.h" #include "xenia/xbox.h" #include "xenia/kernel/fs/entry.h" #include "poly/fs.h" diff --git a/src/xenia/kernel/fs/stfs.cc b/src/xenia/kernel/fs/stfs.cc index b749c4d76..0ee341ff8 100644 --- a/src/xenia/kernel/fs/stfs.cc +++ b/src/xenia/kernel/fs/stfs.cc @@ -13,6 +13,8 @@ #include +#include "xenia/logging.h" + namespace xe { namespace kernel { namespace fs { diff --git a/src/xenia/kernel/fs/stfs.h b/src/xenia/kernel/fs/stfs.h index a3d9f48a2..98994d531 100644 --- a/src/xenia/kernel/fs/stfs.h +++ b/src/xenia/kernel/fs/stfs.h @@ -14,7 +14,6 @@ #include #include "poly/mapped_memory.h" -#include "xenia/common.h" #include "xenia/xbox.h" #include "xenia/kernel/fs/entry.h" #include "poly/fs.h" diff --git a/src/xenia/kernel/kernel_state.h b/src/xenia/kernel/kernel_state.h index 8aebeac24..0ec3595b7 100644 --- a/src/xenia/kernel/kernel_state.h +++ b/src/xenia/kernel/kernel_state.h @@ -13,7 +13,6 @@ #include #include -#include "xenia/common.h" #include "xenia/export_resolver.h" #include "xenia/kernel/app.h" #include "xenia/kernel/content_manager.h" diff --git a/src/xenia/kernel/native_list.h b/src/xenia/kernel/native_list.h index 37f9f19bd..f95fe4859 100644 --- a/src/xenia/kernel/native_list.h +++ b/src/xenia/kernel/native_list.h @@ -10,7 +10,6 @@ #ifndef XENIA_KERNEL_XBOXKRNL_NATIVE_LIST_H_ #define XENIA_KERNEL_XBOXKRNL_NATIVE_LIST_H_ -#include "xenia/common.h" #include "xenia/memory.h" #include "xenia/xbox.h" diff --git a/src/xenia/kernel/object_table.h b/src/xenia/kernel/object_table.h index 7637b3ad5..4da6f1a54 100644 --- a/src/xenia/kernel/object_table.h +++ b/src/xenia/kernel/object_table.h @@ -14,7 +14,6 @@ #include #include -#include "xenia/common.h" #include "xenia/xbox.h" namespace xe { diff --git a/src/xenia/kernel/objects/xkernel_module.cc b/src/xenia/kernel/objects/xkernel_module.cc index c76803378..73cb86ffc 100644 --- a/src/xenia/kernel/objects/xkernel_module.cc +++ b/src/xenia/kernel/objects/xkernel_module.cc @@ -12,6 +12,7 @@ #include "xenia/emulator.h" #include "xenia/cpu/cpu.h" #include "xenia/kernel/objects/xthread.h" +#include "xenia/logging.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/objects/xthread.cc b/src/xenia/kernel/objects/xthread.cc index 94df7fce2..9261db770 100644 --- a/src/xenia/kernel/objects/xthread.cc +++ b/src/xenia/kernel/objects/xthread.cc @@ -15,6 +15,8 @@ #include "xenia/kernel/native_list.h" #include "xenia/kernel/objects/xevent.h" #include "xenia/kernel/objects/xuser_module.h" +#include "xenia/logging.h" +#include "xenia/profiling.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/objects/xtimer.cc b/src/xenia/kernel/objects/xtimer.cc index 35049f80c..99efb7cd5 100644 --- a/src/xenia/kernel/objects/xtimer.cc +++ b/src/xenia/kernel/objects/xtimer.cc @@ -10,6 +10,7 @@ #include "xenia/kernel/objects/xtimer.h" #include "xenia/cpu/processor.h" +#include "xenia/logging.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/objects/xuser_module.cc b/src/xenia/kernel/objects/xuser_module.cc index a15f00d28..a0301f13f 100644 --- a/src/xenia/kernel/objects/xuser_module.cc +++ b/src/xenia/kernel/objects/xuser_module.cc @@ -13,6 +13,7 @@ #include "xenia/cpu/cpu.h" #include "xenia/kernel/objects/xfile.h" #include "xenia/kernel/objects/xthread.h" +#include "xenia/logging.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/user_profile.h b/src/xenia/kernel/user_profile.h index eaccbcd95..c831e9b85 100644 --- a/src/xenia/kernel/user_profile.h +++ b/src/xenia/kernel/user_profile.h @@ -15,7 +15,6 @@ #include #include -#include "xenia/common.h" #include "xenia/xbox.h" namespace xe { diff --git a/src/xenia/kernel/util/shim_utils.h b/src/xenia/kernel/util/shim_utils.h index 7e00286f6..cd03d7a2e 100644 --- a/src/xenia/kernel/util/shim_utils.h +++ b/src/xenia/kernel/util/shim_utils.h @@ -11,7 +11,6 @@ #define XENIA_KERNEL_UTIL_SHIM_UTILS_H_ #include "xenia/cpu/frontend/ppc_context.h" -#include "xenia/common.h" #include "xenia/export_resolver.h" namespace xe { diff --git a/src/xenia/kernel/util/xex2.cc b/src/xenia/kernel/util/xex2.cc index 5fe59ceea..bd03dd6bb 100644 --- a/src/xenia/kernel/util/xex2.cc +++ b/src/xenia/kernel/util/xex2.cc @@ -13,7 +13,7 @@ #include #include -#include "poly/math.h" + #include "third_party/crypto/rijndael-alg-fst.h" #include "third_party/crypto/rijndael-alg-fst.c" #include "third_party/mspack/lzx.h" @@ -21,6 +21,11 @@ #include "third_party/mspack/mspack.h" #include "third_party/pe/pe_image.h" +#include "poly/math.h" +#include "poly/memory.h" +#include "poly/platform.h" +#include "xenia/logging.h" + // TODO(benvanik): remove. #define XEEXPECTZERO(expr) \ if ((expr) != 0) { \ diff --git a/src/xenia/kernel/util/xex2.h b/src/xenia/kernel/util/xex2.h index fac0a56a6..212badb7c 100644 --- a/src/xenia/kernel/util/xex2.h +++ b/src/xenia/kernel/util/xex2.h @@ -10,7 +10,6 @@ #ifndef XENIA_KERNEL_UTIL_XEX2_H_ #define XENIA_KERNEL_UTIL_XEX2_H_ -#include "xenia/common.h" #include "xenia/kernel/util/xex2_info.h" #include "xenia/memory.h" diff --git a/src/xenia/kernel/util/xex2_info.h b/src/xenia/kernel/util/xex2_info.h index 83a4fbe73..5256fa5cd 100644 --- a/src/xenia/kernel/util/xex2_info.h +++ b/src/xenia/kernel/util/xex2_info.h @@ -10,7 +10,7 @@ #ifndef XENIA_KERNEL_XEX2_INFO_H_ #define XENIA_KERNEL_XEX2_INFO_H_ -#include "xenia/common.h" +#include typedef enum { XEX_HEADER_RESOURCE_INFO = 0x000002FF, diff --git a/src/xenia/kernel/xam_content.cc b/src/xenia/kernel/xam_content.cc index fa74758c6..6f2199664 100644 --- a/src/xenia/kernel/xam_content.cc +++ b/src/xenia/kernel/xam_content.cc @@ -7,11 +7,11 @@ ****************************************************************************** */ -#include "xenia/common.h" #include "xenia/kernel/kernel_state.h" #include "xenia/kernel/objects/xenumerator.h" #include "xenia/kernel/util/shim_utils.h" #include "xenia/kernel/xam_private.h" +#include "xenia/logging.h" #include "xenia/xbox.h" namespace xe { diff --git a/src/xenia/kernel/xam_info.cc b/src/xenia/kernel/xam_info.cc index fd41fc4c4..ae1614e51 100644 --- a/src/xenia/kernel/xam_info.cc +++ b/src/xenia/kernel/xam_info.cc @@ -7,13 +7,13 @@ ****************************************************************************** */ -#include "xenia/common.h" #include "xenia/kernel/kernel_state.h" #include "xenia/kernel/objects/xenumerator.h" #include "xenia/kernel/objects/xuser_module.h" #include "xenia/kernel/util/shim_utils.h" #include "xenia/kernel/util/xex2.h" #include "xenia/kernel/xam_private.h" +#include "xenia/logging.h" #include "xenia/xbox.h" namespace xe { diff --git a/src/xenia/kernel/xam_input.cc b/src/xenia/kernel/xam_input.cc index 4f78c4947..799fe5649 100644 --- a/src/xenia/kernel/xam_input.cc +++ b/src/xenia/kernel/xam_input.cc @@ -7,12 +7,12 @@ ****************************************************************************** */ -#include "xenia/common.h" #include "xenia/emulator.h" #include "xenia/hid/hid.h" #include "xenia/kernel/kernel_state.h" #include "xenia/kernel/util/shim_utils.h" #include "xenia/kernel/xam_private.h" +#include "xenia/logging.h" #include "xenia/xbox.h" namespace xe { diff --git a/src/xenia/kernel/xam_module.h b/src/xenia/kernel/xam_module.h index 30450fefa..ea1fa0636 100644 --- a/src/xenia/kernel/xam_module.h +++ b/src/xenia/kernel/xam_module.h @@ -10,7 +10,6 @@ #ifndef XENIA_KERNEL_XAM_H_ #define XENIA_KERNEL_XAM_H_ -#include "xenia/common.h" #include "xenia/export_resolver.h" #include "xenia/kernel/objects/xkernel_module.h" #include "xenia/kernel/xam_ordinals.h" diff --git a/src/xenia/kernel/xam_msg.cc b/src/xenia/kernel/xam_msg.cc index 1a4648f5f..9b089d852 100644 --- a/src/xenia/kernel/xam_msg.cc +++ b/src/xenia/kernel/xam_msg.cc @@ -7,11 +7,11 @@ ****************************************************************************** */ -#include "xenia/common.h" #include "xenia/kernel/kernel_state.h" #include "xenia/kernel/objects/xevent.h" #include "xenia/kernel/util/shim_utils.h" #include "xenia/kernel/xam_private.h" +#include "xenia/logging.h" #include "xenia/xbox.h" namespace xe { diff --git a/src/xenia/kernel/xam_net.cc b/src/xenia/kernel/xam_net.cc index 5883d2bfb..837630247 100644 --- a/src/xenia/kernel/xam_net.cc +++ b/src/xenia/kernel/xam_net.cc @@ -10,10 +10,10 @@ #define _WINSOCK_DEPRECATED_NO_WARNINGS // inet_addr #include -#include "xenia/common.h" #include "xenia/kernel/kernel_state.h" #include "xenia/kernel/util/shim_utils.h" #include "xenia/kernel/xam_private.h" +#include "xenia/logging.h" #include "xenia/xbox.h" namespace xe { diff --git a/src/xenia/kernel/xam_notify.cc b/src/xenia/kernel/xam_notify.cc index 3d8248157..71265030b 100644 --- a/src/xenia/kernel/xam_notify.cc +++ b/src/xenia/kernel/xam_notify.cc @@ -7,11 +7,11 @@ ****************************************************************************** */ -#include "xenia/common.h" #include "xenia/kernel/kernel_state.h" #include "xenia/kernel/objects/xnotify_listener.h" #include "xenia/kernel/util/shim_utils.h" #include "xenia/kernel/xam_private.h" +#include "xenia/logging.h" #include "xenia/xbox.h" namespace xe { diff --git a/src/xenia/kernel/xam_ordinals.h b/src/xenia/kernel/xam_ordinals.h index b5eeae966..cd09a0699 100644 --- a/src/xenia/kernel/xam_ordinals.h +++ b/src/xenia/kernel/xam_ordinals.h @@ -10,7 +10,6 @@ #ifndef XENIA_KERNEL_XAM_ORDINALS_H_ #define XENIA_KERNEL_XAM_ORDINALS_H_ -#include "xenia/common.h" #include "xenia/export_resolver.h" // Build an ordinal enum to make it easy to lookup ordinals. diff --git a/src/xenia/kernel/xam_private.h b/src/xenia/kernel/xam_private.h index 87f33b060..0aa30a693 100644 --- a/src/xenia/kernel/xam_private.h +++ b/src/xenia/kernel/xam_private.h @@ -10,7 +10,6 @@ #ifndef XENIA_KERNEL_XAM_PRIVATE_H_ #define XENIA_KERNEL_XAM_PRIVATE_H_ -#include "xenia/common.h" #include "xenia/kernel/xam_ordinals.h" namespace xe { diff --git a/src/xenia/kernel/xam_ui.cc b/src/xenia/kernel/xam_ui.cc index f25a20b39..b0e095ecc 100644 --- a/src/xenia/kernel/xam_ui.cc +++ b/src/xenia/kernel/xam_ui.cc @@ -7,10 +7,10 @@ ****************************************************************************** */ -#include "xenia/common.h" #include "xenia/kernel/kernel_state.h" #include "xenia/kernel/util/shim_utils.h" #include "xenia/kernel/xam_private.h" +#include "xenia/logging.h" #include "xenia/xbox.h" namespace xe { diff --git a/src/xenia/kernel/xam_user.cc b/src/xenia/kernel/xam_user.cc index 690dfbc32..279f9487e 100644 --- a/src/xenia/kernel/xam_user.cc +++ b/src/xenia/kernel/xam_user.cc @@ -7,12 +7,12 @@ ****************************************************************************** */ -#include "xenia/common.h" #include "xenia/kernel/kernel_state.h" #include "xenia/kernel/objects/xenumerator.h" #include "xenia/kernel/objects/xthread.h" #include "xenia/kernel/util/shim_utils.h" #include "xenia/kernel/xam_private.h" +#include "xenia/logging.h" #include "xenia/xbox.h" namespace xe { diff --git a/src/xenia/kernel/xam_video.cc b/src/xenia/kernel/xam_video.cc index fed42db97..511a400ad 100644 --- a/src/xenia/kernel/xam_video.cc +++ b/src/xenia/kernel/xam_video.cc @@ -7,7 +7,6 @@ ****************************************************************************** */ -#include "xenia/common.h" #include "xenia/kernel/kernel_state.h" #include "xenia/kernel/util/shim_utils.h" #include "xenia/kernel/xam_private.h" diff --git a/src/xenia/kernel/xam_voice.cc b/src/xenia/kernel/xam_voice.cc index fb48e1009..1febfcd81 100644 --- a/src/xenia/kernel/xam_voice.cc +++ b/src/xenia/kernel/xam_voice.cc @@ -7,11 +7,11 @@ ****************************************************************************** */ -#include "xenia/common.h" #include "xenia/emulator.h" #include "xenia/kernel/kernel_state.h" #include "xenia/kernel/util/shim_utils.h" #include "xenia/kernel/xam_private.h" +#include "xenia/logging.h" #include "xenia/xbox.h" namespace xe { diff --git a/src/xenia/kernel/xboxkrnl_audio.cc b/src/xenia/kernel/xboxkrnl_audio.cc index d1f6d348b..3d8c42b8d 100644 --- a/src/xenia/kernel/xboxkrnl_audio.cc +++ b/src/xenia/kernel/xboxkrnl_audio.cc @@ -8,11 +8,11 @@ */ #include "xenia/apu/apu.h" -#include "xenia/common.h" #include "xenia/emulator.h" #include "xenia/kernel/kernel_state.h" #include "xenia/kernel/util/shim_utils.h" #include "xenia/kernel/xboxkrnl_private.h" +#include "xenia/logging.h" #include "xenia/xbox.h" namespace xe { diff --git a/src/xenia/kernel/xboxkrnl_audio_xma.cc b/src/xenia/kernel/xboxkrnl_audio_xma.cc index 3df6144a4..62a5d012d 100644 --- a/src/xenia/kernel/xboxkrnl_audio_xma.cc +++ b/src/xenia/kernel/xboxkrnl_audio_xma.cc @@ -8,11 +8,11 @@ */ #include "xenia/apu/apu.h" -#include "xenia/common.h" #include "xenia/emulator.h" #include "xenia/kernel/kernel_state.h" #include "xenia/kernel/util/shim_utils.h" #include "xenia/kernel/xboxkrnl_private.h" +#include "xenia/logging.h" #include "xenia/xbox.h" namespace xe { diff --git a/src/xenia/kernel/xboxkrnl_debug.cc b/src/xenia/kernel/xboxkrnl_debug.cc index a954d3c31..f7d4069b4 100644 --- a/src/xenia/kernel/xboxkrnl_debug.cc +++ b/src/xenia/kernel/xboxkrnl_debug.cc @@ -7,11 +7,11 @@ ****************************************************************************** */ -#include "xenia/common.h" #include "xenia/kernel/kernel_state.h" #include "xenia/kernel/objects/xthread.h" #include "xenia/kernel/util/shim_utils.h" #include "xenia/kernel/xboxkrnl_private.h" +#include "xenia/logging.h" #include "xenia/xbox.h" namespace xe { diff --git a/src/xenia/kernel/xboxkrnl_hal.cc b/src/xenia/kernel/xboxkrnl_hal.cc index 8c75e65f4..e694d680c 100644 --- a/src/xenia/kernel/xboxkrnl_hal.cc +++ b/src/xenia/kernel/xboxkrnl_hal.cc @@ -7,10 +7,10 @@ ****************************************************************************** */ -#include "xenia/common.h" #include "xenia/kernel/kernel_state.h" #include "xenia/kernel/util/shim_utils.h" #include "xenia/kernel/xboxkrnl_private.h" +#include "xenia/logging.h" #include "xenia/xbox.h" namespace xe { diff --git a/src/xenia/kernel/xboxkrnl_io.cc b/src/xenia/kernel/xboxkrnl_io.cc index 84b05a2b1..cf4907a62 100644 --- a/src/xenia/kernel/xboxkrnl_io.cc +++ b/src/xenia/kernel/xboxkrnl_io.cc @@ -8,13 +8,13 @@ */ #include "poly/memory.h" -#include "xenia/common.h" #include "xenia/kernel/async_request.h" #include "xenia/kernel/kernel_state.h" #include "xenia/kernel/objects/xevent.h" #include "xenia/kernel/objects/xfile.h" #include "xenia/kernel/util/shim_utils.h" #include "xenia/kernel/xboxkrnl_private.h" +#include "xenia/logging.h" #include "xenia/xbox.h" namespace xe { diff --git a/src/xenia/kernel/xboxkrnl_memory.cc b/src/xenia/kernel/xboxkrnl_memory.cc index a7604c2dc..248e4ed58 100644 --- a/src/xenia/kernel/xboxkrnl_memory.cc +++ b/src/xenia/kernel/xboxkrnl_memory.cc @@ -8,10 +8,10 @@ */ #include "poly/math.h" -#include "xenia/common.h" #include "xenia/kernel/kernel_state.h" #include "xenia/kernel/util/shim_utils.h" #include "xenia/kernel/xboxkrnl_private.h" +#include "xenia/logging.h" #include "xenia/xbox.h" namespace xe { diff --git a/src/xenia/kernel/xboxkrnl_misc.cc b/src/xenia/kernel/xboxkrnl_misc.cc index 2d09ebc11..cd9f51393 100644 --- a/src/xenia/kernel/xboxkrnl_misc.cc +++ b/src/xenia/kernel/xboxkrnl_misc.cc @@ -7,11 +7,11 @@ ****************************************************************************** */ -#include "xenia/common.h" #include "xenia/kernel/kernel_state.h" #include "xenia/kernel/objects/xthread.h" #include "xenia/kernel/util/shim_utils.h" #include "xenia/kernel/xboxkrnl_private.h" +#include "xenia/logging.h" #include "xenia/xbox.h" namespace xe { diff --git a/src/xenia/kernel/xboxkrnl_module.cc b/src/xenia/kernel/xboxkrnl_module.cc index cc47ec99a..03ea0cf6b 100644 --- a/src/xenia/kernel/xboxkrnl_module.cc +++ b/src/xenia/kernel/xboxkrnl_module.cc @@ -16,6 +16,7 @@ #include "xenia/kernel/kernel_state.h" #include "xenia/kernel/xboxkrnl_private.h" #include "xenia/kernel/objects/xuser_module.h" +#include "xenia/logging.h" DEFINE_bool(abort_before_entry, false, "Abort execution right before launching the module."); diff --git a/src/xenia/kernel/xboxkrnl_module.h b/src/xenia/kernel/xboxkrnl_module.h index eef2db06f..bf19c1fe3 100644 --- a/src/xenia/kernel/xboxkrnl_module.h +++ b/src/xenia/kernel/xboxkrnl_module.h @@ -10,7 +10,6 @@ #ifndef XENIA_KERNEL_XBOXKRNL_MODULE_H_ #define XENIA_KERNEL_XBOXKRNL_MODULE_H_ -#include "xenia/common.h" #include "xenia/export_resolver.h" #include "xenia/kernel/objects/xkernel_module.h" #include "xenia/kernel/xboxkrnl_ordinals.h" diff --git a/src/xenia/kernel/xboxkrnl_modules.cc b/src/xenia/kernel/xboxkrnl_modules.cc index 9b3275bb4..4d26bb4cd 100644 --- a/src/xenia/kernel/xboxkrnl_modules.cc +++ b/src/xenia/kernel/xboxkrnl_modules.cc @@ -7,12 +7,12 @@ ****************************************************************************** */ -#include "xenia/common.h" #include "xenia/kernel/kernel_state.h" #include "xenia/kernel/objects/xuser_module.h" #include "xenia/kernel/util/shim_utils.h" #include "xenia/kernel/util/xex2.h" #include "xenia/kernel/xboxkrnl_private.h" +#include "xenia/logging.h" #include "xenia/xbox.h" namespace xe { diff --git a/src/xenia/kernel/xboxkrnl_ob.cc b/src/xenia/kernel/xboxkrnl_ob.cc index 65cfa2239..5da6864c4 100644 --- a/src/xenia/kernel/xboxkrnl_ob.cc +++ b/src/xenia/kernel/xboxkrnl_ob.cc @@ -7,12 +7,12 @@ ****************************************************************************** */ -#include "xenia/common.h" #include "xenia/kernel/kernel_state.h" #include "xenia/kernel/objects/xthread.h" #include "xenia/kernel/util/shim_utils.h" #include "xenia/kernel/xboxkrnl_private.h" #include "xenia/kernel/xobject.h" +#include "xenia/logging.h" #include "xenia/xbox.h" namespace xe { diff --git a/src/xenia/kernel/xboxkrnl_ordinals.h b/src/xenia/kernel/xboxkrnl_ordinals.h index 18d8ee3bc..c1a811364 100644 --- a/src/xenia/kernel/xboxkrnl_ordinals.h +++ b/src/xenia/kernel/xboxkrnl_ordinals.h @@ -10,7 +10,6 @@ #ifndef XENIA_KERNEL_XBOXKRNL_ORDINALS_H_ #define XENIA_KERNEL_XBOXKRNL_ORDINALS_H_ -#include "xenia/common.h" #include "xenia/export_resolver.h" // Build an ordinal enum to make it easy to lookup ordinals. diff --git a/src/xenia/kernel/xboxkrnl_private.h b/src/xenia/kernel/xboxkrnl_private.h index 4550056dc..8d02aaa00 100644 --- a/src/xenia/kernel/xboxkrnl_private.h +++ b/src/xenia/kernel/xboxkrnl_private.h @@ -10,7 +10,6 @@ #ifndef XENIA_KERNEL_XBOXKRNL_PRIVATE_H_ #define XENIA_KERNEL_XBOXKRNL_PRIVATE_H_ -#include "xenia/common.h" #include "xenia/kernel/xboxkrnl_ordinals.h" namespace xe { diff --git a/src/xenia/kernel/xboxkrnl_rtl.cc b/src/xenia/kernel/xboxkrnl_rtl.cc index d8638c50a..9316f8cda 100644 --- a/src/xenia/kernel/xboxkrnl_rtl.cc +++ b/src/xenia/kernel/xboxkrnl_rtl.cc @@ -16,6 +16,7 @@ #include "xenia/kernel/objects/xuser_module.h" #include "xenia/kernel/util/shim_utils.h" #include "xenia/kernel/util/xex2.h" +#include "xenia/logging.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/xboxkrnl_rtl.h b/src/xenia/kernel/xboxkrnl_rtl.h index afaf30687..102d5ffb0 100644 --- a/src/xenia/kernel/xboxkrnl_rtl.h +++ b/src/xenia/kernel/xboxkrnl_rtl.h @@ -10,7 +10,6 @@ #ifndef XENIA_KERNEL_XBOXKRNL_RTL_H_ #define XENIA_KERNEL_XBOXKRNL_RTL_H_ -#include "xenia/common.h" #include "xenia/xbox.h" namespace xe { diff --git a/src/xenia/kernel/xboxkrnl_strings.cc b/src/xenia/kernel/xboxkrnl_strings.cc index d22a5da01..32b147258 100644 --- a/src/xenia/kernel/xboxkrnl_strings.cc +++ b/src/xenia/kernel/xboxkrnl_strings.cc @@ -7,13 +7,13 @@ ****************************************************************************** */ -#include "xenia/common.h" #include "xenia/kernel/kernel_state.h" #include "xenia/kernel/objects/xthread.h" #include "xenia/kernel/objects/xuser_module.h" #include "xenia/kernel/util/shim_utils.h" #include "xenia/kernel/util/xex2.h" #include "xenia/kernel/xboxkrnl_private.h" +#include "xenia/logging.h" #include "xenia/xbox.h" namespace xe { diff --git a/src/xenia/kernel/xboxkrnl_threading.cc b/src/xenia/kernel/xboxkrnl_threading.cc index 99d456221..61da88c9e 100644 --- a/src/xenia/kernel/xboxkrnl_threading.cc +++ b/src/xenia/kernel/xboxkrnl_threading.cc @@ -7,7 +7,6 @@ ****************************************************************************** */ -#include "xenia/common.h" #include "xenia/cpu/processor.h" #include "xenia/kernel/dispatcher.h" #include "xenia/kernel/kernel_state.h" @@ -19,6 +18,7 @@ #include "xenia/kernel/objects/xtimer.h" #include "xenia/kernel/util/shim_utils.h" #include "xenia/kernel/xboxkrnl_private.h" +#include "xenia/logging.h" #include "xenia/xbox.h" namespace xe { diff --git a/src/xenia/kernel/xboxkrnl_usbcam.cc b/src/xenia/kernel/xboxkrnl_usbcam.cc index 8aa233290..0370865fe 100644 --- a/src/xenia/kernel/xboxkrnl_usbcam.cc +++ b/src/xenia/kernel/xboxkrnl_usbcam.cc @@ -7,10 +7,10 @@ ****************************************************************************** */ -#include "xenia/common.h" #include "xenia/kernel/kernel_state.h" #include "xenia/kernel/util/shim_utils.h" #include "xenia/kernel/xboxkrnl_private.h" +#include "xenia/logging.h" #include "xenia/xbox.h" namespace xe { diff --git a/src/xenia/kernel/xboxkrnl_video.cc b/src/xenia/kernel/xboxkrnl_video.cc index 0342316be..77523d0cf 100644 --- a/src/xenia/kernel/xboxkrnl_video.cc +++ b/src/xenia/kernel/xboxkrnl_video.cc @@ -7,7 +7,6 @@ ****************************************************************************** */ -#include "xenia/common.h" #include "xenia/cpu/cpu.h" #include "xenia/emulator.h" #include "xenia/gpu/graphics_system.h" @@ -16,6 +15,7 @@ #include "xenia/kernel/util/shim_utils.h" #include "xenia/kernel/xboxkrnl_private.h" #include "xenia/kernel/xboxkrnl_rtl.h" +#include "xenia/logging.h" #include "xenia/xbox.h" namespace xe { diff --git a/src/xenia/memory.cc b/src/xenia/memory.cc index e50580acd..e3cf3642e 100644 --- a/src/xenia/memory.cc +++ b/src/xenia/memory.cc @@ -16,6 +16,7 @@ #include "poly/math.h" #include "xenia/cpu/mmio_handler.h" +#include "xenia/logging.h" using namespace xe; diff --git a/src/xenia/memory.h b/src/xenia/memory.h index 99c50c1e7..fd7070405 100644 --- a/src/xenia/memory.h +++ b/src/xenia/memory.h @@ -14,9 +14,8 @@ #include #include +#include "poly/platform.h" #include "xenia/memory.h" - -#include "xenia/common.h" #include "xenia/cpu/mmio_handler.h" namespace xe { diff --git a/src/xenia/sources.gypi b/src/xenia/sources.gypi index 9891468fb..0a01e2014 100644 --- a/src/xenia/sources.gypi +++ b/src/xenia/sources.gypi @@ -1,7 +1,6 @@ # Copyright 2013 Ben Vanik. All Rights Reserved. { 'sources': [ - 'common.h', 'debug_agent.cc', 'debug_agent.h', 'emulator.cc', diff --git a/src/xenia/ui/main_window.cc b/src/xenia/ui/main_window.cc index 4578ecce8..a24514104 100644 --- a/src/xenia/ui/main_window.cc +++ b/src/xenia/ui/main_window.cc @@ -13,6 +13,7 @@ #include "poly/threading.h" #include "xenia/gpu/graphics_system.h" #include "xenia/emulator.h" +#include "xenia/profiling.h" namespace xe { namespace ui { diff --git a/src/xenia/xbox.h b/src/xenia/xbox.h index bb64a7578..1ed83ea00 100644 --- a/src/xenia/xbox.h +++ b/src/xenia/xbox.h @@ -13,7 +13,6 @@ #include #include "poly/memory.h" -#include "xenia/common.h" namespace xe { diff --git a/src/xenia/xenia_main.cc b/src/xenia/xenia_main.cc index 2962f1733..895c66138 100644 --- a/src/xenia/xenia_main.cc +++ b/src/xenia/xenia_main.cc @@ -11,6 +11,8 @@ #include "poly/main.h" #include "xenia/emulator.h" #include "xenia/kernel/kernel.h" +#include "xenia/logging.h" +#include "xenia/profiling.h" #include "xenia/ui/main_window.h" DEFINE_string(target, "", "Specifies the target .xex or .iso to execute.");