63 files changed, 62 insertions, 21 deletions

diff --git a/ai_new.c b/ai_new.c
index 57f25643a..347129995 100644
--- a/ai_new.c
+++ b/ai_new.c
@@ -15,6 +15,7 @@
 
 #include "stdafx.h"
 #include "ttd.h"
+#include "table/strings.h"
 #include "command.h"
 #include "ai.h"
 #include "town.h"
diff --git a/aircraft_cmd.c b/aircraft_cmd.c
index 7e0f7bb4c..41e612559 100644
--- a/aircraft_cmd.c
+++ b/aircraft_cmd.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
+#include "table/strings.h"
 #include "vehicle.h"
 #include "engine.h"
 #include "command.h"
diff --git a/aircraft_gui.c b/aircraft_gui.c
index 841f1e3d3..d0b380ee4 100644
--- a/aircraft_gui.c
+++ b/aircraft_gui.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
+#include "table/strings.h"
 #include "window.h"
 #include "gui.h"
 #include "vehicle.h"
diff --git a/airport_gui.c b/airport_gui.c
index 95238f4e2..2cd9c15a7 100644
--- a/airport_gui.c
+++ b/airport_gui.c
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
-
+#include "table/strings.h"
 #include "window.h"
 #include "gui.h"
 #include "viewport.h"
diff --git a/bridge_gui.c b/bridge_gui.c
index dbb9ef642..f78d49d90 100644
--- a/bridge_gui.c
+++ b/bridge_gui.c
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
-
+#include "table/strings.h"
 #include "window.h"
 #include "gui.h"
 #include "viewport.h"
diff --git a/clear_cmd.c b/clear_cmd.c
index 0c7fb2be7..225f40ed0 100644
--- a/clear_cmd.c
+++ b/clear_cmd.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
+#include "table/strings.h"
 #include "viewport.h"
 #include "command.h"
 
diff --git a/command.c b/command.c
index ab016fc19..0da83e269 100644
--- a/command.c
+++ b/command.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
+#include "table/strings.h"
 #include "gui.h"
 #include "command.h"
 #include "player.h"
diff --git a/console.c b/console.c
index 1eb0fbeac..fe7be247f 100644
--- a/console.c
+++ b/console.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
+#include "table/strings.h"
 #include "window.h"
 #include "gui.h"
 #include "gfx.h"
diff --git a/disaster_cmd.c b/disaster_cmd.c
index 93feb9b80..fed34fd5c 100644
--- a/disaster_cmd.c
+++ b/disaster_cmd.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
+#include "table/strings.h"
 #include "vehicle.h"
 #include "command.h"
 #include "news.h"
diff --git a/dock_gui.c b/dock_gui.c
index 553ba6edc..1b024086f 100644
--- a/dock_gui.c
+++ b/dock_gui.c
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
-
+#include "table/strings.h"
 #include "window.h"
 #include "gui.h"
 #include "viewport.h"
diff --git a/dummy_land.c b/dummy_land.c
index a5e8f0a1b..8efd8803d 100644
--- a/dummy_land.c
+++ b/dummy_land.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
+#include "table/strings.h"
 #include "viewport.h"
 #include "command.h"
 
diff --git a/economy.c b/economy.c
index aa1898d27..b4166562e 100644
--- a/economy.c
+++ b/economy.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
+#include "table/strings.h"
 #include "news.h"
 #include "player.h"
 #include "station.h"
diff --git a/engine.c b/engine.c
index f980703bc..3d8e9af12 100644
--- a/engine.c
+++ b/engine.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
+#include "table/strings.h"
 #include "engine.h"
 #include "table/engines.h"
 #include "player.h"
diff --git a/engine_gui.c b/engine_gui.c
index 5217a459b..536ff6524 100644
--- a/engine_gui.c
+++ b/engine_gui.c
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
-
+#include "table/strings.h"
 #include "window.h"
 #include "gui.h"
 #include "viewport.h"
diff --git a/graph_gui.c b/graph_gui.c
index 9929d5d19..000a46848 100644
--- a/graph_gui.c
+++ b/graph_gui.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
+#include "table/strings.h"
 #include "window.h"
 #include "gui.h"
 #include "gfx.h"
diff --git a/industry_cmd.c b/industry_cmd.c
index 80410febb..d1af5e81d 100644
--- a/industry_cmd.c
+++ b/industry_cmd.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
+#include "table/strings.h"
 #include "viewport.h"
 #include "command.h"
 #include "industry.h"
