11 files changed, 11 insertions, 11 deletions
diff --git a/src/base_station_base.h b/src/base_station_base.h
index dd0d55271..c94212087 100644
--- a/src/base_station_base.h
+++ b/src/base_station_base.h
@@ -251,4 +251,4 @@ struct SpecializedStation : public BaseStation {
 
 #define FOR_ALL_BASE_STATIONS_OF_TYPE(name, var) FOR_ALL_ITEMS_FROM(name, station_index, var, 0) if (name::IsExpected(var))
 
-#endif /* STATION_BASE_H */
+#endif /* BASE_STATION_BASE_H */
diff --git a/src/cmd_helper.h b/src/cmd_helper.h
index 0b56fb767..10060dd2d 100644
--- a/src/cmd_helper.h
+++ b/src/cmd_helper.h
@@ -24,4 +24,4 @@ template<typename T, uint S, uint N, typename U> static inline T Extract(U v)
 	return IsInsideMM(masked, EnumPropsT<T>::begin, EnumPropsT<T>::end) ? (T)masked : EnumPropsT<T>::invalid;
 }
 
-#endif
+#endif /* CMD_HELPER_H */
diff --git a/src/direction_func.h b/src/direction_func.h
index c25cf4ea6..8c8170a15 100644
--- a/src/direction_func.h
+++ b/src/direction_func.h
@@ -234,4 +234,4 @@ static inline bool IsValidAxis(Axis d)
 	return d < AXIS_END;
 }
 
-#endif /* DIRECTION_H */
+#endif /* DIRECTION_FUNC_H */
diff --git a/src/engine_base.h b/src/engine_base.h
index 251b42729..366831ad7 100644
--- a/src/engine_base.h
+++ b/src/engine_base.h
@@ -148,4 +148,4 @@ static inline const AircraftVehicleInfo *AircraftVehInfo(EngineID e)
 	return &Engine::Get(e)->u.air;
 }
 
-#endif /* ENGINE_TYPE_H */
+#endif /* ENGINE_BASE_H */
diff --git a/src/network/core/tcp_http.h b/src/network/core/tcp_http.h
index f684e0156..5f54f5ff6 100644
--- a/src/network/core/tcp_http.h
+++ b/src/network/core/tcp_http.h
@@ -143,4 +143,4 @@ public:
 
 #endif /* ENABLE_NETWORK */
 
-#endif /* NETWORK_CORE_HTTP_H */
+#endif /* NETWORK_CORE_TCP_HTTP_H */
diff --git a/src/newgrf_class.h b/src/newgrf_class.h
index 6411492c1..399efa27b 100644
--- a/src/newgrf_class.h
+++ b/src/newgrf_class.h
@@ -99,4 +99,4 @@ struct NewGRFClass {
 	static const Tspec *GetByGrf(uint32 grfid, byte local_id, int *index);
 };
 
-#endif /* NEWGRF_STATION_H */
+#endif /* NEWGRF_CLASS_H */
diff --git a/src/order_base.h b/src/order_base.h
index fccc802e7..47f0b6d93 100644
--- a/src/order_base.h
+++ b/src/order_base.h
@@ -431,4 +431,4 @@ public:
 #define FOR_ALL_ORDER_LISTS_FROM(var, start) FOR_ALL_ITEMS_FROM(OrderList, orderlist_index, var, start)
 #define FOR_ALL_ORDER_LISTS(var) FOR_ALL_ORDER_LISTS_FROM(var, 0)
 
-#endif /* ORDER_H */
+#endif /* ORDER_BASE_H */
diff --git a/src/os/macosx/splash.h b/src/os/macosx/splash.h
index ed78c0e9a..e5399a2cf 100644
--- a/src/os/macosx/splash.h
+++ b/src/os/macosx/splash.h
@@ -24,4 +24,4 @@ extern "C" {
 }
 #endif //__cplusplus
 
-#endif
+#endif /* SPLASH_H */
diff --git a/src/settings_internal.h b/src/settings_internal.h
index 045d13639..7dca0332f 100644
--- a/src/settings_internal.h
+++ b/src/settings_internal.h
@@ -94,4 +94,4 @@ void SetCompanySetting(uint index, int32 value);
 
 extern VehicleDefaultSettings _old_vds;
 
-#endif /* SETTINGS_H */
+#endif /* SETTINGS_INTERNAL_H */
diff --git a/src/strings_func.h b/src/strings_func.h
index 9c4adfb1d..8595a84f7 100644
--- a/src/strings_func.h
+++ b/src/strings_func.h
@@ -113,4 +113,4 @@ void CheckForMissingGlyphsInLoadedLanguagePack();
 
 int strnatcmp(const char *s1, const char *s2);
 
-#endif /* STRINGS_TYPE_H */
+#endif /* STRINGS_FUNC_H */
diff --git a/src/terraform_gui.h b/src/terraform_gui.h
index c87e58352..2e9c3e240 100644
--- a/src/terraform_gui.h
+++ b/src/terraform_gui.h
@@ -19,4 +19,4 @@ bool IsDraggingDiagonal();
 Window *ShowTerraformToolbar(Window *link = NULL);
 Window *ShowEditorTerraformToolbar();
 
-#endif /* GUI_H */
+#endif /* TERRAFORM_GUI_H */