diff --git a/src/editor/map/editor_map.cpp b/src/editor/map/editor_map.cpp
index 4c5643c4b2e2..f12a29e5a621 100644
--- a/src/editor/map/editor_map.cpp
+++ b/src/editor/map/editor_map.cpp
@@ -23,8 +23,6 @@
 #include "map/label.hpp"
 #include "wml_exception.hpp"
 
-#include "terrain/type_data.hpp"
-
 namespace editor {
 
 editor_map_load_exception wrap_exc(const char* type, const std::string& e_msg, const std::string& filename)
diff --git a/src/editor/map/map_context.cpp b/src/editor/map/map_context.cpp
index 11280ecc3caf..31431246f43a 100644
--- a/src/editor/map/map_context.cpp
+++ b/src/editor/map/map_context.cpp
@@ -27,7 +27,6 @@
 #include "serialization/binary_or_text.hpp"
 #include "serialization/parser.hpp"
 #include "team.hpp"
-#include "terrain/type_data.hpp"
 #include "units/unit.hpp"
 #include "game_config_view.hpp"
 
diff --git a/src/game_board.cpp b/src/game_board.cpp
index 20ea59e7fcda..505d17eaa425 100644
--- a/src/game_board.cpp
+++ b/src/game_board.cpp
@@ -18,7 +18,6 @@
 #include "log.hpp"
 #include "map/map.hpp"
 #include "recall_list_manager.hpp"
-#include "terrain/type_data.hpp"
 #include "units/unit.hpp"
 
 #include <set>
diff --git a/src/game_board.hpp b/src/game_board.hpp
index c8ab42700ecd..0a48891b5df3 100644
--- a/src/game_board.hpp
+++ b/src/game_board.hpp
@@ -16,7 +16,6 @@
 
 #include "display_context.hpp"
 #include "team.hpp"
-#include "terrain/type_data.hpp"
 #include "units/map.hpp"
 #include "units/id.hpp"
 #include "utils/optional_fwd.hpp"
diff --git a/src/game_display.cpp b/src/game_display.cpp
index 4476ed5ce3f5..450db8cc63db 100644
--- a/src/game_display.cpp
+++ b/src/game_display.cpp
@@ -39,7 +39,6 @@
 #include "tod_manager.hpp"
 #include "color.hpp"
 #include "synced_context.hpp"
-#include "terrain/type_data.hpp"
 #include "units/unit.hpp"
 #include "units/drawer.hpp"
 #include "whiteboard/manager.hpp"
diff --git a/src/game_initialization/playcampaign.cpp b/src/game_initialization/playcampaign.cpp
index e45ede523d82..51a3af9f7f3e 100644
--- a/src/game_initialization/playcampaign.cpp
+++ b/src/game_initialization/playcampaign.cpp
@@ -42,7 +42,6 @@
 #include "savegame.hpp"
 #include "saved_game.hpp"
 #include "sound.hpp"
-#include "terrain/type_data.hpp"
 #include "wml_exception.hpp"
 #include "formula/string_utils.hpp"
 #include "wesnothd_connection.hpp"
diff --git a/src/gui/widgets/unit_preview_pane.cpp b/src/gui/widgets/unit_preview_pane.cpp
index 22302eef6e6c..250f71e8e55b 100644
--- a/src/gui/widgets/unit_preview_pane.cpp
+++ b/src/gui/widgets/unit_preview_pane.cpp
@@ -38,6 +38,7 @@
 #include "resources.hpp"
 #include "team.hpp"
 #include "terrain/movement.hpp"
+#include "terrain/type_data.hpp"
 #include "units/attack_type.hpp"
 #include "units/types.hpp"
 #include "units/helper.hpp"
diff --git a/src/movetype.cpp b/src/movetype.cpp
index db6d0e8c80bf..89970d43f41d 100644
--- a/src/movetype.cpp
+++ b/src/movetype.cpp
@@ -24,7 +24,6 @@
 #include "log.hpp"
 #include "map/map.hpp"
 #include "terrain/translation.hpp"
-#include "terrain/type_data.hpp"
 #include "units/types.hpp" // for attack_type
 
 static lg::log_domain log_config("config");
diff --git a/src/play_controller.cpp b/src/play_controller.cpp
index 78ca7932f156..fa9a18312f59 100644
--- a/src/play_controller.cpp
+++ b/src/play_controller.cpp
@@ -60,7 +60,6 @@
 #include "soundsource.hpp"
 #include "statistics.hpp"
 #include "synced_context.hpp"
-#include "terrain/type_data.hpp"
 #include "tooltips.hpp"
 #include "units/unit.hpp"
 #include "units/types.hpp"
diff --git a/src/play_controller.hpp b/src/play_controller.hpp
index 72fbac94fc54..27bee11e47b2 100644
--- a/src/play_controller.hpp
+++ b/src/play_controller.hpp
@@ -22,7 +22,6 @@
 #include "menu_events.hpp"
 #include "mouse_events.hpp"
 #include "persist_manager.hpp"
-#include "terrain/type_data.hpp"
 #include "tod_manager.hpp"
 #include "game_state.hpp"
 #include "utils/optional_fwd.hpp"
diff --git a/src/scripting/game_lua_kernel.cpp b/src/scripting/game_lua_kernel.cpp
index 68c0f0a76450..877b6425f8fc 100644
--- a/src/scripting/game_lua_kernel.cpp
+++ b/src/scripting/game_lua_kernel.cpp
@@ -93,7 +93,6 @@
 #include "terrain/terrain.hpp"                  // for terrain_type
 #include "terrain/filter.hpp"           // for terrain_filter
 #include "terrain/translation.hpp"      // for read_terrain_code, etc
-#include "terrain/type_data.hpp"
 #include "time_of_day.hpp"              // for time_of_day
 #include "tod_manager.hpp"              // for tod_manager
 #include "tstring.hpp"                  // for t_string, operator+
diff --git a/src/tests/utils/fake_display.cpp b/src/tests/utils/fake_display.cpp
index ab2b94d5881c..1f548f5a9a69 100644
--- a/src/tests/utils/fake_display.cpp
+++ b/src/tests/utils/fake_display.cpp
@@ -20,7 +20,6 @@
 #include "game_config_view.hpp"
 #include "game_display.hpp"
 #include "reports.hpp"
-#include "terrain/type_data.hpp"
 
 namespace wb
 {