diff --git a/ai_build.c b/ai_build.c
index 121b9fee09..370189af84 100644
--- a/ai_build.c
+++ b/ai_build.c
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "map.h"
 #include "tile.h"
 #include "command.h"
diff --git a/ai_new.c b/ai_new.c
index ec122ba1f0..d1e7f4a2c7 100644
--- a/ai_new.c
+++ b/ai_new.c
@@ -18,6 +18,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "table/strings.h"
 #include "map.h"
 #include "tile.h"
diff --git a/ai_old.c b/ai_old.c
index 95ac10111c..d93ee6c285 100644
--- a/ai_old.c
+++ b/ai_old.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "openttd.h"
+#include "functions.h"
 #include "map.h"
 #include "tile.h"
 #include "player.h"
diff --git a/ai_pathfinder.c b/ai_pathfinder.c
index cee7a6e6b2..c754b89b49 100644
--- a/ai_pathfinder.c
+++ b/ai_pathfinder.c
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "map.h"
 #include "tile.h"
 #include "command.h"
diff --git a/aircraft_cmd.c b/aircraft_cmd.c
index d5f9d061be..0ed5a43547 100644
--- a/aircraft_cmd.c
+++ b/aircraft_cmd.c
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "table/strings.h"
 #include "map.h"
 #include "tile.h"
diff --git a/aircraft_gui.c b/aircraft_gui.c
index b38a7244fa..00a2f030be 100644
--- a/aircraft_gui.c
+++ b/aircraft_gui.c
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "table/sprites.h"
 #include "table/strings.h"
 #include "map.h"
diff --git a/airport_gui.c b/airport_gui.c
index a1cd6e0c0b..5af423ba66 100644
--- a/airport_gui.c
+++ b/airport_gui.c
@@ -2,6 +2,7 @@
 #include "openttd.h"
 #include "table/sprites.h"
 #include "table/strings.h"
+#include "functions.h"
 #include "map.h"
 #include "window.h"
 #include "gui.h"
diff --git a/bridge_gui.c b/bridge_gui.c
index 47401c538f..d4b899e583 100644
--- a/bridge_gui.c
+++ b/bridge_gui.c
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "table/strings.h"
+#include "functions.h"
 #include "map.h"
 #include "window.h"
 #include "gui.h"
diff --git a/callback_table.h b/callback_table.h
index f3540521d8..83deb9c95c 100644
--- a/callback_table.h
+++ b/callback_table.h
@@ -1,6 +1,8 @@
 #ifndef CALLBACK_TABLE_H
 #define CALLBACK_TABLE_H
 
+#include "functions.h"
+
 extern CommandCallback *_callback_table[];
 extern const int _callback_table_count;
 
diff --git a/clear_cmd.c b/clear_cmd.c
index 34ea9e0f75..25b7e96e5a 100644
--- a/clear_cmd.c
+++ b/clear_cmd.c
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "table/strings.h"
+#include "functions.h"
 #include "map.h"
 #include "player.h"
 #include "tile.h"
diff --git a/command.c b/command.c
index df5099a287..cb2baa10e1 100644
--- a/command.c
+++ b/command.c
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "table/strings.h"
+#include "functions.h"
 #include "map.h"
 #include "gui.h"
 #include "command.h"
diff --git a/console.c b/console.c
index 959d54bb9a..76fb56d676 100644
--- a/console.c
+++ b/console.c
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "table/strings.h"
+#include "functions.h"
 #include "window.h"
 #include "gui.h"
 #include "gfx.h"
diff --git a/debug.c b/debug.c
index 9987c28222..4573efc65c 100644
--- a/debug.c
+++ b/debug.c
@@ -4,6 +4,7 @@
 #include "openttd.h"
 #include "console.h"
 #include "debug.h"
+#include "functions.h"
 #include "string.h"
 
 int _debug_ai_level;
