--- a/bridge_map.h	Thu Sep 28 18:13:31 2006 +0000
+++ b/bridge_map.h	Thu Sep 28 18:42:35 2006 +0000
@@ -232,4 +232,4 @@
 }
 
 
-#endif
+#endif /* BRIDGE_MAP_H */

--- a/clear_map.h	Thu Sep 28 18:13:31 2006 +0000
+++ b/clear_map.h	Thu Sep 28 18:42:35 2006 +0000
@@ -142,4 +142,4 @@
 	SetClearGroundDensity(t, CLEAR_FIELDS, 3);
 }
 
-#endif
+#endif /* CLEAR_MAP_H */

--- a/date.h	Thu Sep 28 18:13:31 2006 +0000
+++ b/date.h	Thu Sep 28 18:42:35 2006 +0000
@@ -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 @@
 void SetDate(Date date);
 void ConvertDateToYMD(Date date, YearMonthDay *ymd);
 Date ConvertYMDToDate(Year year, Month month, Day day);
+
+#endif /* DATE_H */

--- a/direction.h	Thu Sep 28 18:13:31 2006 +0000
+++ b/direction.h	Thu Sep 28 18:42:35 2006 +0000
@@ -144,4 +144,4 @@
 	return d < AXIS_END;
 }
 
-#endif
+#endif /* DIRECTION_H */

--- a/livery.h	Thu Sep 28 18:13:31 2006 +0000
+++ b/livery.h	Thu Sep 28 18:42:35 2006 +0000
@@ -56,4 +56,3 @@
 } Livery;
 
 #endif /* LIVERY_H */
-

--- a/network_gui.h	Thu Sep 28 18:13:31 2006 +0000
+++ b/network_gui.h	Thu Sep 28 18:42:35 2006 +0000
@@ -5,4 +5,4 @@
 
 void ShowNetworkNeedPassword(NetworkPasswordType npt);
 
-#endif
+#endif /* NETWORK_GUI_H */

--- a/rail_map.h	Thu Sep 28 18:13:31 2006 +0000
+++ b/rail_map.h	Thu Sep 28 18:42:35 2006 +0000
@@ -349,4 +349,4 @@
 	_m[t].m5 = RAIL_TILE_DEPOT_WAYPOINT | RAIL_SUBTYPE_WAYPOINT | a;
 }
 
-#endif
+#endif /* RAIL_MAP_H */

--- a/railtypes.h	Thu Sep 28 18:13:31 2006 +0000
+++ b/railtypes.h	Thu Sep 28 18:42:35 2006 +0000
@@ -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 @@
 		2,
 	},
 };
+
+#endif /* RAILTYPES_H */

--- a/road.h	Thu Sep 28 18:13:31 2006 +0000
+++ b/road.h	Thu Sep 28 18:42:35 2006 +0000
@@ -23,4 +23,4 @@
 	return (RoadBits)(1U << (3 ^ d));
 }
 
-#endif
+#endif /* ROAD_H */

--- a/road_cmd.h	Thu Sep 28 18:13:31 2006 +0000
+++ b/road_cmd.h	Thu Sep 28 18:42:35 2006 +0000
@@ -7,4 +7,4 @@
 
 void DrawRoadDepotSprite(int x, int y, DiagDirection dir);
 
-#endif
+#endif /* ROAD_CMD_H */

--- a/road_map.h	Thu Sep 28 18:13:31 2006 +0000
+++ b/road_map.h	Thu Sep 28 18:42:35 2006 +0000
@@ -210,4 +210,4 @@
 	_m[t].m5 = ROAD_TILE_DEPOT << 4 | dir;
 }
 
-#endif
+#endif /* ROAD_MAP_H */

--- a/roadveh.h	Thu Sep 28 18:13:31 2006 +0000
+++ b/roadveh.h	Thu Sep 28 18:42:35 2006 +0000
@@ -1,5 +1,8 @@
 /* $Id$ */
 
+#ifndef ROADVEH_H
+#define ROADVEH_H
+
 #include "vehicle.h"
 
 
@@ -15,3 +18,5 @@
 }
 
 void CcCloneRoadVeh(bool success, TileIndex tile, uint32 p1, uint32 p2);
+
+#endif /* ROADVEH_H */

--- a/ship.h	Thu Sep 28 18:13:31 2006 +0000
+++ b/ship.h	Thu Sep 28 18:42:35 2006 +0000
@@ -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 @@
 {
 	return IsShipInDepot(v) && v->vehstatus & VS_STOPPED;
 }
+
+#endif /* SHIP_H */

--- a/slope.h	Thu Sep 28 18:13:31 2006 +0000
+++ b/slope.h	Thu Sep 28 18:42:35 2006 +0000
@@ -38,4 +38,4 @@
 	return (Slope)(0xF ^ s);
 }
 
-#endif
+#endif /* SLOPE_H */

--- a/station_map.h	Thu Sep 28 18:13:31 2006 +0000
+++ b/station_map.h	Thu Sep 28 18:42:35 2006 +0000
@@ -301,4 +301,4 @@
 	MakeStation(t, OWNER_NONE, sid, GFX_OILRIG_BASE);
 }
 
-#endif
+#endif /* STATION_MAP_H */

--- a/tgp.h	Thu Sep 28 18:13:31 2006 +0000
+++ b/tgp.h	Thu Sep 28 18:42:35 2006 +0000
@@ -5,4 +5,4 @@
 
 void GenerateTerrainPerlin(void);
 
-#endif
+#endif /* TGP_H */

--- a/tree_map.h	Thu Sep 28 18:13:31 2006 +0000
+++ b/tree_map.h	Thu Sep 28 18:42:35 2006 +0000
@@ -128,4 +128,4 @@
 	_m[t].m5 = count << 6 | growth;
 }
 
-#endif
+#endif /* TREE_MAP_H */

--- a/tunnel_map.h	Thu Sep 28 18:13:31 2006 +0000
+++ b/tunnel_map.h	Thu Sep 28 18:42:35 2006 +0000
@@ -60,4 +60,4 @@
 	_m[t].m5 = TRANSPORT_RAIL << 2 | d;
 }
 
-#endif
+#endif /* TUNNEL_MAP_H */

--- a/unmovable.h	Thu Sep 28 18:13:31 2006 +0000
+++ b/unmovable.h	Thu Sep 28 18:42:35 2006 +0000
@@ -5,4 +5,4 @@
 
 void UpdateCompanyHQ(Player *p, uint score);
 
-#endif
+#endif /* UNMOVABLE_H */

--- a/unmovable_map.h	Thu Sep 28 18:13:31 2006 +0000
+++ b/unmovable_map.h	Thu Sep 28 18:42:35 2006 +0000
@@ -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 @@
 	MakeUnmovable(t + TileDiffXY(1, 0), UNMOVABLE_HQ_EAST, o);
 	MakeUnmovable(t + TileDiffXY(1, 1), UNMOVABLE_HQ_SOUTH, o);
 }
+
+#endif /* UNMOVABLE_MAP_H */

--- a/void_map.h	Thu Sep 28 18:13:31 2006 +0000
+++ b/void_map.h	Thu Sep 28 18:42:35 2006 +0000
@@ -15,4 +15,4 @@
 	_m[t].extra = 0;
 }
 
-#endif
+#endif /* VOID_MAP_H */

--- a/water_map.h	Thu Sep 28 18:13:31 2006 +0000
+++ b/water_map.h	Thu Sep 28 18:42:35 2006 +0000
@@ -139,4 +139,4 @@
 	MakeLockTile(t + delta, o, LOCK_UPPER + d);
 }
 
-#endif
+#endif /* WATER_MAP_H */