diff --git a/industry_gui.c b/industry_gui.c
index db34d8b44..48c6b03f4 100644
--- a/industry_gui.c
+++ b/industry_gui.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
+#include "table/strings.h"
 //#include "gui.h"
 #include "window.h"
 #include "gfx.h"
diff --git a/intro_gui.c b/intro_gui.c
index deb42cf37..750ffb16b 100644
--- a/intro_gui.c
+++ b/intro_gui.c
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
-
+#include "table/strings.h"
 #include "window.h"
 #include "gui.h"
 #include "viewport.h"
diff --git a/main_gui.c b/main_gui.c
index f1f0ea286..92874db04 100644
--- a/main_gui.c
+++ b/main_gui.c
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
-
+#include "table/strings.h"
 #include "window.h"
 #include "gui.h"
 #include "viewport.h"
diff --git a/misc.c b/misc.c
index 6e6bc1b42..afc084737 100644
--- a/misc.c
+++ b/misc.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
+#include "table/strings.h"
 #include "vehicle.h"
 #include "gfx.h"
 #include "assert.h"
diff --git a/misc_cmd.c b/misc_cmd.c
index f592c08ce..f907df5c0 100644
--- a/misc_cmd.c
+++ b/misc_cmd.c
@@ -1,6 +1,7 @@
 
 #include "stdafx.h"
 #include "ttd.h"
+#include "table/strings.h"
 #include "command.h"
 #include "player.h"
 #include "gfx.h"
diff --git a/misc_gui.c b/misc_gui.c
index 8e1957c46..fe3569c01 100644
--- a/misc_gui.c
+++ b/misc_gui.c
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
-
+#include "table/strings.h"
 #include "window.h"
 #include "gui.h"
 #include "viewport.h"
diff --git a/music_gui.c b/music_gui.c
index 773f0fc73..7994b4d65 100644
--- a/music_gui.c
+++ b/music_gui.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
+#include "table/strings.h"
 #include "window.h"
 #include "gui.h"
 #include "gfx.h"
diff --git a/network.c b/network.c
index 50ff771d5..c249e1b86 100644
--- a/network.c
+++ b/network.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
+#include "table/strings.h"
 #include "gui.h"
 #include "command.h"
 #include "player.h"
diff --git a/network_gui.c b/network_gui.c
index 216be02c8..6f2e3ad1b 100644
--- a/network_gui.c
+++ b/network_gui.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
+#include "table/strings.h"
 #include "window.h"
 #include "gui.h"
 #include "gfx.h"
diff --git a/news_gui.c b/news_gui.c
index 22af2ce76..b5a0e059e 100644
--- a/news_gui.c
+++ b/news_gui.c
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
-
+#include "table/strings.h"
 #include "window.h"
 #include "gui.h"
 #include "viewport.h"
diff --git a/oldloader.c b/oldloader.c
index f12b3a864..81f3ed9b3 100644
--- a/oldloader.c
+++ b/oldloader.c
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
-
+#include "table/strings.h"
 #include "town.h"
 #include "industry.h"
 #include "station.h"
diff --git a/order_cmd.c b/order_cmd.c
index 6e5e0d04c..d63f3f8c5 100644
--- a/order_cmd.c
+++ b/order_cmd.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
+#include "table/strings.h"
 #include "vehicle.h"
 #include "command.h"
 #include "station.h"
diff --git a/order_gui.c b/order_gui.c
index 68b19e7bd..3dcc5f4bd 100644
--- a/order_gui.c
+++ b/order_gui.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
+#include "table/strings.h"
 #include "window.h"
 #include "gui.h"
 #include "gfx.h"
diff --git a/player_gui.c b/player_gui.c
index c53cd6b3e..61a2a02e5 100644
--- a/player_gui.c
+++ b/player_gui.c
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
-
+#include "table/strings.h"
 #include "window.h"
 #include "gui.h"
 #include "viewport.h"
diff --git a/players.c b/players.c
index 2050969c1..d72983f1a 100644
--- a/players.c
+++ b/players.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
+#include "table/strings.h"
 #include "player.h"
 #include "town.h"
 #include "vehicle.h"
diff --git a/rail_cmd.c b/rail_cmd.c
index 9e63f870d..19f84a8d2 100644
--- a/rail_cmd.c
+++ b/rail_cmd.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
+#include "table/strings.h"
 #include "vehicle.h"
 #include "viewport.h"
 #include "command.h"
