From 74924c81863a20cc6369060f177915cca102caca Mon Sep 17 00:00:00 2001
From: Rubidium <rubidium@openttd.org>
Date: Sun, 18 Jun 2023 19:46:53 +0200
Subject: [PATCH] Codechange: includes must be before 'safeguards.h'

---
 src/mixer.cpp        | 2 +-
 src/music.cpp        | 2 +-
 src/settings_gui.cpp | 3 +--
 src/town_gui.cpp     | 2 +-
 src/waypoint_gui.cpp | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/mixer.cpp b/src/mixer.cpp
index 95f1c30f9d..eefff9dd8d 100644
--- a/src/mixer.cpp
+++ b/src/mixer.cpp
@@ -12,10 +12,10 @@
 #include <atomic>
 #include "core/math_func.hpp"
 #include "framerate_type.h"
+#include "mixer.h"
 #include "settings_type.h"
 
 #include "safeguards.h"
-#include "mixer.h"
 
 struct MixerChannel {
 	/* pointer to allocated buffer memory */
diff --git a/src/music.cpp b/src/music.cpp
index 6c69d5e625..bd224fb7fe 100644
--- a/src/music.cpp
+++ b/src/music.cpp
@@ -13,9 +13,9 @@
 /** The type of set we're replacing */
 #define SET_TYPE "music"
 #include "base_media_func.h"
+#include "random_access_file_type.h"
 
 #include "safeguards.h"
-#include "random_access_file_type.h"
 
 
 /**
diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp
index 70cf9189cb..9e4f372175 100644
--- a/src/settings_gui.cpp
+++ b/src/settings_gui.cpp
@@ -44,10 +44,9 @@
 #include "network/core/config.h"
 #include "network/network_gui.h"
 #include "network/network_survey.h"
-
+#include "video/video_driver.hpp"
 
 #include "safeguards.h"
-#include "video/video_driver.hpp"
 
 
 static const StringID _autosave_dropdown[] = {
diff --git a/src/town_gui.cpp b/src/town_gui.cpp
index 0ddf2b9906..c60307fa5c 100644
--- a/src/town_gui.cpp
+++ b/src/town_gui.cpp
@@ -37,13 +37,13 @@
 #include "timer/timer.h"
 #include "timer/timer_game_calendar.h"
 #include "timer/timer_window.h"
+#include "zoom_func.h"
 
 #include "widgets/town_widget.h"
 
 #include "table/strings.h"
 
 #include "safeguards.h"
-#include "zoom_func.h"
 
 TownKdtree _town_local_authority_kdtree(&Kdtree_TownXYFunc);
 
diff --git a/src/waypoint_gui.cpp b/src/waypoint_gui.cpp
index 8081984e0c..d8b3c10379 100644
--- a/src/waypoint_gui.cpp
+++ b/src/waypoint_gui.cpp
@@ -21,13 +21,13 @@
 #include "window_func.h"
 #include "waypoint_base.h"
 #include "waypoint_cmd.h"
+#include "zoom_func.h"
 
 #include "widgets/waypoint_widget.h"
 
 #include "table/strings.h"
 
 #include "safeguards.h"
-#include "zoom_func.h"
 
 /** GUI for accessing waypoints and buoys. */
 struct WaypointWindow : Window {