diff --git a/bridge_map.h b/bridge_map.h
index 89f4417b7b..4547c9dbbb 100644
--- a/bridge_map.h
+++ b/bridge_map.h
@@ -232,4 +232,4 @@ static inline void MakeRailBridgeMiddle(TileIndex t, uint bridgetype, uint piece
 }
 
 
-#endif
+#endif /* BRIDGE_MAP_H */
diff --git a/clear_map.h b/clear_map.h
index 8dfed21ced..50ae63b1b8 100644
--- a/clear_map.h
+++ b/clear_map.h
@@ -142,4 +142,4 @@ static inline void MakeField(TileIndex t, uint field_type, uint16 industry)
 	SetClearGroundDensity(t, CLEAR_FIELDS, 3);
 }
 
-#endif
+#endif /* CLEAR_MAP_H */
diff --git a/date.h b/date.h
index e32b4463bf..37691d24a2 100644
--- a/date.h
+++ b/date.h
@@ -1,5 +1,8 @@
 /* $Id$ */
 
+#ifndef DATE_H
+#define DATE_H
+
 /**
  * 1 day is 74 ticks; _date_fract used to be uint16 and incremented by 885. On
  *                    an overflow the new day begun and 65535 / 885 = 74.
@@ -52,3 +55,5 @@ extern DateFract _date_fract;
 void SetDate(Date date);
 void ConvertDateToYMD(Date date, YearMonthDay *ymd);
 Date ConvertYMDToDate(Year year, Month month, Day day);
+
+#endif /* DATE_H */
diff --git a/direction.h b/direction.h
index ca9cf34ddf..477c34046a 100644
--- a/direction.h
+++ b/direction.h
@@ -144,4 +144,4 @@ static inline bool IsValidAxis(Axis d)
 	return d < AXIS_END;
 }
 
-#endif
+#endif /* DIRECTION_H */
diff --git a/livery.h b/livery.h
index 990fe87e15..2655dcd48b 100644
--- a/livery.h
+++ b/livery.h
@@ -56,4 +56,3 @@ typedef struct Livery {
 } Livery;
 
 #endif /* LIVERY_H */
-
diff --git a/network_gui.h b/network_gui.h
index 521ebc5243..e0aee1cb74 100644
--- a/network_gui.h
+++ b/network_gui.h
@@ -5,4 +5,4 @@
 
 void ShowNetworkNeedPassword(NetworkPasswordType npt);
 
-#endif
+#endif /* NETWORK_GUI_H */
diff --git a/rail_map.h b/rail_map.h
index 2755940c0e..c3bfc96819 100644
--- a/rail_map.h
+++ b/rail_map.h
@@ -349,4 +349,4 @@ static inline void MakeRailWaypoint(TileIndex t, Owner o, Axis a, RailType r, ui
 	_m[t].m5 = RAIL_TILE_DEPOT_WAYPOINT | RAIL_SUBTYPE_WAYPOINT | a;
 }
 
-#endif
+#endif /* RAIL_MAP_H */
diff --git a/railtypes.h b/railtypes.h
index be2ff2907b..e21c1250df 100644
--- a/railtypes.h
+++ b/railtypes.h
@@ -1,5 +1,8 @@
 /* $Id$ */
 
+#ifndef RAILTYPES_H
+#define RAILTYPES_H
+
 /** @file railtypes.h
  * All the railtype-specific information is stored here.
  */
@@ -207,3 +210,5 @@ RailtypeInfo _railtypes[] = {
 		2,
 	},
 };
+
+#endif /* RAILTYPES_H */
diff --git a/road.h b/road.h
index 965e16a70a..3418ef8cd2 100644
--- a/road.h
+++ b/road.h
@@ -23,4 +23,4 @@ static inline RoadBits DiagDirToRoadBits(DiagDirection d)
 	return (RoadBits)(1U << (3 ^ d));
 }
 
-#endif
+#endif /* ROAD_H */
diff --git a/road_cmd.h b/road_cmd.h
index aeda82db17..436ecd9001 100644
--- a/road_cmd.h
+++ b/road_cmd.h
@@ -7,4 +7,4 @@
 
 void DrawRoadDepotSprite(int x, int y, DiagDirection dir);
 
-#endif
+#endif /* ROAD_CMD_H */
diff --git a/road_map.h b/road_map.h
index 9ec26da617..07670f97c2 100644
--- a/road_map.h
+++ b/road_map.h
@@ -210,4 +210,4 @@ static inline void MakeRoadDepot(TileIndex t, Owner owner, DiagDirection dir)
 	_m[t].m5 = ROAD_TILE_DEPOT << 4 | dir;
 }
 
-#endif
+#endif /* ROAD_MAP_H */
diff --git a/roadveh.h b/roadveh.h
index a30d6d536b..e0c497b467 100644
--- a/roadveh.h
+++ b/roadveh.h
@@ -1,5 +1,8 @@
 /* $Id$ */
 
