diff --git a/projectfiles/CodeBlocks-SCons/wesnoth.cbp b/projectfiles/CodeBlocks-SCons/wesnoth.cbp
index 77e59a6d888..f129b454e3b 100644
--- a/projectfiles/CodeBlocks-SCons/wesnoth.cbp
+++ b/projectfiles/CodeBlocks-SCons/wesnoth.cbp
@@ -8,8 +8,8 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="release">
-				<Option output="../../wesnoth" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="../../" />
+				<Option output="..\..\wesnoth" prefix_auto="1" extension_auto="1" />
+				<Option working_dir="..\..\" />
 				<Option type="0" />
 				<Option compiler="gcc" />
 				<MakeCommands>
@@ -20,8 +20,8 @@
 				</MakeCommands>
 			</Target>
 			<Target title="debug">
-				<Option output="../../wesnoth-debug" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="../../" />
+				<Option output="..\..\wesnoth-debug" prefix_auto="1" extension_auto="1" />
+				<Option working_dir="..\..\" />
 				<Option type="0" />
 				<Option compiler="gcc" />
 				<MakeCommands>
@@ -41,10 +41,10 @@
 			<Add option="-DUSE_GZIP" />
 			<Add option="-DHAVE_FRIBIDI" />
 			<Add option="-DDISABLE_POOL_ALLOC" />
-			<Add directory="../../src" />
-			<Add directory="../../src/sdl_ttf" />
-			<Add directory="../../src/serialization" />
-			<Add directory="../../src/widgets" />
+			<Add directory="..\..\src" />
+			<Add directory="..\..\src\sdl_ttf" />
+			<Add directory="..\..\src\serialization" />
+			<Add directory="..\..\src\widgets" />
 		</Compiler>
 		<Linker>
 			<Add option="-mthreads" />
@@ -72,212 +72,213 @@
 			<Add library="gobject-2.0" />
 			<Add library="fontconfig" />
 		</Linker>
-		<Unit filename="../../packaging/windows/wesnoth.rc">
+		<Unit filename="..\..\packaging\windows\wesnoth.rc">
 			<Option compilerVar="WINDRES" />
 		</Unit>