diff --git a/dedicated.c b/dedicated.c
index cd99dfbbba..99c5c3e10f 100644
--- a/dedicated.c
+++ b/dedicated.c
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "network.h"
 #include "hal.h"
 
diff --git a/depot.c b/depot.c
index d62e2afdf9..236612a0e6 100644
--- a/depot.c
+++ b/depot.c
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "depot.h"
+#include "functions.h"
 #include "tile.h"
 #include "map.h"
 #include "table/strings.h"
diff --git a/disaster_cmd.c b/disaster_cmd.c
index 371c697109..78046cdc92 100644
--- a/disaster_cmd.c
+++ b/disaster_cmd.c
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "table/strings.h"
+#include "functions.h"
 #include "map.h"
 #include "tile.h"
 #include "vehicle.h"
diff --git a/dock_gui.c b/dock_gui.c
index 53a9cb75f4..f28cf8818e 100644
--- a/dock_gui.c
+++ b/dock_gui.c
@@ -2,6 +2,7 @@
 #include "openttd.h"
 #include "table/sprites.h"
 #include "table/strings.h"
+#include "functions.h"
 #include "map.h"
 #include "window.h"
 #include "station.h"
diff --git a/dummy_land.c b/dummy_land.c
index 9f668ff08e..9102244b43 100644
--- a/dummy_land.c
+++ b/dummy_land.c
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "table/strings.h"
+#include "functions.h"
 #include "viewport.h"
 #include "command.h"
 
diff --git a/economy.c b/economy.c
index 6ebd81e9ad..76540b0f0c 100644
--- a/economy.c
+++ b/economy.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "openttd.h"
+#include "functions.h"
 #include "strings.h" // XXX InjectDParam()
 #include "table/strings.h"
 #include "map.h"
diff --git a/engine.c b/engine.c
index 1c4f544b3a..aefa407d80 100644
--- a/engine.c
+++ b/engine.c
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "table/strings.h"
 #include "engine.h"
 #include "table/engines.h"
diff --git a/engine_gui.c b/engine_gui.c
index 9cbcdb5d39..35807d4a14 100644
--- a/engine_gui.c
+++ b/engine_gui.c
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "table/strings.h"
+#include "functions.h"
 #include "window.h"
 #include "gui.h"
 #include "viewport.h"
diff --git a/fileio.c b/fileio.c
index e13a73ead1..6d46b511ae 100644
--- a/fileio.c
+++ b/fileio.c
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "fileio.h"
+#include "functions.h"
 #include "macros.h"
 #include "variables.h"
 #if defined(UNIX) || defined(__OS2__)
diff --git a/gfx.c b/gfx.c
index 22ff3f9435..47cc39cc95 100644
--- a/gfx.c
+++ b/gfx.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "openttd.h"
+#include "functions.h"
 #include "player.h"
 #include "spritecache.h"
 #include "strings.h"
diff --git a/graph_gui.c b/graph_gui.c
index 527830b606..f9849f5d96 100644
--- a/graph_gui.c
+++ b/graph_gui.c
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "table/strings.h"
+#include "functions.h"
 #include "window.h"
 #include "gui.h"
 #include "gfx.h"
diff --git a/industry_cmd.c b/industry_cmd.c
index f368122c98..e5041d759d 100644
--- a/industry_cmd.c
+++ b/industry_cmd.c
@@ -2,6 +2,7 @@
 #include "openttd.h"
 #include "table/strings.h"
 #include "table/sprites.h"
+#include "functions.h"
 #include "map.h"
 #include "tile.h"
 #include "viewport.h"
diff --git a/industry_gui.c b/industry_gui.c
index db2d016e1f..9fe49b2d67 100644
--- a/industry_gui.c
+++ b/industry_gui.c
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "strings.h"
 #include "table/strings.h"
 #include "table/sprites.h"
diff --git a/intro_gui.c b/intro_gui.c
index f81e129f7e..48fa672840 100644
--- a/intro_gui.c
+++ b/intro_gui.c
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "table/strings.h"
+#include "functions.h"
 #include "window.h"
 #include "gui.h"
 #include "viewport.h"
