diff --git a/projectfiles/CodeBlocks-SCons/wesnoth.cbp b/projectfiles/CodeBlocks-SCons/wesnoth.cbp
index 237e67c8cfc..ccc659b3f04 100644
--- a/projectfiles/CodeBlocks-SCons/wesnoth.cbp
+++ b/projectfiles/CodeBlocks-SCons/wesnoth.cbp
@@ -52,8 +52,6 @@
 		<Unit filename="..\..\src\ai_dfool.cpp" />
 		<Unit filename="..\..\src\ai_dfool.hpp" />
 		<Unit filename="..\..\src\ai_move.cpp" />
-		<Unit filename="..\..\src\ai_python.cpp" />
-		<Unit filename="..\..\src\ai_python.hpp" />
 		<Unit filename="..\..\src\ai_village.cpp" />
 		<Unit filename="..\..\src\animated.hpp" />
 		<Unit filename="..\..\src\animated.i" />
diff --git a/projectfiles/CodeBlocks/wesnoth.cbp b/projectfiles/CodeBlocks/wesnoth.cbp
index 3a794aa081d..57c47ed5324 100644
--- a/projectfiles/CodeBlocks/wesnoth.cbp
+++ b/projectfiles/CodeBlocks/wesnoth.cbp
@@ -82,8 +82,6 @@
 		<Unit filename="..\..\src\ai_dfool.cpp" />
 		<Unit filename="..\..\src\ai_dfool.hpp" />
 		<Unit filename="..\..\src\ai_move.cpp" />
-		<Unit filename="..\..\src\ai_python.cpp" />
-		<Unit filename="..\..\src\ai_python.hpp" />
 		<Unit filename="..\..\src\ai_village.cpp" />
 		<Unit filename="..\..\src\animated.hpp" />
 		<Unit filename="..\..\src\animated.i" />
diff --git a/projectfiles/Dev-C++/wesnoth.dev b/projectfiles/Dev-C++/wesnoth.dev
index 9eb79978f76..08435f09190 100644
--- a/projectfiles/Dev-C++/wesnoth.dev
+++ b/projectfiles/Dev-C++/wesnoth.dev
@@ -1,7 +1,7 @@
 [Project]
 FileName=wesnoth.dev
 Name=wesnoth
-UnitCount=210
+UnitCount=209
 Type=0
 Ver=1
 ObjFiles=
@@ -90,7 +90,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit53]
-FileName=..\..\src\serialization\binary_or_text.cpp
+FileName=..\..\src\titlescreen.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1
@@ -100,7 +100,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit56]
-FileName=..\..\src\help.cpp
+FileName=..\..\src\preferences_display.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1
@@ -110,7 +110,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit70]
-FileName=..\..\src\halo.cpp
+FileName=..\..\src\sdl_utils.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1
@@ -120,16 +120,6 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit72]
-FileName=..\..\src\generate_report.cpp
-CompileCpp=1
-Folder=wesnoth
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit73]
 FileName=..\..\src\theme.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -139,8 +129,8 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit78]
-FileName=..\..\src\playsingle_controller.cpp
+[Unit73]
+FileName=..\..\src\variable.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1
@@ -149,7 +139,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit79]
+[Unit78]
 FileName=..\..\src\play_controller.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -159,7 +149,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit80]
+[Unit79]
 FileName=..\..\src\playmp_controller.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -169,8 +159,18 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
+[Unit80]
+FileName=..\..\src\network_worker.cpp
+CompileCpp=1
+Folder=wesnoth
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
 [Unit85]
-FileName=..\..\src\mouse_events.cpp
+FileName=..\..\src\minimap.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1
@@ -180,7 +180,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit89]
-FileName=..\..\src\settings.cpp
+FileName=..\..\src\serialization\tokenizer.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1
@@ -190,16 +190,6 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit92]
-FileName=..\..\src\gui\widgets\settings.cpp
-CompileCpp=1
-Folder=wesnoth
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit93]
 FileName=..\..\src\gui\widgets\window_builder.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -209,7 +199,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit94]
+[Unit93]
 FileName=..\..\src\gui\widgets\grid.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -219,7 +209,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit95]
+[Unit94]
 FileName=..\..\src\gui\widgets\listbox.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -229,7 +219,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit96]