-		<Unit filename="../../src/about.cpp" />
-		<Unit filename="../../src/actions.cpp" />
-		<Unit filename="../../src/addon_checks.cpp" />
-		<Unit filename="../../src/addon_management.cpp" />
-		<Unit filename="../../src/ai.cpp" />
-		<Unit filename="../../src/ai_attack.cpp" />
-		<Unit filename="../../src/ai_dfool.cpp" />
-		<Unit filename="../../src/ai_move.cpp" />
-		<Unit filename="../../src/ai_python.cpp" />
-		<Unit filename="../../src/ai_village.cpp" />
-		<Unit filename="../../src/animated_game.cpp" />
-		<Unit filename="../../src/astarnode.cpp" />
-		<Unit filename="../../src/astarsearch.cpp" />
-		<Unit filename="../../src/attack_prediction.cpp" />
-		<Unit filename="../../src/attack_prediction_display.cpp" />
-		<Unit filename="../../src/builder.cpp" />
-		<Unit filename="../../src/callable_objects.cpp" />
-		<Unit filename="../../src/cavegen.cpp" />
-		<Unit filename="../../src/clipboard.cpp" />
-		<Unit filename="../../src/color_range.cpp" />
-		<Unit filename="../../src/config.cpp" />
-		<Unit filename="../../src/config_adapter.cpp" />
-		<Unit filename="../../src/config_cache.cpp" />
-		<Unit filename="../../src/construct_dialog.cpp" />
-		<Unit filename="../../src/controller_base.cpp" />
-		<Unit filename="../../src/cursor.cpp" />
-		<Unit filename="../../src/dialogs.cpp" />
-		<Unit filename="../../src/display.cpp" />
-		<Unit filename="../../src/editor2/action.cpp" />
-		<Unit filename="../../src/editor2/brush.cpp" />
-		<Unit filename="../../src/editor2/editor_controller.cpp" />
-		<Unit filename="../../src/editor2/editor_display.cpp" />
-		<Unit filename="../../src/editor2/editor_layout.cpp" />
-		<Unit filename="../../src/editor2/editor_main.cpp" />
-		<Unit filename="../../src/editor2/editor_map.cpp" />
-		<Unit filename="../../src/editor2/editor_palettes.cpp" />
-		<Unit filename="../../src/editor2/map_context.cpp" />
-		<Unit filename="../../src/editor2/map_fragment.cpp" />
-		<Unit filename="../../src/editor2/mouse_action.cpp" />
-		<Unit filename="../../src/events.cpp" />
-		<Unit filename="../../src/filechooser.cpp" />
-		<Unit filename="../../src/filesystem.cpp" />
-		<Unit filename="../../src/filesystem_win32.ii" />
-		<Unit filename="../../src/floating_textbox.cpp" />
-		<Unit filename="../../src/font.cpp" />
-		<Unit filename="../../src/formula.cpp" />
-		<Unit filename="../../src/formula_ai.cpp" />
-		<Unit filename="../../src/formula_function.cpp" />
-		<Unit filename="../../src/formula_string_utils.cpp" />
-		<Unit filename="../../src/formula_tokenizer.cpp" />
-		<Unit filename="../../src/game.cpp" />
-		<Unit filename="../../src/game_config.cpp" />
-		<Unit filename="../../src/game_display.cpp" />
-		<Unit filename="../../src/game_events.cpp" />
-		<Unit filename="../../src/game_preferences.cpp" />
-		<Unit filename="../../src/game_preferences_display.cpp" />
-		<Unit filename="../../src/gamestatus.cpp" />
-		<Unit filename="../../src/generate_report.cpp" />
-		<Unit filename="../../src/generic_event.cpp" />
-		<Unit filename="../../src/gettext.cpp" />
-		<Unit filename="../../src/gui/dialogs/addon_connect.cpp" />
-		<Unit filename="../../src/gui/dialogs/dialog.cpp" />
-		<Unit filename="../../src/gui/dialogs/editor_generate_map.cpp" />
-		<Unit filename="../../src/gui/dialogs/editor_new_map.cpp" />
-		<Unit filename="../../src/gui/dialogs/editor_resize_map.cpp" />
-		<Unit filename="../../src/gui/dialogs/editor_settings.cpp" />
-		<Unit filename="../../src/gui/dialogs/language_selection.cpp" />
-		<Unit filename="../../src/gui/dialogs/message.cpp" />
-		<Unit filename="../../src/gui/dialogs/mp_connect.cpp" />
-		<Unit filename="../../src/gui/dialogs/mp_create_game.cpp" />
-		<Unit filename="../../src/gui/dialogs/mp_method_selection.cpp" />
-		<Unit filename="../../src/gui/dialogs/title_screen.cpp" />
-		<Unit filename="../../src/gui/dialogs/wml_message.cpp" />
-		<Unit filename="../../src/gui/widgets/button.cpp" />
-		<Unit filename="../../src/gui/widgets/canvas.cpp" />
-		<Unit filename="../../src/gui/widgets/container.cpp" />
-		<Unit filename="../../src/gui/widgets/control.cpp" />
-		<Unit filename="../../src/gui/widgets/event_handler.cpp" />
-		<Unit filename="../../src/gui/widgets/generator.cpp" />
-		<Unit filename="../../src/gui/widgets/grid.cpp" />
-		<Unit filename="../../src/gui/widgets/helper.cpp" />
-		<Unit filename="../../src/gui/widgets/horizontal_scrollbar.cpp" />
-		<Unit filename="../../src/gui/widgets/image.cpp" />
-		<Unit filename="../../src/gui/widgets/label.cpp" />
-		<Unit filename="../../src/gui/widgets/listbox.cpp" />
-		<Unit filename="../../src/gui/widgets/menubar.cpp" />
-		<Unit filename="../../src/gui/widgets/minimap.cpp" />
-		<Unit filename="../../src/gui/widgets/panel.cpp" />
-		<Unit filename="../../src/gui/widgets/scroll_label.cpp" />
-		<Unit filename="../../src/gui/widgets/scrollbar.cpp" />
-		<Unit filename="../../src/gui/widgets/settings.cpp" />
-		<Unit filename="../../src/gui/widgets/slider.cpp" />
-		<Unit filename="../../src/gui/widgets/spacer.cpp" />
-		<Unit filename="../../src/gui/widgets/text.cpp" />
-		<Unit filename="../../src/gui/widgets/text_box.cpp" />
-		<Unit filename="../../src/gui/widgets/toggle_button.cpp" />
-		<Unit filename="../../src/gui/widgets/toggle_panel.cpp" />
-		<Unit filename="../../src/gui/widgets/tooltip.cpp" />
-		<Unit filename="../../src/gui/widgets/vertical_scrollbar.cpp" />
-		<Unit filename="../../src/gui/widgets/vertical_scrollbar_container.cpp" />
-		<Unit filename="../../src/gui/widgets/widget.cpp" />
-		<Unit filename="../../src/gui/widgets/window.cpp" />
-		<Unit filename="../../src/gui/widgets/window_builder.cpp" />
-		<Unit filename="../../src/halo.cpp" />
-		<Unit filename="../../src/help.cpp" />
-		<Unit filename="../../src/hotkeys.cpp" />
-		<Unit filename="../../src/image.cpp" />
-		<Unit filename="../../src/intro.cpp" />
-		<Unit filename="../../src/key.cpp" />
-		<Unit filename="../../src/language.cpp" />
-		<Unit filename="../../src/leader_list.cpp" />
-		<Unit filename="../../src/loadscreen.cpp" />
-		<Unit filename="../../src/log.cpp" />
-		<Unit filename="../../src/map.cpp" />
-		<Unit filename="../../src/map_create.cpp" />
-		<Unit filename="../../src/map_label.cpp" />
-		<Unit filename="../../src/map_location.cpp" />
-		<Unit filename="../../src/mapgen.cpp" />
-		<Unit filename="../../src/mapgen_dialog.cpp" />
-		<Unit filename="../../src/marked-up_text.cpp" />
-		<Unit filename="../../src/md5.cpp" />
-		<Unit filename="../../src/menu_events.cpp" />
-		<Unit filename="../../src/minimap.cpp" />
-		<Unit filename="../../src/mouse_events.cpp" />
-		<Unit filename="../../src/mouse_handler_base.cpp" />
-		<Unit filename="../../src/multiplayer.cpp" />
-		<Unit filename="../../src/multiplayer_connect.cpp" />
-		<Unit filename="../../src/multiplayer_create.cpp" />
-		<Unit filename="../../src/multiplayer_lobby.cpp" />
-		<Unit filename="../../src/multiplayer_ui.cpp" />
-		<Unit filename="../../src/multiplayer_wait.cpp" />
-		<Unit filename="../../src/network.cpp" />
-		<Unit filename="../../src/network_worker.cpp" />
-		<Unit filename="../../src/pathfind.cpp" />
-		<Unit filename="../../src/pathutils.cpp" />
-		<Unit filename="../../src/play_controller.cpp" />
-		<Unit filename="../../src/playcampaign.cpp" />
-		<Unit filename="../../src/playmp_controller.cpp" />
-		<Unit filename="../../src/playsingle_controller.cpp" />
-		<Unit filename="../../src/playturn.cpp" />
-		<Unit filename="../../src/portrait.cpp" />
-		<Unit filename="../../src/preferences.cpp" />
-		<Unit filename="../../src/preferences_display.cpp" />
-		<Unit filename="../../src/race.cpp" />
-		<Unit filename="../../src/random.cpp" />
-		<Unit filename="../../src/replay.cpp" />
-		<Unit filename="../../src/replay_controller.cpp" />
-		<Unit filename="../../src/reports.cpp" />
-		<Unit filename="../../src/sdl_utils.cpp" />
-		<Unit filename="../../src/serialization/binary_or_text.cpp" />
-		<Unit filename="../../src/serialization/binary_wml.cpp" />
-		<Unit filename="../../src/serialization/parser.cpp" />
-		<Unit filename="../../src/serialization/preprocessor.cpp" />
-		<Unit filename="../../src/serialization/string_utils.cpp" />
-		<Unit filename="../../src/serialization/tokenizer.cpp" />
-		<Unit filename="../../src/settings.cpp" />
-		<Unit filename="../../src/sha1.cpp" />
-		<Unit filename="../../src/show_dialog.cpp" />
-		<Unit filename="../../src/sound.cpp" />
-		<Unit filename="../../src/soundsource.cpp" />
-		<Unit filename="../../src/statistics.cpp" />
-		<Unit filename="../../src/statistics_dialog.cpp" />
-		<Unit filename="../../src/team.cpp" />
-		<Unit filename="../../src/terrain.cpp" />
-		<Unit filename="../../src/terrain_filter.cpp" />
-		<Unit filename="../../src/terrain_translation.cpp" />
-		<Unit filename="../../src/text.cpp" />
-		<Unit filename="../../src/theme.cpp" />
-		<Unit filename="../../src/thread.cpp" />
-		<Unit filename="../../src/time_of_day.cpp" />
-		<Unit filename="../../src/titlescreen.cpp" />
-		<Unit filename="../../src/tooltips.cpp" />
-		<Unit filename="../../src/tstring.cpp" />
-		<Unit filename="../../src/unit.cpp" />
-		<Unit filename="../../src/unit_abilities.cpp" />
-		<Unit filename="../../src/unit_animation.cpp" />
-		<Unit filename="../../src/unit_display.cpp" />
-		<Unit filename="../../src/unit_frame.cpp" />
-		<Unit filename="../../src/unit_id.cpp" />
-		<Unit filename="../../src/unit_map.cpp" />
-		<Unit filename="../../src/unit_types.cpp" />
-		<Unit filename="../../src/upload_log.cpp" />
-		<Unit filename="../../src/util.cpp" />
-		<Unit filename="../../src/variable.cpp" />
-		<Unit filename="../../src/variant.cpp" />
-		<Unit filename="../../src/version.cpp" />
-		<Unit filename="../../src/video.cpp" />
-		<Unit filename="../../src/widgets/button.cpp" />
-		<Unit filename="../../src/widgets/combo.cpp" />
-		<Unit filename="../../src/widgets/combo_drag.cpp" />
-		<Unit filename="../../src/widgets/drop_target.cpp" />
-		<Unit filename="../../src/widgets/file_menu.cpp" />
-		<Unit filename="../../src/widgets/label.cpp" />
-		<Unit filename="../../src/widgets/menu.cpp" />
-		<Unit filename="../../src/widgets/menu_style.cpp" />
-		<Unit filename="../../src/widgets/progressbar.cpp" />
-		<Unit filename="../../src/widgets/scrollarea.cpp" />
-		<Unit filename="../../src/widgets/scrollbar.cpp" />
-		<Unit filename="../../src/widgets/scrollpane.cpp" />
-		<Unit filename="../../src/widgets/slider.cpp" />
-		<Unit filename="../../src/widgets/textbox.cpp" />
-		<Unit filename="../../src/widgets/widget.cpp" />
-		<Unit filename="../../src/wml_exception.cpp" />
+		<Unit filename="..\..\src\about.cpp" />
+		<Unit filename="..\..\src\actions.cpp" />
+		<Unit filename="..\..\src\addon_checks.cpp" />
+		<Unit filename="..\..\src\addon_management.cpp" />
+		<Unit filename="..\..\src\ai.cpp" />
+		<Unit filename="..\..\src\ai_attack.cpp" />
+		<Unit filename="..\..\src\ai_dfool.cpp" />
+		<Unit filename="..\..\src\ai_move.cpp" />
+		<Unit filename="..\..\src\ai_python.cpp" />
+		<Unit filename="..\..\src\ai_village.cpp" />
+		<Unit filename="..\..\src\animated_game.cpp" />
+		<Unit filename="..\..\src\astarnode.cpp" />
+		<Unit filename="..\..\src\astarsearch.cpp" />
+		<Unit filename="..\..\src\attack_prediction.cpp" />
+		<Unit filename="..\..\src\attack_prediction_display.cpp" />
+		<Unit filename="..\..\src\builder.cpp" />
+		<Unit filename="..\..\src\callable_objects.cpp" />
+		<Unit filename="..\..\src\cavegen.cpp" />
+		<Unit filename="..\..\src\clipboard.cpp" />
+		<Unit filename="..\..\src\color_range.cpp" />
+		<Unit filename="..\..\src\config.cpp" />
+		<Unit filename="..\..\src\config_adapter.cpp" />
+		<Unit filename="..\..\src\config_cache.cpp" />
+		<Unit filename="..\..\src\construct_dialog.cpp" />
+		<Unit filename="..\..\src\controller_base.cpp" />
+		<Unit filename="..\..\src\cursor.cpp" />
+		<Unit filename="..\..\src\dialogs.cpp" />
+		<Unit filename="..\..\src\display.cpp" />
+		<Unit filename="..\..\src\editor2\action.cpp" />
+		<Unit filename="..\..\src\editor2\brush.cpp" />
+		<Unit filename="..\..\src\editor2\editor_controller.cpp" />
+		<Unit filename="..\..\src\editor2\editor_display.cpp" />
+		<Unit filename="..\..\src\editor2\editor_layout.cpp" />
+		<Unit filename="..\..\src\editor2\editor_main.cpp" />
+		<Unit filename="..\..\src\editor2\editor_map.cpp" />
+		<Unit filename="..\..\src\editor2\editor_palettes.cpp" />
+		<Unit filename="..\..\src\editor2\map_context.cpp" />
+		<Unit filename="..\..\src\editor2\map_fragment.cpp" />
+		<Unit filename="..\..\src\editor2\mouse_action.cpp" />
+		<Unit filename="..\..\src\events.cpp" />
+		<Unit filename="..\..\src\filechooser.cpp" />
+		<Unit filename="..\..\src\filesystem.cpp" />
+		<Unit filename="..\..\src\filesystem_win32.ii" />
+		<Unit filename="..\..\src\floating_textbox.cpp" />
+		<Unit filename="..\..\src\font.cpp" />
+		<Unit filename="..\..\src\formula.cpp" />
+		<Unit filename="..\..\src\formula_ai.cpp" />
+		<Unit filename="..\..\src\formula_function.cpp" />
+		<Unit filename="..\..\src\formula_string_utils.cpp" />
+		<Unit filename="..\..\src\formula_tokenizer.cpp" />
+		<Unit filename="..\..\src\game.cpp" />
+		<Unit filename="..\..\src\game_config.cpp" />
+		<Unit filename="..\..\src\game_display.cpp" />
+		<Unit filename="..\..\src\game_events.cpp" />
+		<Unit filename="..\..\src\game_preferences.cpp" />
+		<Unit filename="..\..\src\game_preferences_display.cpp" />
+		<Unit filename="..\..\src\gamestatus.cpp" />
+		<Unit filename="..\..\src\generate_report.cpp" />
+		<Unit filename="..\..\src\generic_event.cpp" />
+		<Unit filename="..\..\src\gettext.cpp" />
+		<Unit filename="..\..\src\gui\dialogs\addon_connect.cpp" />
+		<Unit filename="..\..\src\gui\dialogs\dialog.cpp" />
+		<Unit filename="..\..\src\gui\dialogs\editor_generate_map.cpp" />
+		<Unit filename="..\..\src\gui\dialogs\editor_new_map.cpp" />
+		<Unit filename="..\..\src\gui\dialogs\editor_resize_map.cpp" />
+		<Unit filename="..\..\src\gui\dialogs\editor_settings.cpp" />
+		<Unit filename="..\..\src\gui\dialogs\language_selection.cpp" />
+		<Unit filename="..\..\src\gui\dialogs\message.cpp" />
+		<Unit filename="..\..\src\gui\dialogs\mp_connect.cpp" />
+		<Unit filename="..\..\src\gui\dialogs\mp_create_game.cpp" />
+		<Unit filename="..\..\src\gui\dialogs\mp_method_selection.cpp" />
+		<Unit filename="..\..\src\gui\dialogs\title_screen.cpp" />
+		<Unit filename="..\..\src\gui\dialogs\wml_message.cpp" />
+		<Unit filename="..\..\src\gui\widgets\button.cpp" />
+		<Unit filename="..\..\src\gui\widgets\canvas.cpp" />
+		<Unit filename="..\..\src\gui\widgets\container.cpp" />
+		<Unit filename="..\..\src\gui\widgets\control.cpp" />
+		<Unit filename="..\..\src\gui\widgets\event_handler.cpp" />
+		<Unit filename="..\..\src\gui\widgets\generator.cpp" />
+		<Unit filename="..\..\src\gui\widgets\grid.cpp" />
+		<Unit filename="..\..\src\gui\widgets\helper.cpp" />
+		<Unit filename="..\..\src\gui\widgets\horizontal_scrollbar.cpp" />
+		<Unit filename="..\..\src\gui\widgets\image.cpp" />
+		<Unit filename="..\..\src\gui\widgets\label.cpp" />
+		<Unit filename="..\..\src\gui\widgets\listbox.cpp" />
+		<Unit filename="..\..\src\gui\widgets\menubar.cpp" />
+		<Unit filename="..\..\src\gui\widgets\minimap.cpp" />
+		<Unit filename="..\..\src\gui\widgets\panel.cpp" />
+		<Unit filename="..\..\src\gui\widgets\scroll_label.cpp" />
+		<Unit filename="..\..\src\gui\widgets\scrollbar.cpp" />
+		<Unit filename="..\..\src\gui\widgets\scrollbar_container.cpp" />
+		<Unit filename="..\..\src\gui\widgets\settings.cpp" />
+		<Unit filename="..\..\src\gui\widgets\slider.cpp" />
+		<Unit filename="..\..\src\gui\widgets\spacer.cpp" />
+		<Unit filename="..\..\src\gui\widgets\text.cpp" />
+		<Unit filename="..\..\src\gui\widgets\text_box.cpp" />
+		<Unit filename="..\..\src\gui\widgets\toggle_button.cpp" />
+		<Unit filename="..\..\src\gui\widgets\toggle_panel.cpp" />
+		<Unit filename="..\..\src\gui\widgets\tooltip.cpp" />
+		<Unit filename="..\..\src\gui\widgets\vertical_scrollbar.cpp" />
+		<Unit filename="..\..\src\gui\widgets\vertical_scrollbar_container.cpp" />
+		<Unit filename="..\..\src\gui\widgets\widget.cpp" />
+		<Unit filename="..\..\src\gui\widgets\window.cpp" />
+		<Unit filename="..\..\src\gui\widgets\window_builder.cpp" />
+		<Unit filename="..\..\src\halo.cpp" />
+		<Unit filename="..\..\src\help.cpp" />
+		<Unit filename="..\..\src\hotkeys.cpp" />
+		<Unit filename="..\..\src\image.cpp" />
+		<Unit filename="..\..\src\intro.cpp" />
+		<Unit filename="..\..\src\key.cpp" />
+		<Unit filename="..\..\src\language.cpp" />
+		<Unit filename="..\..\src\leader_list.cpp" />
+		<Unit filename="..\..\src\loadscreen.cpp" />
+		<Unit filename="..\..\src\log.cpp" />
+		<Unit filename="..\..\src\map.cpp" />
+		<Unit filename="..\..\src\map_create.cpp" />
+		<Unit filename="..\..\src\map_label.cpp" />
+		<Unit filename="..\..\src\map_location.cpp" />
+		<Unit filename="..\..\src\mapgen.cpp" />
+		<Unit filename="..\..\src\mapgen_dialog.cpp" />
+		<Unit filename="..\..\src\marked-up_text.cpp" />
+		<Unit filename="..\..\src\md5.cpp" />
+		<Unit filename="..\..\src\menu_events.cpp" />
+		<Unit filename="..\..\src\minimap.cpp" />
+		<Unit filename="..\..\src\mouse_events.cpp" />
+		<Unit filename="..\..\src\mouse_handler_base.cpp" />
+		<Unit filename="..\..\src\multiplayer.cpp" />
+		<Unit filename="..\..\src\multiplayer_connect.cpp" />
+		<Unit filename="..\..\src\multiplayer_create.cpp" />
+		<Unit filename="..\..\src\multiplayer_lobby.cpp" />
+		<Unit filename="..\..\src\multiplayer_ui.cpp" />
+		<Unit filename="..\..\src\multiplayer_wait.cpp" />
+		<Unit filename="..\..\src\network.cpp" />
+		<Unit filename="..\..\src\network_worker.cpp" />
+		<Unit filename="..\..\src\pathfind.cpp" />
+		<Unit filename="..\..\src\pathutils.cpp" />
+		<Unit filename="..\..\src\play_controller.cpp" />
+		<Unit filename="..\..\src\playcampaign.cpp" />
+		<Unit filename="..\..\src\playmp_controller.cpp" />
+		<Unit filename="..\..\src\playsingle_controller.cpp" />
+		<Unit filename="..\..\src\playturn.cpp" />
+		<Unit filename="..\..\src\portrait.cpp" />
+		<Unit filename="..\..\src\preferences.cpp" />
+		<Unit filename="..\..\src\preferences_display.cpp" />
+		<Unit filename="..\..\src\race.cpp" />
+		<Unit filename="..\..\src\random.cpp" />
+		<Unit filename="..\..\src\replay.cpp" />
+		<Unit filename="..\..\src\replay_controller.cpp" />
+		<Unit filename="..\..\src\reports.cpp" />
+		<Unit filename="..\..\src\sdl_utils.cpp" />
+		<Unit filename="..\..\src\serialization\binary_or_text.cpp" />
+		<Unit filename="..\..\src\serialization\binary_wml.cpp" />
+		<Unit filename="..\..\src\serialization\parser.cpp" />
+		<Unit filename="..\..\src\serialization\preprocessor.cpp" />
+		<Unit filename="..\..\src\serialization\string_utils.cpp" />
+		<Unit filename="..\..\src\serialization\tokenizer.cpp" />
+		<Unit filename="..\..\src\settings.cpp" />
+		<Unit filename="..\..\src\sha1.cpp" />
+		<Unit filename="..\..\src\show_dialog.cpp" />
+		<Unit filename="..\..\src\sound.cpp" />
+		<Unit filename="..\..\src\soundsource.cpp" />
+		<Unit filename="..\..\src\statistics.cpp" />
+		<Unit filename="..\..\src\statistics_dialog.cpp" />
+		<Unit filename="..\..\src\team.cpp" />
+		<Unit filename="..\..\src\terrain.cpp" />
+		<Unit filename="..\..\src\terrain_filter.cpp" />
+		<Unit filename="..\..\src\terrain_translation.cpp" />
+		<Unit filename="..\..\src\text.cpp" />
+		<Unit filename="..\..\src\theme.cpp" />
+		<Unit filename="..\..\src\thread.cpp" />
+		<Unit filename="..\..\src\time_of_day.cpp" />
+		<Unit filename="..\..\src\titlescreen.cpp" />
+		<Unit filename="..\..\src\tooltips.cpp" />
+		<Unit filename="..\..\src\tstring.cpp" />
+		<Unit filename="..\..\src\unit.cpp" />
+		<Unit filename="..\..\src\unit_abilities.cpp" />
+		<Unit filename="..\..\src\unit_animation.cpp" />
+		<Unit filename="..\..\src\unit_display.cpp" />
+		<Unit filename="..\..\src\unit_frame.cpp" />
+		<Unit filename="..\..\src\unit_id.cpp" />
+		<Unit filename="..\..\src\unit_map.cpp" />
+		<Unit filename="..\..\src\unit_types.cpp" />
+		<Unit filename="..\..\src\upload_log.cpp" />
+		<Unit filename="..\..\src\util.cpp" />
+		<Unit filename="..\..\src\variable.cpp" />
+		<Unit filename="..\..\src\variant.cpp" />
+		<Unit filename="..\..\src\version.cpp" />
+		<Unit filename="..\..\src\video.cpp" />
+		<Unit filename="..\..\src\widgets\button.cpp" />
+		<Unit filename="..\..\src\widgets\combo.cpp" />
+		<Unit filename="..\..\src\widgets\combo_drag.cpp" />
+		<Unit filename="..\..\src\widgets\drop_target.cpp" />
+		<Unit filename="..\..\src\widgets\file_menu.cpp" />
+		<Unit filename="..\..\src\widgets\label.cpp" />
+		<Unit filename="..\..\src\widgets\menu.cpp" />
+		<Unit filename="..\..\src\widgets\menu_style.cpp" />
+		<Unit filename="..\..\src\widgets\progressbar.cpp" />
+		<Unit filename="..\..\src\widgets\scrollarea.cpp" />
+		<Unit filename="..\..\src\widgets\scrollbar.cpp" />
+		<Unit filename="..\..\src\widgets\scrollpane.cpp" />
+		<Unit filename="..\..\src\widgets\slider.cpp" />
+		<Unit filename="..\..\src\widgets\textbox.cpp" />
+		<Unit filename="..\..\src\widgets\widget.cpp" />
+		<Unit filename="..\..\src\wml_exception.cpp" />
 		<Extensions>
 			<code_completion />
 			<debugger />