diff --git a/landscape.c b/landscape.c
index cae2a14270..055029397b 100644
--- a/landscape.c
+++ b/landscape.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "openttd.h"
+#include "functions.h"
 #include "map.h"
 #include "player.h"
 #include "spritecache.h"
diff --git a/main_gui.c b/main_gui.c
index e4d42f715a..f5ccb6ef4a 100644
--- a/main_gui.c
+++ b/main_gui.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "openttd.h"
+#include "functions.h"
 #include "spritecache.h"
 #include "strings.h"
 #include "table/sprites.h"
diff --git a/misc.c b/misc.c
index daf8169c86..7579578f40 100644
--- a/misc.c
+++ b/misc.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "openttd.h"
+#include "functions.h"
 #include "string.h"
 #include "strings.h" // XXX GetParam*
 #include "table/strings.h"
diff --git a/misc_cmd.c b/misc_cmd.c
index b5958a20ac..a3539f8ea6 100644
--- a/misc_cmd.c
+++ b/misc_cmd.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "openttd.h"
+#include "functions.h"
 #include "string.h"
 #include "table/strings.h"
 #include "command.h"
diff --git a/misc_gui.c b/misc_gui.c
index cd277e8370..cbe7a71bef 100644
--- a/misc_gui.c
+++ b/misc_gui.c
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "saveload.h"
 #include "spritecache.h"
 #include "strings.h"
diff --git a/music_gui.c b/music_gui.c
index 0c5731d824..6d1689104d 100644
--- a/music_gui.c
+++ b/music_gui.c
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "table/strings.h"
+#include "functions.h"
 #include "window.h"
 #include "gui.h"
 #include "gfx.h"
diff --git a/network.c b/network.c
index 2265795c34..e02391a7c6 100644
--- a/network.c
+++ b/network.c
@@ -1,5 +1,7 @@
 #include "stdafx.h"
+#include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "string.h"
 #include "strings.h"
 #include "map.h"
diff --git a/network_client.c b/network_client.c
index 2288f9b051..43478e81c8 100644
--- a/network_client.c
+++ b/network_client.c
@@ -7,6 +7,7 @@
 #ifdef ENABLE_NETWORK
 
 #include "table/strings.h"
+#include "functions.h"
 #include "network_client.h"
 #include "network_gamelist.h"
 #include "saveload.h"
diff --git a/network_data.c b/network_data.c
index 02cecfc060..6462144d3a 100644
--- a/network_data.c
+++ b/network_data.c
@@ -5,6 +5,7 @@
 // Is the network enabled?
 #ifdef ENABLE_NETWORK
 
+#include "functions.h"
 #include "string.h"
 #include "table/strings.h"
 #include "network_client.h"
diff --git a/network_gui.c b/network_gui.c
index a1ae21cae7..5cd906737d 100644
--- a/network_gui.c
+++ b/network_gui.c
@@ -10,13 +10,13 @@
 #ifdef ENABLE_NETWORK
 
 #include "table/strings.h"
+#include "functions.h"
 #include "network_data.h"
 #include "network_gamelist.h"
 #include "window.h"
 #include "gui.h"
 #include "gfx.h"
 #include "command.h"
-#include "functions.h"
 #include "variables.h"
 #include "network_server.h"
 #include "network_udp.h"
diff --git a/network_server.c b/network_server.c
index ff0f050945..b8a91bcaf7 100644
--- a/network_server.c
+++ b/network_server.c
@@ -7,6 +7,7 @@
 #ifdef ENABLE_NETWORK
 
 #include "table/strings.h"
+#include "functions.h"
 #include "network_server.h"
 #include "network_udp.h"
 #include "console.h"
diff --git a/newgrf.c b/newgrf.c
index 66e15af152..ffd0075061 100644
--- a/newgrf.c
+++ b/newgrf.c
@@ -6,6 +6,7 @@
 #include "debug.h"
 #include "gfx.h"
 #include "fileio.h"