diff --git a/rail_gui.c b/rail_gui.c
index dc0721d73..81fda3cd1 100644
--- a/rail_gui.c
+++ b/rail_gui.c
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
-
+#include "table/strings.h"
 #include "window.h"
 #include "gui.h"
 #include "viewport.h"
diff --git a/road_cmd.c b/road_cmd.c
index b189640cb..0f4271c75 100644
--- a/road_cmd.c
+++ b/road_cmd.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
+#include "table/strings.h"
 #include "vehicle.h"
 #include "viewport.h"
 #include "command.h"
diff --git a/road_gui.c b/road_gui.c
index c7779b878..61b8a1668 100644
--- a/road_gui.c
+++ b/road_gui.c
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
-
+#include "table/strings.h"
 #include "window.h"
 #include "gui.h"
 #include "viewport.h"
diff --git a/roadveh_cmd.c b/roadveh_cmd.c
index 5de98db27..bf1c4d4a4 100644
--- a/roadveh_cmd.c
+++ b/roadveh_cmd.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
+#include "table/strings.h"
 #include "vehicle.h"
 #include "engine.h"
 #include "command.h"
diff --git a/roadveh_gui.c b/roadveh_gui.c
index e240cf01e..dd57e0f9d 100644
--- a/roadveh_gui.c
+++ b/roadveh_gui.c
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
-
+#include "table/strings.h"
 #include "window.h"
 #include "gui.h"
 #include "gfx.h"
diff --git a/screenshot.c b/screenshot.c
index 4f3e72309..28ed9b394 100644
--- a/screenshot.c
+++ b/screenshot.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
+#include "table/strings.h"
 #include "gfx.h"
 #include "viewport.h"
 #include "player.h"
diff --git a/settings_gui.c b/settings_gui.c
index 4e3ef7351..476a7f01f 100644
--- a/settings_gui.c
+++ b/settings_gui.c
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
-
+#include "table/strings.h"
 #include "window.h"
 #include "gui.h"
 #include "gfx.h"
diff --git a/ship_cmd.c b/ship_cmd.c
index 980f8e326..a5e7f65a1 100644
--- a/ship_cmd.c
+++ b/ship_cmd.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
+#include "table/strings.h"
 #include "vehicle.h"
 #include "command.h"
 #include "pathfind.h"
diff --git a/ship_gui.c b/ship_gui.c
index 23a796d0d..94c06dfc8 100644
--- a/ship_gui.c
+++ b/ship_gui.c
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
-
+#include "table/strings.h"
 #include "window.h"
 #include "gui.h"
 #include "gfx.h"
diff --git a/smallmap_gui.c b/smallmap_gui.c
index 280252054..d9c9714b3 100644
--- a/smallmap_gui.c
+++ b/smallmap_gui.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
+#include "table/strings.h"
 #include "gui.h"
 #include "window.h"
 #include "gfx.h"
diff --git a/station_cmd.c b/station_cmd.c
index 04bb7d526..f28626ef0 100644
--- a/station_cmd.c
+++ b/station_cmd.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
+#include "table/strings.h"
 #include "station.h"
 #include "gfx.h"
 #include "window.h"
diff --git a/station_gui.c b/station_gui.c
index a43be575e..f0c2f34a5 100644
--- a/station_gui.c
+++ b/station_gui.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
+#include "table/strings.h"
 #include "window.h"
 #include "gui.h"
 #include "station.h"
diff --git a/strings.c b/strings.c
index 5b8b0d005..d2b0f1fcf 100644
--- a/strings.c
+++ b/strings.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
+#include "table/strings.h"
 #include "station.h"
 #include "town.h"
 #include "vehicle.h"
diff --git a/subsidy_gui.c b/subsidy_gui.c
index ddb294561..4227c4bb5 100644
--- a/subsidy_gui.c
+++ b/subsidy_gui.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
+#include "table/strings.h"
 #include "window.h"
 #include "gui.h"
 #include "station.h"
diff --git a/terraform_gui.c b/terraform_gui.c
index 2f5ae77ce..7704903be 100644
--- a/terraform_gui.c
+++ b/terraform_gui.c
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
-
+#include "table/strings.h"
 #include "window.h"
 #include "gui.h"
 #include "viewport.h"