+[Unit95]
 FileName=..\..\src\gui\widgets\window.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -239,8 +229,18 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
+[Unit96]
+FileName=..\..\src\variant.cpp
+CompileCpp=1
+Folder=wesnoth
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
 [Unit98]
-FileName=..\..\src\formula.cpp
+FileName=..\..\src\gui\widgets\event_handler.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1
@@ -250,16 +250,6 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit100]
-FileName=..\..\src\gui\widgets\control.cpp
-CompileCpp=1
-Folder=wesnoth
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit101]
 FileName=..\..\src\widgets\scrollbar.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -269,8 +259,18 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
+[Unit101]
+FileName=..\..\src\clipboard.cpp
+CompileCpp=1
+Folder=wesnoth
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
 [Unit105]
-FileName=..\..\src\multiplayer_connect.cpp
+FileName=..\..\src\multiplayer_wait.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1
@@ -280,16 +280,6 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit107]
-FileName=..\..\src\multiplayer_lobby.cpp
-CompileCpp=1
-Folder=wesnoth
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit108]
 FileName=..\..\src\widgets\combo.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -299,7 +289,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit109]
+[Unit108]
 FileName=..\..\src\widgets\slider.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -309,8 +299,8 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit112]
-FileName=..\..\src\gui\widgets\text.cpp
+[Unit109]
+FileName=..\..\src\menu_events.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1
@@ -319,7 +309,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit113]
+[Unit112]
 FileName=..\..\src\gui\widgets\text_box.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -329,8 +319,8 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit118]
-FileName=..\..\src\astarsearch.cpp
+[Unit113]
+FileName=..\..\src\pathfind.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1
@@ -339,7 +329,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit119]
+[Unit118]
 FileName=..\..\src\reports.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -349,7 +339,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit120]
+[Unit119]
 FileName=..\..\src\unit_frame.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -359,8 +349,8 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit125]
-FileName=..\..\src\mapgen_dialog.cpp
+[Unit120]
+FileName=..\..\src\terrain_filter.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1
@@ -369,7 +359,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit126]
+[Unit125]
 FileName=..\..\src\cavegen.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -379,8 +369,18 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
+[Unit126]
+FileName=..\..\src\floating_textbox.cpp
+CompileCpp=1
+Folder=wesnoth
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
 [Unit128]
-FileName=..\..\src\playturn.cpp
+FileName=..\..\src\soundsource.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1
@@ -390,16 +390,6 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit131]
-FileName=..\..\src\gui\widgets\vertical_scrollbar.cpp
-CompileCpp=1
-Folder=wesnoth
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit132]
 FileName=..\..\src\gui\widgets\toggle_button.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -409,7 +399,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit133]
+[Unit132]
 FileName=..\..\src\gui\widgets\button.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -419,7 +409,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit134]
+[Unit133]
 FileName=..\..\src\gui\widgets\panel.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -429,7 +419,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit135]
+[Unit134]
 FileName=..\..\src\gui\widgets\label.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -439,7 +429,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit136]
+[Unit135]
 FileName=..\..\src\gui\widgets\container.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -449,7 +439,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit137]
+[Unit136]
 FileName=..\..\src\gui\widgets\scrollbar.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -459,7 +449,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit138]
+[Unit137]
 FileName=..\..\src\formula_function.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -469,7 +459,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit139]
+[Unit138]
 FileName=..\..\src\formula_tokenizer.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -479,7 +469,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit140]
+[Unit139]
 FileName=..\..\src\leader_list.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -489,7 +479,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit141]
+[Unit140]
 FileName=..\..\src\filechooser.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -499,8 +489,8 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit143]
-FileName=..\..\src\ai_attack.cpp
+[Unit141]
+FileName=..\..\src\formula_ai.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1
@@ -509,7 +499,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit144]
+[Unit143]
 FileName=..\..\src\ai_dfool.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -519,8 +509,8 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit146]
-FileName=..\..\src\ai_move.cpp
+[Unit144]
+FileName=..\..\src\ai_village.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1
@@ -529,7 +519,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit147]
+[Unit146]
 FileName=..\..\src\astarnode.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -539,7 +529,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit148]
+[Unit147]
 FileName=..\..\src\mapgen.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -549,7 +539,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit149]
