11 files changed, 2 insertions, 19 deletions
diff --git a/src/company_cmd.cpp b/src/company_cmd.cpp
index afc961e7f..297b18399 100644
--- a/src/company_cmd.cpp
+++ b/src/company_cmd.cpp
@@ -13,7 +13,6 @@
 #include "network/network.h"
 #include "network/network_func.h"
 #include "network/network_base.h"
-#include "variables.h"
 #include "ai/ai.hpp"
 #include "company_manager_face.h"
 #include "group.h"
@@ -23,7 +22,6 @@
 #include "gfx_func.h"
 #include "date_func.h"
 #include "sound_func.h"
-#include "core/alloc_func.hpp"
 #include "autoreplace_func.h"
 #include "autoreplace_gui.h"
 #include "string_func.h"
diff --git a/src/misc_cmd.cpp b/src/misc_cmd.cpp
index aeda6f754..b51df10b1 100644
--- a/src/misc_cmd.cpp
+++ b/src/misc_cmd.cpp
@@ -16,7 +16,6 @@
 #include "vehicle_func.h"
 #include "string_func.h"
 #include "company_func.h"
-#include "company_base.h"
 #include "company_gui.h"
 #include "settings_type.h"
 #include "vehicle_base.h"
diff --git a/src/road_cmd.cpp b/src/road_cmd.cpp
index d80e2d9d1..7b34560f4 100644
--- a/src/road_cmd.cpp
+++ b/src/road_cmd.cpp
@@ -20,7 +20,6 @@
 #include "window_func.h"
 #include "strings_func.h"
 #include "vehicle_func.h"
-#include "vehicle_base.h"
 #include "sound_func.h"
 #include "tunnelbridge.h"
 #include "cheat_type.h"
diff --git a/src/signs.cpp b/src/signs.cpp
index 772898e9e..52e1fe72b 100644
--- a/src/signs.cpp
+++ b/src/signs.cpp
@@ -10,7 +10,6 @@
 #include "viewport_func.h"
 #include "zoom_func.h"
 #include "functions.h"
-#include "window_func.h"
 #include "oldpool_func.h"
 
 #include "table/strings.h"
diff --git a/src/signs_cmd.cpp b/src/signs_cmd.cpp
index 8c1869a18..ada2e2e07 100644
--- a/src/signs_cmd.cpp
+++ b/src/signs_cmd.cpp
@@ -8,7 +8,6 @@
 #include "signs_base.h"
 #include "signs_func.h"
 #include "command_func.h"
-#include "strings_func.h"
 #include "tilehighlight_func.h"
 #include "window_func.h"
 #include "map_func.h"
diff --git a/src/tunnelbridge_cmd.cpp b/src/tunnelbridge_cmd.cpp
index c7f779870..6682f593e 100644
--- a/src/tunnelbridge_cmd.cpp
+++ b/src/tunnelbridge_cmd.cpp
@@ -9,7 +9,6 @@
 #include "openttd.h"
 #include "rail_map.h"
 #include "landscape.h"
-#include "town_type.h"
 #include "unmovable_map.h"
 #include "viewport_func.h"
 #include "command_func.h"
diff --git a/src/vehicle.cpp b/src/vehicle.cpp
index bdc6d0c6b..bce879ab5 100644
--- a/src/vehicle.cpp
+++ b/src/vehicle.cpp
@@ -12,7 +12,6 @@
 #include "landscape.h"
 #include "timetable.h"
 #include "viewport_func.h"
-#include "gfx_func.h"
 #include "news_func.h"
 #include "command_func.h"
 #include "company_func.h"
@@ -33,7 +32,6 @@
 #include "autoreplace_func.h"
 #include "autoreplace_gui.h"
 #include "oldpool_func.h"
-#include "depot_map.h"
 #include "ai/ai.hpp"
 #include "core/smallmap_type.hpp"
 #include "depot_func.h"
diff --git a/src/vehicle_cmd.cpp b/src/vehicle_cmd.cpp
index 8b1c7cc90..eb95e0104 100644
--- a/src/vehicle_cmd.cpp
+++ b/src/vehicle_cmd.cpp
@@ -3,24 +3,18 @@
 /** @file vehicle_cmd.cpp Commands for vehicles. */
 
 #include "stdafx.h"
-#include "openttd.h"
 #include "roadveh.h"
-#include "ship.h"
 #include "gfx_func.h"
 #include "news_func.h"
 #include "command_func.h"
 #include "company_func.h"
 #include "vehicle_gui.h"
 #include "train.h"
-#include "aircraft.h"
 #include "newgrf_engine.h"
 #include "newgrf_text.h"
-#include "group.h"
 #include "functions.h"
-#include "date_func.h"
 #include "window_func.h"
 #include "vehicle_func.h"
-#include "autoreplace_func.h"
 #include "string_func.h"
 #include "depot_map.h"
 #include "vehiclelist.h"
diff --git a/src/waypoint.cpp b/src/waypoint.cpp
index 9b7d8fa70..c39a83273 100644
--- a/src/waypoint.cpp
+++ b/src/waypoint.cpp
@@ -4,7 +4,7 @@
 
 #include "stdafx.h"
 
-#include "command_func.h"
+#include "strings_type.h"
 #include "rail.h"
 #include "station_base.h"
 #include "town.h"
@@ -12,7 +12,7 @@
 #include "window_func.h"
 #include "newgrf_station.h"
 #include "oldpool_func.h"
-#include "train.h"
+#include "order_func.h"
 
 DEFINE_OLD_POOL_GENERIC(Waypoint, Waypoint)
 
diff --git a/src/waypoint_cmd.cpp b/src/waypoint_cmd.cpp
index 94df93f88..1314b247d 100644
--- a/src/waypoint_cmd.cpp
+++ b/src/waypoint_cmd.cpp
@@ -20,7 +20,6 @@
 #include "string_func.h"
 #include "company_func.h"
 #include "newgrf_station.h"
-#include "oldpool_func.h"
 #include "viewport_func.h"
 #include "train.h"
 
diff --git a/src/waypoint_gui.cpp b/src/waypoint_gui.cpp
index 91222f3ac..67f88b4ba 100644
--- a/src/waypoint_gui.cpp
+++ b/src/waypoint_gui.cpp
@@ -12,7 +12,6 @@
 #include "gfx_func.h"
 #include "command_func.h"
 #include "company_func.h"
-#include "functions.h"
 #include "window_func.h"
 
 #include "table/strings.h"