diff --git a/src/autoreplace_gui.cpp b/src/autoreplace_gui.cpp
index b25efa9ff6..a91c0f4318 100644
--- a/src/autoreplace_gui.cpp
+++ b/src/autoreplace_gui.cpp
@@ -16,6 +16,7 @@
 #include "vehicle_gui.h"
 #include "newgrf_engine.h"
 #include "group.h"
+#include "rail.h"
 
 
 static RailType _railtype_selected_in_replace_gui;
diff --git a/src/bridge_map.h b/src/bridge_map.h
index 13030092f4..3ec527c3ca 100644
--- a/src/bridge_map.h
+++ b/src/bridge_map.h
@@ -8,7 +8,7 @@
 #include "direction_func.h"
 #include "macros.h"
 #include "map.h"
-#include "rail.h"
+#include "rail_type.h"
 #include "road_map.h"
 #include "tile.h"
 
diff --git a/src/elrail.cpp b/src/elrail.cpp
index 1aedb056a5..4e529869dc 100644
--- a/src/elrail.cpp
+++ b/src/elrail.cpp
@@ -53,7 +53,7 @@
 #include "functions.h" /* We should REALLY get rid of this goddamn file, as it is butt-ugly */
 #include "variables.h" /* ... same here */
 #include "landscape.h"
-#include "rail.h"
+#include "rail_type.h"
 #include "debug.h"
 #include "tunnel_map.h"
 #include "road_map.h"
diff --git a/src/engine.h b/src/engine.h
index 1ef09d3db8..9ac4cd5b96 100644
--- a/src/engine.h
+++ b/src/engine.h
@@ -6,7 +6,7 @@
 #define ENGINE_H
 
 #include "oldpool.h"
-#include "rail.h"
+#include "rail_type.h"
 #include "sound.h"
 #include "vehicle.h"
 
diff --git a/src/newgrf.cpp b/src/newgrf.cpp
index 3c7b887b3f..d372821be3 100644
--- a/src/newgrf.cpp
+++ b/src/newgrf.cpp
@@ -48,6 +48,7 @@
 #include "table/landscape_sprite.h"
 #include "gfxinit.h"
 #include "fios.h"
+#include "rail.h"
 
 /* TTDPatch extended GRF format codec
  * (c) Petr Baudis 2004 (GPL'd)
diff --git a/src/newgrf_house.cpp b/src/newgrf_house.cpp
index 169396245e..2b770fede8 100644
--- a/src/newgrf_house.cpp
+++ b/src/newgrf_house.cpp
@@ -10,6 +10,7 @@
 #include "viewport.h"
 #include "landscape.h"
 #include "date.h"
+#include "tile.h"
 #include "town.h"
 #include "town_map.h"
 #include "sound.h"
diff --git a/src/pathfind.cpp b/src/pathfind.cpp
index 988c2b7377..6fc812c899 100644
--- a/src/pathfind.cpp
+++ b/src/pathfind.cpp
@@ -12,7 +12,7 @@
 #include "map.h"
 #include "tile.h"
 #include "pathfind.h"
-#include "rail.h"
+#include "rail_type.h"
 #include "debug.h"
 #include "tunnel_map.h"
 #include "variables.h"
diff --git a/src/player.h b/src/player.h
index 620ea7d5b8..decfc15f47 100644
--- a/src/player.h
+++ b/src/player.h
@@ -7,7 +7,7 @@
 
 #include "oldpool.h"
 #include "aystar.h"
-#include "rail.h"
+#include "rail_type.h"
 #include "road_func.h"
 #include "engine.h"
 #include "livery.h"
diff --git a/src/track_func.h b/src/track_func.h
index 813f211b19..3f36129f67 100644
--- a/src/track_func.h
+++ b/src/track_func.h
@@ -514,4 +514,4 @@ static inline bool IsStraightRoadTrackdir(Trackdir dir)
 	return (dir & 0x06) == 0;
 }
 
-#endif /* RAIL_H */
+#endif /* TRACK_FUNC_H */
diff --git a/src/track_type.h b/src/track_type.h
index b40795de5c..bd8ccde151 100644
--- a/src/track_type.h
+++ b/src/track_type.h
@@ -122,4 +122,4 @@ template <> struct EnumPropsT<TrackdirBits> : MakeEnumPropsT<TrackdirBits, uint1
 typedef TinyEnumT<TrackdirBits> TrackdirBitsShort;
 DECLARE_ENUM_AS_BIT_SET(TrackdirBits);
 
-#endif /* RAIL_H */
+#endif /* TRACK_TYPE_H */
diff --git a/src/vehicle.cpp b/src/vehicle.cpp
index 7b9c8bc9ca..b35e3afd93 100644
--- a/src/vehicle.cpp
+++ b/src/vehicle.cpp
@@ -28,7 +28,7 @@
 #include "vehicle_gui.h"
 #include "depot.h"
 #include "station.h"
-#include "rail.h"
+#include "rail_type.h"
 #include "train.h"
 #include "aircraft.h"
 #include "industry_map.h"