diff --git a/projectfiles/CodeBlocks/wesnoth.cbp b/projectfiles/CodeBlocks/wesnoth.cbp
index 43addf796e9..0a4ae7a67be 100644
--- a/projectfiles/CodeBlocks/wesnoth.cbp
+++ b/projectfiles/CodeBlocks/wesnoth.cbp
@@ -146,6 +146,7 @@
 		<Unit filename="..\..\src\gui\widgets\panel.cpp" />
 		<Unit filename="..\..\src\gui\widgets\scroll_label.cpp" />
 		<Unit filename="..\..\src\gui\widgets\scrollbar.cpp" />
+		<Unit filename="..\..\src\gui\widgets\scrollbar_container.cpp" />
 		<Unit filename="..\..\src\gui\widgets\settings.cpp" />
 		<Unit filename="..\..\src\gui\widgets\slider.cpp" />
 		<Unit filename="..\..\src\gui\widgets\spacer.cpp" />
diff --git a/projectfiles/Dev-C++/wesnoth.dev b/projectfiles/Dev-C++/wesnoth.dev
index a7459a8eaff..a93c873b682 100644
--- a/projectfiles/Dev-C++/wesnoth.dev
+++ b/projectfiles/Dev-C++/wesnoth.dev
@@ -1,7 +1,7 @@
 [Project]
 FileName=wesnoth.dev
 Name=wesnoth
-UnitCount=204
+UnitCount=205
 Type=0
 Ver=1
 ObjFiles=
@@ -899,16 +899,6 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit205]
-FileName=..\..\src\widgets\textbox.cpp
-CompileCpp=1
-Folder=Wesnoth
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
 [Unit206]
 FileName=..\..\src\widgets\textbox.hpp
 CompileCpp=1
@@ -2627,3 +2617,13 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
+[Unit205]
+FileName=..\..\src\gui\widgets\scrollbar_container.cpp
+CompileCpp=1
+Folder=wesnoth
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+