diff --git a/src/ship_cmd.cpp b/src/ship_cmd.cpp
--- a/src/ship_cmd.cpp
+++ b/src/ship_cmd.cpp
@@ -16,11 +16,12 @@
 #include "command_func.h"
 #include "news_func.h"
 #include "company_func.h"
-#include "npf.h"
+#include "pathfinder/npf/npf.h"
 #include "depot_base.h"
+#include "station_base.h"
 #include "vehicle_gui.h"
 #include "newgrf_engine.h"
-#include "yapf/yapf.h"
+#include "pathfinder/yapf/yapf.h"
 #include "newgrf_sound.h"
 #include "spritecache.h"
 #include "strings_func.h"
@@ -33,7 +34,7 @@
 #include "gfx_func.h"
 #include "effectvehicle_func.h"
 #include "ai/ai.hpp"
-#include "pathfind.h"
+#include "pathfinder/opf/opf_ship.h"
 #include "landscape_type.h"
 
 #include "table/strings.h"