+[Unit148]
 FileName=..\..\src\gui\widgets\widget.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -559,7 +549,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit150]
+[Unit149]
 FileName=..\..\src\widgets\file_menu.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -569,7 +559,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit151]
+[Unit150]
 FileName=..\..\src\filesystem_win32.ii
 CompileCpp=1
 Folder=wesnoth
@@ -579,7 +569,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit152]
+[Unit151]
 FileName=..\..\src\addon_management.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -589,7 +579,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit153]
+[Unit152]
 FileName=..\..\src\gui\dialogs\addon_connect.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -599,7 +589,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit154]
+[Unit153]
 FileName=..\..\src\addon_checks.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -609,8 +599,18 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
+[Unit154]
+FileName=..\..\src\gui\dialogs\dialog.cpp
+CompileCpp=1
+Folder=wesnoth
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
 [Unit160]
-FileName=..\..\src\controller_base.cpp
+FileName=..\..\src\portrait.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1
@@ -620,7 +620,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit162]
-FileName=..\..\src\mouse_handler_base.cpp
+FileName=..\..\src\attack_prediction_display.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1
@@ -630,7 +630,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit165]
-FileName=..\..\src\gui\widgets\menubar.cpp
+FileName=..\..\src\statistics_dialog.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1
@@ -640,7 +640,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit169]
-FileName=..\..\src\gui\widgets\spacer.cpp
+FileName=..\..\src\gui\widgets\tooltip.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1
@@ -650,16 +650,6 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit171]
-FileName=..\..\src\widgets\combo_drag.cpp
-CompileCpp=1
-Folder=wesnoth
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit172]
 FileName=..\..\src\widgets\drop_target.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -669,8 +659,8 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit175]
-FileName=..\..\src\gui\dialogs\title_screen.cpp
+[Unit172]
+FileName=..\..\src\version.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1
@@ -679,7 +669,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit176]
+[Unit175]
 FileName=..\..\src\config_cache.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -689,7 +679,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit177]
+[Unit176]
 FileName=..\..\src\network.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -699,8 +689,8 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit180]
-FileName=..\..\src\game_events.cpp
+[Unit177]
+FileName=..\..\src\unit_id.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1
@@ -709,7 +699,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit181]
+[Unit180]
 FileName=..\..\src\gui\widgets\image.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -719,7 +709,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit182]
+[Unit181]
 FileName=..\..\src\gui\dialogs\message.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -729,7 +719,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit183]
+[Unit182]
 FileName=..\..\src\map_location.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -739,7 +729,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit184]
+[Unit183]
 FileName=..\..\src\editor2\action.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -749,7 +739,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit185]
+[Unit184]
 FileName=..\..\src\editor2\brush.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -759,7 +749,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit186]
+[Unit185]
 FileName=..\..\src\editor2\editor_controller.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -769,8 +759,8 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit188]
-FileName=..\..\src\editor2\editor_layout.cpp
+[Unit186]
+FileName=..\..\src\editor2\editor_display.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1
@@ -779,7 +769,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit189]
+[Unit188]
 FileName=..\..\src\editor2\editor_main.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -789,7 +779,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit190]
+[Unit189]
 FileName=..\..\src\editor2\editor_map.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -799,8 +789,8 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit194]
-FileName=..\..\src\editor2\mouse_action.cpp
+[Unit190]
+FileName=..\..\src\editor2\editor_palettes.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1
@@ -809,7 +799,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit195]
+[Unit194]
 FileName=..\..\src\gui\dialogs\editor_resize_map.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -819,7 +809,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit196]
+[Unit195]
 FileName=..\..\src\gui\dialogs\editor_generate_map.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -829,7 +819,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit197]
+[Unit196]
 FileName=..\..\src\gui\dialogs\editor_new_map.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -839,7 +829,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit198]
+[Unit197]
 FileName=..\..\src\gui\dialogs\editor_settings.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -849,7 +839,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit199]
+[Unit198]
 FileName=..\..\packaging\windows\wesnoth.rc
 CompileCpp=1
 Folder=wesnoth
@@ -859,7 +849,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit200]
+[Unit199]
 FileName=..\..\src\gui\dialogs\wml_message.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -869,7 +859,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit201]
+[Unit200]
 FileName=..\..\src\gui\widgets\horizontal_scrollbar.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -879,7 +869,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit202]