diff --git a/town_cmd.c b/town_cmd.c
index e0c616864..c913567de 100644
--- a/town_cmd.c
+++ b/town_cmd.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
+#include "table/strings.h"
 #include "viewport.h"
 #include "town.h"
 #include "command.h"
diff --git a/town_gui.c b/town_gui.c
index ef9163de2..829a1c015 100644
--- a/town_gui.c
+++ b/town_gui.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
+#include "table/strings.h"
 #include "town.h"
 #include "window.h"
 #include "gfx.h"
diff --git a/train_cmd.c b/train_cmd.c
index edc7a6834..b082dacfb 100644
--- a/train_cmd.c
+++ b/train_cmd.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
+#include "table/strings.h"
 #include "vehicle.h"
 #include "command.h"
 #include "pathfind.h"
diff --git a/train_gui.c b/train_gui.c
index 1cd2c9b60..6a848f3de 100644
--- a/train_gui.c
+++ b/train_gui.c
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
-
+#include "table/strings.h"
 #include "window.h"
 #include "gui.h"
 #include "gfx.h"
diff --git a/tree_cmd.c b/tree_cmd.c
index 55b17fd0d..ed7946691 100644
--- a/tree_cmd.c
+++ b/tree_cmd.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
+#include "table/strings.h"
 #include "viewport.h"
 #include "command.h"
 #include "town.h"
diff --git a/ttd.c b/ttd.c
index a4052711e..fed7c0f3c 100644
--- a/ttd.c
+++ b/ttd.c
@@ -1,4 +1,5 @@
 #include "stdafx.h"
+#include "table/strings.h"
 
 #define VARDEF
 #include "ttd.h"
diff --git a/ttd.h b/ttd.h
index 656c71640..5e60dec6d 100644
--- a/ttd.h
+++ b/ttd.h
@@ -1,9 +1,6 @@
 #ifndef TTD_H
 #define TTD_H
 
-// include strings
-#include "table/strings.h"
-
 #ifndef VARDEF
 #define VARDEF extern
 #endif
diff --git a/tunnelbridge_cmd.c b/tunnelbridge_cmd.c
index 1e1d61fa0..47ebab2e1 100644
--- a/tunnelbridge_cmd.c
+++ b/tunnelbridge_cmd.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
+#include "table/strings.h"
 #include "vehicle.h"
 #include "viewport.h"
 #include "command.h"
diff --git a/unix.c b/unix.c
index 058e75775..9d1736df4 100644
--- a/unix.c
+++ b/unix.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
+#include "table/strings.h"
 #include "hal.h"
 
 #include <dirent.h>
diff --git a/unmovable_cmd.c b/unmovable_cmd.c
index 44700ab21..61b6fb4b0 100644
--- a/unmovable_cmd.c
+++ b/unmovable_cmd.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
+#include "table/strings.h"
 #include "command.h"
 #include "viewport.h"
 #include "player.h"
diff --git a/vehicle.c b/vehicle.c
index dbabd034c..2621adf30 100644
--- a/vehicle.c
+++ b/vehicle.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
+#include "table/strings.h"
 #include "vehicle.h"
 #include "gfx.h"
 //#include "station.h"
diff --git a/vehicle_gui.c b/vehicle_gui.c
index 2b3e27916..65342d626 100644
--- a/vehicle_gui.c
+++ b/vehicle_gui.c
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
-
+#include "table/strings.h"
 #include "vehicle.h"
 
 VehicleSortListingTypeFunctions * const _vehicle_sorter[] = {
diff --git a/viewport.c b/viewport.c
index 5c195503f..5adb9cf05 100644
--- a/viewport.c
+++ b/viewport.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
+#include "table/strings.h"
 #include "viewport.h"
 #include "window.h"
 #include "vehicle.h"
diff --git a/water_cmd.c b/water_cmd.c
index f7393cf9a..016b11b86 100644
--- a/water_cmd.c
+++ b/water_cmd.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
+#include "table/strings.h"
 #include "vehicle.h"
 #include "viewport.h"
 #include "command.h"
diff --git a/widget.c b/widget.c
index 49313e26f..1c47c5528 100644
--- a/widget.c
+++ b/widget.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
+#include "table/strings.h"
 #include "window.h"
 #include "gfx.h"
 #include "viewport.h"
diff --git a/win32.c b/win32.c
index 2a7da5284..e85562456 100644
--- a/win32.c
+++ b/win32.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
+#include "table/strings.h"
 #include "gfx.h"
 #include "sound.h"
 #include "window.h"