diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj
index 2ec5a57545..c6b09aa276 100644
--- a/projects/openttd_vs80.vcproj
+++ b/projects/openttd_vs80.vcproj
@@ -1676,11 +1676,11 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\core\pool.hpp"
+				RelativePath=".\..\src\core\pool_func.hpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\core\pool_func.hpp"
+				RelativePath=".\..\src\core\pool_type.hpp"
 				>
 			</File>
 			<File
diff --git a/projects/openttd_vs90.vcproj b/projects/openttd_vs90.vcproj
index be213cd284..8aa31b1e76 100644
--- a/projects/openttd_vs90.vcproj
+++ b/projects/openttd_vs90.vcproj
@@ -1673,11 +1673,11 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\core\pool.hpp"
+				RelativePath=".\..\src\core\pool_func.hpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\core\pool_func.hpp"
+				RelativePath=".\..\src\core\pool_type.hpp"
 				>
 			</File>
 			<File
diff --git a/source.list b/source.list
index 5a5af4ea7c..a4d2b141dd 100644
--- a/source.list
+++ b/source.list
@@ -364,8 +364,8 @@ core/math_func.cpp
 core/math_func.hpp
 core/mem_func.hpp
 core/overflowsafe_type.hpp
-core/pool.hpp
 core/pool_func.hpp
+core/pool_type.hpp
 core/random_func.cpp
 core/random_func.hpp
 core/smallmap_type.hpp
diff --git a/src/autoreplace_base.h b/src/autoreplace_base.h
index f37f686558..74f9bca5a7 100644
--- a/src/autoreplace_base.h
+++ b/src/autoreplace_base.h
@@ -5,7 +5,7 @@
 #ifndef AUTOREPLACE_BASE_H
 #define AUTOREPLACE_BASE_H
 
-#include "core/pool.hpp"
+#include "core/pool_type.hpp"
 #include "autoreplace_type.h"
 
 typedef uint16 EngineRenewID;
diff --git a/src/cargopacket.h b/src/cargopacket.h
index 26b38342c6..783430221d 100644
--- a/src/cargopacket.h
+++ b/src/cargopacket.h
@@ -5,7 +5,7 @@
 #ifndef CARGOPACKET_H
 #define CARGOPACKET_H
 
-#include "core/pool.hpp"
+#include "core/pool_type.hpp"
 #include "economy_type.h"
 #include "tile_type.h"
 #include "station_type.h"
diff --git a/src/company_base.h b/src/company_base.h
index 83992c538a..e1049bad5a 100644
--- a/src/company_base.h
+++ b/src/company_base.h
@@ -6,7 +6,7 @@
 #define COMPANY_BASE_H
 
 #include "company_type.h"
-#include "core/pool.hpp"
+#include "core/pool_type.hpp"
 #include "road_type.h"
 #include "rail_type.h"
 #include "date_type.h"
diff --git a/src/core/pool_func.hpp b/src/core/pool_func.hpp
index df9e2692f0..3ac28f4729 100644
--- a/src/core/pool_func.hpp
+++ b/src/core/pool_func.hpp
@@ -7,7 +7,7 @@
 
 #include "alloc_func.hpp"
 #include "mem_func.hpp"
-#include "pool.hpp"
+#include "pool_type.hpp"
 
 #define DEFINE_POOL_METHOD(type) \
 	template <class Titem, typename Tindex, size_t Tgrowth_step, size_t Tmax_size> \
diff --git a/src/core/pool.hpp b/src/core/pool_type.hpp
similarity index 97%
rename from src/core/pool.hpp
rename to src/core/pool_type.hpp
index 7c95803f7f..2d32df724f 100644
--- a/src/core/pool.hpp
+++ b/src/core/pool_type.hpp
@@ -1,9 +1,9 @@
 /* $Id$ */
 
-/** @file pool.hpp Defintion of Pool, structure used to access PoolItems, and PoolItem, base structure for Vehicle, Town, and other indexed items. */
+/** @file pool_type.hpp Defintion of Pool, structure used to access PoolItems, and PoolItem, base structure for Vehicle, Town, and other indexed items. */
 
