diff --git a/src/pathfinder/yapf/CMakeLists.txt b/src/pathfinder/yapf/CMakeLists.txt
index 6717233352..529cd022eb 100644
--- a/src/pathfinder/yapf/CMakeLists.txt
+++ b/src/pathfinder/yapf/CMakeLists.txt
@@ -1,7 +1,6 @@
 add_files(
     nodelist.hpp
     yapf.h
-    yapf.hpp
     yapf_base.hpp
     yapf_cache.h
     yapf_common.hpp
@@ -9,6 +8,7 @@ add_files(
     yapf_costcache.hpp
     yapf_costrail.hpp
     yapf_destrail.hpp
+    yapf_includes.h
     yapf_node.hpp
     yapf_node_rail.hpp
     yapf_node_road.hpp
diff --git a/src/pathfinder/yapf/yapf.hpp b/src/pathfinder/yapf/yapf_includes.h
similarity index 95%
rename from src/pathfinder/yapf/yapf.hpp
rename to src/pathfinder/yapf/yapf_includes.h
index 36df4db951..053991bf2b 100644
--- a/src/pathfinder/yapf/yapf.hpp
+++ b/src/pathfinder/yapf/yapf_includes.h
@@ -5,7 +5,7 @@
  * 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.hpp Base includes/functions for YAPF. */
+/** @file yapf_includes.h Base includes for YAPF. */
 
 #ifndef YAPF_HPP
 #define YAPF_HPP
diff --git a/src/pathfinder/yapf/yapf_rail.cpp b/src/pathfinder/yapf/yapf_rail.cpp
index 94ec48f127..825e2ca0eb 100644
--- a/src/pathfinder/yapf/yapf_rail.cpp
+++ b/src/pathfinder/yapf/yapf_rail.cpp
@@ -9,7 +9,7 @@
 
 #include "../../stdafx.h"
 
-#include "yapf.hpp"
+#include "yapf_includes.h"
 #include "yapf_cache.h"
 #include "yapf_node_rail.hpp"
 #include "yapf_costrail.hpp"
diff --git a/src/pathfinder/yapf/yapf_road.cpp b/src/pathfinder/yapf/yapf_road.cpp
index 41102c2e15..5ae0292a0d 100644
--- a/src/pathfinder/yapf/yapf_road.cpp
+++ b/src/pathfinder/yapf/yapf_road.cpp
@@ -8,7 +8,7 @@
 /** @file yapf_road.cpp The road pathfinding. */
 
 #include "../../stdafx.h"
-#include "yapf.hpp"
+#include "yapf_includes.h"
 #include "yapf_node_road.hpp"
 #include "../../roadstop_base.h"
 
diff --git a/src/pathfinder/yapf/yapf_ship.cpp b/src/pathfinder/yapf/yapf_ship.cpp
index c5db0fc403..02789d047d 100644
--- a/src/pathfinder/yapf/yapf_ship.cpp
+++ b/src/pathfinder/yapf/yapf_ship.cpp
@@ -12,7 +12,7 @@
 #include "../../industry.h"
 #include "../../vehicle_func.h"
 
-#include "yapf.hpp"
+#include "yapf_includes.h"
 #include "yapf_node_ship.hpp"
 #include "yapf_ship_regions.h"
 #include "../water_regions.h"
diff --git a/src/pathfinder/yapf/yapf_ship_regions.cpp b/src/pathfinder/yapf/yapf_ship_regions.cpp
index bc3d0fcf32..3e3a75ef9d 100644
--- a/src/pathfinder/yapf/yapf_ship_regions.cpp
+++ b/src/pathfinder/yapf/yapf_ship_regions.cpp
@@ -10,7 +10,7 @@
 #include "../../stdafx.h"
 #include "../../ship.h"
 
-#include "yapf.hpp"
+#include "yapf_includes.h"
 #include "yapf_ship_regions.h"
 #include "../water_regions.h"
 
diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp
index 544cd35ef9..df7bd37192 100644
--- a/src/train_cmd.cpp
+++ b/src/train_cmd.cpp
@@ -13,7 +13,7 @@
 #include "command_func.h"
 #include "error_func.h"
 #include "pathfinder/npf/npf_func.h"
-#include "pathfinder/yapf/yapf.hpp"
+#include "pathfinder/yapf/yapf_includes.h"
 #include "news_func.h"
 #include "company_func.h"
 #include "newgrf_sound.h"