8 files changed, 24 insertions, 24 deletions
diff --git a/src/ai/ai_info.hpp b/src/ai/ai_info.hpp
index 5bb1c9f5e..ace456a79 100644
--- a/src/ai/ai_info.hpp
+++ b/src/ai/ai_info.hpp
@@ -9,8 +9,8 @@
 
 /** @file ai_info.hpp AIInfo keeps track of all information of an AI, like Author, Description, ... */
 
-#ifndef AI_INFO
-#define AI_INFO
+#ifndef AI_INFO_HPP
+#define AI_INFO_HPP
 
 #ifdef ENABLE_AI
 
@@ -158,4 +158,4 @@ private:
 };
 
 #endif /* ENABLE_AI */
-#endif /* AI_INFO */
+#endif /* AI_INFO_HPP */
diff --git a/src/animated_tile_func.h b/src/animated_tile_func.h
index 1b400a81d..2e7c0fb69 100644
--- a/src/animated_tile_func.h
+++ b/src/animated_tile_func.h
@@ -9,8 +9,8 @@
 
 /** @file animated_tile_func.h Tile animation! */
 
-#ifndef ANIMATED_TILE_H
-#define ANIMATED_TILE_H
+#ifndef ANIMATED_TILE_FUNC_H
+#define ANIMATED_TILE_FUNC_H
 
 #include "tile_type.h"
 
@@ -19,4 +19,4 @@ void DeleteAnimatedTile(TileIndex tile);
 void AnimateAnimatedTiles();
 void InitializeAnimatedTiles();
 
-#endif /* ANIMATED_TILE_H */
+#endif /* ANIMATED_TILE_FUNC_H */
diff --git a/src/engine_func.h b/src/engine_func.h
index 5b89f6cc5..d8fbeb607 100644
--- a/src/engine_func.h
+++ b/src/engine_func.h
@@ -9,8 +9,8 @@
 
 /** @file engine_func.h Functions related to engines. */
 
-#ifndef ENGINE_H
-#define ENGINE_H
+#ifndef ENGINE_FUNC_H
+#define ENGINE_FUNC_H
 
 #include "engine_type.h"
 #include "vehicle_type.h"
@@ -31,4 +31,4 @@ void StartupOneEngine(Engine *e, Date aging_date);
 
 uint GetTotalCapacityOfArticulatedParts(EngineID engine);
 
-#endif /* ENGINE_H */
+#endif /* ENGINE_FUNC_H */
diff --git a/src/network/core/address.h b/src/network/core/address.h
index b20a28773..a7f9902a2 100644
--- a/src/network/core/address.h
+++ b/src/network/core/address.h
@@ -9,8 +9,8 @@
 
 /** @file core/address.h Wrapper for network addresses. */
 
-#ifndef NETWORK_ADDRESS_H
-#define NETWORK_ADDRESS_H
+#ifndef NETWORK_CORE_ADDRESS_H
+#define NETWORK_CORE_ADDRESS_H
 
 #include "os_abstraction.h"
 #include "config.h"
@@ -264,4 +264,4 @@ public:
 };
 
 #endif /* ENABLE_NETWORK */
-#endif /* NETWORK_ADDRESS_H */
+#endif /* NETWORK_CORE_ADDRESS_H */
diff --git a/src/network/core/core.h b/src/network/core/core.h
index 083ec02b2..ca7c763bd 100644
--- a/src/network/core/core.h
+++ b/src/network/core/core.h
@@ -11,8 +11,8 @@
  * @file core.h Base for all network types (UDP and TCP)
  */
 
-#ifndef NETWORK_CORE_H
-#define NETWORK_CORE_H
+#ifndef NETWORK_CORE_CORE_H
+#define NETWORK_CORE_CORE_H
 
 #include "../../newgrf_config.h"
 #include "config.h"
@@ -82,4 +82,4 @@ public:
 
 #endif /* ENABLE_NETWORK */
 
-#endif /* NETWORK_CORE_H */
+#endif /* NETWORK_CORE_CORE_H */
diff --git a/src/network/core/tcp_content.h b/src/network/core/tcp_content.h
index f9ff4be35..048ce3da3 100644
--- a/src/network/core/tcp_content.h
+++ b/src/network/core/tcp_content.h
@@ -11,8 +11,8 @@
  * @file tcp_content.h Basic functions to receive and send TCP packets to/from the content server.
  */
 
-#ifndef NETWORK_CORE_CONTENT_H
-#define NETWORK_CORE_CONTENT_H
+#ifndef NETWORK_CORE_TCP_CONTENT_H
+#define NETWORK_CORE_TCP_CONTENT_H
 
 #include "os_abstraction.h"
 #include "tcp.h"
@@ -215,4 +215,4 @@ public:
 
 #endif /* ENABLE_NETWORK */
 
-#endif /* NETWORK_CORE_CONTENT_H */
+#endif /* NETWORK_CORE_TCP_CONTENT_H */
diff --git a/src/script/script_info.hpp b/src/script/script_info.hpp
index f25158049..69af93768 100644
--- a/src/script/script_info.hpp
+++ b/src/script/script_info.hpp
@@ -9,8 +9,8 @@
 
 /** @file script_info.hpp ScriptInfo keeps track of all information of a script, like Author, Description, ... */
 
-#ifndef SCRIPT_INFO
-#define SCRIPT_INFO
+#ifndef SCRIPT_INFO_HPP
+#define SCRIPT_INFO_HPP
 
 #include <squirrel.h>
 #include "../misc/countedptr.hpp"
@@ -101,4 +101,4 @@ private:
 	const char *url;
 };
 
-#endif /* SCRIPT_INFO */
+#endif /* SCRIPT_INFO_HPP */
diff --git a/src/waypoint_base.h b/src/waypoint_base.h
index 6b8d59579..88ba93320 100644
--- a/src/waypoint_base.h
+++ b/src/waypoint_base.h
@@ -9,8 +9,8 @@
 
 /** @file waypoint_base.h Base of waypoints. */
 
-#ifndef WAYPOINT_H
-#define WAYPOINT_H
+#ifndef WAYPOINT_BASE_H
+#define WAYPOINT_BASE_H
 
 #include "base_station_base.h"
 
@@ -64,4 +64,4 @@ struct Waypoint : SpecializedStation<Waypoint, true> {
 
 #define FOR_ALL_WAYPOINTS(var) FOR_ALL_BASE_STATIONS_OF_TYPE(Waypoint, var)
 
-#endif /* WAYPOINT_H */
+#endif /* WAYPOINT_BASE_H */