diff --git a/src/openttd.cpp b/src/openttd.cpp
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -10,7 +10,6 @@
 
 #include "openttd.h"
 
-#include "driver.h"
 #include "blitter/factory.hpp"
 #include "sound/sound_driver.hpp"
 #include "music/music_driver.hpp"
@@ -18,75 +17,46 @@
 
 #include "fontcache.h"
 #include "gfxinit.h"
-#include "gfx_func.h"
 #include "gui.h"
 #include "mixer.h"
 #include "sound_func.h"
 #include "window_func.h"
 
-#include "debug.h"
 #include "saveload/saveload.h"
 #include "landscape.h"
 #include "company_func.h"
-#include "company_base.h"
 #include "command_func.h"
-#include "town.h"
-#include "industry.h"
 #include "news_func.h"
 #include "fileio_func.h"
 #include "fios.h"
-#include "airport.h"
 #include "aircraft.h"
 #include "console_func.h"
 #include "screenshot.h"
 #include "network/network.h"
 #include "network/network_func.h"
 #include "signs_base.h"
-#include "signs_func.h"
-#include "waypoint.h"
 #include "ai/ai.hpp"
 #include "ai/ai_config.hpp"
-#include "train.h"
-#include "yapf/yapf.h"
 #include "settings_func.h"
 #include "genworld.h"
-#include "company_manager_face.h"
 #include "group.h"
 #include "strings_func.h"
 #include "date_func.h"
 #include "vehicle_func.h"
 #include "gamelog.h"
-#include "cheat_func.h"
+#include "cheat_type.h"
 #include "animated_tile_func.h"
 #include "functions.h"
 #include "elrail_func.h"
 #include "rev.h"
 #include "highscore.h"
 
-#include "newgrf.h"
-#include "newgrf_config.h"
-#include "newgrf_house.h"
 #include "newgrf_commons.h"
-#include "newgrf_station.h"
 
-#include "clear_map.h"
-#include "tree_map.h"
-#include "rail_map.h"
-#include "road_map.h"
-#include "road_cmd.h"
-#include "station_map.h"
-#include "town_map.h"
-#include "industry_map.h"
-#include "unmovable_map.h"
-#include "tunnel_map.h"
-#include "bridge_map.h"
-#include "water_map.h"
-#include "tunnelbridge_map.h"
-#include "void_map.h"
-#include "water.h"
+#include "town.h"
+#include "industry.h"
 
 #include <stdarg.h>
-#include <signal.h>
 
 #include "table/strings.h"