diff --git a/src/xenia/gpu/graphics_system.h b/src/xenia/gpu/graphics_system.h
index 8e76adbcb..f9b637338 100644
--- a/src/xenia/gpu/graphics_system.h
+++ b/src/xenia/gpu/graphics_system.h
@@ -15,6 +15,7 @@
 #include <thread>
 
 #include "xenia/cpu/processor.h"
+#include "xenia/gpu/command_processor.h"
 #include "xenia/gpu/register_file.h"
 #include "xenia/kernel/xthread.h"
 #include "xenia/memory.h"
@@ -28,8 +29,6 @@ class Emulator;
 namespace xe {
 namespace gpu {
 
-class CommandProcessor;
-
 class GraphicsSystem {
  public:
   virtual ~GraphicsSystem();
@@ -63,6 +62,7 @@ class GraphicsSystem {
   virtual void ClearCaches();
 
   void SetSwapCallback(std::function<void()> fn);
+  gpu::SwapState& swap_state() { return command_processor_->swap_state(); }
 
   void RequestFrameTrace();
   void BeginTracing();