diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 88d6f779d17ba..4b6558a318f23 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -908,7 +908,6 @@ set(wesnoth-main_SRC
 
 set(libwesnoth-game_STAT_SRC
 	arrow.cpp
-	builder.cpp
 	clipboard.cpp
 	construct_dialog.cpp
 	cursor.cpp
@@ -953,6 +952,7 @@ set(libwesnoth-game_STAT_SRC
 	soundsource.cpp
 	sound_music_track.cpp
 	terrain.cpp
+	terrain_builder.cpp
 	terrain_translation.cpp
 	text.cpp
 	time_of_day.cpp
diff --git a/src/SConscript b/src/SConscript
index 368d53410f91b..e8642b5f964e4 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -70,8 +70,6 @@ libwesnoth_core = [env.Library("wesnoth_core", libwesnoth_core_sources)]
 
 libwesnoth_sources = Split("""
     arrow.cpp
-    pathfind/astarsearch.cpp
-    builder.cpp
     clipboard.cpp
     config_assign.cpp
     construct_dialog.cpp
@@ -102,6 +100,7 @@ libwesnoth_sources = Split("""
     map_label.cpp
     marked-up_text.cpp
     minimap.cpp
+    pathfind/astarsearch.cpp
     pathutils.cpp
     preferences.cpp
     preferences_display.cpp
@@ -114,6 +113,7 @@ libwesnoth_sources = Split("""
     soundsource.cpp
     sound_music_track.cpp
     terrain.cpp
+    terrain_builder.cpp
     terrain_translation.cpp
     text.cpp
     time_of_day.cpp
diff --git a/src/display.cpp b/src/display.cpp
index ec1a38d5e3a73..83eb31c3dd3df 100644
--- a/src/display.cpp
+++ b/src/display.cpp
@@ -17,7 +17,6 @@
  * Routines to set up the display, scroll and zoom the map.
  */
 
-#include "builder.hpp"
 #include "cursor.hpp"
 #include "display.hpp"
 #include "game_preferences.hpp"
@@ -30,6 +29,7 @@
 #include "map_label.hpp"
 #include "minimap.hpp"
 #include "reports.hpp"
+#include "terrain_builder.hpp"
 #include "text.hpp"
 #include "time_of_day.hpp"
 #include "tooltips.hpp"
diff --git a/src/editor/editor_display.cpp b/src/editor/editor_display.cpp
index 09a28d56a9465..a98850e62449b 100644
--- a/src/editor/editor_display.cpp
+++ b/src/editor/editor_display.cpp
@@ -14,8 +14,8 @@
 #define GETTEXT_DOMAIN "wesnoth-editor"
 
 #include "editor_display.hpp"
-#include "builder.hpp"
 #include "reports.hpp"
+#include "terrain_builder.hpp"
 
 namespace editor {
 
diff --git a/src/game_config_manager.cpp b/src/game_config_manager.cpp
index 1a3d1ee3c2c9e..d6e79b0256b33 100644
--- a/src/game_config_manager.cpp
+++ b/src/game_config_manager.cpp
@@ -16,19 +16,19 @@
 #include "about.hpp"
 #include "addon/manager.hpp"
 #include "ai/configuration.hpp"
-#include "builder.hpp"
 #include "cursor.hpp"
 #include "game_config.hpp"
 #include "gettext.hpp"
 #include "gui/dialogs/wml_error.hpp"
+#include "hotkey/hotkey_item.hpp"
+#include "hotkey/hotkey_command.hpp"
 #include "language.hpp"
 #include "loadscreen.hpp"
 #include "log.hpp"
 #include "preferences.hpp"
 #include "resources.hpp"
 #include "scripting/lua.hpp"
-#include "hotkey/hotkey_item.hpp"
-#include "hotkey/hotkey_command.hpp"
+#include "terrain_builder.hpp"
 
 #include <boost/foreach.hpp>
 
diff --git a/src/menu_events.cpp b/src/menu_events.cpp
index 87331429c1a9f..c1bc7a735518b 100644
--- a/src/menu_events.cpp
+++ b/src/menu_events.cpp
@@ -26,7 +26,6 @@
 #include "actions/move.hpp"
 #include "actions/undo.hpp"
 #include "actions/vision.hpp"
-#include "builder.hpp"
 #include "ai/manager.hpp"
 #include "dialogs.hpp"
 #include "formatter.hpp"
@@ -64,6 +63,7 @@
 #include "sound.hpp"
 #include "statistics_dialog.hpp"
 #include "synced_context.hpp"
+#include "terrain_builder.hpp"
 #include "unit_display.hpp"
 #include "wml_separators.hpp"
 #include "formula_string_utils.hpp"
diff --git a/src/builder.cpp b/src/terrain_builder.cpp
similarity index 99%
rename from src/builder.cpp
rename to src/terrain_builder.cpp
index eac1f8db64bb6..6559b07a7968b 100644
--- a/src/builder.cpp
+++ b/src/terrain_builder.cpp
@@ -17,13 +17,13 @@
  * Terrain builder.
  */
 
-#include "builder.hpp"
+#include "terrain_builder.hpp"
 
+#include "image.hpp"
 #include "loadscreen.hpp"
 #include "log.hpp"
 #include "map.hpp"
 #include "serialization/string_utils.hpp"
-#include "image.hpp"
 
 #include <boost/foreach.hpp>
 
diff --git a/src/builder.hpp b/src/terrain_builder.hpp
similarity index 99%
rename from src/builder.hpp
rename to src/terrain_builder.hpp
index 70641e94ff9a3..ecd749323e0ba 100644
--- a/src/builder.hpp
+++ b/src/terrain_builder.hpp
@@ -17,8 +17,8 @@
  * Definitions for the terrain builder.
  */
 
-#ifndef BUILDER_H_INCLUDED
-#define BUILDER_H_INCLUDED
+#ifndef TERRAIN_BUILDER_H_INCLUDED
+#define TERRAIN_BUILDER_H_INCLUDED
 
 #include "animated.hpp"
 #include "map_location.hpp"