+[Unit201]
 FileName=..\..\src\gui\widgets\generator.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -889,8 +879,18 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
+[Unit202]
+FileName=..\..\src\formula_string_utils.cpp
+CompileCpp=1
+Folder=wesnoth
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
 [Unit204]
-FileName=..\..\src\gui\widgets\scrollbar_container.cpp
+FileName=..\..\src\gui\dialogs\mp_cmd_wrapper.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1
@@ -900,16 +900,6 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit206]
-FileName=..\..\src\gui\widgets\password_box.cpp
-CompileCpp=1
-Folder=wesnoth
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit207]
 FileName=..\..\src\malloc.c
 CompileCpp=1
 Folder=wesnoth
@@ -919,7 +909,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit208]
+[Unit207]
 FileName=..\..\src\poolalloc.c
 CompileCpp=1
 Folder=wesnoth
@@ -929,7 +919,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit209]
+[Unit208]
 FileName=..\..\src\image_function.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -939,6 +929,16 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
+[Unit209]
+FileName=..\..\src\gui\dialogs\addon_list.cpp
+CompileCpp=1
+Folder=wesnoth
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
 [Unit210]
 FileName=..\..\src\gui\dialogs\addon_list.cpp
 CompileCpp=1
@@ -1098,7 +1098,7 @@ ProductVersion=
 AutoIncBuildNr=0
 
 [Unit166]
-FileName=..\..\src\statistics_dialog.cpp
+FileName=..\..\src\gui\dialogs\mp_create_game.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1
@@ -1108,7 +1108,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit167]
-FileName=..\..\src\gui\dialogs\mp_create_game.cpp
+FileName=..\..\src\gui\widgets\minimap.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1
@@ -1508,7 +1508,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit55]
-FileName=..\..\src\display.cpp
+FileName=..\..\src\help.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1
@@ -1518,7 +1518,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit61]
-FileName=..\..\src\unit_abilities.cpp
+FileName=..\..\src\race.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1
@@ -1528,16 +1528,6 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit63]
-FileName=..\..\src\unit.cpp
-CompileCpp=1
-Folder=wesnoth
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit64]
 FileName=..\..\src\actions.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -1547,8 +1537,18 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
+[Unit64]
+FileName=..\..\src\map_label.cpp
+CompileCpp=1
+Folder=wesnoth
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
 [Unit83]
-FileName=..\..\src\key.cpp
+FileName=..\..\src\widgets\scrollarea.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1
@@ -1558,16 +1558,6 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit116]
-FileName=..\..\src\ai.cpp
-CompileCpp=1
-Folder=wesnoth
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit117]
 FileName=..\..\src\generic_event.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -1577,8 +1567,18 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
+[Unit117]
+FileName=..\..\src\astarsearch.cpp
+CompileCpp=1
+Folder=wesnoth
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
 [Unit127]
-FileName=..\..\src\floating_textbox.cpp
+FileName=..\..\src\playturn.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1
@@ -1588,7 +1588,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit156]
-FileName=..\..\src\gui\dialogs\mp_connect.cpp
+FileName=..\..\src\time_of_day.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1
@@ -1598,16 +1598,6 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit158]
-FileName=..\..\src\gui\widgets\toggle_panel.cpp
-CompileCpp=1
-Folder=wesnoth
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit159]
 FileName=..\..\src\text.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -1617,8 +1607,18 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
+[Unit159]
+FileName=..\..\src\controller_base.cpp
+CompileCpp=1
+Folder=wesnoth
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
 [Unit161]
-FileName=..\..\src\portrait.cpp
+FileName=..\..\src\mouse_handler_base.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1
@@ -2008,7 +2008,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit52]
-FileName=..\..\src\ai_python.cpp
+FileName=..\..\src\serialization\binary_or_text.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1
@@ -2018,7 +2018,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit54]
-FileName=..\..\src\titlescreen.cpp
+FileName=..\..\src\display.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1
@@ -2028,16 +2028,6 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit57]
-FileName=..\..\src\preferences_display.cpp
-CompileCpp=1
-Folder=wesnoth
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit58]
 FileName=..\..\src\game_preferences_display.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -2047,7 +2037,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit59]
+[Unit58]
 FileName=..\..\src\unit_animation.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -2057,7 +2047,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit60]