+#include "functions.h"
 #include "engine.h"
 #include "station.h"
 #include "sprite.h"
diff --git a/news_gui.c b/news_gui.c
index c9d919affe..91cb413297 100644
--- a/news_gui.c
+++ b/news_gui.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "openttd.h"
+#include "functions.h"
 #include "strings.h"
 #include "table/sprites.h"
 #include "table/strings.h"
diff --git a/npf.c b/npf.c
index a1f5e52df1..6bbaefcf2c 100644
--- a/npf.c
+++ b/npf.c
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "npf.h"
 #include "aystar.h"
 #include "macros.h"
diff --git a/oldloader.c b/oldloader.c
index 8dc1b1ae00..5859759567 100644
--- a/oldloader.c
+++ b/oldloader.c
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "table/strings.h"
+#include "functions.h"
 #include "map.h"
 #include "town.h"
 #include "industry.h"
diff --git a/openttd.c b/openttd.c
index 5e1a91e06e..d692091790 100644
--- a/openttd.c
+++ b/openttd.c
@@ -9,6 +9,7 @@
 
 #define VARDEF
 #include "openttd.h"
+#include "functions.h"
 #include "mixer.h"
 #include "spritecache.h"
 #include "gfx.h"
diff --git a/openttd.h b/openttd.h
index 912b0aea16..215a127194 100644
--- a/openttd.h
+++ b/openttd.h
@@ -547,6 +547,4 @@ enum {
 };
 VARDEF byte _no_scroll;
 
-#include "functions.h"
-
 #endif /* OPENTTD_H */
diff --git a/order_cmd.c b/order_cmd.c
index 8ec6afb08d..7b925c5cd3 100644
--- a/order_cmd.c
+++ b/order_cmd.c
@@ -2,6 +2,7 @@
 #include "openttd.h"
 #include "airport.h"
 #include "depot.h"
+#include "functions.h"
 #include "table/strings.h"
 #include "vehicle.h"
 #include "waypoint.h"
diff --git a/order_gui.c b/order_gui.c
index f0dd46538d..cdfc95bec7 100644
--- a/order_gui.c
+++ b/order_gui.c
@@ -2,6 +2,7 @@
 #include "openttd.h"
 #include "table/sprites.h"
 #include "table/strings.h"
+#include "functions.h"
 #include "map.h"
 #include "tile.h"
 #include "window.h"
diff --git a/pathfind.c b/pathfind.c
index 737b6d36d7..b0e3f6cf2b 100644
--- a/pathfind.c
+++ b/pathfind.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "openttd.h"
+#include "functions.h"
 #include "map.h"
 #include "tile.h"
 #include "pathfind.h"
diff --git a/pbs.c b/pbs.c
index 53711a75b6..4cfa2d9f5c 100644
--- a/pbs.c
+++ b/pbs.c
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
-#include "pbs.h"
 #include "functions.h"
+#include "pbs.h"
 #include "debug.h"
 #include "map.h"
 #include "tile.h"
diff --git a/player_gui.c b/player_gui.c
index bd5e4cc5b7..1f634727ac 100644
--- a/player_gui.c
+++ b/player_gui.c
@@ -2,6 +2,7 @@
 #include "openttd.h"
 #include "table/sprites.h"
 #include "table/strings.h"
+#include "functions.h"
 #include "window.h"
 #include "gui.h"
 #include "viewport.h"
diff --git a/players.c b/players.c
index 55313ada9d..92b5b39c39 100644
--- a/players.c
+++ b/players.c
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "engine.h"
+#include "functions.h"
 #include "string.h"
 #include "strings.h"
 #include "table/strings.h"
