summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--projects/openttd_vs100.vcxproj1
-rw-r--r--projects/openttd_vs100.vcxproj.filters3
-rw-r--r--projects/openttd_vs80.vcproj4
-rw-r--r--projects/openttd_vs90.vcproj4
-rw-r--r--source.list1
-rw-r--r--src/clear_cmd.cpp1
-rw-r--r--src/date.cpp1
-rw-r--r--src/dedicated.cpp2
-rw-r--r--src/disaster_cmd.cpp1
-rw-r--r--src/fileio.cpp1
-rw-r--r--src/gamelog.cpp1
-rw-r--r--src/genworld.cpp1
-rw-r--r--src/genworld_gui.cpp1
-rw-r--r--src/gfx.cpp1
-rw-r--r--src/highscore.cpp1
-rw-r--r--src/industry_cmd.cpp1
-rw-r--r--src/industry_gui.cpp1
-rw-r--r--src/landscape.cpp1
-rw-r--r--src/misc.cpp1
-rw-r--r--src/music/libtimidity.cpp1
-rw-r--r--src/network/network_content.cpp1
-rw-r--r--src/newgrf.cpp1
-rw-r--r--src/newgrf_airporttiles.cpp1
-rw-r--r--src/newgrf_house.cpp1
-rw-r--r--src/newgrf_industrytiles.cpp1
-rw-r--r--src/newgrf_railtype.cpp1
-rw-r--r--src/newgrf_station.cpp1
-rw-r--r--src/openttd.cpp5
-rw-r--r--src/os/macosx/splash.cpp1
-rw-r--r--src/os/os2/os2.cpp1
-rw-r--r--src/rail_cmd.cpp1
-rw-r--r--src/road_cmd.cpp1
-rw-r--r--src/saveload/misc_sl.cpp1
-rw-r--r--src/saveload/oldloader_sl.cpp1
-rw-r--r--src/saveload/saveload.cpp1
-rw-r--r--src/settings.cpp1
-rw-r--r--src/station_cmd.cpp1
-rw-r--r--src/terraform_cmd.cpp1
-rw-r--r--src/terraform_gui.cpp1
-rw-r--r--src/toolbar_gui.cpp1
-rw-r--r--src/town_cmd.cpp1
-rw-r--r--src/town_gui.cpp1
-rw-r--r--src/tree_cmd.cpp1
-rw-r--r--src/tunnelbridge_cmd.cpp1
-rw-r--r--src/variables.h19
-rw-r--r--src/video/allegro_v.cpp1
-rw-r--r--src/video/cocoa/cocoa_v.mm1
-rw-r--r--src/video/cocoa/event.mm1
-rw-r--r--src/video/dedicated_v.cpp1
-rw-r--r--src/video/sdl_v.cpp1
-rw-r--r--src/video/win32_v.cpp1
-rw-r--r--src/viewport.cpp1
-rw-r--r--src/window.cpp1
53 files changed, 0 insertions, 84 deletions
diff --git a/projects/openttd_vs100.vcxproj b/projects/openttd_vs100.vcxproj
index 6fdf426ac..93efda894 100644
--- a/projects/openttd_vs100.vcxproj
+++ b/projects/openttd_vs100.vcxproj
@@ -578,7 +578,6 @@
<ClInclude Include="..\src\transport_type.h" />
<ClInclude Include="..\src\tunnelbridge.h" />
<ClInclude Include="..\src\unmovable.h" />
- <ClInclude Include="..\src\variables.h" />
<ClInclude Include="..\src\vehicle_base.h" />
<ClInclude Include="..\src\vehicle_func.h" />
<ClInclude Include="..\src\vehicle_gui.h" />
diff --git a/projects/openttd_vs100.vcxproj.filters b/projects/openttd_vs100.vcxproj.filters
index e063b737a..4aa8f2819 100644
--- a/projects/openttd_vs100.vcxproj.filters
+++ b/projects/openttd_vs100.vcxproj.filters
@@ -937,9 +937,6 @@
<ClInclude Include="..\src\unmovable.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\src\variables.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="..\src\vehicle_base.h">
<Filter>Header Files</Filter>
</ClInclude>
diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj
index febd17297..b6697d750 100644
--- a/projects/openttd_vs80.vcproj
+++ b/projects/openttd_vs80.vcproj
@@ -1580,10 +1580,6 @@
>
</File>
<File
- RelativePath=".\..\src\variables.h"
- >
- </File>
- <File
RelativePath=".\..\src\vehicle_base.h"
>
</File>
diff --git a/projects/openttd_vs90.vcproj b/projects/openttd_vs90.vcproj
index e21534b4f..a0c31ce14 100644
--- a/projects/openttd_vs90.vcproj
+++ b/projects/openttd_vs90.vcproj
@@ -1577,10 +1577,6 @@
>
</File>
<File
- RelativePath=".\..\src\variables.h"
- >
- </File>
- <File
RelativePath=".\..\src\vehicle_base.h"
>
</File>
diff --git a/source.list b/source.list
index 412a2c1a4..30b6a8aae 100644
--- a/source.list
+++ b/source.list
@@ -304,7 +304,6 @@ transparency_gui.h
transport_type.h
tunnelbridge.h
unmovable.h
-variables.h
vehicle_base.h
vehicle_func.h
vehicle_gui.h
diff --git a/src/clear_cmd.cpp b/src/clear_cmd.cpp
index e417c5053..fafd90371 100644
--- a/src/clear_cmd.cpp
+++ b/src/clear_cmd.cpp
@@ -14,7 +14,6 @@
#include "clear_map.h"
#include "command_func.h"
#include "landscape.h"
-#include "variables.h"
#include "genworld.h"
#include "landscape_type.h"
#include "functions.h"
diff --git a/src/date.cpp b/src/date.cpp
index 4b9a49f6d..3c29eaf82 100644
--- a/src/date.cpp
+++ b/src/date.cpp
@@ -10,7 +10,6 @@
/** @file date.cpp Handling of dates in our native format and transforming them to something human readable. */
#include "stdafx.h"
-#include "variables.h"
#include "network/network.h"
#include "network/network_func.h"
#include "currency.h"
diff --git a/src/dedicated.cpp b/src/dedicated.cpp
index 1de4d3a49..ca7e341d7 100644
--- a/src/dedicated.cpp
+++ b/src/dedicated.cpp
@@ -17,8 +17,6 @@ char *_log_file; ///< File to reroute output of a forked OpenTTD to
#if defined(UNIX) && !defined(__MORPHOS__)
-#include "variables.h"
-
#include <unistd.h>
#if (defined(SUNOS) && !defined(_LP64) && !defined(_I32LPx)) || defined(__HAIKU__)
diff --git a/src/disaster_cmd.cpp b/src/disaster_cmd.cpp
index 31227b3bd..c0c838456 100644
--- a/src/disaster_cmd.cpp
+++ b/src/disaster_cmd.cpp
@@ -32,7 +32,6 @@
#include "news_func.h"
#include "town.h"
#include "company_func.h"
-#include "variables.h"
#include "strings_func.h"
#include "date_func.h"
#include "functions.h"
diff --git a/src/fileio.cpp b/src/fileio.cpp
index f1f8faae1..33a4e3976 100644
--- a/src/fileio.cpp
+++ b/src/fileio.cpp
@@ -11,7 +11,6 @@
#include "stdafx.h"
#include "fileio_func.h"
-#include "variables.h"
#include "debug.h"
#include "fios.h"
#include "string_func.h"
diff --git a/src/gamelog.cpp b/src/gamelog.cpp
index 7d827a379..b1102dff8 100644
--- a/src/gamelog.cpp
+++ b/src/gamelog.cpp
@@ -13,7 +13,6 @@
#include "openttd.h"
#include "saveload/saveload.h"
#include "core/alloc_func.hpp"
-#include "variables.h"
#include "string_func.h"
#include "settings_type.h"
#include "gamelog_internal.h"
diff --git a/src/genworld.cpp b/src/genworld.cpp
index b4cab558b..2ed8836a3 100644
--- a/src/genworld.cpp
+++ b/src/genworld.cpp
@@ -13,7 +13,6 @@
#include "openttd.h"
#include "landscape.h"
#include "company_func.h"
-#include "variables.h"
#include "thread/thread.h"
#include "command_func.h"
#include "genworld.h"
diff --git a/src/genworld_gui.cpp b/src/genworld_gui.cpp
index fda190de8..692fe5c1f 100644
--- a/src/genworld_gui.cpp
+++ b/src/genworld_gui.cpp
@@ -12,7 +12,6 @@
#include "stdafx.h"
#include "openttd.h"
#include "heightmap.h"
-#include "variables.h"
#include "debug.h"
#include "genworld.h"
#include "network/network.h"
diff --git a/src/gfx.cpp b/src/gfx.cpp
index 44d44a757..e394ad64b 100644
--- a/src/gfx.cpp
+++ b/src/gfx.cpp
@@ -11,7 +11,6 @@
#include "stdafx.h"
#include "gfx_func.h"
-#include "variables.h"
#include "fontcache.h"
#include "genworld.h"
#include "zoom_func.h"
diff --git a/src/highscore.cpp b/src/highscore.cpp
index beb4d1356..1c79d44fa 100644
--- a/src/highscore.cpp
+++ b/src/highscore.cpp
@@ -18,7 +18,6 @@
#include "strings_func.h"
#include "table/strings.h"
#include "core/sort_func.hpp"
-#include "variables.h"
#include "debug.h"
HighScore _highscore_table[5][5]; // 4 difficulty-settings (+ network); top 5
diff --git a/src/industry_cmd.cpp b/src/industry_cmd.cpp
index 1c72f6e4c..b9508084e 100644
--- a/src/industry_cmd.cpp
+++ b/src/industry_cmd.cpp
@@ -19,7 +19,6 @@
#include "command_func.h"
#include "town.h"
#include "news_func.h"
-#include "variables.h"
#include "cheat_type.h"
#include "genworld.h"
#include "tree_map.h"
diff --git a/src/industry_gui.cpp b/src/industry_gui.cpp
index adfb8bd20..c21264064 100644
--- a/src/industry_gui.cpp
+++ b/src/industry_gui.cpp
@@ -18,7 +18,6 @@
#include "gfx_func.h"
#include "industry.h"
#include "town.h"
-#include "variables.h"
#include "cheat_type.h"
#include "newgrf.h"
#include "newgrf_industries.h"
diff --git a/src/landscape.cpp b/src/landscape.cpp
index 5352a6467..ea3199422 100644
--- a/src/landscape.cpp
+++ b/src/landscape.cpp
@@ -18,7 +18,6 @@
#include "viewport_func.h"
#include "command_func.h"
#include "landscape.h"
-#include "variables.h"
#include "void_map.h"
#include "tgp.h"
#include "genworld.h"
diff --git a/src/misc.cpp b/src/misc.cpp
index b27966ec0..34d46fbca 100644
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -12,7 +12,6 @@
#include "stdafx.h"
#include "landscape.h"
#include "news_func.h"
-#include "variables.h"
#include "ai/ai.hpp"
#include "ai/ai_gui.hpp"
#include "newgrf_house.h"
diff --git a/src/music/libtimidity.cpp b/src/music/libtimidity.cpp
index db456fc5a..82f011c23 100644
--- a/src/music/libtimidity.cpp
+++ b/src/music/libtimidity.cpp
@@ -12,7 +12,6 @@
#include "../stdafx.h"
#include "../openttd.h"
#include "../sound_type.h"
-#include "../variables.h"
#include "../debug.h"
#include "libtimidity.h"
#include <fcntl.h>
diff --git a/src/network/network_content.cpp b/src/network/network_content.cpp
index a7032a60f..d10353bfd 100644
--- a/src/network/network_content.cpp
+++ b/src/network/network_content.cpp
@@ -16,7 +16,6 @@
#include "../ai/ai.hpp"
#include "../window_func.h"
#include "../gui.h"
-#include "../variables.h"
#include "../base_media_base.h"
#include "../settings_type.h"
#include "network_content.h"
diff --git a/src/newgrf.cpp b/src/newgrf.cpp
index b7eb461a9..2f8560c3c 100644
--- a/src/newgrf.cpp
+++ b/src/newgrf.cpp
@@ -17,7 +17,6 @@
#include "fileio_func.h"
#include "engine_func.h"
#include "engine_base.h"
-#include "variables.h"
#include "bridge.h"
#include "town.h"
#include "newgrf_engine.h"
diff --git a/src/newgrf_airporttiles.cpp b/src/newgrf_airporttiles.cpp
index 6b239c1a7..9fc2b960c 100644
--- a/src/newgrf_airporttiles.cpp
+++ b/src/newgrf_airporttiles.cpp
@@ -23,7 +23,6 @@
#include "landscape.h"
#include "company_base.h"
#include "town.h"
-#include "variables.h"
#include "functions.h"
#include "core/random_func.hpp"
#include "table/strings.h"
diff --git a/src/newgrf_house.cpp b/src/newgrf_house.cpp
index c3a309c33..b0f391606 100644
--- a/src/newgrf_house.cpp
+++ b/src/newgrf_house.cpp
@@ -10,7 +10,6 @@
/** @file newgrf_house.cpp Implementation of NewGRF houses. */
#include "stdafx.h"
-#include "variables.h"
#include "debug.h"
#include "viewport_func.h"
#include "landscape.h"
diff --git a/src/newgrf_industrytiles.cpp b/src/newgrf_industrytiles.cpp
index 479f51ede..2e5b404f8 100644
--- a/src/newgrf_industrytiles.cpp
+++ b/src/newgrf_industrytiles.cpp
@@ -10,7 +10,6 @@
/** @file newgrf_industrytiles.cpp NewGRF handling of industry tiles. */
#include "stdafx.h"
-#include "variables.h"
#include "debug.h"
#include "viewport_func.h"
#include "landscape.h"
diff --git a/src/newgrf_railtype.cpp b/src/newgrf_railtype.cpp
index a0d66ec03..cb020d902 100644
--- a/src/newgrf_railtype.cpp
+++ b/src/newgrf_railtype.cpp
@@ -4,7 +4,6 @@
#include "stdafx.h"
#include "openttd.h"
-#include "variables.h"
#include "debug.h"
#include "strings_type.h"
#include "rail.h"
diff --git a/src/newgrf_station.cpp b/src/newgrf_station.cpp
index df1d0a567..5fb4d587d 100644
--- a/src/newgrf_station.cpp
+++ b/src/newgrf_station.cpp
@@ -10,7 +10,6 @@
/** @file newgrf_station.cpp Functions for dealing with station classes and custom stations. */
#include "stdafx.h"
-#include "variables.h"
#include "debug.h"
#include "station_base.h"
#include "waypoint_base.h"
diff --git a/src/openttd.cpp b/src/openttd.cpp
index c17d15652..67553349a 100644
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -11,11 +11,6 @@
#include "stdafx.h"
-#define VARDEF
-#include "variables.h"
-#undef VARDEF
-
-
#include "blitter/factory.hpp"
#include "sound/sound_driver.hpp"
#include "music/music_driver.hpp"
diff --git a/src/os/macosx/splash.cpp b/src/os/macosx/splash.cpp
index c9861c312..6d8bf2f1f 100644
--- a/src/os/macosx/splash.cpp
+++ b/src/os/macosx/splash.cpp
@@ -11,7 +11,6 @@
#include "../../stdafx.h"
#include "../../openttd.h"
-#include "../../variables.h"
#include "../../debug.h"
#include "../../gfx_func.h"
#include "../../fileio_func.h"
diff --git a/src/os/os2/os2.cpp b/src/os/os2/os2.cpp
index ead6f78c3..82693bd48 100644
--- a/src/os/os2/os2.cpp
+++ b/src/os/os2/os2.cpp
@@ -11,7 +11,6 @@
#include "../../stdafx.h"
#include "../../openttd.h"
-#include "../../variables.h"
#include "../../gui.h"
#include "../../fileio_func.h"
#include "../../fios.h"
diff --git a/src/rail_cmd.cpp b/src/rail_cmd.cpp
index 70a5a4325..eedfe7546 100644
--- a/src/rail_cmd.cpp
+++ b/src/rail_cmd.cpp
@@ -23,7 +23,6 @@
#include "newgrf_railtype.h"
#include "newgrf_commons.h"
#include "train.h"
-#include "variables.h"
#include "autoslope.h"
#include "water.h"
#include "tunnelbridge_map.h"
diff --git a/src/road_cmd.cpp b/src/road_cmd.cpp
index 6549f2047..4b82d8eb7 100644
--- a/src/road_cmd.cpp
+++ b/src/road_cmd.cpp
@@ -18,7 +18,6 @@
#include "pathfinder/yapf/yapf_cache.h"
#include "depot_base.h"
#include "newgrf.h"
-#include "variables.h"
#include "autoslope.h"
#include "tunnelbridge_map.h"
#include "window_func.h"
diff --git a/src/saveload/misc_sl.cpp b/src/saveload/misc_sl.cpp
index 96b1f61af..abe4d411a 100644
--- a/src/saveload/misc_sl.cpp
+++ b/src/saveload/misc_sl.cpp
@@ -11,7 +11,6 @@
#include "../stdafx.h"
#include "../date_func.h"
-#include "../variables.h"
#include "../openttd.h"
#include "../zoom_func.h"
#include "../vehicle_func.h"
diff --git a/src/saveload/oldloader_sl.cpp b/src/saveload/oldloader_sl.cpp
index b1789e4a2..0bef6045a 100644
--- a/src/saveload/oldloader_sl.cpp
+++ b/src/saveload/oldloader_sl.cpp
@@ -24,7 +24,6 @@
#include "../depot_base.h"
#include "../date_func.h"
#include "../vehicle_func.h"
-#include "../variables.h"
#include "../effectvehicle_base.h"
#include "../core/mem_func.hpp"
#include "../core/alloc_type.hpp"
diff --git a/src/saveload/saveload.cpp b/src/saveload/saveload.cpp
index ac84dd9a2..c44703157 100644
--- a/src/saveload/saveload.cpp
+++ b/src/saveload/saveload.cpp
@@ -26,7 +26,6 @@
#include "../thread/thread.h"
#include "../town.h"
#include "../network/network.h"
-#include "../variables.h"
#include "../window_func.h"
#include "../strings_func.h"
#include "../core/endian_func.hpp"
diff --git a/src/settings.cpp b/src/settings.cpp
index 0f2ab8a6c..b2bbd3622 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -25,7 +25,6 @@
#include "stdafx.h"
#include "currency.h"
#include "screenshot.h"
-#include "variables.h"
#include "network/network.h"
#include "network/network_func.h"
#include "settings_internal.h"
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp
index 5e0d478ea..3f7b9f1c6 100644
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -26,7 +26,6 @@
#include "newgrf_station.h"
#include "pathfinder/yapf/yapf_cache.h"
#include "road_internal.h" /* For drawing catenary/checking road removal */
-#include "variables.h"
#include "autoslope.h"
#include "water.h"
#include "station_gui.h"
diff --git a/src/terraform_cmd.cpp b/src/terraform_cmd.cpp
index 49b55ef04..9ff56545c 100644
--- a/src/terraform_cmd.cpp
+++ b/src/terraform_cmd.cpp
@@ -14,7 +14,6 @@
#include "command_func.h"
#include "tunnel_map.h"
#include "bridge_map.h"
-#include "variables.h"
#include "functions.h"
#include "economy_func.h"
#include "genworld.h"
diff --git a/src/terraform_gui.cpp b/src/terraform_gui.cpp
index cc4e58e73..2c6a9a42a 100644
--- a/src/terraform_gui.cpp
+++ b/src/terraform_gui.cpp
@@ -19,7 +19,6 @@
#include "viewport_func.h"
#include "command_func.h"
#include "signs_func.h"
-#include "variables.h"
#include "functions.h"
#include "sound_func.h"
#include "base_station_base.h"
diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp
index c13c1ca22..c5b917858 100644
--- a/src/toolbar_gui.cpp
+++ b/src/toolbar_gui.cpp
@@ -15,7 +15,6 @@
#include "window_func.h"
#include "viewport_func.h"
#include "command_func.h"
-#include "variables.h"
#include "vehicle_gui.h"
#include "rail_gui.h"
#include "road_gui.h"
diff --git a/src/town_cmd.cpp b/src/town_cmd.cpp
index c318ae1ce..d994e8da5 100644
--- a/src/town_cmd.cpp
+++ b/src/town_cmd.cpp
@@ -22,7 +22,6 @@
#include "news_func.h"
#include "gui.h"
#include "unmovable_map.h"
-#include "variables.h"
#include "genworld.h"
#include "newgrf_debug.h"
#include "newgrf_house.h"
diff --git a/src/town_gui.cpp b/src/town_gui.cpp
index b845ec7bc..830d81ced 100644
--- a/src/town_gui.cpp
+++ b/src/town_gui.cpp
@@ -20,7 +20,6 @@
#include "company_base.h"
#include "company_gui.h"
#include "network/network.h"
-#include "variables.h"
#include "strings_func.h"
#include "sound_func.h"
#include "economy_func.h"
diff --git a/src/tree_cmd.cpp b/src/tree_cmd.cpp
index baed9ab56..085eea223 100644
--- a/src/tree_cmd.cpp
+++ b/src/tree_cmd.cpp
@@ -17,7 +17,6 @@
#include "command_func.h"
#include "economy_func.h"
#include "town.h"
-#include "variables.h"
#include "genworld.h"
#include "transparency.h"
#include "functions.h"
diff --git a/src/tunnelbridge_cmd.cpp b/src/tunnelbridge_cmd.cpp
index 893238e1b..3cad201a9 100644
--- a/src/tunnelbridge_cmd.cpp
+++ b/src/tunnelbridge_cmd.cpp
@@ -20,7 +20,6 @@
#include "cmd_helper.h"
#include "command_func.h"
#include "town.h"
-#include "variables.h"
#include "train.h"
#include "ship.h"
#include "roadveh.h"
diff --git a/src/variables.h b/src/variables.h
deleted file mode 100644
index 1fe9e2978..000000000
--- a/src/variables.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* $Id$ */
-
-/*
- * This file is part of OpenTTD.
- * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
- * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/** @file variables.h Messing file that will cease to exist some time in the future. */
-
-#ifndef VARIABLES_H
-#define VARIABLES_H
-
-#ifndef VARDEF
-#define VARDEF extern
-#endif
-
-#endif /* VARIABLES_H */
diff --git a/src/video/allegro_v.cpp b/src/video/allegro_v.cpp
index 4181fee3c..26fe059ae 100644
--- a/src/video/allegro_v.cpp
+++ b/src/video/allegro_v.cpp
@@ -19,7 +19,6 @@
#include "../stdafx.h"
#include "../openttd.h"
#include "../gfx_func.h"
-#include "../variables.h"
#include "../rev.h"
#include "../blitter/factory.hpp"
#include "../network/network.h"
diff --git a/src/video/cocoa/cocoa_v.mm b/src/video/cocoa/cocoa_v.mm
index 7589420b0..61dfd7ce2 100644
--- a/src/video/cocoa/cocoa_v.mm
+++ b/src/video/cocoa/cocoa_v.mm
@@ -26,7 +26,6 @@
#include "../../openttd.h"
#include "../../debug.h"
-#include "../../variables.h"
#include "../../core/geometry_type.hpp"
#include "cocoa_v.h"
#include "../../blitter/factory.hpp"
diff --git a/src/video/cocoa/event.mm b/src/video/cocoa/event.mm
index 5df3f5b75..08bf875fa 100644
--- a/src/video/cocoa/event.mm
+++ b/src/video/cocoa/event.mm
@@ -26,7 +26,6 @@
#include "../../openttd.h"
#include "../../debug.h"
#include "../../os/macosx/splash.h"
-#include "../../variables.h"
#include "../../settings_type.h"
#include "../../core/geometry_type.hpp"
#include "cocoa_v.h"
diff --git a/src/video/dedicated_v.cpp b/src/video/dedicated_v.cpp
index 48e65c747..85ccf0a1c 100644
--- a/src/video/dedicated_v.cpp
+++ b/src/video/dedicated_v.cpp
@@ -17,7 +17,6 @@
#include "../network/network.h"
#include "../network/network_internal.h"
#include "../console_func.h"
-#include "../variables.h"
#include "../genworld.h"
#include "../fileio_type.h"
#include "../fios.h"
diff --git a/src/video/sdl_v.cpp b/src/video/sdl_v.cpp
index d87e9e54e..9e0a38fa9 100644
--- a/src/video/sdl_v.cpp
+++ b/src/video/sdl_v.cpp
@@ -15,7 +15,6 @@
#include "../openttd.h"
#include "../gfx_func.h"
#include "../sdl.h"
-#include "../variables.h"
#include "../rev.h"
#include "../blitter/factory.hpp"
#include "../network/network.h"
diff --git a/src/video/win32_v.cpp b/src/video/win32_v.cpp
index 9f0a3c3df..673d50be1 100644
--- a/src/video/win32_v.cpp
+++ b/src/video/win32_v.cpp
@@ -12,7 +12,6 @@
#include "../stdafx.h"
#include "../openttd.h"
#include "../gfx_func.h"
-#include "../variables.h"
#include "../os/windows/win32.h"
#include "../rev.h"
#include "../blitter/factory.hpp"
diff --git a/src/viewport.cpp b/src/viewport.cpp
index b55c4a414..1d7b94c3d 100644
--- a/src/viewport.cpp
+++ b/src/viewport.cpp
@@ -33,7 +33,6 @@
#include "town.h"
#include "signs_base.h"
#include "signs_func.h"
-#include "variables.h"
#include "vehicle_base.h"
#include "vehicle_gui.h"
#include "blitter/factory.hpp"
diff --git a/src/window.cpp b/src/window.cpp
index 7215061b7..da6a1cc18 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -17,7 +17,6 @@
#include "console_func.h"
#include "console_gui.h"
#include "viewport_func.h"
-#include "variables.h"
#include "genworld.h"
#include "blitter/factory.hpp"
#include "zoom_func.h"