[UI/GPU] Fix include order

src/xenia/ui/d3d12/d3d12_context.h

@@ -14,7 +14,7 @@
 
 #include "xenia/ui/d3d12/command_list.h"
 #include "xenia/ui/d3d12/cpu_fence.h"
-#include "xenia/ui/d3d12/d3d12_api.h"
+#include "xenia/ui/d3d12/d3d12_immediate_drawer.h"
 #include "xenia/ui/d3d12/d3d12_provider.h"
 #include "xenia/ui/graphics_context.h"
 
@@ -24,8 +24,6 @@ namespace xe {
 namespace ui {
 namespace d3d12 {
 
-class D3D12ImmediateDrawer;
-
 class D3D12Context : public GraphicsContext {
  public:
   ~D3D12Context() override;

src/xenia/ui/d3d12/d3d12_immediate_drawer.cc

@@ -14,6 +14,7 @@
 #include "xenia/base/assert.h"
 #include "xenia/base/logging.h"
 #include "xenia/base/math.h"
+#include "xenia/ui/d3d12/d3d12_context.h"
 #include "xenia/ui/d3d12/d3d12_util.h"
 
 namespace xe {

src/xenia/ui/d3d12/d3d12_immediate_drawer.h

@@ -16,7 +16,6 @@
 
 #include "xenia/ui/d3d12/command_list.h"
 #include "xenia/ui/d3d12/d3d12_api.h"
-#include "xenia/ui/d3d12/d3d12_context.h"
 #include "xenia/ui/d3d12/pools.h"
 #include "xenia/ui/immediate_drawer.h"
 
@@ -24,6 +23,8 @@ namespace xe {
 namespace ui {
 namespace d3d12 {
 
+class D3D12Context;
+
 class D3D12ImmediateDrawer : public ImmediateDrawer {
  public:
   D3D12ImmediateDrawer(D3D12Context* graphics_context);

src/xenia/ui/d3d12/pools.cc

@@ -13,6 +13,7 @@
 
 #include "xenia/base/assert.h"
 #include "xenia/base/logging.h"
+#include "xenia/ui/d3d12/d3d12_context.h"
 #include "xenia/ui/d3d12/d3d12_util.h"
 
 namespace xe {

src/xenia/ui/d3d12/pools.h

@@ -10,13 +10,16 @@
 #ifndef XENIA_UI_D3D12_POOLS_H_
 #define XENIA_UI_D3D12_POOLS_H_
 
+#include <cstdint>
+
 #include "xenia/ui/d3d12/d3d12_api.h"
-#include "xenia/ui/d3d12/d3d12_context.h"
 
 namespace xe {
 namespace ui {
 namespace d3d12 {
 
+class D3D12Context;
+
 class UploadBufferPool {
  public:
   UploadBufferPool(D3D12Context* context, uint32_t page_size);

src/xenia/ui/vk/vulkan_context.h

@@ -13,6 +13,7 @@
 #include <memory>
 
 #include "xenia/ui/graphics_context.h"
+#include "xenia/ui/vk/vulkan_immediate_drawer.h"
 #include "xenia/ui/vk/vulkan_provider.h"
 
 #define FINE_GRAINED_DRAW_SCOPES 1
@@ -21,8 +22,6 @@ namespace xe {
 namespace ui {
 namespace vk {
 
-class VulkanImmediateDrawer;
-
 class VulkanContext : public GraphicsContext {
  public:
   ~VulkanContext() override;

src/xenia/ui/vk/vulkan_immediate_drawer.cc

@@ -9,6 +9,8 @@
 
 #include "xenia/ui/vk/vulkan_immediate_drawer.h"
 
+#include "xenia/ui/vk/vulkan_context.h"
+
 namespace xe {
 namespace ui {
 namespace vk {

src/xenia/ui/vk/vulkan_immediate_drawer.h

@@ -13,12 +13,13 @@
 #include <memory>
 
 #include "xenia/ui/immediate_drawer.h"
-#include "xenia/ui/vk/vulkan_context.h"
 
 namespace xe {
 namespace ui {
 namespace vk {
 
+class VulkanContext;
+
 class VulkanImmediateDrawer : public ImmediateDrawer {
  public:
   VulkanImmediateDrawer(VulkanContext* graphics_context);

src/xenia/ui/vk/vulkan_provider.cc

@@ -13,6 +13,7 @@
 
 #include "xenia/base/cvar.h"
 #include "xenia/base/logging.h"
+#include "xenia/base/platform.h"
 #include "xenia/ui/vk/vulkan_context.h"
 #include "xenia/ui/vk/vulkan_util.h"