diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj
index e47017a0e6..ddc02a6ab7 100644
--- a/projects/openttd_vs80.vcproj
+++ b/projects/openttd_vs80.vcproj
@@ -3463,6 +3463,10 @@
 				RelativePath=".\..\src\pathfinder\pathfinder_func.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\pathfinder\pathfinder_type.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="NPF"
@@ -3519,6 +3523,10 @@
 				RelativePath=".\..\src\pathfinder\yapf\yapf_base.hpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\pathfinder\yapf\yapf_cache.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\pathfinder\yapf\yapf_common.hpp"
 				>
diff --git a/projects/openttd_vs90.vcproj b/projects/openttd_vs90.vcproj
index 07fa3253e9..f2501b02bd 100644
--- a/projects/openttd_vs90.vcproj
+++ b/projects/openttd_vs90.vcproj
@@ -3460,6 +3460,10 @@
 				RelativePath=".\..\src\pathfinder\pathfinder_func.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\pathfinder\pathfinder_type.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="NPF"
@@ -3516,6 +3520,10 @@
 				RelativePath=".\..\src\pathfinder\yapf\yapf_base.hpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\pathfinder\yapf\yapf_cache.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\pathfinder\yapf\yapf_common.hpp"
 				>
diff --git a/source.list b/source.list
index eca9da184d..0e13423f88 100644
--- a/source.list
+++ b/source.list
@@ -817,6 +817,7 @@ network/core/udp.h
 pathfinder/opf/opf_ship.cpp
 pathfinder/opf/opf_ship.h
 pathfinder/pathfinder_func.h
+pathfinder/pathfinder_type.h
 
 # NPF
 pathfinder/npf/aystar.cpp
@@ -833,6 +834,7 @@ pathfinder/yapf/nodelist.hpp
 pathfinder/yapf/yapf.h
 pathfinder/yapf/yapf.hpp
 pathfinder/yapf/yapf_base.hpp
+pathfinder/yapf/yapf_cache.h
 pathfinder/yapf/yapf_common.hpp
 pathfinder/yapf/yapf_costbase.hpp
 pathfinder/yapf/yapf_costcache.hpp
diff --git a/src/pathfinder/yapf/yapf.h b/src/pathfinder/yapf/yapf.h
index 2faf5e56ad..c7ddb3d6ea 100644
--- a/src/pathfinder/yapf/yapf.h
+++ b/src/pathfinder/yapf/yapf.h
@@ -102,7 +102,4 @@ bool YapfTrainCheckReverse(const Train *v);
  */
 bool YapfTrainFindNearestSafeTile(const Train *v, TileIndex tile, Trackdir td, bool override_railtype);
 
-/** Use this function to notify YAPF that track layout (or signal configuration) has change */
-void YapfNotifyTrackLayoutChange(TileIndex tile, Track track);
-
 #endif /* YAPF_H */
diff --git a/src/pathfinder/yapf/yapf_cache.h b/src/pathfinder/yapf/yapf_cache.h
new file mode 100644
index 0000000000..ba342f0115
--- /dev/null
+++ b/src/pathfinder/yapf/yapf_cache.h
@@ -0,0 +1,24 @@
+/* $Id$ */
+
+/*
+ * This file is part of OpenTTD.
+ * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+ * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/** @file yapf_cache.h Entry point for OpenTTD to YAPF's cache. */
+
+#ifndef  YAPF_CACHE_H
+#define  YAPF_CACHE_H
+
+#include "../../track_type.h"
+
+/**
+ * Use this function to notify YAPF that track layout (or signal configuration) has change.
+ * @param tile  the tile that is changed
+ * @param track what piece of track is changed
+ */
+void YapfNotifyTrackLayoutChange(TileIndex tile, Track track);
+
+#endif /* YAPF_CACHE_H */
diff --git a/src/pathfinder/yapf/yapf_rail.cpp b/src/pathfinder/yapf/yapf_rail.cpp
index 1cf8677f9a..5cb4957fd0 100644
--- a/src/pathfinder/yapf/yapf_rail.cpp
+++ b/src/pathfinder/yapf/yapf_rail.cpp
@@ -12,6 +12,7 @@
 #include "../../stdafx.h"
 
 #include "yapf.hpp"
