diff --git a/src/landscape.cpp b/src/landscape.cpp
index 932b4167f1..9abadda591 100644
--- a/src/landscape.cpp
+++ b/src/landscape.cpp
@@ -30,7 +30,7 @@
 #include "core/random_func.hpp"
 #include "object_base.h"
 #include "company_func.h"
-#include "pathfinder/npf/aystar.h"
+#include "pathfinder/aystar.h"
 #include "saveload/saveload.h"
 #include "framerate_type.h"
 #include "landscape_cmd.h"
diff --git a/src/pathfinder/CMakeLists.txt b/src/pathfinder/CMakeLists.txt
index adf896895d..f34463cbf6 100644
--- a/src/pathfinder/CMakeLists.txt
+++ b/src/pathfinder/CMakeLists.txt
@@ -1,8 +1,11 @@
-add_subdirectory(npf)
 add_subdirectory(yapf)
 
 add_files(
+    aystar.h
+    aystar.cpp
     follow_track.hpp
+    queue.h
+    queue.cpp
     pathfinder_func.h
     pathfinder_type.h
     water_regions.h
diff --git a/src/pathfinder/npf/aystar.cpp b/src/pathfinder/aystar.cpp
similarity index 100%
rename from src/pathfinder/npf/aystar.cpp
rename to src/pathfinder/aystar.cpp
diff --git a/src/pathfinder/npf/aystar.h b/src/pathfinder/aystar.h
similarity index 100%
rename from src/pathfinder/npf/aystar.h
rename to src/pathfinder/aystar.h
diff --git a/src/pathfinder/npf/CMakeLists.txt b/src/pathfinder/npf/CMakeLists.txt
deleted file mode 100644
index 8a79949dce..0000000000
--- a/src/pathfinder/npf/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-add_files(
-    aystar.cpp
-    aystar.h
-    queue.cpp
-    queue.h
-)
diff --git a/src/pathfinder/pathfinder_type.h b/src/pathfinder/pathfinder_type.h
index 7f3a3f474b..aadcdac8d2 100644
--- a/src/pathfinder/pathfinder_type.h
+++ b/src/pathfinder/pathfinder_type.h
@@ -11,7 +11,7 @@
 #define PATHFINDER_TYPE_H
 
 #include "../tile_type.h"
-#include "npf/aystar.h"
+#include "aystar.h"
 
 /** Length (penalty) of one tile with YAPF */
 static const int YAPF_TILE_LENGTH = 100;
diff --git a/src/pathfinder/npf/queue.cpp b/src/pathfinder/queue.cpp
similarity index 100%
rename from src/pathfinder/npf/queue.cpp
rename to src/pathfinder/queue.cpp
diff --git a/src/pathfinder/npf/queue.h b/src/pathfinder/queue.h
similarity index 100%
rename from src/pathfinder/npf/queue.h
rename to src/pathfinder/queue.h