From 0c4835bc36f5fa520eec247f2ab06c87fb1c286c Mon Sep 17 00:00:00 2001
From: Jan <jan@laupetin.net>
Date: Sun, 19 Nov 2023 16:26:36 +0100
Subject: [PATCH] Fix build due to reordered headers

---
 src/ObjLoading/Parsing/Menu/Domain/CommonItemDef.h | 1 +
 src/ZoneCode/Game/IW3/IW3.h                        | 6 +++++-
 src/ZoneCode/Game/IW4/IW4.h                        | 6 +++++-
 src/ZoneCode/Game/IW5/IW5.h                        | 6 +++++-
 src/ZoneCode/Game/T5/T5.h                          | 6 +++++-
 src/ZoneCode/Game/T6/T6.h                          | 6 +++++-
 src/ZoneCommon/Pool/XAssetInfo.h                   | 1 +
 7 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/src/ObjLoading/Parsing/Menu/Domain/CommonItemDef.h b/src/ObjLoading/Parsing/Menu/Domain/CommonItemDef.h
index 7ec80e30..98a22764 100644
--- a/src/ObjLoading/Parsing/Menu/Domain/CommonItemDef.h
+++ b/src/ObjLoading/Parsing/Menu/Domain/CommonItemDef.h
@@ -4,6 +4,7 @@
 #include "EventHandler/CommonEventHandlerSet.h"
 #include "Parsing/Simple/Expression/ISimpleExpression.h"
 
+#include <map>
 #include <string>
 #include <vector>
 
diff --git a/src/ZoneCode/Game/IW3/IW3.h b/src/ZoneCode/Game/IW3/IW3.h
index 8c2054a1..8444b535 100644
--- a/src/ZoneCode/Game/IW3/IW3.h
+++ b/src/ZoneCode/Game/IW3/IW3.h
@@ -2,7 +2,11 @@
 
 // Entry point for IW3 code generation
 
-#include "../../../Common/Game/IW3/IW3_Assets.h"
+// clang-format off: Order of includes matters here
+
 #include "../Common.h"
+#include "../../../Common/Game/IW3/IW3_Assets.h"
+
+// clang-format on
 
 // EOF
diff --git a/src/ZoneCode/Game/IW4/IW4.h b/src/ZoneCode/Game/IW4/IW4.h
index 368ab5f2..39b80eea 100644
--- a/src/ZoneCode/Game/IW4/IW4.h
+++ b/src/ZoneCode/Game/IW4/IW4.h
@@ -2,7 +2,11 @@
 
 // Entry point for IW4 code generation
 
-#include "../../../Common/Game/IW4/IW4_Assets.h"
+// clang-format off: Order of includes matters here
+
 #include "../Common.h"
+#include "../../../Common/Game/IW4/IW4_Assets.h"
+
+// clang-format on
 
 // EOF
diff --git a/src/ZoneCode/Game/IW5/IW5.h b/src/ZoneCode/Game/IW5/IW5.h
index 621ba4d5..3052fdaf 100644
--- a/src/ZoneCode/Game/IW5/IW5.h
+++ b/src/ZoneCode/Game/IW5/IW5.h
@@ -2,7 +2,11 @@
 
 // Entry point for IW5 code generation
 
-#include "../../../Common/Game/IW5/IW5_Assets.h"
+// clang-format off: Order of includes matters here
+
 #include "../Common.h"
+#include "../../../Common/Game/IW5/IW5_Assets.h"
+
+// clang-format on
 
 // EOF
diff --git a/src/ZoneCode/Game/T5/T5.h b/src/ZoneCode/Game/T5/T5.h
index 7803852c..7fc65d2c 100644
--- a/src/ZoneCode/Game/T5/T5.h
+++ b/src/ZoneCode/Game/T5/T5.h
@@ -2,7 +2,11 @@
 
 // Entry point for T5 code generation
 
-#include "../../../Common/Game/T5/T5_Assets.h"
+// clang-format off: Order of includes matters here
+
 #include "../Common.h"
+#include "../../../Common/Game/T5/T5_Assets.h"
+
+// clang-format on
 
 // EOF
diff --git a/src/ZoneCode/Game/T6/T6.h b/src/ZoneCode/Game/T6/T6.h
index 7cbce404..d71df041 100644
--- a/src/ZoneCode/Game/T6/T6.h
+++ b/src/ZoneCode/Game/T6/T6.h
@@ -2,7 +2,11 @@
 
 // Entry point for T6 code generation
 
-#include "../../../Common/Game/T6/T6_Assets.h"
+// clang-format off: Order of includes matters here
+
 #include "../Common.h"
+#include "../../../Common/Game/T6/T6_Assets.h"
+
+// clang-format on
 
 // EOF
diff --git a/src/ZoneCommon/Pool/XAssetInfo.h b/src/ZoneCommon/Pool/XAssetInfo.h
index 4b447565..59aa3e1d 100644
--- a/src/ZoneCommon/Pool/XAssetInfo.h
+++ b/src/ZoneCommon/Pool/XAssetInfo.h
@@ -1,5 +1,6 @@
 #pragma once
 #include "Zone/Zone.h"
+#include "Zone/ZoneTypes.h"
 
 #include <string>
 #include <vector>