7 files changed, 12 insertions, 12 deletions
diff --git a/src/ai/ai.cpp b/src/ai/ai.cpp
index d6e616883..78189917a 100644
--- a/src/ai/ai.cpp
+++ b/src/ai/ai.cpp
@@ -8,8 +8,8 @@
 #include "../command_func.h"
 #include "../network/network.h"
 #include "../core/alloc_func.hpp"
-#include "../player_func.h"
-#include "../player_base.h"
+#include "../company_func.h"
+#include "../company_base.h"
 #include "ai.h"
 #include "default/default.h"
 #include "trolly/trolly.h"
diff --git a/src/ai/default/default.cpp b/src/ai/default/default.cpp
index e269535ae..defa32ab2 100644
--- a/src/ai/default/default.cpp
+++ b/src/ai/default/default.cpp
@@ -26,8 +26,8 @@
 #include "../../vehicle_func.h"
 #include "../../functions.h"
 #include "../../saveload.h"
-#include "../../player_func.h"
-#include "../../player_base.h"
+#include "../../company_func.h"
+#include "../../company_base.h"
 #include "../../settings_type.h"
 #include "default.h"
 #include "../../tunnelbridge.h"
diff --git a/src/ai/trolly/build.cpp b/src/ai/trolly/build.cpp
index 311ca71f2..f6aee3239 100644
--- a/src/ai/trolly/build.cpp
+++ b/src/ai/trolly/build.cpp
@@ -14,8 +14,8 @@
 #include "../../bridge.h"
 #include "../../vehicle_func.h"
 #include "../../vehicle_base.h"
-#include "../../player_base.h"
-#include "../../player_func.h"
+#include "../../company_base.h"
+#include "../../company_func.h"
 #include "../ai.h"
 #include "../../tunnelbridge.h"
 
diff --git a/src/ai/trolly/pathfinder.cpp b/src/ai/trolly/pathfinder.cpp
index 258243f23..ca8b2a635 100644
--- a/src/ai/trolly/pathfinder.cpp
+++ b/src/ai/trolly/pathfinder.cpp
@@ -13,8 +13,8 @@
 #include "../../tunnelbridge_map.h"
 #include "../ai.h"
 #include "../../variables.h"
-#include "../../player_base.h"
-#include "../../player_func.h"
+#include "../../company_base.h"
+#include "../../company_func.h"
 #include "../../tunnelbridge.h"
 
 
diff --git a/src/ai/trolly/shared.cpp b/src/ai/trolly/shared.cpp
index d08bfd723..1183f0371 100644
--- a/src/ai/trolly/shared.cpp
+++ b/src/ai/trolly/shared.cpp
@@ -7,7 +7,7 @@
 #include "../../debug.h"
 #include "../../map_func.h"
 #include "../../vehicle_base.h"
-#include "../../player_base.h"
+#include "../../company_base.h"
 #include "trolly.h"
 
 int AiNew_GetRailDirection(TileIndex tile_a, TileIndex tile_b, TileIndex tile_c)
diff --git a/src/ai/trolly/trolly.cpp b/src/ai/trolly/trolly.cpp
index 9ec6b937d..23a67011b 100644
--- a/src/ai/trolly/trolly.cpp
+++ b/src/ai/trolly/trolly.cpp
@@ -38,8 +38,8 @@
 #include "../../vehicle_func.h"
 #include "../../date_func.h"
 #include "../ai.h"
-#include "../../player_base.h"
-#include "../../player_func.h"
+#include "../../company_base.h"
+#include "../../company_func.h"
 
 #include "table/strings.h"
 
diff --git a/src/ai/trolly/trolly.h b/src/ai/trolly/trolly.h
index 2b11623e9..a1d8e0cd9 100644
--- a/src/ai/trolly/trolly.h
+++ b/src/ai/trolly/trolly.h
@@ -6,7 +6,7 @@
 #define AI_TROLLY_H
 
 #include "../../aystar.h"
-#include "../../player_type.h"
+#include "../../company_type.h"
 #include "../../vehicle_type.h"
 #include "../../date_type.h"
 #include "../../engine_type.h"