-#ifndef POOL_HPP
-#define POOL_HPP
+#ifndef POOL_TYPE_HPP
+#define POOL_TYPE_HPP
 
 template <class Titem, typename Tindex, size_t Tgrowth_step, size_t Tmax_size>
 struct Pool {
@@ -281,4 +281,4 @@ private:
 
 #define FOR_ALL_ITEMS(type, iter, var) FOR_ALL_ITEMS_FROM(type, iter, var, 0)
 
-#endif /* POOL_HPP */
+#endif /* POOL_TYPE_HPP */
diff --git a/src/depot_base.h b/src/depot_base.h
index b4e47cb60a..f8c7270e88 100644
--- a/src/depot_base.h
+++ b/src/depot_base.h
@@ -7,7 +7,7 @@
 
 #include "tile_type.h"
 #include "depot_type.h"
-#include "core/pool.hpp"
+#include "core/pool_type.hpp"
 #include "town_type.h"
 
 typedef Pool<Depot, DepotID, 64, 64000> DepotPool;
diff --git a/src/engine_base.h b/src/engine_base.h
index 3e53564e47..2f071f343f 100644
--- a/src/engine_base.h
+++ b/src/engine_base.h
@@ -7,7 +7,7 @@
 
 #include "engine_type.h"
 #include "economy_type.h"
-#include "core/pool.hpp"
+#include "core/pool_type.hpp"
 #include "core/smallvec_type.hpp"
 
 typedef Pool<Engine, EngineID, 64, 64000> EnginePool;
diff --git a/src/group.h b/src/group.h
index e60f66c43b..762f915f43 100644
--- a/src/group.h
+++ b/src/group.h
@@ -6,7 +6,7 @@
 #define GROUP_H
 
 #include "group_type.h"
-#include "core/pool.hpp"
+#include "core/pool_type.hpp"
 #include "company_type.h"
 #include "vehicle_type.h"
 #include "engine_type.h"
diff --git a/src/industry.h b/src/industry.h
index 5508b73a0e..7bd1ead446 100644
--- a/src/industry.h
+++ b/src/industry.h
@@ -5,7 +5,7 @@
 #ifndef INDUSTRY_H
 #define INDUSTRY_H
 
-#include "core/pool.hpp"
+#include "core/pool_type.hpp"
 #include "core/random_func.hpp"
 #include "newgrf_storage.h"
 #include "cargo_type.h"
diff --git a/src/network/core/tcp_game.h b/src/network/core/tcp_game.h
index d01a3d9a8e..1d29b5a02e 100644
--- a/src/network/core/tcp_game.h
+++ b/src/network/core/tcp_game.h
@@ -12,7 +12,7 @@
 #include "os_abstraction.h"
 #include "tcp.h"
 #include "packet.h"
-#include "../../core/pool.hpp"
+#include "../../core/pool_type.hpp"
 
 /**
  * Enum with all types of UDP packets.
diff --git a/src/network/network_base.h b/src/network/network_base.h
index 2714217cd9..da5039abc2 100644
--- a/src/network/network_base.h
+++ b/src/network/network_base.h
@@ -8,7 +8,7 @@
 #ifdef ENABLE_NETWORK
 
 #include "network_type.h"
-#include "../core/pool.hpp"
+#include "../core/pool_type.hpp"
 
 typedef Pool<NetworkClientInfo, ClientIndex, 8, MAX_CLIENT_SLOTS> NetworkClientInfoPool;
 extern NetworkClientInfoPool _networkclientinfo_pool;
diff --git a/src/newgrf_spritegroup.h b/src/newgrf_spritegroup.h
index ebaa908eaf..b8dd5f151d 100644
--- a/src/newgrf_spritegroup.h
+++ b/src/newgrf_spritegroup.h
@@ -11,7 +11,7 @@
 #include "gfx_type.h"
 #include "engine_type.h"
 #include "tile_type.h"
-#include "core/pool.hpp"
+#include "core/pool_type.hpp"
 
 #include "newgrf_cargo.h"
 #include "newgrf_callbacks.h"
diff --git a/src/order_base.h b/src/order_base.h
index 6630efe64b..442a9ae217 100644
--- a/src/order_base.h
+++ b/src/order_base.h
@@ -6,7 +6,7 @@
 #define ORDER_BASE_H
 
 #include "order_type.h"
-#include "core/pool.hpp"
+#include "core/pool_type.hpp"
 #include "core/bitmath_func.hpp"
 #include "cargo_type.h"
 #include "depot_type.h"
diff --git a/src/signs_base.h b/src/signs_base.h
index e4fa3f9c42..131816eead 100644
--- a/src/signs_base.h
+++ b/src/signs_base.h
@@ -8,7 +8,7 @@
 #include "signs_type.h"
 #include "viewport_type.h"
 #include "tile_type.h"
-#include "core/pool.hpp"
+#include "core/pool_type.hpp"
 
 typedef Pool<Sign, SignID, 16, 64000> SignPool;
 extern SignPool _sign_pool;
diff --git a/src/station_base.h b/src/station_base.h
index 1b580db2b8..f494cf67f4 100644
--- a/src/station_base.h
+++ b/src/station_base.h
@@ -7,7 +7,7 @@
 
 #include "station_type.h"
 #include "airport.h"
-#include "core/pool.hpp"
+#include "core/pool_type.hpp"
 #include "cargopacket.h"
 #include "cargo_type.h"
 #include "town_type.h"
diff --git a/src/town.h b/src/town.h
index ca8ef7f29b..d1658b2b83 100644
--- a/src/town.h
+++ b/src/town.h
@@ -5,7 +5,7 @@
 #ifndef TOWN_H
 #define TOWN_H
 
-#include "core/pool.hpp"
+#include "core/pool_type.hpp"
 #include "core/bitmath_func.hpp"
 #include "core/random_func.hpp"
 #include "cargo_type.h"
diff --git a/src/vehicle_base.h b/src/vehicle_base.h
index 955c4f3fe9..6c3d867576 100644
--- a/src/vehicle_base.h
+++ b/src/vehicle_base.h
@@ -16,7 +16,7 @@
 #include "date_type.h"
 #include "company_base.h"
 #include "company_type.h"
-#include "core/pool.hpp"
+#include "core/pool_type.hpp"
 #include "order_base.h"
 #include "cargopacket.h"
 #include "texteff.hpp"
diff --git a/src/waypoint.h b/src/waypoint.h
index eb388e86d0..3f72ac4ca2 100644
--- a/src/waypoint.h
+++ b/src/waypoint.h
@@ -12,7 +12,7 @@
 #include "town_type.h"
 #include "viewport_type.h"
 #include "date_type.h"
-#include "core/pool.hpp"
+#include "core/pool_type.hpp"
 
 typedef Pool<Waypoint, WaypointID, 32, 64000> WaypointPool;
 extern WaypointPool _waypoint_pool;