--- a/depot.h	Sun Jun 04 18:22:32 2006 +0000
+++ b/depot.h	Mon Jun 05 08:34:39 2006 +0000
@@ -8,11 +8,8 @@
 
 #include "direction.h"
 #include "pool.h"
-#include "rail_map.h"
-#include "road_map.h"
 #include "tile.h"
 #include "variables.h"
-#include "water_map.h"
 
 struct Depot {
 	TileIndex xy;
@@ -92,20 +89,6 @@
 	}
 }
 
-/**
- * Returns the direction the exit of the depot on the given tile is facing.
- */
-static inline DiagDirection GetDepotDirection(TileIndex tile, TransportType type)
-{
-	assert(IsTileDepotType(tile, type));
-
-	switch (type) {
-		case TRANSPORT_RAIL:  return GetRailDepotDirection(tile);
-		case TRANSPORT_ROAD:  return GetRoadDepotDirection(tile);
-		case TRANSPORT_WATER: return GetShipDepotDirection(tile);
-		default: return INVALID_DIAGDIR; /* Not reached */
-	}
-}
 
 /**
 	Find out if the slope of the tile is suitable to build a depot of given direction

--- a/npf.c	Sun Jun 04 18:22:32 2006 +0000
+++ b/npf.c	Mon Jun 05 08:34:39 2006 +0000
@@ -15,6 +15,7 @@
 #include "depot.h"
 #include "tunnel_map.h"
 #include "network.h"
+#include "water_map.h"
 
 static AyStar _npf_aystar;
 
@@ -491,6 +492,23 @@
 	return true; /* no need to check */
 }
 
+
+/**
+ * Returns the direction the exit of the depot on the given tile is facing.
+ */
+static DiagDirection GetDepotDirection(TileIndex tile, TransportType type)
+{
+	assert(IsTileDepotType(tile, type));
+
+	switch (type) {
+		case TRANSPORT_RAIL:  return GetRailDepotDirection(tile);
+		case TRANSPORT_ROAD:  return GetRoadDepotDirection(tile);
+		case TRANSPORT_WATER: return GetShipDepotDirection(tile);
+		default: return INVALID_DIAGDIR; /* Not reached */
+	}
+}
+
+
 /* Will just follow the results of GetTileTrackStatus concerning where we can
  * go and where not. Uses AyStar.user_data[NPF_TYPE] as the transport type and
  * an argument to GetTileTrackStatus. Will skip tunnels, meaning that the

--- a/vehicle.c	Sun Jun 04 18:22:32 2006 +0000
+++ b/vehicle.c	Mon Jun 05 08:34:39 2006 +0000
@@ -2,6 +2,7 @@
 
 #include "stdafx.h"
 #include "openttd.h"
+#include "road_map.h"
 #include "spritecache.h"
 #include "table/sprites.h"
 #include "table/strings.h"
@@ -25,6 +26,7 @@
 #include "train.h"
 #include "industry_map.h"
 #include "station_map.h"
+#include "water_map.h"
 
 #define INVALID_COORD (-0x8000)
 #define GEN_HASH(x,y) (((x & 0x1F80)>>7) + ((y & 0xFC0)))