diff --git a/src/vehicle_cmd.cpp b/src/vehicle_cmd.cpp
--- a/src/vehicle_cmd.cpp
+++ b/src/vehicle_cmd.cpp
@@ -16,11 +16,9 @@
 #include "cmd_helper.h"
 #include "command_func.h"
 #include "company_func.h"
-#include "vehicle_gui.h"
 #include "train.h"
 #include "aircraft.h"
 #include "newgrf_text.h"
-#include "window_func.h"
 #include "vehicle_func.h"
 #include "string_func.h"
 #include "depot_map.h"
@@ -28,7 +26,7 @@
 #include "engine_func.h"
 #include "articulated_vehicles.h"
 #include "autoreplace_gui.h"
-#include "company_base.h"
+#include "group.h"
 #include "order_backup.h"
 #include "ship.h"
 #include "newgrf.h"