diff --git a/src/xenia/app/emulator_window.cc b/src/xenia/app/emulator_window.cc
index 3226a886b..d6e4dc760 100644
--- a/src/xenia/app/emulator_window.cc
+++ b/src/xenia/app/emulator_window.cc
@@ -13,10 +13,10 @@
 #include "xenia/base/clock.h"
 #include "xenia/base/logging.h"
 #include "xenia/base/platform.h"
+#include "xenia/base/profiling.h"
 #include "xenia/base/threading.h"
 #include "xenia/emulator.h"
 #include "xenia/gpu/graphics_system.h"
-#include "xenia/profiling.h"
 
 namespace xe {
 namespace app {
diff --git a/src/xenia/app/xenia_main.cc b/src/xenia/app/xenia_main.cc
index fbc921be3..85d73da50 100644
--- a/src/xenia/app/xenia_main.cc
+++ b/src/xenia/app/xenia_main.cc
@@ -12,9 +12,9 @@
 #include "xenia/app/emulator_window.h"
 #include "xenia/base/logging.h"
 #include "xenia/base/main.h"
+#include "xenia/base/profiling.h"
 #include "xenia/debug/ui/debug_window.h"
 #include "xenia/emulator.h"
-#include "xenia/profiling.h"
 #include "xenia/ui/file_picker.h"
 
 DEFINE_string(target, "", "Specifies the target .xex or .iso to execute.");
diff --git a/src/xenia/apu/audio_system.cc b/src/xenia/apu/audio_system.cc
index 897c7d939..e0d4f0cb5 100644
--- a/src/xenia/apu/audio_system.cc
+++ b/src/xenia/apu/audio_system.cc
@@ -14,11 +14,11 @@
 #include "xenia/apu/xma_decoder.h"
 #include "xenia/base/logging.h"
 #include "xenia/base/math.h"
+#include "xenia/base/profiling.h"
 #include "xenia/base/ring_buffer.h"
 #include "xenia/base/string_buffer.h"
 #include "xenia/base/threading.h"
 #include "xenia/cpu/thread_state.h"
-#include "xenia/profiling.h"
 
 #include "xenia/apu/nop/nop_audio_system.h"
 #if XE_PLATFORM_WIN32
diff --git a/src/xenia/apu/xma_context.cc b/src/xenia/apu/xma_context.cc
index 0eeaec4cd..1b7840cce 100644
--- a/src/xenia/apu/xma_context.cc
+++ b/src/xenia/apu/xma_context.cc
@@ -16,8 +16,8 @@
 #include "xenia/apu/xma_helpers.h"
 #include "xenia/base/bit_stream.h"
 #include "xenia/base/logging.h"
+#include "xenia/base/profiling.h"
 #include "xenia/base/ring_buffer.h"
-#include "xenia/profiling.h"
 
 extern "C" {
 #include "third_party/libav/libavcodec/avcodec.h"
diff --git a/src/xenia/apu/xma_decoder.cc b/src/xenia/apu/xma_decoder.cc
index 82d601dcd..411ab812b 100644
--- a/src/xenia/apu/xma_decoder.cc
+++ b/src/xenia/apu/xma_decoder.cc
@@ -14,12 +14,12 @@
 #include "xenia/apu/xma_context.h"
 #include "xenia/base/logging.h"
 #include "xenia/base/math.h"
+#include "xenia/base/profiling.h"
 #include "xenia/base/ring_buffer.h"
 #include "xenia/base/string_buffer.h"
 #include "xenia/cpu/processor.h"
 #include "xenia/cpu/thread_state.h"
 #include "xenia/kernel/xthread.h"
-#include "xenia/profiling.h"
 
 extern "C" {
 #include "third_party/libav/libavutil/log.h"
diff --git a/src/xenia/base/premake5.lua b/src/xenia/base/premake5.lua
index 21ed7720e..378ed3fc1 100644
--- a/src/xenia/base/premake5.lua
+++ b/src/xenia/base/premake5.lua
@@ -8,6 +8,7 @@ project("xenia-base")
   defines({
   })
   includedirs({
+    project_root.."/third_party/elemental-forms/src",
     project_root.."/build_tools/third_party/gflags/src",
   })
   local_platform_files()
diff --git a/src/xenia/profiling.cc b/src/xenia/base/profiling.cc
similarity index 99%
rename from src/xenia/profiling.cc
rename to src/xenia/base/profiling.cc
index f55d535ac..742a6a279 100644
--- a/src/xenia/profiling.cc
+++ b/src/xenia/base/profiling.cc
@@ -30,7 +30,7 @@
 #include "third_party/microprofile/microprofile.h"
 
 #include "xenia/base/assert.h"
-#include "xenia/profiling.h"
+#include "xenia/base/profiling.h"
 #include "xenia/ui/window.h"
 
 #if XE_OPTION_PROFILING
diff --git a/src/xenia/profiling.h b/src/xenia/base/profiling.h
similarity index 98%
rename from src/xenia/profiling.h
rename to src/xenia/base/profiling.h
index 46c6ae2b9..15b1778ec 100644
--- a/src/xenia/profiling.h
+++ b/src/xenia/base/profiling.h
@@ -7,8 +7,8 @@
  ******************************************************************************
  */
 
-#ifndef XENIA_PROFILING_H_
-#define XENIA_PROFILING_H_
+#ifndef XENIA_BASE_PROFILING_H_
+#define XENIA_BASE_PROFILING_H_
 
 #include <memory>
 
@@ -176,4 +176,4 @@ class Profiler {
 
 }  // namespace xe
 
-#endif  // XENIA_PROFILING_H_
+#endif  // XENIA_BASE_PROFILING_H_
diff --git a/src/xenia/cpu/backend/x64/x64_assembler.cc b/src/xenia/cpu/backend/x64/x64_assembler.cc
index a23729188..887785124 100644
--- a/src/xenia/cpu/backend/x64/x64_assembler.cc
+++ b/src/xenia/cpu/backend/x64/x64_assembler.cc
@@ -13,6 +13,7 @@
 
 #include "third_party/capstone/include/capstone/capstone.h"
 #include "third_party/capstone/include/capstone/x86.h"
+#include "xenia/base/profiling.h"
 #include "xenia/base/reset_scope.h"
 #include "xenia/cpu/backend/x64/x64_backend.h"
 #include "xenia/cpu/backend/x64/x64_emitter.h"
@@ -21,7 +22,6 @@
 #include "xenia/cpu/hir/hir_builder.h"
 #include "xenia/cpu/hir/label.h"
 #include "xenia/cpu/processor.h"
-#include "xenia/profiling.h"
 
 namespace xe {
 namespace cpu {
diff --git a/src/xenia/cpu/backend/x64/x64_emitter.cc b/src/xenia/cpu/backend/x64/x64_emitter.cc
index c318035e8..ea99e6169 100644
--- a/src/xenia/cpu/backend/x64/x64_emitter.cc
+++ b/src/xenia/cpu/backend/x64/x64_emitter.cc
@@ -19,6 +19,7 @@
 #include "xenia/base/logging.h"
 #include "xenia/base/math.h"
 #include "xenia/base/memory.h"
+#include "xenia/base/profiling.h"
 #include "xenia/base/vec128.h"
 #include "xenia/cpu/backend/x64/x64_backend.h"
 #include "xenia/cpu/backend/x64/x64_code_cache.h"
@@ -32,7 +33,6 @@
 #include "xenia/cpu/symbol.h"
 #include "xenia/cpu/thread_state.h"
 #include "xenia/debug/debugger.h"
-#include "xenia/profiling.h"
 
 DEFINE_bool(enable_debugprint_log, false,
             "Log debugprint traps to the active debugger");
diff --git a/src/xenia/cpu/compiler/compiler.cc b/src/xenia/cpu/compiler/compiler.cc
index 21af3e5d0..aefd758ee 100644
--- a/src/xenia/cpu/compiler/compiler.cc
+++ b/src/xenia/cpu/compiler/compiler.cc
@@ -9,8 +9,8 @@
 
 #include "xenia/cpu/compiler/compiler.h"
 
+#include "xenia/base/profiling.h"
 #include "xenia/cpu/compiler/compiler_pass.h"
-#include "xenia/profiling.h"
 
 namespace xe {
 namespace cpu {
diff --git a/src/xenia/cpu/compiler/passes/constant_propagation_pass.cc b/src/xenia/cpu/compiler/passes/constant_propagation_pass.cc
index dfe31aaf4..468e35ce0 100644
--- a/src/xenia/cpu/compiler/passes/constant_propagation_pass.cc
+++ b/src/xenia/cpu/compiler/passes/constant_propagation_pass.cc
@@ -12,9 +12,9 @@
 #include <gflags/gflags.h>
 
 #include "xenia/base/assert.h"
+#include "xenia/base/profiling.h"
 #include "xenia/cpu/function.h"
 #include "xenia/cpu/processor.h"
-#include "xenia/profiling.h"
 
 DEFINE_bool(inline_mmio_access, true, "Inline constant MMIO loads and stores.");
 
diff --git a/src/xenia/cpu/compiler/passes/context_promotion_pass.cc b/src/xenia/cpu/compiler/passes/context_promotion_pass.cc
index d51f1341b..2ccf4c969 100644
--- a/src/xenia/cpu/compiler/passes/context_promotion_pass.cc
+++ b/src/xenia/cpu/compiler/passes/context_promotion_pass.cc
@@ -11,9 +11,9 @@
 
 #include <gflags/gflags.h>
 
+#include "xenia/base/profiling.h"
 #include "xenia/cpu/compiler/compiler.h"
 #include "xenia/cpu/processor.h"
-#include "xenia/profiling.h"
 
 DECLARE_bool(debug);
 
diff --git a/src/xenia/cpu/compiler/passes/control_flow_analysis_pass.cc b/src/xenia/cpu/compiler/passes/control_flow_analysis_pass.cc
index 4f7dbfd99..f3129900a 100644
--- a/src/xenia/cpu/compiler/passes/control_flow_analysis_pass.cc
+++ b/src/xenia/cpu/compiler/passes/control_flow_analysis_pass.cc
@@ -9,10 +9,10 @@
 
 #include "xenia/cpu/compiler/passes/control_flow_analysis_pass.h"
 
+#include "xenia/base/profiling.h"
 #include "xenia/cpu/backend/backend.h"
 #include "xenia/cpu/compiler/compiler.h"
 #include "xenia/cpu/processor.h"
-#include "xenia/profiling.h"
 
 namespace xe {
 namespace cpu {
diff --git a/src/xenia/cpu/compiler/passes/control_flow_simplification_pass.cc b/src/xenia/cpu/compiler/passes/control_flow_simplification_pass.cc
index 3e1af8fa0..a7a207e59 100644
--- a/src/xenia/cpu/compiler/passes/control_flow_simplification_pass.cc
+++ b/src/xenia/cpu/compiler/passes/control_flow_simplification_pass.cc
@@ -9,10 +9,10 @@
 
 #include "xenia/cpu/compiler/passes/control_flow_simplification_pass.h"
 
+#include "xenia/base/profiling.h"
 #include "xenia/cpu/backend/backend.h"
 #include "xenia/cpu/compiler/compiler.h"
 #include "xenia/cpu/processor.h"
-#include "xenia/profiling.h"
 
 namespace xe {
 namespace cpu {
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 82454b55f..a858e4329 100644
--- a/src/xenia/cpu/compiler/passes/data_flow_analysis_pass.cc
+++ b/src/xenia/cpu/compiler/passes/data_flow_analysis_pass.cc
@@ -11,10 +11,10 @@
 
 #include "xenia/base/assert.h"
 #include "xenia/base/platform.h"
+#include "xenia/base/profiling.h"
 #include "xenia/cpu/backend/backend.h"
 #include "xenia/cpu/compiler/compiler.h"
 #include "xenia/cpu/processor.h"
-#include "xenia/profiling.h"
 
 #if XE_COMPILER_MSVC
 #pragma warning(push)
diff --git a/src/xenia/cpu/compiler/passes/dead_code_elimination_pass.cc b/src/xenia/cpu/compiler/passes/dead_code_elimination_pass.cc
index dcef66f68..d7ff9a0fd 100644
--- a/src/xenia/cpu/compiler/passes/dead_code_elimination_pass.cc
+++ b/src/xenia/cpu/compiler/passes/dead_code_elimination_pass.cc
@@ -9,7 +9,7 @@
 
 #include "xenia/cpu/compiler/passes/dead_code_elimination_pass.h"
 
-#include "xenia/profiling.h"
+#include "xenia/base/profiling.h"
 
 namespace xe {
 namespace cpu {
diff --git a/src/xenia/cpu/compiler/passes/finalization_pass.cc b/src/xenia/cpu/compiler/passes/finalization_pass.cc
index 553a912d3..f6796822a 100644
--- a/src/xenia/cpu/compiler/passes/finalization_pass.cc
+++ b/src/xenia/cpu/compiler/passes/finalization_pass.cc
@@ -9,10 +9,10 @@
 
 #include "xenia/cpu/compiler/passes/finalization_pass.h"
 
+#include "xenia/base/profiling.h"
 #include "xenia/cpu/backend/backend.h"
 #include "xenia/cpu/compiler/compiler.h"
 #include "xenia/cpu/processor.h"
-#include "xenia/profiling.h"
 
 namespace xe {
 namespace cpu {
diff --git a/src/xenia/cpu/compiler/passes/memory_sequence_combination_pass.cc b/src/xenia/cpu/compiler/passes/memory_sequence_combination_pass.cc
index 11ba9561a..051e3185f 100644
--- a/src/xenia/cpu/compiler/passes/memory_sequence_combination_pass.cc
+++ b/src/xenia/cpu/compiler/passes/memory_sequence_combination_pass.cc
@@ -9,7 +9,7 @@
 
 #include "xenia/cpu/compiler/passes/memory_sequence_combination_pass.h"
 
-#include "xenia/profiling.h"
+#include "xenia/base/profiling.h"
 
 namespace xe {
 namespace cpu {
diff --git a/src/xenia/cpu/compiler/passes/register_allocation_pass.cc b/src/xenia/cpu/compiler/passes/register_allocation_pass.cc
index ea996b1e2..c0fb62394 100644
--- a/src/xenia/cpu/compiler/passes/register_allocation_pass.cc
+++ b/src/xenia/cpu/compiler/passes/register_allocation_pass.cc
@@ -15,7 +15,7 @@
 #include "xenia/base/assert.h"
 #include "xenia/base/logging.h"
 #include "xenia/base/math.h"
-#include "xenia/profiling.h"
+#include "xenia/base/profiling.h"
 
 namespace xe {
 namespace cpu {
diff --git a/src/xenia/cpu/compiler/passes/simplification_pass.cc b/src/xenia/cpu/compiler/passes/simplification_pass.cc
index ad56b5613..3278ab7c6 100644
--- a/src/xenia/cpu/compiler/passes/simplification_pass.cc
+++ b/src/xenia/cpu/compiler/passes/simplification_pass.cc
@@ -9,7 +9,7 @@
 
 #include "xenia/cpu/compiler/passes/simplification_pass.h"
 
-#include "xenia/profiling.h"
+#include "xenia/base/profiling.h"
 
 namespace xe {
 namespace cpu {
diff --git a/src/xenia/cpu/compiler/passes/validation_pass.cc b/src/xenia/cpu/compiler/passes/validation_pass.cc
index 512b2e43e..35aee8453 100644
--- a/src/xenia/cpu/compiler/passes/validation_pass.cc
+++ b/src/xenia/cpu/compiler/passes/validation_pass.cc
@@ -10,10 +10,10 @@
 #include "xenia/cpu/compiler/passes/validation_pass.h"
 
 #include "xenia/base/assert.h"
+#include "xenia/base/profiling.h"
 #include "xenia/cpu/backend/backend.h"
 #include "xenia/cpu/compiler/compiler.h"
 #include "xenia/cpu/processor.h"
-#include "xenia/profiling.h"
 
 namespace xe {
 namespace cpu {
diff --git a/src/xenia/cpu/compiler/passes/value_reduction_pass.cc b/src/xenia/cpu/compiler/passes/value_reduction_pass.cc
index ff142cac4..94a218219 100644
--- a/src/xenia/cpu/compiler/passes/value_reduction_pass.cc
+++ b/src/xenia/cpu/compiler/passes/value_reduction_pass.cc
@@ -10,10 +10,10 @@
 #include "xenia/cpu/compiler/passes/value_reduction_pass.h"
 
 #include "xenia/base/platform.h"
+#include "xenia/base/profiling.h"
 #include "xenia/cpu/backend/backend.h"
 #include "xenia/cpu/compiler/compiler.h"
 #include "xenia/cpu/processor.h"
-#include "xenia/profiling.h"
 
 #if XE_COMPILER_MSVC
 #pragma warning(push)
diff --git a/src/xenia/cpu/entry_table.cc b/src/xenia/cpu/entry_table.cc
index 7d2f08e05..8770fe332 100644
--- a/src/xenia/cpu/entry_table.cc
+++ b/src/xenia/cpu/entry_table.cc
@@ -9,8 +9,8 @@
 
 #include "xenia/cpu/entry_table.h"
 
+#include "xenia/base/profiling.h"
 #include "xenia/base/threading.h"
-#include "xenia/profiling.h"
 
 namespace xe {
 namespace cpu {
diff --git a/src/xenia/cpu/frontend/ppc_hir_builder.cc b/src/xenia/cpu/frontend/ppc_hir_builder.cc
index cf7bb6d8b..9c2998d9d 100644
--- a/src/xenia/cpu/frontend/ppc_hir_builder.cc
+++ b/src/xenia/cpu/frontend/ppc_hir_builder.cc
@@ -14,6 +14,7 @@
 #include "xenia/base/byte_order.h"
 #include "xenia/base/logging.h"
 #include "xenia/base/memory.h"
+#include "xenia/base/profiling.h"
 #include "xenia/cpu/cpu_flags.h"
 #include "xenia/cpu/frontend/ppc_context.h"
 #include "xenia/cpu/frontend/ppc_disasm.h"
@@ -21,7 +22,6 @@
 #include "xenia/cpu/frontend/ppc_instr.h"
 #include "xenia/cpu/hir/label.h"
 #include "xenia/cpu/processor.h"
-#include "xenia/profiling.h"
 
 namespace xe {
 namespace cpu {
diff --git a/src/xenia/cpu/frontend/ppc_scanner.cc b/src/xenia/cpu/frontend/ppc_scanner.cc
index f0bc53ceb..5bb3885cf 100644
--- a/src/xenia/cpu/frontend/ppc_scanner.cc
+++ b/src/xenia/cpu/frontend/ppc_scanner.cc
@@ -14,10 +14,10 @@
 
 #include "xenia/base/logging.h"
 #include "xenia/base/memory.h"
+#include "xenia/base/profiling.h"
 #include "xenia/cpu/frontend/ppc_frontend.h"
 #include "xenia/cpu/frontend/ppc_instr.h"
 #include "xenia/cpu/processor.h"
-#include "xenia/profiling.h"
 
 #if 0
 #define LOGPPC(fmt, ...) XELOGCORE('p', fmt, ##__VA_ARGS__)
diff --git a/src/xenia/cpu/frontend/ppc_translator.cc b/src/xenia/cpu/frontend/ppc_translator.cc
index 862abb725..c4f5ac99c 100644
--- a/src/xenia/cpu/frontend/ppc_translator.cc
+++ b/src/xenia/cpu/frontend/ppc_translator.cc
@@ -14,6 +14,7 @@
 #include "xenia/base/assert.h"
 #include "xenia/base/byte_order.h"
 #include "xenia/base/memory.h"
+#include "xenia/base/profiling.h"
 #include "xenia/base/reset_scope.h"
 #include "xenia/cpu/compiler/compiler_passes.h"
 #include "xenia/cpu/cpu_flags.h"
@@ -24,7 +25,6 @@
 #include "xenia/cpu/frontend/ppc_scanner.h"
 #include "xenia/cpu/processor.h"
 #include "xenia/debug/debugger.h"
-#include "xenia/profiling.h"
 
 DEFINE_bool(preserve_hir_disasm, true,
             "Preserves HIR disassembly for the debugger when it is attached.");
diff --git a/src/xenia/cpu/hir/hir_builder.cc b/src/xenia/cpu/hir/hir_builder.cc
index e93cb7c90..ab9468cb1 100644
--- a/src/xenia/cpu/hir/hir_builder.cc
+++ b/src/xenia/cpu/hir/hir_builder.cc
@@ -14,12 +14,12 @@
 #include <cstring>
 
 #include "xenia/base/assert.h"
+#include "xenia/base/profiling.h"
 #include "xenia/cpu/function.h"
 #include "xenia/cpu/hir/block.h"
 #include "xenia/cpu/hir/instr.h"
 #include "xenia/cpu/hir/label.h"
 #include "xenia/cpu/symbol.h"
-#include "xenia/profiling.h"
 
 // Will scribble arena memory to hopefully find use before clears.
 // #define SCRIBBLE_ARENA_ON_RESET
diff --git a/src/xenia/cpu/module.cc b/src/xenia/cpu/module.cc
index d672e233d..4c582763f 100644
--- a/src/xenia/cpu/module.cc
+++ b/src/xenia/cpu/module.cc
@@ -14,9 +14,9 @@
 #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"
-#include "xenia/profiling.h"
 
 namespace xe {
 namespace cpu {
diff --git a/src/xenia/cpu/processor.cc b/src/xenia/cpu/processor.cc
index 1609c3577..b0e578ba6 100644
--- a/src/xenia/cpu/processor.cc
+++ b/src/xenia/cpu/processor.cc
@@ -16,6 +16,7 @@
 #include "xenia/base/byte_order.h"
 #include "xenia/base/logging.h"
 #include "xenia/base/memory.h"
+#include "xenia/base/profiling.h"
 #include "xenia/cpu/cpu_flags.h"
 #include "xenia/cpu/export_resolver.h"
 #include "xenia/cpu/frontend/ppc_frontend.h"
@@ -24,7 +25,6 @@
 #include "xenia/cpu/thread_state.h"
 #include "xenia/cpu/xex_module.h"
 #include "xenia/debug/debugger.h"
-#include "xenia/profiling.h"
 
 // TODO(benvanik): based on compiler support
 #include "xenia/cpu/backend/x64/x64_backend.h"
diff --git a/src/xenia/emulator.cc b/src/xenia/emulator.cc
index b961146cb..62ffcd31f 100644
--- a/src/xenia/emulator.cc
+++ b/src/xenia/emulator.cc
@@ -18,6 +18,7 @@
 #include "xenia/base/debugging.h"
 #include "xenia/base/exception_handler.h"
 #include "xenia/base/logging.h"
+#include "xenia/base/profiling.h"
 #include "xenia/base/string.h"
 #include "xenia/cpu/backend/code_cache.h"
 #include "xenia/gpu/graphics_system.h"
@@ -26,7 +27,6 @@
 #include "xenia/kernel/xam/xam_module.h"
 #include "xenia/kernel/xboxkrnl/xboxkrnl_module.h"
 #include "xenia/memory.h"
-#include "xenia/profiling.h"
 #include "xenia/vfs/devices/disc_image_device.h"
 #include "xenia/vfs/devices/host_path_device.h"
 #include "xenia/vfs/devices/stfs_container_device.h"
diff --git a/src/xenia/gpu/gl4/command_processor.cc b/src/xenia/gpu/gl4/command_processor.cc
index fe7deff34..18c61ab25 100644
--- a/src/xenia/gpu/gl4/command_processor.cc
+++ b/src/xenia/gpu/gl4/command_processor.cc
@@ -13,6 +13,7 @@
 
 #include "xenia/base/logging.h"
 #include "xenia/base/math.h"
+#include "xenia/base/profiling.h"
 #include "xenia/emulator.h"
 #include "xenia/gpu/gl4/gl4_gpu_flags.h"
 #include "xenia/gpu/gl4/gl4_graphics_system.h"
@@ -20,7 +21,6 @@
 #include "xenia/gpu/sampler_info.h"
 #include "xenia/gpu/texture_info.h"
 #include "xenia/gpu/xenos.h"
-#include "xenia/profiling.h"
 
 #include "third_party/xxhash/xxhash.h"
 
diff --git a/src/xenia/gpu/gl4/gl4_graphics_system.cc b/src/xenia/gpu/gl4/gl4_graphics_system.cc
index dfc95e8dd..ae073e3a0 100644
--- a/src/xenia/gpu/gl4/gl4_graphics_system.cc
+++ b/src/xenia/gpu/gl4/gl4_graphics_system.cc
@@ -14,13 +14,13 @@
 
 #include "xenia/base/clock.h"
 #include "xenia/base/logging.h"
+#include "xenia/base/profiling.h"
 #include "xenia/base/threading.h"
 #include "xenia/cpu/processor.h"
 #include "xenia/emulator.h"
 #include "xenia/gpu/gl4/gl4_gpu_flags.h"
 #include "xenia/gpu/gpu_flags.h"
 #include "xenia/gpu/tracing.h"
-#include "xenia/profiling.h"
 #include "xenia/ui/window.h"
 
 namespace xe {
diff --git a/src/xenia/gpu/gl4/texture_cache.cc b/src/xenia/gpu/gl4/texture_cache.cc
index 65ba9c7da..ebe98e6d6 100644
--- a/src/xenia/gpu/gl4/texture_cache.cc
+++ b/src/xenia/gpu/gl4/texture_cache.cc
@@ -16,8 +16,8 @@
 #include "xenia/base/logging.h"
 #include "xenia/base/math.h"
 #include "xenia/base/memory.h"
+#include "xenia/base/profiling.h"
 #include "xenia/gpu/gpu_flags.h"
-#include "xenia/profiling.h"
 
 namespace xe {
 namespace gpu {
diff --git a/src/xenia/gpu/gl4/trace_viewer_main.cc b/src/xenia/gpu/gl4/trace_viewer_main.cc
index 2725af0b5..e1289c69a 100644
--- a/src/xenia/gpu/gl4/trace_viewer_main.cc
+++ b/src/xenia/gpu/gl4/trace_viewer_main.cc
@@ -17,12 +17,12 @@
 #include "xenia/base/mapped_memory.h"
 #include "xenia/base/math.h"
 #include "xenia/base/platform_win.h"
+#include "xenia/base/profiling.h"
 #include "xenia/emulator.h"
 #include "xenia/gpu/graphics_system.h"
 #include "xenia/gpu/register_file.h"
 #include "xenia/gpu/tracing.h"
 #include "xenia/gpu/xenos.h"
-#include "xenia/profiling.h"
 #include "xenia/ui/gl/gl_context.h"
 #include "xenia/ui/imgui_drawer.h"
 #include "xenia/ui/window.h"
diff --git a/src/xenia/hid/input_system.cc b/src/xenia/hid/input_system.cc
index 16b3e3513..9ca55bea8 100644
--- a/src/xenia/hid/input_system.cc
+++ b/src/xenia/hid/input_system.cc
@@ -9,9 +9,9 @@
 
 #include "xenia/hid/input_system.h"
 
+#include "xenia/base/profiling.h"
 #include "xenia/hid/hid_flags.h"
 #include "xenia/hid/input_driver.h"
-#include "xenia/profiling.h"
 
 #include "xenia/hid/nop/nop_hid.h"
 #if XE_PLATFORM_WIN32
diff --git a/src/xenia/kernel/xthread.cc b/src/xenia/kernel/xthread.cc
index 261d7913f..64b3e15cb 100644
--- a/src/xenia/kernel/xthread.cc
+++ b/src/xenia/kernel/xthread.cc
@@ -16,13 +16,13 @@
 #include "xenia/base/clock.h"
 #include "xenia/base/logging.h"
 #include "xenia/base/math.h"
+#include "xenia/base/profiling.h"
 #include "xenia/base/threading.h"
 #include "xenia/cpu/processor.h"
 #include "xenia/emulator.h"
 #include "xenia/kernel/kernel_state.h"
 #include "xenia/kernel/user_module.h"
 #include "xenia/kernel/xevent.h"
-#include "xenia/profiling.h"
 
 DEFINE_bool(ignore_thread_priorities, true,
             "Ignores game-specified thread priorities.");
diff --git a/src/xenia/ui/elemental_drawer.cc b/src/xenia/ui/elemental_drawer.cc
index 5dddbcabc..6eb81fd32 100644
--- a/src/xenia/ui/elemental_drawer.cc
+++ b/src/xenia/ui/elemental_drawer.cc
@@ -13,7 +13,7 @@
 #include "el/util/math.h"
 #include "xenia/base/assert.h"
 #include "xenia/base/logging.h"
-#include "xenia/profiling.h"
+#include "xenia/base/profiling.h"
 #include "xenia/ui/window.h"
 
 namespace xe {
diff --git a/src/xenia/ui/gl/gl_context.cc b/src/xenia/ui/gl/gl_context.cc
index ae70cc93b..4b089c0a9 100644
--- a/src/xenia/ui/gl/gl_context.cc
+++ b/src/xenia/ui/gl/gl_context.cc
@@ -17,7 +17,7 @@
 #include "xenia/base/assert.h"
 #include "xenia/base/logging.h"
 #include "xenia/base/math.h"
-#include "xenia/profiling.h"
+#include "xenia/base/profiling.h"
 #include "xenia/ui/gl/gl_immediate_drawer.h"
 #include "xenia/ui/window.h"
 
diff --git a/src/xenia/ui/gl/premake5.lua b/src/xenia/ui/gl/premake5.lua
index 69e4a7c30..2f13d65d2 100644
--- a/src/xenia/ui/gl/premake5.lua
+++ b/src/xenia/ui/gl/premake5.lua
@@ -34,7 +34,6 @@ project("xenia-ui-window-gl-demo")
     "glew",
     "imgui",
     "xenia-base",
-    "xenia-core",
     "xenia-ui",
     "xenia-ui-gl",
   })
diff --git a/src/xenia/ui/window_demo.cc b/src/xenia/ui/window_demo.cc
index aefa28882..1b1ebcbc2 100644
--- a/src/xenia/ui/window_demo.cc
+++ b/src/xenia/ui/window_demo.cc
@@ -17,8 +17,8 @@
 #include "xenia/base/logging.h"
 #include "xenia/base/main.h"
 #include "xenia/base/platform_win.h"
+#include "xenia/base/profiling.h"
 #include "xenia/base/threading.h"
-#include "xenia/profiling.h"
 #include "xenia/ui/imgui_drawer.h"
 #include "xenia/ui/window.h"
 
@@ -200,4 +200,3 @@ int window_demo_main(const std::vector<std::wstring>& args) {
 
 }  // namespace ui
 }  // namespace xe
-