+#ifndef ROADVEH_H
+#define ROADVEH_H
+
 #include "vehicle.h"
 
 
@@ -15,3 +18,5 @@ static inline bool IsRoadVehInDepotStopped(const Vehicle* v)
 }
 
 void CcCloneRoadVeh(bool success, TileIndex tile, uint32 p1, uint32 p2);
+
+#endif /* ROADVEH_H */
diff --git a/ship.h b/ship.h
index db5773fb58..eb81ef9a62 100644
--- a/ship.h
+++ b/ship.h
@@ -1,5 +1,8 @@
 /* $Id$ */
 
+#ifndef SHIP_H
+#define SHIP_H
+
 #include "vehicle.h"
 
 void CcCloneShip(bool success, TileIndex tile, uint32 p1, uint32 p2);
@@ -14,3 +17,5 @@ static inline bool IsShipInDepotStopped(const Vehicle* v)
 {
 	return IsShipInDepot(v) && v->vehstatus & VS_STOPPED;
 }
+
+#endif /* SHIP_H */
diff --git a/slope.h b/slope.h
index 60c05bee84..0708bc5d59 100644
--- a/slope.h
+++ b/slope.h
@@ -38,4 +38,4 @@ static inline Slope ComplementSlope(Slope s)
 	return (Slope)(0xF ^ s);
 }
 
-#endif
+#endif /* SLOPE_H */
diff --git a/station_map.h b/station_map.h
index 912cfc572e..c52769b141 100644
--- a/station_map.h
+++ b/station_map.h
@@ -301,4 +301,4 @@ static inline void MakeOilrig(TileIndex t, StationID sid)
 	MakeStation(t, OWNER_NONE, sid, GFX_OILRIG_BASE);
 }
 
-#endif
+#endif /* STATION_MAP_H */
diff --git a/tgp.h b/tgp.h
index e229c9d85b..1e51eecbe0 100644
--- a/tgp.h
+++ b/tgp.h
@@ -5,4 +5,4 @@
 
 void GenerateTerrainPerlin(void);
 
-#endif
+#endif /* TGP_H */
diff --git a/tree_map.h b/tree_map.h
index de952b50fc..3265046591 100644
--- a/tree_map.h
+++ b/tree_map.h
@@ -128,4 +128,4 @@ static inline void MakeTree(TileIndex t, TreeType type, uint count, uint growth,
 	_m[t].m5 = count << 6 | growth;
 }
 
-#endif
+#endif /* TREE_MAP_H */
diff --git a/tunnel_map.h b/tunnel_map.h
index 67c1fa94f1..9ad54d07ed 100644
--- a/tunnel_map.h
+++ b/tunnel_map.h
@@ -60,4 +60,4 @@ static inline void MakeRailTunnel(TileIndex t, Owner o, DiagDirection d, RailTyp
 	_m[t].m5 = TRANSPORT_RAIL << 2 | d;
 }
 
-#endif
+#endif /* TUNNEL_MAP_H */
diff --git a/unmovable.h b/unmovable.h
index 9e3ce473a9..d7483aa6ea 100644
--- a/unmovable.h
+++ b/unmovable.h
@@ -5,4 +5,4 @@
 
 void UpdateCompanyHQ(Player *p, uint score);
 
-#endif
+#endif /* UNMOVABLE_H */
diff --git a/unmovable_map.h b/unmovable_map.h
index 5fa62a4417..d016a7ac1d 100644
--- a/unmovable_map.h
+++ b/unmovable_map.h
@@ -1,5 +1,8 @@
 /* $Id$ */
 
+#ifndef UNMOVABLE_MAP_H
+#define UNMOVABLE_MAP_H
+
 enum {
 	HQ_NUM_TILE = 4,
 	HQ_NUM_SIZE = 5
@@ -114,3 +117,5 @@ static inline void MakeCompanyHQ(TileIndex t, Owner o)
 	MakeUnmovable(t + TileDiffXY(1, 0), UNMOVABLE_HQ_EAST, o);
 	MakeUnmovable(t + TileDiffXY(1, 1), UNMOVABLE_HQ_SOUTH, o);
 }
+
+#endif /* UNMOVABLE_MAP_H */
diff --git a/void_map.h b/void_map.h
index f1fe9b6fd7..552a8c705b 100644
--- a/void_map.h
+++ b/void_map.h
@@ -15,4 +15,4 @@ static inline void MakeVoid(TileIndex t)
 	_m[t].extra = 0;
 }
 
-#endif
+#endif /* VOID_MAP_H */
diff --git a/water_map.h b/water_map.h
index e449c104de..db3308cbf5 100644
--- a/water_map.h
+++ b/water_map.h
@@ -139,4 +139,4 @@ static inline void MakeLock(TileIndex t, Owner o, DiagDirection d)
 	MakeLockTile(t + delta, o, LOCK_UPPER + d);
 }
 
-#endif
+#endif /* WATER_MAP_H */