+[Unit59]
 FileName=..\..\src\terrain_translation.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -2067,8 +2057,18 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
+[Unit60]
+FileName=..\..\src\unit_abilities.cpp
+CompileCpp=1
+Folder=wesnoth
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
 [Unit62]
-FileName=..\..\src\race.cpp
+FileName=..\..\src\unit.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1
@@ -2078,16 +2078,6 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit65]
-FileName=..\..\src\map_label.cpp
-CompileCpp=1
-Folder=wesnoth
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit66]
 FileName=..\..\src\pathutils.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -2097,7 +2087,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit67]
+[Unit66]
 FileName=..\..\src\animated_game.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -2107,7 +2097,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit68]
+[Unit67]
 FileName=..\..\src\builder.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -2117,7 +2107,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit69]
+[Unit68]
 FileName=..\..\src\team.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -2127,8 +2117,18 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
+[Unit69]
+FileName=..\..\src\halo.cpp
+CompileCpp=1
+Folder=wesnoth
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
 [Unit71]
-FileName=..\..\src\sdl_utils.cpp
+FileName=..\..\src\generate_report.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1
@@ -2138,16 +2138,6 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit74]
-FileName=..\..\src\variable.cpp
-CompileCpp=1
-Folder=wesnoth
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit75]
 FileName=..\..\src\terrain.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -2157,7 +2147,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit76]
+[Unit75]
 FileName=..\..\src\replay_controller.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -2167,7 +2157,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit77]
+[Unit76]
 FileName=..\..\src\map_create.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -2177,8 +2167,8 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit81]
-FileName=..\..\src\network_worker.cpp
+[Unit77]
+FileName=..\..\src\playsingle_controller.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1
@@ -2187,7 +2177,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit82]
+[Unit81]
 FileName=..\..\src\widgets\label.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -2197,8 +2187,18 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
+[Unit82]
+FileName=..\..\src\key.cpp
+CompileCpp=1
+Folder=wesnoth
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
 [Unit84]
-FileName=..\..\src\widgets\scrollarea.cpp
+FileName=..\..\src\mouse_events.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1
@@ -2208,16 +2208,6 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit87]
-FileName=..\..\src\widgets\progressbar.cpp
-CompileCpp=1
-Folder=wesnoth
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit88]
 FileName=..\..\src\color_range.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -2227,8 +2217,8 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit90]
-FileName=..\..\src\serialization\tokenizer.cpp
+[Unit88]
+FileName=..\..\src\settings.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1
@@ -2237,7 +2227,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit91]
+[Unit90]
 FileName=..\..\src\gui\widgets\helper.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -2247,8 +2237,18 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
+[Unit91]
+FileName=..\..\src\gui\widgets\settings.cpp
+CompileCpp=1
+Folder=wesnoth
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
 [Unit97]
-FileName=..\..\src\variant.cpp
+FileName=..\..\src\formula.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1
@@ -2258,7 +2258,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit99]
-FileName=..\..\src\gui\widgets\event_handler.cpp
+FileName=..\..\src\gui\widgets\control.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1
@@ -2268,16 +2268,6 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit102]
-FileName=..\..\src\clipboard.cpp
-CompileCpp=1
-Folder=wesnoth
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit103]
 FileName=..\..\src\multiplayer_ui.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -2287,7 +2277,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit104]
+[Unit103]
 FileName=..\..\src\multiplayer_create.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -2297,8 +2287,18 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
+[Unit104]
+FileName=..\..\src\multiplayer_connect.cpp
+CompileCpp=1
+Folder=wesnoth
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
 [Unit106]
-FileName=..\..\src\multiplayer_wait.cpp
+FileName=..\..\src\multiplayer_lobby.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1
@@ -2308,16 +2308,6 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit110]
-FileName=..\..\src\menu_events.cpp
-CompileCpp=1
-Folder=wesnoth
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit111]
 FileName=..\..\src\widgets\scrollpane.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -2327,8 +2317,8 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit114]
-FileName=..\..\src\pathfind.cpp
+[Unit111]
+FileName=..\..\src\gui\widgets\text.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1
@@ -2337,7 +2327,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit115]
+[Unit114]
 FileName=..\..\src\unit_display.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -2347,8 +2337,8 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit121]
