diff --git a/rail_cmd.c b/rail_cmd.c
index 0aea49b77e..fe12c6590a 100644
--- a/rail_cmd.c
+++ b/rail_cmd.c
@@ -24,6 +24,7 @@
 #include "sprite.h"
 #include "depot.h"
 #include "waypoint.h"
+#include "window.h"
 #include "rail.h"
 #include "railtypes.h" // include table for railtypes
 #include "newgrf.h"
diff --git a/station.h b/station.h
index 3c6bab0087..91d18839ea 100644
--- a/station.h
+++ b/station.h
@@ -8,7 +8,6 @@
 #include "sprite.h"
 #include "tile.h"
 #include "newgrf_station.h"
-#include "window.h"
 
 typedef struct GoodsEntry {
 	uint16 waiting_acceptance;