diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj
index 48efeed1cd..5b61359f0e 100644
--- a/projects/openttd_vs80.vcproj
+++ b/projects/openttd_vs80.vcproj
@@ -891,6 +891,10 @@
 				RelativePath=".\..\src\depot.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\depot_type.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\direction_func.h"
 				>
diff --git a/projects/openttd_vs90.vcproj b/projects/openttd_vs90.vcproj
index c7edde6e8d..98c44fdff8 100644
--- a/projects/openttd_vs90.vcproj
+++ b/projects/openttd_vs90.vcproj
@@ -888,6 +888,10 @@
 				RelativePath=".\..\src\depot.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\depot_type.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\direction_func.h"
 				>
diff --git a/source.list b/source.list
index 805452390c..34d49fc497 100644
--- a/source.list
+++ b/source.list
@@ -131,6 +131,7 @@ debug.h
 video/dedicated_v.h
 ai/default/default.h
 depot.h
+depot_type.h
 direction_func.h
 direction_type.h
 music/dmusic.h
diff --git a/src/depot.h b/src/depot.h
index f551f943f2..42bd84b543 100644
--- a/src/depot.h
+++ b/src/depot.h
@@ -6,13 +6,13 @@
 #define DEPOT_H
 
 #include "direction_type.h"
+#include "depot_type.h"
 #include "oldpool.h"
 #include "road_map.h"
 #include "rail_map.h"
 #include "water_map.h"
 #include "station_map.h"
 
-struct Depot;
 DECLARE_OLD_POOL(Depot, Depot, 3, 8000)
 
 struct Depot : PoolItem<Depot, DepotID, &_Depot_pool> {
diff --git a/src/depot_type.h b/src/depot_type.h
new file mode 100644
index 0000000000..71372cce5f
--- /dev/null
+++ b/src/depot_type.h
@@ -0,0 +1,11 @@
+/* $Id$ */
+
+/** @file depot_type.h Header files for depots (not hangars) */
+
+#ifndef DEPOT_TYPE_H
+#define DEPOT_TYPE_H
+
+typedef uint16 DepotID;
+struct Depot;
+
+#endif /* DEPOT_TYPE_H */
diff --git a/src/openttd.h b/src/openttd.h
index 1968512348..8530d6dd37 100644
--- a/src/openttd.h
+++ b/src/openttd.h
@@ -9,7 +9,6 @@
 #endif
 
 // Forward declarations of structs.
-struct Depot;
 struct Waypoint;
 struct Station;
 struct ViewPort;
@@ -26,7 +25,6 @@ typedef EngineID *EngineList; ///< engine list type placeholder acceptable for C
 typedef uint16 StationID;
 static const StationID INVALID_STATION = 0xFFFF;
 typedef uint16 RoadStopID;
-typedef uint16 DepotID;
 typedef uint16 WaypointID;
 typedef uint16 OrderID;
 typedef uint16 SignID;
diff --git a/src/yapf/yapf.h b/src/yapf/yapf.h
index 51ba06b925..40851eb42a 100644
--- a/src/yapf/yapf.h
+++ b/src/yapf/yapf.h
@@ -6,6 +6,7 @@
 #define  YAPF_H
 
 #include "../debug.h"
+#include "../depot_type.h"
 
 /** Finds the best path for given ship.
  * @param v        the ship that needs to find a path