diff --git a/src/engine_gui.h b/src/engine_gui.h
index 096bdca8c5..9667e884d5 100644
--- a/src/engine_gui.h
+++ b/src/engine_gui.h
@@ -15,6 +15,7 @@
 #include "gfx_type.h"
 #include "vehicle_type.h"
 #include "engine_base.h"
+#include "window_type.h"
 
 struct GUIEngineListItem {
 	EngineID engine_id;       ///< Engine to display in build purchase list
diff --git a/src/tbtr_template_gui_main.cpp b/src/tbtr_template_gui_main.cpp
index 385816ac17..0b7338e9f1 100644
--- a/src/tbtr_template_gui_main.cpp
+++ b/src/tbtr_template_gui_main.cpp
@@ -8,45 +8,37 @@
 /** @file tbtr_template_gui_main.cpp Template-based train replacement: main GUI. */
 
 #include "stdafx.h"
-#include "command_func.h"
-#include "vehicle_gui.h"
-#include "newgrf_engine.h"
-#include "group.h"
-#include "rail.h"
-#include "strings_func.h"
-#include "window_func.h"
 #include "autoreplace_func.h"
+#include "command_func.h"
 #include "company_func.h"
-#include "engine_base.h"
-#include "window_gui.h"
-#include "viewport_func.h"
-#include "tilehighlight_func.h"
-#include "engine_gui.h"
-#include "settings_func.h"
-#include "core/geometry_func.hpp"
-#include "rail_gui.h"
-#include "network/network.h"
-#include "zoom_func.h"
-#include "textbuf_gui.h"
 #include "core/backup_type.hpp"
-
+#include "core/geometry_func.hpp"
+#include "core/pool_func.hpp"
+#include "engine_base.h"
+#include "engine_func.h"
+#include "engine_gui.h"
+#include "gfx_type.h"
+#include "group.h"
+#include "network/network.h"
+#include "newgrf_engine.h"
+#include "rail_gui.h"
+#include "rail.h"
+#include "settings_func.h"
+#include "spritecache.h"
+#include "strings_func.h"
 #include "table/sprites.h"
 #include "table/strings.h"
-
-// test creating pool -> creating vehicles
-#include "core/pool_func.hpp"
-
-#include "vehicle_gui_base.h"
-#include "vehicle_base.h"
+#include "textbuf_gui.h"
+#include "tilehighlight_func.h"
 #include "train.h"
+#include "vehicle_base.h"
 #include "vehicle_func.h"
-
-#include "gfx_type.h"
-
-#include "engine_func.h"
-
-// drawing the vehicle length based on occupied tiles
-#include "spritecache.h"
+#include "vehicle_gui_base.h"
+#include "vehicle_gui.h"
+#include "viewport_func.h"
+#include "window_func.h"
+#include "window_gui.h"
+#include "zoom_func.h"
 
 #include "tbtr_template_gui_main.h"
 #include "tbtr_template_gui_create.h"
diff --git a/src/tbtr_template_vehicle.cpp b/src/tbtr_template_vehicle.cpp
index 7d7539c30d..98fa7069ea 100644
--- a/src/tbtr_template_vehicle.cpp
+++ b/src/tbtr_template_vehicle.cpp
@@ -8,38 +8,30 @@
 /** @file tbtr_template_vehicle.cpp Template-based train replacement: template vehicle. */
 
 #include "stdafx.h"
-#include "company_func.h"
-#include "train.h"
-#include "command_func.h"
-#include "engine_func.h"
-#include "vehicle_func.h"
+#include "articulated_vehicles.h"
 #include "autoreplace_func.h"
 #include "autoreplace_gui.h"
-#include "group.h"
-#include "articulated_vehicles.h"
-#include "core/random_func.hpp"
-#include "core/pool_type.hpp"
-#include "engine_type.h"
-#include "group_type.h"
+#include "command_func.h"
+#include "company_func.h"
 #include "core/pool_func.hpp"
-
-#include "table/strings.h"
-
+#include "core/pool_type.hpp"
+#include "core/random_func.hpp"
+#include "engine_func.h"
+#include "engine_type.h"
+#include "group.h"
+#include "group_type.h"
+#include "newgrf_cargo.h"
+#include "newgrf_engine.h"
 #include "newgrf.h"
-
-#include "vehicle_type.h"
+#include "newgrf_spritegroup.h"
+#include "table/strings.h"
+#include "table/train_cmd.h"
+#include "tbtr_template_vehicle_func.h"
+#include "tbtr_template_vehicle.h"
+#include "train.h"
 #include "vehicle_base.h"
 #include "vehicle_func.h"
-
-#include "table/train_cmd.h"
-
-#include "tbtr_template_vehicle.h"
-#include "tbtr_template_vehicle_func.h"
-
-// since doing stuff with sprites
-#include "newgrf_spritegroup.h"
-#include "newgrf_engine.h"
-#include "newgrf_cargo.h"
+#include "vehicle_type.h"
 
 #include "3rdparty/robin_hood/robin_hood.h"
 
diff --git a/src/tbtr_template_vehicle_func.cpp b/src/tbtr_template_vehicle_func.cpp
index 9c7ebbc082..8e702b17b2 100644
--- a/src/tbtr_template_vehicle_func.cpp
+++ b/src/tbtr_template_vehicle_func.cpp
@@ -8,35 +8,31 @@
 /** @file tbtr_template_vehicle_func.cpp Template-based train replacement: template vehicle functions. */
 
 #include "stdafx.h"
-#include "window_gui.h"
-#include "gfx_func.h"
-#include "window_func.h"
-#include "command_func.h"
-#include "vehicle_gui.h"
-#include "train.h"
-#include "strings_func.h"
-#include "vehicle_func.h"
-#include "core/geometry_type.hpp"
-#include "debug.h"
-#include "zoom_func.h"
-#include "core/backup_type.hpp"
-#include "core/random_func.hpp"
-
-#include "table/sprites.h"
-#include "table/strings.h"
-
-#include "cargoaction.h"
-#include "train.h"
-#include "company_func.h"
-#include "newgrf.h"
-#include "spritecache.h"
 #include "articulated_vehicles.h"
 #include "autoreplace_func.h"
-
+#include "cargoaction.h"
+#include "command_func.h"
+#include "company_func.h"
+#include "core/backup_type.hpp"
+#include "core/geometry_type.hpp"
+#include "core/random_func.hpp"
+#include "debug.h"
 #include "depot_base.h"
-
-#include "tbtr_template_vehicle.h"
+#include "gfx_func.h"
+#include "newgrf.h"
+#include "spritecache.h"
+#include "strings_func.h"
+#include "table/sprites.h"
+#include "table/strings.h"
 #include "tbtr_template_vehicle_func.h"
+#include "tbtr_template_vehicle.h"
+#include "train.h"
+#include "vehicle_func.h"
+#include "vehicle_gui.h"
+#include "window_func.h"
+#include "window_gui.h"
+#include "zoom_func.h"
+
 
 #include <map>
 #include <stdio.h>