diff --git a/console.c b/console.c
index 2bb5dc646d..d6b60616f5 100644
--- a/console.c
+++ b/console.c
@@ -10,7 +10,6 @@
 #include "player.h"
 #include "variables.h"
 #include "string.h"
-#include "hal.h"
 #include <stdarg.h>
 #include <string.h>
 #include "console.h"
diff --git a/intro_gui.c b/intro_gui.c
index e67c80b8b5..bd0bbdef6f 100644
--- a/intro_gui.c
+++ b/intro_gui.c
@@ -6,11 +6,8 @@
 #include "functions.h"
 #include "window.h"
 #include "gui.h"
-#include "viewport.h"
 #include "gfx.h"
 #include "player.h"
-#include "command.h"
-#include "console.h"
 #include "network.h"
 #include "variables.h"
 
diff --git a/music_gui.c b/music_gui.c
index 7884dd314f..4da6c64d5a 100644
--- a/music_gui.c
+++ b/music_gui.c
@@ -5,7 +5,6 @@
 #include "table/strings.h"
 #include "functions.h"
 #include "window.h"
-#include "gui.h"
 #include "gfx.h"
 #include "sound.h"
 #include "hal.h"
diff --git a/news_gui.c b/news_gui.c
index 39779c1ea3..5d484436cd 100644
--- a/news_gui.c
+++ b/news_gui.c
@@ -7,7 +7,6 @@
 #include "table/sprites.h"
 #include "table/strings.h"
 #include "window.h"
-#include "gui.h"
 #include "viewport.h"
 #include "gfx.h"
 #include "news.h"
diff --git a/npf.h b/npf.h
index 89bcf20c65..17fd11e03f 100644
--- a/npf.h
+++ b/npf.h
@@ -8,7 +8,6 @@
 #include "vehicle.h"
 #include "pbs.h"
 #include "tile.h"
-#include "rail.h"
 #include "variables.h"
 
 //mowing grass
diff --git a/screenshot.c b/screenshot.c
index 18840e8c27..ad32f20c13 100644
--- a/screenshot.c
+++ b/screenshot.c
@@ -9,7 +9,6 @@
 #include "gfx.h"
 #include "viewport.h"
 #include "player.h"
-#include "gui.h"
 #include "screenshot.h"
 #include "variables.h"
 
diff --git a/ship_cmd.c b/ship_cmd.c
index be6b2aee8f..880ef60da8 100644
--- a/ship_cmd.c
+++ b/ship_cmd.c
@@ -12,7 +12,6 @@
 #include "station.h"
 #include "news.h"
 #include "engine.h"
-#include "gui.h"
 #include "player.h"
 #include "sound.h"
 #include "npf.h"
diff --git a/subsidy_gui.c b/subsidy_gui.c
index 647cefc3ef..85cc060f75 100644
--- a/subsidy_gui.c
+++ b/subsidy_gui.c
@@ -5,7 +5,6 @@
 #include "table/strings.h"
 #include "functions.h"
 #include "window.h"
-#include "gui.h"
 #include "station.h"
 #include "industry.h"
 #include "town.h"
diff --git a/town_cmd.c b/town_cmd.c
index d8d4b0b8f8..453ad13408 100644
--- a/town_cmd.c
+++ b/town_cmd.c
@@ -20,7 +20,6 @@
 #include "saveload.h"
 #include "economy.h"
 #include "gui.h"
-#include "network.h"
 #include "variables.h"
 
 enum {
diff --git a/vehicle.c b/vehicle.c
index b6935b9a3e..6cf7ba8749 100644
--- a/vehicle.c
+++ b/vehicle.c
@@ -21,7 +21,6 @@
 #include "vehicle_gui.h"
 #include "depot.h"
 #include "station.h"
-#include "gui.h"
 #include "rail.h"
 #include "train.h"
 
diff --git a/video/dedicated_v.c b/video/dedicated_v.c
index 3e016959dc..3c367efe92 100644
--- a/video/dedicated_v.c
+++ b/video/dedicated_v.c
@@ -10,7 +10,6 @@
 #include "../gfx.h"
 #include "../network.h"
 #include "../window.h"
-#include "../command.h"
 #include "../console.h"
 #include "../variables.h"
 #include "dedicated_v.h"