-FileName=..\..\src\terrain_filter.cpp
+[Unit115]
+FileName=..\..\src\ai.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1
@@ -2357,7 +2347,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit122]
+[Unit121]
 FileName=..\..\src\callable_objects.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -2367,7 +2357,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit123]
+[Unit122]
 FileName=..\..\src\attack_prediction.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -2377,7 +2367,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit124]
+[Unit123]
 FileName=..\..\src\config_adapter.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -2387,8 +2377,8 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit129]
-FileName=..\..\src\soundsource.cpp
+[Unit124]
+FileName=..\..\src\mapgen_dialog.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1
@@ -2397,7 +2387,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit130]
+[Unit129]
 FileName=..\..\src\gui\widgets\canvas.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -2407,8 +2397,18 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
+[Unit130]
+FileName=..\..\src\gui\widgets\vertical_scrollbar.cpp
+CompileCpp=1
+Folder=wesnoth
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
 [Unit142]
-FileName=..\..\src\formula_ai.cpp
+FileName=..\..\src\ai_attack.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1
@@ -2418,7 +2418,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit145]
-FileName=..\..\src\ai_village.cpp
+FileName=..\..\src\ai_move.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1
@@ -2438,7 +2438,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit155]
-FileName=..\..\src\gui\dialogs\dialog.cpp
+FileName=..\..\src\gui\dialogs\mp_connect.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1
@@ -2458,7 +2458,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit157]
-FileName=..\..\src\time_of_day.cpp
+FileName=..\..\src\gui\widgets\toggle_panel.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1
@@ -2468,16 +2468,6 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit163]
-FileName=..\..\src\attack_prediction_display.cpp
-CompileCpp=1
-Folder=wesnoth
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit164]
 FileName=..\..\src\gui\widgets\slider.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -2487,8 +2477,18 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
+[Unit164]
+FileName=..\..\src\gui\widgets\menubar.cpp
+CompileCpp=1
+Folder=wesnoth
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
 [Unit168]
-FileName=..\..\src\gui\widgets\minimap.cpp
+FileName=..\..\src\gui\widgets\spacer.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1
@@ -2498,7 +2498,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit170]
-FileName=..\..\src\gui\widgets\tooltip.cpp
+FileName=..\..\src\widgets\combo_drag.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1
@@ -2508,16 +2508,6 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit173]
-FileName=..\..\src\version.cpp
-CompileCpp=1
-Folder=wesnoth
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit174]
 FileName=..\..\src\md5.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -2527,8 +2517,18 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
+[Unit174]
+FileName=..\..\src\gui\dialogs\title_screen.cpp
+CompileCpp=1
+Folder=wesnoth
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
 [Unit179]
-FileName=..\..\src\gui\widgets\scroll_label.cpp
+FileName=..\..\src\game_events.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1
@@ -2548,7 +2548,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit178]
-FileName=..\..\src\unit_id.cpp
+FileName=..\..\src\gui\widgets\scroll_label.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1
@@ -2558,7 +2558,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit86]
-FileName=..\..\src\minimap.cpp
+FileName=..\..\src\widgets\progressbar.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1
@@ -2568,7 +2568,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit187]
-FileName=..\..\src\editor2\editor_display.cpp
+FileName=..\..\src\editor2\editor_layout.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1
@@ -2578,16 +2578,6 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit191]
-FileName=..\..\src\editor2\editor_palettes.cpp
-CompileCpp=1
-Folder=wesnoth
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit192]
 FileName=..\..\src\editor2\map_context.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -2597,7 +2587,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit193]
+[Unit192]
 FileName=..\..\src\editor2\map_fragment.cpp
 CompileCpp=1
 Folder=wesnoth
@@ -2607,8 +2597,18 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
+[Unit193]
+FileName=..\..\src\editor2\mouse_action.cpp
+CompileCpp=1
+Folder=wesnoth
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
 [Unit203]
-FileName=..\..\src\formula_string_utils.cpp
+FileName=..\..\src\gui\widgets\scrollbar_container.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1
@@ -2618,7 +2618,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit205]
-FileName=..\..\src\gui\dialogs\mp_cmd_wrapper.cpp
+FileName=..\..\src\gui\widgets\password_box.cpp
 CompileCpp=1
 Folder=wesnoth
 Compile=1