Codechange: includes must be before 'safeguards.h'

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 */

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"
 
 
 /**

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[] = {

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);
 

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 {