diff --git a/src/openrct2/PlatformEnvironment.cpp b/src/openrct2/PlatformEnvironment.cpp
index 025695715a..4924311d12 100644
--- a/src/openrct2/PlatformEnvironment.cpp
+++ b/src/openrct2/PlatformEnvironment.cpp
@@ -15,6 +15,7 @@
 #include "core/Path.hpp"
 #include "core/String.hpp"
 #include "platform/Platform.h"
+#include "util/Util.h"
 
 using namespace OpenRCT2;
 
diff --git a/src/openrct2/config/Config.h b/src/openrct2/config/Config.h
index cc6d3eede7..8206ed3602 100644
--- a/src/openrct2/config/Config.h
+++ b/src/openrct2/config/Config.h
@@ -10,13 +10,14 @@
 #pragma once
 
 #include "../core/String.hpp"
-#include "../drawing/Drawing.h"
-#include "../localisation/Currency.h"
+#include "../localisation/CurrencyTypes.h"
 #include "ConfigTypes.h"
 
 #include <atomic>
 #include <string>
 
+struct Gx;
+
 struct GeneralConfiguration
 {
     // Paths
diff --git a/src/openrct2/drawing/TTF.cpp b/src/openrct2/drawing/TTF.cpp
index d3b25d46b4..07a17a580b 100644
--- a/src/openrct2/drawing/TTF.cpp
+++ b/src/openrct2/drawing/TTF.cpp
@@ -22,6 +22,7 @@
 #    include "../drawing/Font.h"
 #    include "../localisation/LocalisationService.h"
 #    include "../platform/Platform.h"
+#    include "../util/Util.h"
 #    include "DrawingLock.hpp"
 #    include "TTF.h"
 
diff --git a/src/openrct2/libopenrct2.vcxproj b/src/openrct2/libopenrct2.vcxproj
index ec0bf786d3..3ab6981da5 100644
--- a/src/openrct2/libopenrct2.vcxproj
+++ b/src/openrct2/libopenrct2.vcxproj
@@ -279,7 +279,7 @@
     <ClInclude Include="Limits.h" />
     <ClInclude Include="localisation\ConversionTables.h" />
     <ClInclude Include="localisation\Currency.h" />
-    <ClInclude Include="localisation\CurrencyType.h" />
+    <ClInclude Include="localisation\CurrencyTypes.h" />
     <ClInclude Include="localisation\Date.h" />
     <ClInclude Include="localisation\FormatCodes.h" />
     <ClInclude Include="localisation\Formatter.h" />
diff --git a/src/openrct2/localisation/Currency.h b/src/openrct2/localisation/Currency.h
index bc5125d47f..4928dd77fb 100644
--- a/src/openrct2/localisation/Currency.h
+++ b/src/openrct2/localisation/Currency.h
@@ -12,13 +12,7 @@
 #include "../common.h"
 #include "../core/String.hpp"
 #include "../util/Util.h"
-#include "CurrencyType.h"
-
-enum class CurrencyAffix
-{
-    Prefix,
-    Suffix
-};
+#include "CurrencyTypes.h"
 
 #define CURRENCY_SYMBOL_MAX_SIZE 8
 #define CURRENCY_RATE_MAX_NUM_DIGITS 9
diff --git a/src/openrct2/localisation/CurrencyType.h b/src/openrct2/localisation/CurrencyTypes.h
similarity index 95%
rename from src/openrct2/localisation/CurrencyType.h
rename to src/openrct2/localisation/CurrencyTypes.h
index ddb5ebb478..5c1a6ee976 100644
--- a/src/openrct2/localisation/CurrencyType.h
+++ b/src/openrct2/localisation/CurrencyTypes.h
@@ -36,3 +36,9 @@ enum class CurrencyType : uint8_t
 
     Count // Last item
 };
+
+enum class CurrencyAffix
+{
+    Prefix,
+    Suffix
+};