diff --git a/src/openrct2-ui/windows/GuestList.cpp b/src/openrct2-ui/windows/GuestList.cpp
index ad37b5ef4f..f45b915dca 100644
--- a/src/openrct2-ui/windows/GuestList.cpp
+++ b/src/openrct2-ui/windows/GuestList.cpp
@@ -15,6 +15,7 @@
 #pragma endregion
 
 #include <openrct2/config/Config.h>
+#include <openrct2-ui/windows/Window.h>
 
 #include <openrct2/game.h>
 #include <openrct2/interface/widget.h>
diff --git a/src/openrct2-ui/windows/StaffFirePrompt.cpp b/src/openrct2-ui/windows/StaffFirePrompt.cpp
index 8d727373af..1dcbb578c7 100644
--- a/src/openrct2-ui/windows/StaffFirePrompt.cpp
+++ b/src/openrct2-ui/windows/StaffFirePrompt.cpp
@@ -14,6 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
+#include <openrct2-ui/windows/Window.h>
 #include <openrct2/game.h>
 #include <openrct2/interface/widget.h>
 #include <openrct2/localisation/localisation.h>
diff --git a/src/openrct2-ui/windows/TitleScenarioSelect.cpp b/src/openrct2-ui/windows/TitleScenarioSelect.cpp
index e852263115..9dae7067a2 100644
--- a/src/openrct2-ui/windows/TitleScenarioSelect.cpp
+++ b/src/openrct2-ui/windows/TitleScenarioSelect.cpp
@@ -18,6 +18,7 @@
 #include <openrct2/scenario/ScenarioRepository.h>
 #include <openrct2/scenario/ScenarioSources.h>
 #include <openrct2/core/Memory.hpp>
+#include <openrct2-ui/windows/Window.h>
 
 #include <openrct2/audio/audio.h>
 #include <openrct2/localisation/date.h>
diff --git a/src/openrct2-ui/windows/TrackDesignManage.cpp b/src/openrct2-ui/windows/TrackDesignManage.cpp
index 69f16b0233..09584369d7 100644
--- a/src/openrct2-ui/windows/TrackDesignManage.cpp
+++ b/src/openrct2-ui/windows/TrackDesignManage.cpp
@@ -14,13 +14,14 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../Context.h"
-#include "../ride/TrackDesignRepository.h"
-#include "../core/Math.hpp"
+#include <openrct2/Context.h>
+#include <openrct2/ride/TrackDesignRepository.h>
+#include <openrct2/core/Math.hpp>
+#include <openrct2-ui/windows/Window.h>
 
-#include "../interface/widget.h"
-#include "../localisation/localisation.h"
-#include "../util/util.h"
+#include <openrct2/interface/widget.h>
+#include <openrct2/localisation/localisation.h>
+#include <openrct2/util/util.h>
 
 #pragma region Widgets