Codechange: Move template class implementation includes.

These are now placed at the bottom of the including files include list.

src/company_gui.cpp

@@ -24,7 +24,6 @@
 #include "strings_func.h"
 #include "timer/timer_game_economy.h"
 #include "dropdown_type.h"
-#include "dropdown_common_type.h"
 #include "tilehighlight_func.h"
 #include "company_base.h"
 #include "core/geometry_func.hpp"
@@ -51,6 +50,8 @@
 
 #include "table/strings.h"
 
+#include "dropdown_common_type.h"
+
 #include "safeguards.h"
 
 

src/dropdown.cpp

@@ -10,7 +10,6 @@
 #include "stdafx.h"
 #include "dropdown_type.h"
 #include "dropdown_func.h"
-#include "dropdown_common_type.h"
 #include "strings_func.h"
 #include "timer/timer.h"
 #include "timer/timer_window.h"
@@ -22,6 +21,8 @@
 
 #include "table/strings.h"
 
+#include "dropdown_common_type.h"
+
 #include "safeguards.h"
 
 std::unique_ptr<DropDownListItem> MakeDropDownListDividerItem()

src/dropdown_common_type.h

@@ -15,7 +15,6 @@
 #include "palette_func.h"
 #include "string_func.h"
 #include "strings_func.h"
-#include "table/strings.h"
 #include "window_gui.h"
 
 /**

src/genworld_gui.cpp

@@ -19,7 +19,6 @@
 #include "fios.h"
 #include "string_func.h"
 #include "dropdown_type.h"
-#include "dropdown_common_type.h"
 #include "dropdown_func.h"
 #include "querystring_gui.h"
 #include "town.h"
@@ -39,6 +38,8 @@
 
 #include "table/strings.h"
 
+#include "dropdown_common_type.h"
+
 #include "safeguards.h"
 
 

src/newgrf_airport.cpp

@@ -14,11 +14,12 @@
 #include "newgrf_spritegroup.h"
 #include "newgrf_text.h"
 #include "station_base.h"
-#include "newgrf_class_func.h"
 #include "town.h"
 
 #include "table/strings.h"
 
+#include "newgrf_class_func.h"
+
 #include "safeguards.h"
 
 /**

src/newgrf_badge.cpp

@@ -9,7 +9,6 @@
 
 #include "stdafx.h"
 #include "dropdown_type.h"
-#include "dropdown_common_type.h"
 #include "newgrf.h"
 #include "newgrf_badge.h"
 #include "newgrf_badge_type.h"
@@ -22,6 +21,8 @@
 
 #include "table/strings.h"
 
+#include "dropdown_common_type.h"
+
 #include "safeguards.h"
 
 /** Separator to identify badge classes from a label. */

src/newgrf_class_func.h

@@ -9,8 +9,6 @@
 
 #include "newgrf_class.h"
 
-#include "table/strings.h"
-
 /** Reset the classes, i.e. clear everything. */
 template <typename Tspec, typename Tindex, Tindex Tmax>
 void NewGRFClass<Tspec, Tindex, Tmax>::Reset()

src/newgrf_object.cpp

@@ -14,7 +14,6 @@
 #include "genworld.h"
 #include "newgrf_badge.h"
 #include "newgrf_object.h"
-#include "newgrf_class_func.h"
 #include "newgrf_sound.h"
 #include "object_base.h"
 #include "object_map.h"
@@ -26,6 +25,8 @@
 
 #include "table/strings.h"
 
+#include "newgrf_class_func.h"
+
 #include "safeguards.h"
 
 /** The override manager for our objects. */

src/newgrf_roadstop.cpp

@@ -13,7 +13,6 @@
 #include "roadstop_base.h"
 #include "newgrf_badge.h"
 #include "newgrf_roadstop.h"
-#include "newgrf_class_func.h"
 #include "newgrf_cargo.h"
 #include "newgrf_roadtype.h"
 #include "gfx_type.h"
@@ -28,6 +27,8 @@
 
 #include "table/strings.h"
 
+#include "newgrf_class_func.h"
+
 #include "safeguards.h"
 
 template <>

src/newgrf_station.cpp

@@ -23,11 +23,12 @@
 #include "company_func.h"
 #include "tunnelbridge_map.h"
 #include "newgrf_animation_base.h"
-#include "newgrf_class_func.h"
 #include "timer/timer_game_calendar.h"
 
 #include "table/strings.h"
 
+#include "newgrf_class_func.h"
+
 #include "safeguards.h"
 
 

src/settings_gui.cpp

@@ -22,7 +22,6 @@
 #include "string_func.h"
 #include "dropdown_type.h"
 #include "dropdown_func.h"
-#include "dropdown_common_type.h"
 #include "slider_func.h"
 #include "highscore.h"
 #include "base_media_base.h"
@@ -54,6 +53,8 @@
 
 #include "table/strings.h"
 
+#include "dropdown_common_type.h"
+
 #include "safeguards.h"
 
 

src/station_gui.cpp

@@ -21,7 +21,6 @@
 #include "window_func.h"
 #include "viewport_func.h"
 #include "dropdown_type.h"
-#include "dropdown_common_type.h"
 #include "dropdown_func.h"
 #include "station_base.h"
 #include "waypoint_base.h"
@@ -39,6 +38,8 @@
 
 #include "table/strings.h"
 
+#include "dropdown_common_type.h"
+
 #include "safeguards.h"
 
 struct StationTypeFilter

src/toolbar_gui.cpp

@@ -15,7 +15,6 @@
 #include "command_func.h"
 #include "dropdown_type.h"
 #include "dropdown_func.h"
-#include "dropdown_common_type.h"
 #include "house.h"
 #include "vehicle_gui.h"
 #include "rail_gui.h"
@@ -69,6 +68,8 @@
 
 #include "table/strings.h"
 
+#include "dropdown_common_type.h"
+
 #include "safeguards.h"