diff --git a/pool.c b/pool.c
index cb12311b78..16abdacf69 100644
--- a/pool.c
+++ b/pool.c
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "pool.h"
 
 /**
diff --git a/rail_cmd.c b/rail_cmd.c
index 3bb1a30caf..70973b5593 100644
--- a/rail_cmd.c
+++ b/rail_cmd.c
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "table/sprites.h"
 #include "table/strings.h"
 #include "map.h"
diff --git a/rail_gui.c b/rail_gui.c
index bdc474b48b..11f94149da 100644
--- a/rail_gui.c
+++ b/rail_gui.c
@@ -2,6 +2,7 @@
 #include "openttd.h"
 #include "table/sprites.h"
 #include "table/strings.h"
+#include "functions.h"
 #include "map.h"
 #include "tile.h"
 #include "window.h"
diff --git a/road_cmd.c b/road_cmd.c
index 26ef7ff8aa..d9a1791aac 100644
--- a/road_cmd.c
+++ b/road_cmd.c
@@ -2,6 +2,7 @@
 #include "openttd.h"
 #include "table/sprites.h"
 #include "table/strings.h"
+#include "functions.h"
 #include "map.h"
 #include "tile.h"
 #include "vehicle.h"
diff --git a/road_gui.c b/road_gui.c
index 0b3c5ebf3d..df3bc9f45b 100644
--- a/road_gui.c
+++ b/road_gui.c
@@ -2,6 +2,7 @@
 #include "openttd.h"
 #include "table/sprites.h"
 #include "table/strings.h"
+#include "functions.h"
 #include "map.h"
 #include "tile.h"
 #include "window.h"
diff --git a/roadveh_cmd.c b/roadveh_cmd.c
index 293d2004e7..2ada6dd3c7 100644
--- a/roadveh_cmd.c
+++ b/roadveh_cmd.c
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "table/strings.h"
 #include "map.h"
 #include "tile.h"
diff --git a/roadveh_gui.c b/roadveh_gui.c
index 01d9b3e8a8..26f2917be9 100644
--- a/roadveh_gui.c
+++ b/roadveh_gui.c
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "table/sprites.h"
 #include "table/strings.h"
 #include "map.h"
diff --git a/saveload.c b/saveload.c
index e6fcca30ec..ae796922fe 100644
--- a/saveload.c
+++ b/saveload.c
@@ -16,6 +16,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "vehicle.h"
 #include "station.h"
 #include "town.h"
diff --git a/screenshot.c b/screenshot.c
index c0c07dd5c2..ff92ae3aa2 100644
--- a/screenshot.c
+++ b/screenshot.c
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "strings.h"
 #include "table/strings.h"
 #include "gfx.h"
diff --git a/sdl.c b/sdl.c
index 26232c4651..ecd06d97af 100644
--- a/sdl.c
+++ b/sdl.c
@@ -3,6 +3,7 @@
 #if defined(WITH_SDL)
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "gfx.h"
 #include "mixer.h"
 #include "window.h"
diff --git a/settings.c b/settings.c
index 5a9b471786..c7589967dc 100644
--- a/settings.c
+++ b/settings.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "openttd.h"
+#include "functions.h"
 #include "screenshot.h"
 #include "sound.h"
 #include "spritecache.h"
diff --git a/settings_gui.c b/settings_gui.c
index 0604c9d6f6..79d90d0bd6 100644
--- a/settings_gui.c
+++ b/settings_gui.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "openttd.h"
+#include "functions.h"
 #include "string.h"
 #include "strings.h" // XXX GetCurrentCurrencyRate()
 #include "table/sprites.h"
diff --git a/ship_cmd.c b/ship_cmd.c
index e93fd5d2e7..9158b5ca93 100644
--- a/ship_cmd.c
+++ b/ship_cmd.c
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "table/strings.h"
+#include "functions.h"
 #include "map.h"
 #include "tile.h"
 #include "vehicle.h"
diff --git a/ship_gui.c b/ship_gui.c
index 752bc4f53a..30d962932f 100644
--- a/ship_gui.c
+++ b/ship_gui.c
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "table/strings.h"
 #include "map.h"
 #include "window.h"
diff --git a/signs.c b/signs.c
index c640ad2cbc..2d86dd00ee 100644
--- a/signs.c
+++ b/signs.c
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "table/strings.h"
+#include "functions.h"
 #include "player.h"
 #include "signs.h"
 #include "saveload.h"
diff --git a/smallmap_gui.c b/smallmap_gui.c
index 5890562c97..ae3482d64f 100644
--- a/smallmap_gui.c
+++ b/smallmap_gui.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "openttd.h"
+#include "functions.h"
 #include "spritecache.h"
 #include "table/strings.h"
 #include "table/sprites.h"
diff --git a/sound.c b/sound.c
index 071fdd17e8..eb45e177a9 100644
--- a/sound.c
+++ b/sound.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "openttd.h"
+#include "functions.h"
 #include "map.h"
 #include "mixer.h"
 #include "sound.h"
diff --git a/spritecache.c b/spritecache.c
index fe59255552..7c1ddd5b46 100644
--- a/spritecache.c
+++ b/spritecache.c
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "gfx.h"
 #include "spritecache.h"
 #include "table/sprites.h"
diff --git a/station_cmd.c b/station_cmd.c
index 57e2db3d5c..fdff069719 100644
--- a/station_cmd.c
+++ b/station_cmd.c
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "table/sprites.h"
 #include "table/strings.h"
 #include "map.h"
diff --git a/station_gui.c b/station_gui.c
index 9b5b1de222..f12c086a32 100644
--- a/station_gui.c
+++ b/station_gui.c
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "strings.h"
 #include "table/strings.h"
 #include "window.h"
diff --git a/strings.c b/strings.c
index 77a2635639..400e0a3f81 100644
--- a/strings.c
+++ b/strings.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "openttd.h"
+#include "functions.h"
 #include "string.h"
 #include "strings.h"
 #include "table/strings.h"
diff --git a/subsidy_gui.c b/subsidy_gui.c
index f966724e1a..9e7719f3de 100644
--- a/subsidy_gui.c
+++ b/subsidy_gui.c
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "table/strings.h"
+#include "functions.h"
 #include "window.h"
 #include "gui.h"
 #include "station.h"
diff --git a/terraform_gui.c b/terraform_gui.c
index 10a0c78d04..467dcad8fb 100644
--- a/terraform_gui.c
+++ b/terraform_gui.c
@@ -2,6 +2,7 @@
 #include "openttd.h"
 #include "table/sprites.h"
 #include "table/strings.h"
+#include "functions.h"
 #include "player.h"
 #include "tile.h"
 #include "window.h"
diff --git a/texteff.c b/texteff.c
index e6c0308131..9f99365385 100644
--- a/texteff.c
+++ b/texteff.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "openttd.h"
+#include "functions.h"
 #include "strings.h"
 #include "gfx.h"
 #include "viewport.h"
diff --git a/town_cmd.c b/town_cmd.c
index 76ca08d972..e70fee4a31 100644
--- a/town_cmd.c
+++ b/town_cmd.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "openttd.h"
+#include "functions.h"
 #include "strings.h"
 #include "table/strings.h"
 #include "table/sprites.h"
diff --git a/town_gui.c b/town_gui.c
index 23791b663e..3745b77769 100644
--- a/town_gui.c
+++ b/town_gui.c
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "strings.h"
 #include "table/sprites.h"
 #include "table/strings.h"
diff --git a/train_cmd.c b/train_cmd.c
index 7b38ba0720..471d15e595 100644
--- a/train_cmd.c
+++ b/train_cmd.c
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "table/strings.h"
 #include "map.h"
 #include "tile.h"
diff --git a/train_gui.c b/train_gui.c
index 2905c554d3..f1094d9853 100644
--- a/train_gui.c
+++ b/train_gui.c
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "table/sprites.h"
 #include "table/strings.h"
 #include "map.h"
diff --git a/tree_cmd.c b/tree_cmd.c
index 8b7e3a50c5..bd0d5796fb 100644
--- a/tree_cmd.c
+++ b/tree_cmd.c
@@ -3,6 +3,7 @@
 #include "table/strings.h"
 #include "table/sprites.h"
 #include "table/tree_land.h"
+#include "functions.h"
 #include "map.h"
 #include "tile.h"
 #include "viewport.h"
diff --git a/tunnelbridge_cmd.c b/tunnelbridge_cmd.c
index 250cd6277b..552987c4b8 100644
--- a/tunnelbridge_cmd.c
+++ b/tunnelbridge_cmd.c
@@ -2,6 +2,7 @@
 #include "openttd.h"
 #include "table/sprites.h"
 #include "table/strings.h"
+#include "functions.h"
 #include "map.h"
 #include "tile.h"
 #include "vehicle.h"
diff --git a/unix.c b/unix.c
index 6dcd70be97..758a2f3557 100644
--- a/unix.c
+++ b/unix.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "openttd.h"
+#include "functions.h"
 #include "window.h"
 #include "string.h"
 #include "table/strings.h"
diff --git a/unmovable_cmd.c b/unmovable_cmd.c
index 5b04328e63..ddc7702f22 100644
--- a/unmovable_cmd.c
+++ b/unmovable_cmd.c
@@ -2,6 +2,7 @@
 #include "openttd.h"
 #include "table/strings.h"
 #include "table/sprites.h"
+#include "functions.h"
 #include "map.h"
 #include "tile.h"
 #include "command.h"
diff --git a/vehicle.c b/vehicle.c
index defce52c1d..21b026ce75 100644
--- a/vehicle.c
+++ b/vehicle.c
@@ -3,6 +3,7 @@
 #include "spritecache.h"
 #include "table/sprites.h"
 #include "table/strings.h"
+#include "functions.h"
 #include "map.h"
 #include "tile.h"
 #include "vehicle.h"
diff --git a/vehicle_gui.c b/vehicle_gui.c
index 2cfc40a4d0..5a27ad8268 100644
--- a/vehicle_gui.c
+++ b/vehicle_gui.c
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "player.h"
 #include "strings.h"
 #include "table/sprites.h"
diff --git a/viewport.c b/viewport.c
index 48f1b82306..53547ad75a 100644
--- a/viewport.c
+++ b/viewport.c
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "spritecache.h"
 #include "strings.h"
 #include "table/sprites.h"
diff --git a/water_cmd.c b/water_cmd.c
index f05bcf0187..9f92c74af4 100644
--- a/water_cmd.c
+++ b/water_cmd.c
@@ -2,6 +2,7 @@
 #include "openttd.h"
 #include "table/sprites.h"
 #include "table/strings.h"
+#include "functions.h"
 #include "map.h"
 #include "tile.h"
 #include "vehicle.h"
diff --git a/waypoint.c b/waypoint.c
index 958dd53783..981c8c8bf5 100644
--- a/waypoint.c
+++ b/waypoint.c
@@ -2,6 +2,7 @@
 #include "openttd.h"
 
 #include "command.h"
+#include "functions.h"
 #include "gfx.h"
 #include "map.h"
 #include "order.h"
diff --git a/widget.c b/widget.c
index 39f1b56425..52a07d96ab 100644
--- a/widget.c
+++ b/widget.c
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "openttd.h"
+#include "functions.h"
 #include "player.h"
 #include "table/sprites.h"
 #include "table/strings.h"
diff --git a/win32.c b/win32.c
index 65cef9048a..b14ff3a31d 100644
--- a/win32.c
+++ b/win32.c
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "saveload.h"
 #include "string.h"
 #include "table/strings.h"
diff --git a/window.c b/window.c
index 6760be8dfd..41f144e922 100644
--- a/window.c
+++ b/window.c
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "map.h"
 #include "player.h"
 #include "window.h"