+#include "yapf_cache.h"
 #include "yapf_node_rail.hpp"
 #include "yapf_costrail.hpp"
 #include "yapf_destrail.hpp"
diff --git a/src/rail_cmd.cpp b/src/rail_cmd.cpp
index 269f05500a..90ec223d94 100644
--- a/src/rail_cmd.cpp
+++ b/src/rail_cmd.cpp
@@ -17,7 +17,7 @@
 #include "command_func.h"
 #include "engine_base.h"
 #include "depot_base.h"
-#include "pathfinder/yapf/yapf.h"
+#include "pathfinder/yapf/yapf_cache.h"
 #include "newgrf_engine.h"
 #include "landscape_type.h"
 #include "newgrf_commons.h"
diff --git a/src/road_cmd.cpp b/src/road_cmd.cpp
index 16c5ba37a1..ce8ba45a55 100644
--- a/src/road_cmd.cpp
+++ b/src/road_cmd.cpp
@@ -16,7 +16,7 @@
 #include "landscape.h"
 #include "viewport_func.h"
 #include "command_func.h"
-#include "pathfinder/yapf/yapf.h"
+#include "pathfinder/yapf/yapf_cache.h"
 #include "depot_base.h"
 #include "newgrf.h"
 #include "variables.h"
diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp
index 70fe5a2fa4..438c1069ae 100644
--- a/src/saveload/afterload.cpp
+++ b/src/saveload/afterload.cpp
@@ -25,7 +25,17 @@
 #include "../clear_map.h"
 #include "../vehicle_func.h"
 #include "../newgrf_station.h"
-#include "../pathfinder/yapf/yapf.hpp"
+#include "../openttd.h"
+#include "../debug.h"
+#include "../string_func.h"
+#include "../date_func.h"
+#include "../roadveh.h"
+#include "../train.h"
+#include "../station_base.h"
+#include "../waypoint_base.h"
+#include "../tunnelbridge_map.h"
+#include "../landscape.h"
+#include "../pathfinder/yapf/yapf_cache.h"
 #include "../elrail_func.h"
 #include "../signs_func.h"
 #include "../aircraft.h"
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp
index 347c57dec0..8346a61ba9 100644
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -25,7 +25,7 @@
 #include "newgrf_cargo.h"
 #include "newgrf_station.h"
 #include "newgrf_commons.h"
-#include "pathfinder/yapf/yapf.h"
+#include "pathfinder/yapf/yapf_cache.h"
 #include "road_internal.h" /* For drawing catenary/checking road removal */
 #include "variables.h"
 #include "autoslope.h"
diff --git a/src/tunnelbridge_cmd.cpp b/src/tunnelbridge_cmd.cpp
index 7348a0d4d0..1f3bfdcc60 100644
--- a/src/tunnelbridge_cmd.cpp
+++ b/src/tunnelbridge_cmd.cpp
@@ -25,7 +25,7 @@
 #include "ship.h"
 #include "roadveh.h"
 #include "water_map.h"
-#include "pathfinder/yapf/yapf.h"
+#include "pathfinder/yapf/yapf_cache.h"
 #include "newgrf_sound.h"
 #include "autoslope.h"
 #include "tunnelbridge_map.h"
diff --git a/src/waypoint_cmd.cpp b/src/waypoint_cmd.cpp
index ce46ef923b..0e31a88968 100644
--- a/src/waypoint_cmd.cpp
+++ b/src/waypoint_cmd.cpp
@@ -16,7 +16,7 @@
 #include "bridge_map.h"
 #include "town.h"
 #include "waypoint_base.h"
-#include "pathfinder/yapf/yapf.h"
+#include "pathfinder/yapf/yapf_cache.h"
 #include "strings_func.h"
 #include "functions.h"
 #include "window_func.h"