From effac18045c264b4ec8cfd44b32ff2142c46fde0 Mon Sep 17 00:00:00 2001
From: Sergey Popov <loonycyborg@gmail.com>
Date: Fri, 6 Feb 2009 23:22:25 +0000
Subject: [PATCH] Committed McShark's projectfiles update.

---
 projectfiles/CodeBlocks-SCons/wesnoth.cbp  | 182 +++++-
 projectfiles/CodeBlocks-SCons/wesnothd.cbp |  37 ++
 projectfiles/CodeBlocks/wesnoth.cbp        | 171 +++++
 projectfiles/CodeBlocks/wesnothd.cbp       | 107 ++-
 projectfiles/Dev-C++/wesnoth.dev           |   2 +-
 projectfiles/Dev-C++/wesnothd.dev          |  13 +-
 projectfiles/VC9/wesnoth.vcproj            | 725 ++++++++++++++++++++-
 projectfiles/VC9/wesnothd.vcproj           | 724 ++++++++++++--------
 8 files changed, 1634 insertions(+), 327 deletions(-)

diff --git a/projectfiles/CodeBlocks-SCons/wesnoth.cbp b/projectfiles/CodeBlocks-SCons/wesnoth.cbp
index 03aeba4fe1f..b8f3fd84022 100644
--- a/projectfiles/CodeBlocks-SCons/wesnoth.cbp
+++ b/projectfiles/CodeBlocks-SCons/wesnoth.cbp
@@ -38,87 +38,164 @@
 			<Option compilerVar="WINDRES" />
 		</Unit>
 		<Unit filename="..\..\src\about.cpp" />
+		<Unit filename="..\..\src\about.hpp" />
 		<Unit filename="..\..\src\actions.cpp" />
+		<Unit filename="..\..\src\actions.hpp" />
 		<Unit filename="..\..\src\addon_checks.cpp" />
+		<Unit filename="..\..\src\addon_checks.hpp" />
 		<Unit filename="..\..\src\addon_management.cpp" />
+		<Unit filename="..\..\src\addon_management.hpp" />
 		<Unit filename="..\..\src\ai.cpp" />
+		<Unit filename="..\..\src\ai.hpp" />
+		<Unit filename="..\..\src\ai2.hpp" />
 		<Unit filename="..\..\src\ai_attack.cpp" />
 		<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" />
 		<Unit filename="..\..\src\animated_game.cpp" />
+		<Unit filename="..\..\src\array.hpp" />
+		<Unit filename="..\..\src\asserts.hpp" />
 		<Unit filename="..\..\src\astarnode.cpp" />
+		<Unit filename="..\..\src\astarnode.hpp" />
 		<Unit filename="..\..\src\astarsearch.cpp" />
 		<Unit filename="..\..\src\attack_prediction.cpp" />
+		<Unit filename="..\..\src\attack_prediction.hpp" />
 		<Unit filename="..\..\src\attack_prediction_display.cpp" />
+		<Unit filename="..\..\src\attack_prediction_display.hpp" />
 		<Unit filename="..\..\src\builder.cpp" />
+		<Unit filename="..\..\src\builder.hpp" />
 		<Unit filename="..\..\src\callable_objects.cpp" />
+		<Unit filename="..\..\src\callable_objects.hpp" />
 		<Unit filename="..\..\src\cavegen.cpp" />
+		<Unit filename="..\..\src\cavegen.hpp" />
 		<Unit filename="..\..\src\clipboard.cpp" />
+		<Unit filename="..\..\src\clipboard.hpp" />
 		<Unit filename="..\..\src\color_range.cpp" />
 		<Unit filename="..\..\src\config.cpp" />
+		<Unit filename="..\..\src\config.hpp" />
 		<Unit filename="..\..\src\config_adapter.cpp" />
+		<Unit filename="..\..\src\config_adapter.hpp" />
 		<Unit filename="..\..\src\config_cache.cpp" />
+		<Unit filename="..\..\src\config_cache.hpp" />
 		<Unit filename="..\..\src\construct_dialog.cpp" />
+		<Unit filename="..\..\src\construct_dialog.hpp" />
 		<Unit filename="..\..\src\controller_base.cpp" />
+		<Unit filename="..\..\src\controller_base.hpp" />
 		<Unit filename="..\..\src\cursor.cpp" />
+		<Unit filename="..\..\src\cursor.hpp" />
 		<Unit filename="..\..\src\dialogs.cpp" />
+		<Unit filename="..\..\src\dialogs.hpp" />
 		<Unit filename="..\..\src\display.cpp" />
+		<Unit filename="..\..\src\display.hpp" />
 		<Unit filename="..\..\src\editor2\action.cpp" />
+		<Unit filename="..\..\src\editor2\action.hpp" />
+		<Unit filename="..\..\src\editor2\action_base.hpp" />
 		<Unit filename="..\..\src\editor2\brush.cpp" />
+		<Unit filename="..\..\src\editor2\brush.hpp" />
+		<Unit filename="..\..\src\editor2\editor_common.hpp" />
 		<Unit filename="..\..\src\editor2\editor_controller.cpp" />
+		<Unit filename="..\..\src\editor2\editor_controller.hpp" />
 		<Unit filename="..\..\src\editor2\editor_display.cpp" />
+		<Unit filename="..\..\src\editor2\editor_display.hpp" />
 		<Unit filename="..\..\src\editor2\editor_layout.cpp" />
+		<Unit filename="..\..\src\editor2\editor_layout.hpp" />
 		<Unit filename="..\..\src\editor2\editor_main.cpp" />
+		<Unit filename="..\..\src\editor2\editor_main.hpp" />
 		<Unit filename="..\..\src\editor2\editor_map.cpp" />
+		<Unit filename="..\..\src\editor2\editor_map.hpp" />
 		<Unit filename="..\..\src\editor2\editor_palettes.cpp" />
+		<Unit filename="..\..\src\editor2\editor_palettes.hpp" />
 		<Unit filename="..\..\src\editor2\map_context.cpp" />
+		<Unit filename="..\..\src\editor2\map_context.hpp" />
 		<Unit filename="..\..\src\editor2\map_fragment.cpp" />
+		<Unit filename="..\..\src\editor2\map_fragment.hpp" />
 		<Unit filename="..\..\src\editor2\mouse_action.cpp" />
+		<Unit filename="..\..\src\editor2\mouse_action.hpp" />
 		<Unit filename="..\..\src\events.cpp" />
+		<Unit filename="..\..\src\events.hpp" />
 		<Unit filename="..\..\src\filechooser.cpp" />
+		<Unit filename="..\..\src\filechooser.hpp" />
 		<Unit filename="..\..\src\filesystem.cpp" />
+		<Unit filename="..\..\src\filesystem.hpp" />
 		<Unit filename="..\..\src\filesystem_win32.ii" />
 		<Unit filename="..\..\src\floating_textbox.cpp" />
+		<Unit filename="..\..\src\floating_textbox.hpp" />
 		<Unit filename="..\..\src\font.cpp" />
+		<Unit filename="..\..\src\font.hpp" />
+		<Unit filename="..\..\src\foreach.hpp" />
+		<Unit filename="..\..\src\formatter.hpp" />
 		<Unit filename="..\..\src\formula.cpp" />
+		<Unit filename="..\..\src\formula.hpp" />
 		<Unit filename="..\..\src\formula_ai.cpp" />
+		<Unit filename="..\..\src\formula_ai.hpp" />
+		<Unit filename="..\..\src\formula_callable.hpp" />
 		<Unit filename="..\..\src\formula_function.cpp" />
+		<Unit filename="..\..\src\formula_function.hpp" />
 		<Unit filename="..\..\src\formula_string_utils.cpp" />
+		<Unit filename="..\..\src\formula_string_utils.hpp" />
 		<Unit filename="..\..\src\formula_tokenizer.cpp" />
-		<Unit filename="..\..\src\game.cpp" />
+		<Unit filename="..\..\src\formula_tokenizer.hpp" />
+		<Unit filename="..\..\src\game.cpp">
+			<Option compiler="gcc" use="1" buildCommand="$compiler $options -DDISABLE_POOL_ALLOC $includes -c $file -o $object" />
+		</Unit>
 		<Unit filename="..\..\src\game_config.cpp" />
+		<Unit filename="..\..\src\game_config.hpp" />
 		<Unit filename="..\..\src\game_display.cpp" />
+		<Unit filename="..\..\src\game_display.hpp" />
+		<Unit filename="..\..\src\game_end_exceptions.hpp" />
+		<Unit filename="..\..\src\game_errors.hpp" />
 		<Unit filename="..\..\src\game_events.cpp" />
+		<Unit filename="..\..\src\game_events.hpp" />
 		<Unit filename="..\..\src\game_preferences.cpp" />
+		<Unit filename="..\..\src\game_preferences.hpp" />
 		<Unit filename="..\..\src\game_preferences_display.cpp" />
 		<Unit filename="..\..\src\gamestatus.cpp" />
+		<Unit filename="..\..\src\gamestatus.hpp" />
 		<Unit filename="..\..\src\generate_report.cpp" />
 		<Unit filename="..\..\src\generic_event.cpp" />
+		<Unit filename="..\..\src\generic_event.hpp" />
 		<Unit filename="..\..\src\gettext.cpp" />
+		<Unit filename="..\..\src\gettext.hpp" />
+		<Unit filename="..\..\src\global.hpp" />
 		<Unit filename="..\..\src\gui\dialogs\addon_connect.cpp" />
+		<Unit filename="..\..\src\gui\dialogs\addon_connect.hpp" />
 		<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\language_selection.hpp" />
 		<Unit filename="..\..\src\gui\dialogs\message.cpp" />
+		<Unit filename="..\..\src\gui\dialogs\message.hpp" />
 		<Unit filename="..\..\src\gui\dialogs\mp_cmd_wrapper.cpp" />
+		<Unit filename="..\..\src\gui\dialogs\mp_cmd_wrapper.hpp" />
 		<Unit filename="..\..\src\gui\dialogs\mp_connect.cpp" />
+		<Unit filename="..\..\src\gui\dialogs\mp_connect.hpp" />
 		<Unit filename="..\..\src\gui\dialogs\mp_create_game.cpp" />
+		<Unit filename="..\..\src\gui\dialogs\mp_create_game.hpp" />
 		<Unit filename="..\..\src\gui\dialogs\mp_method_selection.cpp" />
+		<Unit filename="..\..\src\gui\dialogs\mp_method_selection.hpp" />
 		<Unit filename="..\..\src\gui\dialogs\title_screen.cpp" />
+		<Unit filename="..\..\src\gui\dialogs\title_screen.hpp" />
 		<Unit filename="..\..\src\gui\dialogs\wml_message.cpp" />
+		<Unit filename="..\..\src\gui\dialogs\wml_message.hpp" />
 		<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\control.hpp" />
+		<Unit filename="..\..\src\gui\widgets\debug.hpp" />
 		<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\helper.hpp" />
 		<Unit filename="..\..\src\gui\widgets\horizontal_scrollbar.cpp" />
 		<Unit filename="..\..\src\gui\widgets\image.cpp" />
 		<Unit filename="..\..\src\gui\widgets\label.cpp" />
@@ -131,6 +208,7 @@
 		<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\settings.hpp" />
 		<Unit filename="..\..\src\gui\widgets\slider.cpp" />
 		<Unit filename="..\..\src\gui\widgets\spacer.cpp" />
 		<Unit filename="..\..\src\gui\widgets\text.cpp" />
@@ -141,108 +219,210 @@
 		<Unit filename="..\..\src\gui\widgets\vertical_scrollbar.cpp" />
 		<Unit filename="..\..\src\gui\widgets\widget.cpp" />
 		<Unit filename="..\..\src\gui\widgets\window.cpp" />
+		<Unit filename="..\..\src\gui\widgets\window.hpp" />
 		<Unit filename="..\..\src\gui\widgets\window_builder.cpp" />
 		<Unit filename="..\..\src\halo.cpp" />
+		<Unit filename="..\..\src\halo.hpp" />
 		<Unit filename="..\..\src\help.cpp" />
+		<Unit filename="..\..\src\help.hpp" />
 		<Unit filename="..\..\src\hotkeys.cpp" />
+		<Unit filename="..\..\src\hotkeys.hpp" />
 		<Unit filename="..\..\src\image.cpp" />
+		<Unit filename="..\..\src\image.hpp" />
 		<Unit filename="..\..\src\image_function.cpp" />
+		<Unit filename="..\..\src\image_function.hpp" />
 		<Unit filename="..\..\src\intro.cpp" />
+		<Unit filename="..\..\src\intro.hpp" />
 		<Unit filename="..\..\src\key.cpp" />
+		<Unit filename="..\..\src\key.hpp" />
 		<Unit filename="..\..\src\language.cpp" />
+		<Unit filename="..\..\src\language.hpp" />
+		<Unit filename="..\..\src\language_win32.ii" />
 		<Unit filename="..\..\src\leader_list.cpp" />
+		<Unit filename="..\..\src\leader_list.hpp" />
 		<Unit filename="..\..\src\loadscreen.cpp" />
+		<Unit filename="..\..\src\loadscreen.hpp" />
 		<Unit filename="..\..\src\log.cpp" />
+		<Unit filename="..\..\src\log.hpp" />
+		<Unit filename="..\..\src\malloc.c">
+			<Option compilerVar="CC" />
+			<Option compiler="gcc" use="1" buildCommand="$compiler $options -DDISABLE_POOL_ALLOC $includes -c $file -o $object" />
+		</Unit>
 		<Unit filename="..\..\src\map.cpp" />
+		<Unit filename="..\..\src\map.hpp" />
 		<Unit filename="..\..\src\map_create.cpp" />
+		<Unit filename="..\..\src\map_create.hpp" />
+		<Unit filename="..\..\src\map_exception.hpp" />
 		<Unit filename="..\..\src\map_label.cpp" />
+		<Unit filename="..\..\src\map_label.hpp" />
 		<Unit filename="..\..\src\map_location.cpp" />
+		<Unit filename="..\..\src\map_utils.hpp" />
 		<Unit filename="..\..\src\mapgen.cpp" />
+		<Unit filename="..\..\src\mapgen.hpp" />
 		<Unit filename="..\..\src\mapgen_dialog.cpp" />
+		<Unit filename="..\..\src\mapgen_dialog.hpp" />
 		<Unit filename="..\..\src\marked-up_text.cpp" />
+		<Unit filename="..\..\src\marked-up_text.hpp" />
 		<Unit filename="..\..\src\md5.cpp" />
+		<Unit filename="..\..\src\md5.hpp" />
 		<Unit filename="..\..\src\menu_events.cpp" />
+		<Unit filename="..\..\src\menu_events.hpp" />
 		<Unit filename="..\..\src\minimap.cpp" />
+		<Unit filename="..\..\src\minimap.hpp" />
 		<Unit filename="..\..\src\mouse_events.cpp" />
+		<Unit filename="..\..\src\mouse_events.hpp" />
 		<Unit filename="..\..\src\mouse_handler_base.cpp" />
+		<Unit filename="..\..\src\mouse_handler_base.hpp" />
 		<Unit filename="..\..\src\multiplayer.cpp" />
+		<Unit filename="..\..\src\multiplayer.hpp" />
 		<Unit filename="..\..\src\multiplayer_connect.cpp" />
+		<Unit filename="..\..\src\multiplayer_connect.hpp" />
 		<Unit filename="..\..\src\multiplayer_create.cpp" />
+		<Unit filename="..\..\src\multiplayer_create.hpp" />
 		<Unit filename="..\..\src\multiplayer_lobby.cpp" />
+		<Unit filename="..\..\src\multiplayer_lobby.hpp" />
 		<Unit filename="..\..\src\multiplayer_ui.cpp" />
+		<Unit filename="..\..\src\multiplayer_ui.hpp" />
 		<Unit filename="..\..\src\multiplayer_wait.cpp" />
+		<Unit filename="..\..\src\multiplayer_wait.hpp" />
 		<Unit filename="..\..\src\network.cpp" />
+		<Unit filename="..\..\src\network.hpp" />
 		<Unit filename="..\..\src\network_worker.cpp" />
+		<Unit filename="..\..\src\network_worker.hpp" />
 		<Unit filename="..\..\src\pathfind.cpp" />
+		<Unit filename="..\..\src\pathfind.hpp" />
 		<Unit filename="..\..\src\pathutils.cpp" />
+		<Unit filename="..\..\src\pathutils.hpp" />
 		<Unit filename="..\..\src\play_controller.cpp" />
+		<Unit filename="..\..\src\play_controller.hpp" />
 		<Unit filename="..\..\src\playcampaign.cpp" />
+		<Unit filename="..\..\src\playcampaign.hpp" />
 		<Unit filename="..\..\src\playmp_controller.cpp" />
+		<Unit filename="..\..\src\playmp_controller.hpp" />
 		<Unit filename="..\..\src\playsingle_controller.cpp" />
+		<Unit filename="..\..\src\playsingle_controller.hpp" />
 		<Unit filename="..\..\src\playturn.cpp" />
+		<Unit filename="..\..\src\playturn.hpp" />
+		<Unit filename="..\..\src\poolalloc.c">
+			<Option compilerVar="CC" />
+			<Option compiler="gcc" use="1" buildCommand="$compiler $options -DDISABLE_POOL_ALLOC $includes -c $file -o $object" />
+		</Unit>
 		<Unit filename="..\..\src\portrait.cpp" />
+		<Unit filename="..\..\src\portrait.hpp" />
 		<Unit filename="..\..\src\preferences.cpp" />
+		<Unit filename="..\..\src\preferences.hpp" />
 		<Unit filename="..\..\src\preferences_display.cpp" />
+		<Unit filename="..\..\src\preferences_display.hpp" />
 		<Unit filename="..\..\src\race.cpp" />
+		<Unit filename="..\..\src\race.hpp" />
 		<Unit filename="..\..\src\random.cpp" />
+		<Unit filename="..\..\src\random.hpp" />
 		<Unit filename="..\..\src\replay.cpp" />
+		<Unit filename="..\..\src\replay.hpp" />
 		<Unit filename="..\..\src\replay_controller.cpp" />
+		<Unit filename="..\..\src\replay_controller.hpp" />
 		<Unit filename="..\..\src\reports.cpp" />
+		<Unit filename="..\..\src\reports.hpp" />
+		<Unit filename="..\..\src\scoped_resource.hpp" />
 		<Unit filename="..\..\src\sdl_utils.cpp" />
+		<Unit filename="..\..\src\sdl_utils.hpp" />
 		<Unit filename="..\..\src\serialization\binary_or_text.cpp" />
+		<Unit filename="..\..\src\serialization\binary_or_text.hpp" />
 		<Unit filename="..\..\src\serialization\binary_wml.cpp" />
+		<Unit filename="..\..\src\serialization\binary_wml.hpp" />
 		<Unit filename="..\..\src\serialization\parser.cpp" />
+		<Unit filename="..\..\src\serialization\parser.hpp" />
 		<Unit filename="..\..\src\serialization\preprocessor.cpp" />
+		<Unit filename="..\..\src\serialization\preprocessor.hpp" />
 		<Unit filename="..\..\src\serialization\string_utils.cpp" />
+		<Unit filename="..\..\src\serialization\string_utils.hpp" />
 		<Unit filename="..\..\src\serialization\tokenizer.cpp" />
 		<Unit filename="..\..\src\settings.cpp" />
+		<Unit filename="..\..\src\settings.hpp" />
+		<Unit filename="..\..\src\gui\dialogs\..\..\settings.hpp" />
 		<Unit filename="..\..\src\sha1.cpp" />
+		<Unit filename="..\..\src\sha1.hpp" />
 		<Unit filename="..\..\src\show_dialog.cpp" />
+		<Unit filename="..\..\src\show_dialog.hpp" />
 		<Unit filename="..\..\src\sound.cpp" />
+		<Unit filename="..\..\src\sound.hpp" />
 		<Unit filename="..\..\src\soundsource.cpp" />
+		<Unit filename="..\..\src\soundsource.hpp" />
 		<Unit filename="..\..\src\statistics.cpp" />
+		<Unit filename="..\..\src\statistics.hpp" />
 		<Unit filename="..\..\src\statistics_dialog.cpp" />
+		<Unit filename="..\..\src\statistics_dialog.hpp" />
 		<Unit filename="..\..\src\team.cpp" />
+		<Unit filename="..\..\src\team.hpp" />
 		<Unit filename="..\..\src\terrain.cpp" />
+		<Unit filename="..\..\src\terrain.hpp" />
 		<Unit filename="..\..\src\terrain_filter.cpp" />
+		<Unit filename="..\..\src\terrain_filter.hpp" />
 		<Unit filename="..\..\src\terrain_translation.cpp" />
+		<Unit filename="..\..\src\terrain_translation.hpp" />
 		<Unit filename="..\..\src\text.cpp" />
+		<Unit filename="..\..\src\text.hpp" />
 		<Unit filename="..\..\src\theme.cpp" />
+		<Unit filename="..\..\src\theme.hpp" />
 		<Unit filename="..\..\src\thread.cpp" />
+		<Unit filename="..\..\src\thread.hpp" />
 		<Unit filename="..\..\src\time_of_day.cpp" />
+		<Unit filename="..\..\src\time_of_day.hpp" />
 		<Unit filename="..\..\src\titlescreen.cpp" />
+		<Unit filename="..\..\src\titlescreen.hpp" />
 		<Unit filename="..\..\src\tooltips.cpp" />
+		<Unit filename="..\..\src\tooltips.hpp" />
 		<Unit filename="..\..\src\tstring.cpp" />
+		<Unit filename="..\..\src\tstring.hpp" />
 		<Unit filename="..\..\src\unit.cpp" />
+		<Unit filename="..\..\src\unit.hpp" />
 		<Unit filename="..\..\src\unit_abilities.cpp" />
+		<Unit filename="..\..\src\unit_abilities.hpp" />
 		<Unit filename="..\..\src\unit_animation.cpp" />
 		<Unit filename="..\..\src\unit_display.cpp" />
+		<Unit filename="..\..\src\unit_display.hpp" />
 		<Unit filename="..\..\src\unit_frame.cpp" />
+		<Unit filename="..\..\src\unit_frame.hpp" />
 		<Unit filename="..\..\src\unit_id.cpp" />
+		<Unit filename="..\..\src\unit_id.hpp" />
 		<Unit filename="..\..\src\unit_map.cpp" />
 		<Unit filename="..\..\src\unit_types.cpp" />
+		<Unit filename="..\..\src\unit_types.hpp" />
 		<Unit filename="..\..\src\upload_log.cpp" />
+		<Unit filename="..\..\src\upload_log.hpp" />
 		<Unit filename="..\..\src\util.cpp" />
+		<Unit filename="..\..\src\util.hpp" />
 		<Unit filename="..\..\src\variable.cpp" />
+		<Unit filename="..\..\src\variable.hpp" />
 		<Unit filename="..\..\src\variant.cpp" />
 		<Unit filename="..\..\src\version.cpp" />
+		<Unit filename="..\..\src\version.hpp" />
 		<Unit filename="..\..\src\video.cpp" />
+		<Unit filename="..\..\src\video.hpp" />
+		<Unit filename="..\..\src\wesconfig.h" />
 		<Unit filename="..\..\src\widgets\button.cpp" />
 		<Unit filename="..\..\src\widgets\combo.cpp" />
+		<Unit filename="..\..\src\widgets\combo.hpp" />
 		<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\file_menu.hpp" />
 		<Unit filename="..\..\src\widgets\label.cpp" />
 		<Unit filename="..\..\src\widgets\menu.cpp" />
+		<Unit filename="..\..\src\widgets\menu.hpp" />
 		<Unit filename="..\..\src\widgets\menu_style.cpp" />
 		<Unit filename="..\..\src\widgets\progressbar.cpp" />
+		<Unit filename="..\..\src\widgets\progressbar.hpp" />
 		<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\slider.hpp" />
 		<Unit filename="..\..\src\widgets\textbox.cpp" />
 		<Unit filename="..\..\src\widgets\widget.cpp" />
 		<Unit filename="..\..\src\wml_exception.cpp" />
+		<Unit filename="..\..\src\wml_exception.hpp" />
+		<Unit filename="..\..\src\wml_separators.hpp" />
 		<Extensions>
 			<code_completion />
 			<debugger />
diff --git a/projectfiles/CodeBlocks-SCons/wesnothd.cbp b/projectfiles/CodeBlocks-SCons/wesnothd.cbp
index 7d4853ee70f..fa16df362ff 100644
--- a/projectfiles/CodeBlocks-SCons/wesnothd.cbp
+++ b/projectfiles/CodeBlocks-SCons/wesnothd.cbp
@@ -34,41 +34,78 @@
 				</MakeCommands>
 			</Target>
 		</Build>
+		<Unit filename="../../src/about.hpp" />
 		<Unit filename="../../src/color_range.cpp" />
 		<Unit filename="../../src/config.cpp" />
+		<Unit filename="../../src/config.hpp" />
 		<Unit filename="../../src/filesystem.cpp" />
+		<Unit filename="../../src/filesystem.hpp" />
+		<Unit filename="../../src/filesystem_win32.ii" />
 		<Unit filename="../../src/game_config.cpp" />
+		<Unit filename="../../src/game_config.hpp" />
 		<Unit filename="../../src/gettext.cpp" />
+		<Unit filename="../../src/gettext.hpp" />
+		<Unit filename="../../src/global.hpp" />
+		<Unit filename="../../src/loadscreen.hpp" />
 		<Unit filename="../../src/loadscreen_empty.cpp" />
 		<Unit filename="../../src/log.cpp" />
+		<Unit filename="../../src/log.hpp" />
+		<Unit filename="../../src/map.hpp" />
 		<Unit filename="../../src/network.cpp" />
+		<Unit filename="../../src/network.hpp" />
 		<Unit filename="../../src/network_worker.cpp" />
+		<Unit filename="../../src/network_worker.hpp" />
+		<Unit filename="../../src/scoped_resource.hpp" />
 		<Unit filename="../../src/serialization/binary_or_text.cpp" />
+		<Unit filename="../../src/serialization/binary_or_text.hpp" />
 		<Unit filename="../../src/serialization/binary_wml.cpp" />
+		<Unit filename="../../src/serialization/binary_wml.hpp" />
 		<Unit filename="../../src/serialization/parser.cpp" />
+		<Unit filename="../../src/serialization/parser.hpp" />
 		<Unit filename="../../src/serialization/preprocessor.cpp" />
+		<Unit filename="../../src/serialization/preprocessor.hpp" />
 		<Unit filename="../../src/serialization/string_utils.cpp" />
+		<Unit filename="../../src/serialization/string_utils.hpp" />
 		<Unit filename="../../src/serialization/tokenizer.cpp" />
 		<Unit filename="../../src/server/ban.cpp" />
+		<Unit filename="../../src/server/ban.hpp" />
 		<Unit filename="../../src/server/forum_user_handler.cpp" />
+		<Unit filename="../../src/server/forum_user_handler.hpp" />
 		<Unit filename="../../src/server/game.cpp" />
+		<Unit filename="../../src/server/game.hpp" />
 		<Unit filename="../../src/server/input_stream.cpp" />
+		<Unit filename="../../src/server/input_stream.hpp" />
 		<Unit filename="../../src/server/jwsmtp/base64.cpp" />
+		<Unit filename="../../src/server/jwsmtp/base64.h" />
 		<Unit filename="../../src/server/jwsmtp/compat.cpp" />
+		<Unit filename="../../src/server/jwsmtp/compat.h" />
 		<Unit filename="../../src/server/jwsmtp/mailer.cpp" />
+		<Unit filename="../../src/server/jwsmtp/mailer.h" />
 		<Unit filename="../../src/server/mail.cpp" />
 		<Unit filename="../../src/server/metrics.cpp" />
+		<Unit filename="../../src/server/metrics.hpp" />
 		<Unit filename="../../src/server/player.cpp" />
+		<Unit filename="../../src/server/player.hpp" />
 		<Unit filename="../../src/server/proxy.cpp" />
+		<Unit filename="../../src/server/proxy.hpp" />
 		<Unit filename="../../src/server/sample_user_handler.cpp" />
+		<Unit filename="../../src/server/sample_user_handler.hpp" />
 		<Unit filename="../../src/server/server.cpp" />
 		<Unit filename="../../src/server/simple_wml.cpp" />
+		<Unit filename="../../src/server/simple_wml.hpp" />
 		<Unit filename="../../src/server/user_handler.cpp" />
+		<Unit filename="../../src/server/user_handler.hpp" />
 		<Unit filename="../../src/thread.cpp" />
+		<Unit filename="../../src/thread.hpp" />
 		<Unit filename="../../src/time.cpp" />
+		<Unit filename="../../src/time.hpp" />
 		<Unit filename="../../src/tstring.cpp" />
+		<Unit filename="../../src/tstring.hpp" />
 		<Unit filename="../../src/util.cpp" />
+		<Unit filename="../../src/util.hpp" />
 		<Unit filename="../../src/version.cpp" />
+		<Unit filename="../../src/version.hpp" />
+		<Unit filename="../../src/wesconfig.h" />
 		<Extensions>
 			<code_completion />
 			<debugger />
diff --git a/projectfiles/CodeBlocks/wesnoth.cbp b/projectfiles/CodeBlocks/wesnoth.cbp
index 308f9876719..e5cab01a885 100644
--- a/projectfiles/CodeBlocks/wesnoth.cbp
+++ b/projectfiles/CodeBlocks/wesnoth.cbp
@@ -62,94 +62,170 @@
 			<Add library="cairo" />
 			<Add library="gobject-2.0" />
 			<Add library="fontconfig" />
+			<Add library="libglib-2.0" />
 		</Linker>
 		<Unit filename="..\..\packaging\windows\wesnoth.rc">
 			<Option compilerVar="WINDRES" />
 		</Unit>
 		<Unit filename="..\..\src\about.cpp" />
+		<Unit filename="..\..\src\about.hpp" />
 		<Unit filename="..\..\src\actions.cpp" />
+		<Unit filename="..\..\src\actions.hpp" />
 		<Unit filename="..\..\src\addon_checks.cpp" />
+		<Unit filename="..\..\src\addon_checks.hpp" />
 		<Unit filename="..\..\src\addon_management.cpp" />
+		<Unit filename="..\..\src\addon_management.hpp" />
 		<Unit filename="..\..\src\ai.cpp" />
+		<Unit filename="..\..\src\ai.hpp" />
+		<Unit filename="..\..\src\ai2.hpp" />
 		<Unit filename="..\..\src\ai_attack.cpp" />
 		<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" />
 		<Unit filename="..\..\src\animated_game.cpp" />
+		<Unit filename="..\..\src\array.hpp" />
+		<Unit filename="..\..\src\asserts.hpp" />
 		<Unit filename="..\..\src\astarnode.cpp" />
+		<Unit filename="..\..\src\astarnode.hpp" />
 		<Unit filename="..\..\src\astarsearch.cpp" />
 		<Unit filename="..\..\src\attack_prediction.cpp" />
+		<Unit filename="..\..\src\attack_prediction.hpp" />
 		<Unit filename="..\..\src\attack_prediction_display.cpp" />
+		<Unit filename="..\..\src\attack_prediction_display.hpp" />
 		<Unit filename="..\..\src\builder.cpp" />
+		<Unit filename="..\..\src\builder.hpp" />
 		<Unit filename="..\..\src\callable_objects.cpp" />
+		<Unit filename="..\..\src\callable_objects.hpp" />
 		<Unit filename="..\..\src\cavegen.cpp" />
+		<Unit filename="..\..\src\cavegen.hpp" />
 		<Unit filename="..\..\src\clipboard.cpp" />
+		<Unit filename="..\..\src\clipboard.hpp" />
 		<Unit filename="..\..\src\color_range.cpp" />
 		<Unit filename="..\..\src\config.cpp" />
+		<Unit filename="..\..\src\config.hpp" />
 		<Unit filename="..\..\src\config_adapter.cpp" />
+		<Unit filename="..\..\src\config_adapter.hpp" />
 		<Unit filename="..\..\src\config_cache.cpp" />
+		<Unit filename="..\..\src\config_cache.hpp" />
 		<Unit filename="..\..\src\construct_dialog.cpp" />
+		<Unit filename="..\..\src\construct_dialog.hpp" />
 		<Unit filename="..\..\src\controller_base.cpp" />
+		<Unit filename="..\..\src\controller_base.hpp" />
 		<Unit filename="..\..\src\cursor.cpp" />
+		<Unit filename="..\..\src\cursor.hpp" />
 		<Unit filename="..\..\src\dialogs.cpp" />
+		<Unit filename="..\..\src\dialogs.hpp" />
 		<Unit filename="..\..\src\display.cpp" />
+		<Unit filename="..\..\src\display.hpp" />
 		<Unit filename="..\..\src\editor2\action.cpp" />
+		<Unit filename="..\..\src\editor2\action.hpp" />
+		<Unit filename="..\..\src\editor2\action_base.hpp" />
 		<Unit filename="..\..\src\editor2\brush.cpp" />
+		<Unit filename="..\..\src\editor2\brush.hpp" />
+		<Unit filename="..\..\src\editor2\editor_common.hpp" />
 		<Unit filename="..\..\src\editor2\editor_controller.cpp" />
+		<Unit filename="..\..\src\editor2\editor_controller.hpp" />
 		<Unit filename="..\..\src\editor2\editor_display.cpp" />
+		<Unit filename="..\..\src\editor2\editor_display.hpp" />
 		<Unit filename="..\..\src\editor2\editor_layout.cpp" />
+		<Unit filename="..\..\src\editor2\editor_layout.hpp" />
 		<Unit filename="..\..\src\editor2\editor_main.cpp" />
+		<Unit filename="..\..\src\editor2\editor_main.hpp" />
 		<Unit filename="..\..\src\editor2\editor_map.cpp" />
+		<Unit filename="..\..\src\editor2\editor_map.hpp" />
 		<Unit filename="..\..\src\editor2\editor_palettes.cpp" />
+		<Unit filename="..\..\src\editor2\editor_palettes.hpp" />
 		<Unit filename="..\..\src\editor2\map_context.cpp" />
+		<Unit filename="..\..\src\editor2\map_context.hpp" />
 		<Unit filename="..\..\src\editor2\map_fragment.cpp" />
+		<Unit filename="..\..\src\editor2\map_fragment.hpp" />
 		<Unit filename="..\..\src\editor2\mouse_action.cpp" />
+		<Unit filename="..\..\src\editor2\mouse_action.hpp" />
 		<Unit filename="..\..\src\events.cpp" />
+		<Unit filename="..\..\src\events.hpp" />
 		<Unit filename="..\..\src\filechooser.cpp" />
+		<Unit filename="..\..\src\filechooser.hpp" />
 		<Unit filename="..\..\src\filesystem.cpp" />
+		<Unit filename="..\..\src\filesystem.hpp" />
 		<Unit filename="..\..\src\filesystem_win32.ii" />
 		<Unit filename="..\..\src\floating_textbox.cpp" />
+		<Unit filename="..\..\src\floating_textbox.hpp" />
 		<Unit filename="..\..\src\font.cpp" />
+		<Unit filename="..\..\src\font.hpp" />
+		<Unit filename="..\..\src\foreach.hpp" />
+		<Unit filename="..\..\src\formatter.hpp" />
 		<Unit filename="..\..\src\formula.cpp" />
+		<Unit filename="..\..\src\formula.hpp" />
 		<Unit filename="..\..\src\formula_ai.cpp" />
+		<Unit filename="..\..\src\formula_ai.hpp" />
+		<Unit filename="..\..\src\formula_callable.hpp" />
 		<Unit filename="..\..\src\formula_function.cpp" />
+		<Unit filename="..\..\src\formula_function.hpp" />
 		<Unit filename="..\..\src\formula_string_utils.cpp" />
+		<Unit filename="..\..\src\formula_string_utils.hpp" />
 		<Unit filename="..\..\src\formula_tokenizer.cpp" />
+		<Unit filename="..\..\src\formula_tokenizer.hpp" />
 		<Unit filename="..\..\src\game.cpp">
 			<Option compiler="gcc" use="1" buildCommand="$compiler $options -DDISABLE_POOL_ALLOC $includes -c $file -o $object" />
 		</Unit>
 		<Unit filename="..\..\src\game_config.cpp" />
+		<Unit filename="..\..\src\game_config.hpp" />
 		<Unit filename="..\..\src\game_display.cpp" />
+		<Unit filename="..\..\src\game_display.hpp" />
+		<Unit filename="..\..\src\game_end_exceptions.hpp" />
+		<Unit filename="..\..\src\game_errors.hpp" />
 		<Unit filename="..\..\src\game_events.cpp" />
+		<Unit filename="..\..\src\game_events.hpp" />
 		<Unit filename="..\..\src\game_preferences.cpp" />
+		<Unit filename="..\..\src\game_preferences.hpp" />
 		<Unit filename="..\..\src\game_preferences_display.cpp" />
 		<Unit filename="..\..\src\gamestatus.cpp" />
+		<Unit filename="..\..\src\gamestatus.hpp" />
 		<Unit filename="..\..\src\generate_report.cpp" />
 		<Unit filename="..\..\src\generic_event.cpp" />
+		<Unit filename="..\..\src\generic_event.hpp" />
 		<Unit filename="..\..\src\gettext.cpp" />
+		<Unit filename="..\..\src\gettext.hpp" />
+		<Unit filename="..\..\src\global.hpp" />
 		<Unit filename="..\..\src\gui\dialogs\addon_connect.cpp" />
+		<Unit filename="..\..\src\gui\dialogs\addon_connect.hpp" />
 		<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\language_selection.hpp" />
 		<Unit filename="..\..\src\gui\dialogs\message.cpp" />
+		<Unit filename="..\..\src\gui\dialogs\message.hpp" />
 		<Unit filename="..\..\src\gui\dialogs\mp_cmd_wrapper.cpp" />
+		<Unit filename="..\..\src\gui\dialogs\mp_cmd_wrapper.hpp" />
 		<Unit filename="..\..\src\gui\dialogs\mp_connect.cpp" />
+		<Unit filename="..\..\src\gui\dialogs\mp_connect.hpp" />
 		<Unit filename="..\..\src\gui\dialogs\mp_create_game.cpp" />
+		<Unit filename="..\..\src\gui\dialogs\mp_create_game.hpp" />
 		<Unit filename="..\..\src\gui\dialogs\mp_method_selection.cpp" />
+		<Unit filename="..\..\src\gui\dialogs\mp_method_selection.hpp" />
 		<Unit filename="..\..\src\gui\dialogs\title_screen.cpp" />
+		<Unit filename="..\..\src\gui\dialogs\title_screen.hpp" />
 		<Unit filename="..\..\src\gui\dialogs\wml_message.cpp" />
+		<Unit filename="..\..\src\gui\dialogs\wml_message.hpp" />
 		<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\control.hpp" />
+		<Unit filename="..\..\src\gui\widgets\debug.hpp" />
 		<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\helper.hpp" />
 		<Unit filename="..\..\src\gui\widgets\horizontal_scrollbar.cpp" />
 		<Unit filename="..\..\src\gui\widgets\image.cpp" />
 		<Unit filename="..\..\src\gui\widgets\label.cpp" />
@@ -162,6 +238,7 @@
 		<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\settings.hpp" />
 		<Unit filename="..\..\src\gui\widgets\slider.cpp" />
 		<Unit filename="..\..\src\gui\widgets\spacer.cpp" />
 		<Unit filename="..\..\src\gui\widgets\text.cpp" />
@@ -172,116 +249,210 @@
 		<Unit filename="..\..\src\gui\widgets\vertical_scrollbar.cpp" />
 		<Unit filename="..\..\src\gui\widgets\widget.cpp" />
 		<Unit filename="..\..\src\gui\widgets\window.cpp" />
+		<Unit filename="..\..\src\gui\widgets\window.hpp" />
 		<Unit filename="..\..\src\gui\widgets\window_builder.cpp" />
 		<Unit filename="..\..\src\halo.cpp" />
+		<Unit filename="..\..\src\halo.hpp" />
 		<Unit filename="..\..\src\help.cpp" />
+		<Unit filename="..\..\src\help.hpp" />
 		<Unit filename="..\..\src\hotkeys.cpp" />
+		<Unit filename="..\..\src\hotkeys.hpp" />
 		<Unit filename="..\..\src\image.cpp" />
+		<Unit filename="..\..\src\image.hpp" />
 		<Unit filename="..\..\src\image_function.cpp" />
+		<Unit filename="..\..\src\image_function.hpp" />
 		<Unit filename="..\..\src\intro.cpp" />
+		<Unit filename="..\..\src\intro.hpp" />
 		<Unit filename="..\..\src\key.cpp" />
+		<Unit filename="..\..\src\key.hpp" />
 		<Unit filename="..\..\src\language.cpp" />
+		<Unit filename="..\..\src\language.hpp" />
+		<Unit filename="..\..\src\language_win32.ii" />
 		<Unit filename="..\..\src\leader_list.cpp" />
+		<Unit filename="..\..\src\leader_list.hpp" />
 		<Unit filename="..\..\src\loadscreen.cpp" />
+		<Unit filename="..\..\src\loadscreen.hpp" />
 		<Unit filename="..\..\src\log.cpp" />
+		<Unit filename="..\..\src\log.hpp" />
 		<Unit filename="..\..\src\malloc.c">
 			<Option compilerVar="CC" />
 			<Option compiler="gcc" use="1" buildCommand="$compiler $options -DDISABLE_POOL_ALLOC $includes -c $file -o $object" />
 		</Unit>
 		<Unit filename="..\..\src\map.cpp" />
+		<Unit filename="..\..\src\map.hpp" />
 		<Unit filename="..\..\src\map_create.cpp" />
+		<Unit filename="..\..\src\map_create.hpp" />
+		<Unit filename="..\..\src\map_exception.hpp" />
 		<Unit filename="..\..\src\map_label.cpp" />
+		<Unit filename="..\..\src\map_label.hpp" />
 		<Unit filename="..\..\src\map_location.cpp" />
+		<Unit filename="..\..\src\map_utils.hpp" />
 		<Unit filename="..\..\src\mapgen.cpp" />
+		<Unit filename="..\..\src\mapgen.hpp" />
 		<Unit filename="..\..\src\mapgen_dialog.cpp" />
+		<Unit filename="..\..\src\mapgen_dialog.hpp" />
 		<Unit filename="..\..\src\marked-up_text.cpp" />
+		<Unit filename="..\..\src\marked-up_text.hpp" />
 		<Unit filename="..\..\src\md5.cpp" />
+		<Unit filename="..\..\src\md5.hpp" />
 		<Unit filename="..\..\src\menu_events.cpp" />
+		<Unit filename="..\..\src\menu_events.hpp" />
 		<Unit filename="..\..\src\minimap.cpp" />
+		<Unit filename="..\..\src\minimap.hpp" />
 		<Unit filename="..\..\src\mouse_events.cpp" />
+		<Unit filename="..\..\src\mouse_events.hpp" />
 		<Unit filename="..\..\src\mouse_handler_base.cpp" />
+		<Unit filename="..\..\src\mouse_handler_base.hpp" />
 		<Unit filename="..\..\src\multiplayer.cpp" />
+		<Unit filename="..\..\src\multiplayer.hpp" />
 		<Unit filename="..\..\src\multiplayer_connect.cpp" />
+		<Unit filename="..\..\src\multiplayer_connect.hpp" />
 		<Unit filename="..\..\src\multiplayer_create.cpp" />
+		<Unit filename="..\..\src\multiplayer_create.hpp" />
 		<Unit filename="..\..\src\multiplayer_lobby.cpp" />
+		<Unit filename="..\..\src\multiplayer_lobby.hpp" />
 		<Unit filename="..\..\src\multiplayer_ui.cpp" />
+		<Unit filename="..\..\src\multiplayer_ui.hpp" />
 		<Unit filename="..\..\src\multiplayer_wait.cpp" />
+		<Unit filename="..\..\src\multiplayer_wait.hpp" />
 		<Unit filename="..\..\src\network.cpp" />
+		<Unit filename="..\..\src\network.hpp" />
 		<Unit filename="..\..\src\network_worker.cpp" />
+		<Unit filename="..\..\src\network_worker.hpp" />
 		<Unit filename="..\..\src\pathfind.cpp" />
+		<Unit filename="..\..\src\pathfind.hpp" />
 		<Unit filename="..\..\src\pathutils.cpp" />
+		<Unit filename="..\..\src\pathutils.hpp" />
 		<Unit filename="..\..\src\play_controller.cpp" />
+		<Unit filename="..\..\src\play_controller.hpp" />
 		<Unit filename="..\..\src\playcampaign.cpp" />
+		<Unit filename="..\..\src\playcampaign.hpp" />
 		<Unit filename="..\..\src\playmp_controller.cpp" />
+		<Unit filename="..\..\src\playmp_controller.hpp" />
 		<Unit filename="..\..\src\playsingle_controller.cpp" />
+		<Unit filename="..\..\src\playsingle_controller.hpp" />
 		<Unit filename="..\..\src\playturn.cpp" />
+		<Unit filename="..\..\src\playturn.hpp" />
 		<Unit filename="..\..\src\poolalloc.c">
 			<Option compilerVar="CC" />
 			<Option compiler="gcc" use="1" buildCommand="$compiler $options -DDISABLE_POOL_ALLOC $includes -c $file -o $object" />
 		</Unit>
 		<Unit filename="..\..\src\portrait.cpp" />
+		<Unit filename="..\..\src\portrait.hpp" />
 		<Unit filename="..\..\src\preferences.cpp" />
+		<Unit filename="..\..\src\preferences.hpp" />
 		<Unit filename="..\..\src\preferences_display.cpp" />
+		<Unit filename="..\..\src\preferences_display.hpp" />
 		<Unit filename="..\..\src\race.cpp" />
+		<Unit filename="..\..\src\race.hpp" />
 		<Unit filename="..\..\src\random.cpp" />
+		<Unit filename="..\..\src\random.hpp" />
 		<Unit filename="..\..\src\replay.cpp" />
+		<Unit filename="..\..\src\replay.hpp" />
 		<Unit filename="..\..\src\replay_controller.cpp" />
+		<Unit filename="..\..\src\replay_controller.hpp" />
 		<Unit filename="..\..\src\reports.cpp" />
+		<Unit filename="..\..\src\reports.hpp" />
+		<Unit filename="..\..\src\scoped_resource.hpp" />
 		<Unit filename="..\..\src\sdl_utils.cpp" />
+		<Unit filename="..\..\src\sdl_utils.hpp" />
 		<Unit filename="..\..\src\serialization\binary_or_text.cpp" />
+		<Unit filename="..\..\src\serialization\binary_or_text.hpp" />
 		<Unit filename="..\..\src\serialization\binary_wml.cpp" />
+		<Unit filename="..\..\src\serialization\binary_wml.hpp" />
 		<Unit filename="..\..\src\serialization\parser.cpp" />
+		<Unit filename="..\..\src\serialization\parser.hpp" />
 		<Unit filename="..\..\src\serialization\preprocessor.cpp" />
+		<Unit filename="..\..\src\serialization\preprocessor.hpp" />
 		<Unit filename="..\..\src\serialization\string_utils.cpp" />
+		<Unit filename="..\..\src\serialization\string_utils.hpp" />
 		<Unit filename="..\..\src\serialization\tokenizer.cpp" />
 		<Unit filename="..\..\src\settings.cpp" />
+		<Unit filename="..\..\src\settings.hpp" />
+		<Unit filename="..\..\src\gui\dialogs\..\..\settings.hpp" />
 		<Unit filename="..\..\src\sha1.cpp" />
+		<Unit filename="..\..\src\sha1.hpp" />
 		<Unit filename="..\..\src\show_dialog.cpp" />
+		<Unit filename="..\..\src\show_dialog.hpp" />
 		<Unit filename="..\..\src\sound.cpp" />
+		<Unit filename="..\..\src\sound.hpp" />
 		<Unit filename="..\..\src\soundsource.cpp" />
+		<Unit filename="..\..\src\soundsource.hpp" />
 		<Unit filename="..\..\src\statistics.cpp" />
+		<Unit filename="..\..\src\statistics.hpp" />
 		<Unit filename="..\..\src\statistics_dialog.cpp" />
+		<Unit filename="..\..\src\statistics_dialog.hpp" />
 		<Unit filename="..\..\src\team.cpp" />
+		<Unit filename="..\..\src\team.hpp" />
 		<Unit filename="..\..\src\terrain.cpp" />
+		<Unit filename="..\..\src\terrain.hpp" />
 		<Unit filename="..\..\src\terrain_filter.cpp" />
+		<Unit filename="..\..\src\terrain_filter.hpp" />
 		<Unit filename="..\..\src\terrain_translation.cpp" />
+		<Unit filename="..\..\src\terrain_translation.hpp" />
 		<Unit filename="..\..\src\text.cpp" />
+		<Unit filename="..\..\src\text.hpp" />
 		<Unit filename="..\..\src\theme.cpp" />
+		<Unit filename="..\..\src\theme.hpp" />
 		<Unit filename="..\..\src\thread.cpp" />
+		<Unit filename="..\..\src\thread.hpp" />
 		<Unit filename="..\..\src\time_of_day.cpp" />
+		<Unit filename="..\..\src\time_of_day.hpp" />
 		<Unit filename="..\..\src\titlescreen.cpp" />
+		<Unit filename="..\..\src\titlescreen.hpp" />
 		<Unit filename="..\..\src\tooltips.cpp" />
+		<Unit filename="..\..\src\tooltips.hpp" />
 		<Unit filename="..\..\src\tstring.cpp" />
+		<Unit filename="..\..\src\tstring.hpp" />
 		<Unit filename="..\..\src\unit.cpp" />
+		<Unit filename="..\..\src\unit.hpp" />
 		<Unit filename="..\..\src\unit_abilities.cpp" />
+		<Unit filename="..\..\src\unit_abilities.hpp" />
 		<Unit filename="..\..\src\unit_animation.cpp" />
 		<Unit filename="..\..\src\unit_display.cpp" />
+		<Unit filename="..\..\src\unit_display.hpp" />
 		<Unit filename="..\..\src\unit_frame.cpp" />
+		<Unit filename="..\..\src\unit_frame.hpp" />
 		<Unit filename="..\..\src\unit_id.cpp" />
+		<Unit filename="..\..\src\unit_id.hpp" />
 		<Unit filename="..\..\src\unit_map.cpp" />
 		<Unit filename="..\..\src\unit_types.cpp" />
+		<Unit filename="..\..\src\unit_types.hpp" />
 		<Unit filename="..\..\src\upload_log.cpp" />
+		<Unit filename="..\..\src\upload_log.hpp" />
 		<Unit filename="..\..\src\util.cpp" />
+		<Unit filename="..\..\src\util.hpp" />
 		<Unit filename="..\..\src\variable.cpp" />
+		<Unit filename="..\..\src\variable.hpp" />
 		<Unit filename="..\..\src\variant.cpp" />
 		<Unit filename="..\..\src\version.cpp" />
+		<Unit filename="..\..\src\version.hpp" />
 		<Unit filename="..\..\src\video.cpp" />
+		<Unit filename="..\..\src\video.hpp" />
+		<Unit filename="..\..\src\wesconfig.h" />
 		<Unit filename="..\..\src\widgets\button.cpp" />
 		<Unit filename="..\..\src\widgets\combo.cpp" />
+		<Unit filename="..\..\src\widgets\combo.hpp" />
 		<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\file_menu.hpp" />
 		<Unit filename="..\..\src\widgets\label.cpp" />
 		<Unit filename="..\..\src\widgets\menu.cpp" />
+		<Unit filename="..\..\src\widgets\menu.hpp" />
 		<Unit filename="..\..\src\widgets\menu_style.cpp" />
 		<Unit filename="..\..\src\widgets\progressbar.cpp" />
+		<Unit filename="..\..\src\widgets\progressbar.hpp" />
 		<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\slider.hpp" />
 		<Unit filename="..\..\src\widgets\textbox.cpp" />
 		<Unit filename="..\..\src\widgets\widget.cpp" />
 		<Unit filename="..\..\src\wml_exception.cpp" />
+		<Unit filename="..\..\src\wml_exception.hpp" />
+		<Unit filename="..\..\src\wml_separators.hpp" />
 		<Extensions>
 			<code_completion />
 			<debugger />
diff --git a/projectfiles/CodeBlocks/wesnothd.cbp b/projectfiles/CodeBlocks/wesnothd.cbp
index c658d0ab59d..51074c5a1fe 100644
--- a/projectfiles/CodeBlocks/wesnothd.cbp
+++ b/projectfiles/CodeBlocks/wesnothd.cbp
@@ -47,41 +47,78 @@
 			<Add library="ws2_32" />
 			<Add library="z" />
 		</Linker>
-		<Unit filename="..\..\src\color_range.cpp" />
-		<Unit filename="..\..\src\config.cpp" />
-		<Unit filename="..\..\src\filesystem.cpp" />
-		<Unit filename="..\..\src\game_config.cpp" />
-		<Unit filename="..\..\src\gettext.cpp" />
-		<Unit filename="..\..\src\loadscreen_empty.cpp" />
-		<Unit filename="..\..\src\log.cpp" />
-		<Unit filename="..\..\src\network.cpp" />
-		<Unit filename="..\..\src\network_worker.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\server\ban.cpp" />
-		<Unit filename="..\..\src\server\forum_user_handler.cpp" />
-		<Unit filename="..\..\src\server\game.cpp" />
-		<Unit filename="..\..\src\server\input_stream.cpp" />
-		<Unit filename="..\..\src\server\jwsmtp\base64.cpp" />
-		<Unit filename="..\..\src\server\jwsmtp\compat.cpp" />
-		<Unit filename="..\..\src\server\jwsmtp\mailer.cpp" />
-		<Unit filename="..\..\src\server\mail.cpp" />
-		<Unit filename="..\..\src\server\metrics.cpp" />
-		<Unit filename="..\..\src\server\player.cpp" />
-		<Unit filename="..\..\src\server\proxy.cpp" />
-		<Unit filename="..\..\src\server\sample_user_handler.cpp" />
-		<Unit filename="..\..\src\server\server.cpp" />
-		<Unit filename="..\..\src\server\simple_wml.cpp" />
-		<Unit filename="..\..\src\server\user_handler.cpp" />
-		<Unit filename="..\..\src\thread.cpp" />
-		<Unit filename="..\..\src\time.cpp" />
-		<Unit filename="..\..\src\tstring.cpp" />
-		<Unit filename="..\..\src\util.cpp" />
-		<Unit filename="..\..\src\version.cpp" />
+		<Unit filename="../../src/about.hpp" />
+		<Unit filename="../../src/color_range.cpp" />
+		<Unit filename="../../src/config.cpp" />
+		<Unit filename="../../src/config.hpp" />
+		<Unit filename="../../src/filesystem.cpp" />
+		<Unit filename="../../src/filesystem.hpp" />
+		<Unit filename="../../src/filesystem_win32.ii" />
+		<Unit filename="../../src/game_config.cpp" />
+		<Unit filename="../../src/game_config.hpp" />
+		<Unit filename="../../src/gettext.cpp" />
+		<Unit filename="../../src/gettext.hpp" />
+		<Unit filename="../../src/global.hpp" />
+		<Unit filename="../../src/loadscreen.hpp" />
+		<Unit filename="../../src/loadscreen_empty.cpp" />
+		<Unit filename="../../src/log.cpp" />
+		<Unit filename="../../src/log.hpp" />
+		<Unit filename="../../src/map.hpp" />
+		<Unit filename="../../src/network.cpp" />
+		<Unit filename="../../src/network.hpp" />
+		<Unit filename="../../src/network_worker.cpp" />
+		<Unit filename="../../src/network_worker.hpp" />
+		<Unit filename="../../src/scoped_resource.hpp" />
+		<Unit filename="../../src/serialization/binary_or_text.cpp" />
+		<Unit filename="../../src/serialization/binary_or_text.hpp" />
+		<Unit filename="../../src/serialization/binary_wml.cpp" />
+		<Unit filename="../../src/serialization/binary_wml.hpp" />
+		<Unit filename="../../src/serialization/parser.cpp" />
+		<Unit filename="../../src/serialization/parser.hpp" />
+		<Unit filename="../../src/serialization/preprocessor.cpp" />
+		<Unit filename="../../src/serialization/preprocessor.hpp" />
+		<Unit filename="../../src/serialization/string_utils.cpp" />
+		<Unit filename="../../src/serialization/string_utils.hpp" />
+		<Unit filename="../../src/serialization/tokenizer.cpp" />
+		<Unit filename="../../src/server/ban.cpp" />
+		<Unit filename="../../src/server/ban.hpp" />
+		<Unit filename="../../src/server/forum_user_handler.cpp" />
+		<Unit filename="../../src/server/forum_user_handler.hpp" />
+		<Unit filename="../../src/server/game.cpp" />
+		<Unit filename="../../src/server/game.hpp" />
+		<Unit filename="../../src/server/input_stream.cpp" />
+		<Unit filename="../../src/server/input_stream.hpp" />
+		<Unit filename="../../src/server/jwsmtp/base64.cpp" />
+		<Unit filename="../../src/server/jwsmtp/base64.h" />
+		<Unit filename="../../src/server/jwsmtp/compat.cpp" />
+		<Unit filename="../../src/server/jwsmtp/compat.h" />
+		<Unit filename="../../src/server/jwsmtp/mailer.cpp" />
+		<Unit filename="../../src/server/jwsmtp/mailer.h" />
+		<Unit filename="../../src/server/mail.cpp" />
+		<Unit filename="../../src/server/metrics.cpp" />
+		<Unit filename="../../src/server/metrics.hpp" />
+		<Unit filename="../../src/server/player.cpp" />
+		<Unit filename="../../src/server/player.hpp" />
+		<Unit filename="../../src/server/proxy.cpp" />
+		<Unit filename="../../src/server/proxy.hpp" />
+		<Unit filename="../../src/server/sample_user_handler.cpp" />
+		<Unit filename="../../src/server/sample_user_handler.hpp" />
+		<Unit filename="../../src/server/server.cpp" />
+		<Unit filename="../../src/server/simple_wml.cpp" />
+		<Unit filename="../../src/server/simple_wml.hpp" />
+		<Unit filename="../../src/server/user_handler.cpp" />
+		<Unit filename="../../src/server/user_handler.hpp" />
+		<Unit filename="../../src/thread.cpp" />
+		<Unit filename="../../src/thread.hpp" />
+		<Unit filename="../../src/time.cpp" />
+		<Unit filename="../../src/time.hpp" />
+		<Unit filename="../../src/tstring.cpp" />
+		<Unit filename="../../src/tstring.hpp" />
+		<Unit filename="../../src/util.cpp" />
+		<Unit filename="../../src/util.hpp" />
+		<Unit filename="../../src/version.cpp" />
+		<Unit filename="../../src/version.hpp" />
+		<Unit filename="../../src/wesconfig.h" />
 		<Extensions>
 			<code_completion />
 			<debugger />
diff --git a/projectfiles/Dev-C++/wesnoth.dev b/projectfiles/Dev-C++/wesnoth.dev
index f82f2c511f7..00d7ae464e8 100644
--- a/projectfiles/Dev-C++/wesnoth.dev
+++ b/projectfiles/Dev-C++/wesnoth.dev
@@ -11,7 +11,7 @@ ResourceIncludes=..\..\packaging\windows
 MakeIncludes=
 Compiler=_@@_
 CppCompiler=-DHAVE_PYTHON_@@_-DUSE_GZIP_@@_-DHAVE_FRIBIDI_@@_-DDISABLE_POOL_ALLOC_@@_-mthreads_@@_-march=native_@@_-fexceptions_@@_-O3_@@__@@__@@__@@__@@__@@_
-Linker=-lmingwthrd_@@_-lmingw32_@@_-mthreads_@@_-lSDLmain _@@_-lSDL _@@_-lSDL_image _@@_-lSDL_net _@@_-lSDL_mixer _@@_-lSDL_ttf_@@_-lfreetype _@@_-lintl _@@_-lpython25_@@_-lpng_@@_-lboost_iostreams_dw2_@@_-lboost_regex_dw2_@@_-lz_@@_-lws2_32_@@_-ljpeg_@@_-lfribidi_@@_-lpango-1.0_@@_-lpangocairo-1.0_@@_-lcairo_@@_-lgobject-2.0_@@_-lfontconfig_@@_
+Linker=-lmingwthrd_@@_-lmingw32_@@_-mthreads_@@_-lSDLmain _@@_-lSDL _@@_-lSDL_image _@@_-lSDL_net _@@_-lSDL_mixer _@@_-lSDL_ttf_@@_-lfreetype _@@_-lintl _@@_-lpython25_@@_-lpng_@@_-lboost_iostreams_dw2_@@_-lboost_regex_dw2_@@_-lz_@@_-lws2_32_@@_-ljpeg_@@_-lfribidi_@@_-lpango-1.0_@@_-lpangocairo-1.0_@@_-lcairo_@@_-lgobject-2.0_@@_-lfontconfig_@@_-lglib-2.0_@@_
 IsCpp=1
 Icon=
 ExeOutput=..\..
diff --git a/projectfiles/Dev-C++/wesnothd.dev b/projectfiles/Dev-C++/wesnothd.dev
index fc43c9ab0db..b5b4948134e 100644
--- a/projectfiles/Dev-C++/wesnothd.dev
+++ b/projectfiles/Dev-C++/wesnothd.dev
@@ -2242,7 +2242,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit35]
-FileName=..\..\src\server\forum_user_handler.cpp
+FileName=..\..\src\server\sample_user_handler.cpp
 CompileCpp=1
 Folder=wesnothd
 Compile=1
@@ -2530,3 +2530,14 @@ Link=1
 Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
+
+[Unit34]
+FileName=..\..\src\server\forum_user_handler.cpp
+CompileCpp=1
+Folder=wesnothd
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
diff --git a/projectfiles/VC9/wesnoth.vcproj b/projectfiles/VC9/wesnoth.vcproj
index 04da810c6fe..483d6b79c4e 100644
--- a/projectfiles/VC9/wesnoth.vcproj
+++ b/projectfiles/VC9/wesnoth.vcproj
@@ -61,7 +61,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libintl.lib SDL.lib SDL_image.lib SDL_ttf.lib SDL_mixer.lib SDL_net.lib cairo.lib winmm.lib ws2_32.lib jpeg.lib libpng.lib libogg.lib libvorbisfile.lib SDLmain.lib pango-1.0.lib pangocairo-1.0.lib freetype.lib gobject-2.0.lib python26.lib"
+				AdditionalDependencies="libintl.lib SDL.lib SDL_image.lib SDL_ttf.lib SDL_mixer.lib SDL_net.lib cairo.lib winmm.lib ws2_32.lib jpeg.lib libpng.lib libogg.lib libvorbisfile.lib SDLmain.lib pango-1.0.lib pangocairo-1.0.lib freetype.lib gobject-2.0.lib python26.lib libglib-2.0.lib"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="true"
@@ -140,7 +140,7 @@
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
 				LinkLibraryDependencies="false"
-				AdditionalDependencies="libintl.lib SDL.lib SDL_image.lib SDL_ttf.lib SDL_mixer.lib SDL_net.lib cairo.lib winmm.lib ws2_32.lib jpeg.lib libpng.lib libogg.lib libvorbisfile.lib SDLmain.lib pango-1.0.lib pangocairo-1.0.lib freetype.lib gobject-2.0.lib python26.lib"
+				AdditionalDependencies="libintl.lib SDL.lib SDL_image.lib SDL_ttf.lib SDL_mixer.lib SDL_net.lib cairo.lib winmm.lib ws2_32.lib jpeg.lib libpng.lib libogg.lib libvorbisfile.lib SDLmain.lib pango-1.0.lib pangocairo-1.0.lib freetype.lib gobject-2.0.lib python26.lib glib-2.0.lib"
 				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -2087,18 +2087,719 @@
 				>
 			</File>
 		</Filter>
-		<File
-			RelativePath="..\..\src\animated.i"
+		<Filter
+			Name="Header Files"
+			Filter="hpp;h"
 			>
-		</File>
-		<File
-			RelativePath="..\..\src\filesystem_win32.ii"
+			<File
+				RelativePath="..\..\src\about.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\actions.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\addon_checks.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\addon_management.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\ai.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\ai2.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\ai_dfool.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\ai_python.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\animated.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\array.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\asserts.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\astarnode.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\attack_prediction.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\attack_prediction_display.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\builder.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\callable_objects.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\cavegen.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\clipboard.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\config.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\config_adapter.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\config_cache.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\construct_dialog.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\controller_base.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\cursor.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\dialogs.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\display.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\events.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\filechooser.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\filesystem.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\floating_textbox.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\font.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\foreach.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\formatter.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\formula.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\formula_ai.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\formula_callable.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\formula_function.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\formula_string_utils.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\formula_tokenizer.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\game_config.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\game_display.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\game_end_exceptions.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\game_errors.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\game_events.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\game_preferences.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\gamestatus.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\generic_event.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\gettext.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\global.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\halo.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\help.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\hotkeys.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\image.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\image_function.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\intro.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\key.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\language.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\leader_list.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\loadscreen.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\log.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\map.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\map_create.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\map_exception.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\map_label.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\map_utils.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\mapgen.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\mapgen_dialog.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\marked-up_text.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\md5.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\menu_events.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\minimap.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\mouse_events.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\mouse_handler_base.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\multiplayer.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\multiplayer_connect.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\multiplayer_create.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\multiplayer_lobby.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\multiplayer_ui.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\multiplayer_wait.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\network.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\network_worker.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\pathfind.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\pathutils.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\play_controller.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\playcampaign.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\playmp_controller.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\playsingle_controller.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\playturn.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\portrait.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\preferences.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\preferences_display.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\race.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\random.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\replay.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\replay_controller.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\reports.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\scoped_resource.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\sdl_utils.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\settings.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\sha1.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\show_dialog.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\sound.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\soundsource.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\statistics.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\statistics_dialog.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\team.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\terrain.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\terrain_filter.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\terrain_translation.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\text.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\theme.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\thread.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\time_of_day.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\titlescreen.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\tooltips.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\tstring.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\unit.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\unit_abilities.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\unit_display.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\unit_frame.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\unit_id.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\unit_types.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\upload_log.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\util.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\variable.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\version.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\video.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\wesconfig.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\wml_exception.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\wml_separators.hpp"
+				>
+			</File>
+			<Filter
+				Name="Editor2"
+				>
+				<File
+					RelativePath="..\..\src\editor2\action.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\editor2\action_base.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\editor2\brush.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\editor2\editor_common.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\editor2\editor_controller.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\editor2\editor_display.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\editor2\editor_layout.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\editor2\editor_main.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\editor2\editor_map.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\editor2\editor_palettes.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\editor2\map_context.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\editor2\map_fragment.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\editor2\mouse_action.hpp"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Gui"
+				>
+				<Filter
+					Name="Dialogs"
+					>
+					<File
+						RelativePath="..\..\src\gui\dialogs\addon_connect.hpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\gui\dialogs\language_selection.hpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\gui\dialogs\message.hpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\gui\dialogs\mp_cmd_wrapper.hpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\gui\dialogs\mp_connect.hpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\gui\dialogs\mp_create_game.hpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\gui\dialogs\mp_method_selection.hpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\gui\dialogs\title_screen.hpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\gui\dialogs\wml_message.hpp"
+						>
+					</File>
+				</Filter>
+				<Filter
+					Name="Widgets"
+					>
+					<File
+						RelativePath="..\..\src\gui\widgets\control.hpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\gui\widgets\debug.hpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\gui\widgets\helper.hpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\gui\widgets\settings.hpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\gui\widgets\window.hpp"
+						>
+					</File>
+				</Filter>
+			</Filter>
+			<Filter
+				Name="Serialization"
+				>
+				<File
+					RelativePath="..\..\src\serialization\binary_or_text.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\serialization\binary_wml.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\serialization\parser.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\serialization\preprocessor.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\serialization\string_utils.hpp"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Widgets"
+				>
+				<File
+					RelativePath="..\..\src\widgets\combo.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\widgets\file_menu.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\widgets\menu.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\widgets\progressbar.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\widgets\slider.hpp"
+					>
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="Others"
 			>
-		</File>
-		<File
-			RelativePath="..\..\src\language_win32.ii"
-			>
-		</File>
+			<File
+				RelativePath="..\..\src\animated.i"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\filesystem_win32.ii"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\language_win32.ii"
+				>
+			</File>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/projectfiles/VC9/wesnothd.vcproj b/projectfiles/VC9/wesnothd.vcproj
index 3cd5d2b276c..c6d5da9e025 100644
--- a/projectfiles/VC9/wesnothd.vcproj
+++ b/projectfiles/VC9/wesnothd.vcproj
@@ -230,323 +230,493 @@
 				RelativePath="..\..\src\version.cpp"
 				>
 			</File>
+			<Filter
+				Name="Serialization"
+				>
+				<File
+					RelativePath="..\..\src\serialization\binary_or_text.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\Serialization\"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\Serialization\"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\src\serialization\binary_wml.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\Serialization\"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\Serialization\"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\src\serialization\parser.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\Serialization\"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\Serialization\"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\src\serialization\preprocessor.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\Serialization\"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\Serialization\"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\src\serialization\string_utils.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\Serialization\"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\Serialization\"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\src\serialization\tokenizer.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\Serialization\"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\Serialization\"
+						/>
+					</FileConfiguration>
+				</File>
+			</Filter>
+			<Filter
+				Name="Server"
+				>
+				<File
+					RelativePath="..\..\src\server\ban.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\Server\"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\Server\"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\src\server\forum_user_handler.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\server\game.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\Server\"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\Server\"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\src\server\input_stream.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\Server\"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\Server\"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\src\server\mail.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\server\metrics.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\Server\"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\Server\"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\src\server\player.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\Server\"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\Server\"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\src\server\proxy.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\Server\"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\Server\"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\src\server\server.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\Server\"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\Server\"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\src\server\simple_wml.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\Server\"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\Server\"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\src\server\user_handler.cpp"
+					>
+				</File>
+				<Filter
+					Name="jwsmtp"
+					>
+					<File
+						RelativePath="..\..\src\server\jwsmtp\base64.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\server\jwsmtp\compat.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\server\jwsmtp\mailer.cpp"
+						>
+					</File>
+				</Filter>
+			</Filter>
 		</Filter>
 		<Filter
-			Name="Serialization"
+			Name="Header Files"
+			Filter="hpp;h"
 			>
 			<File
-				RelativePath="..\..\src\serialization\binary_or_text.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\Serialization\"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\Serialization\"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\serialization\binary_wml.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\Serialization\"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\Serialization\"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\serialization\parser.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\Serialization\"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\Serialization\"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\serialization\preprocessor.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\Serialization\"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\Serialization\"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\serialization\string_utils.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\Serialization\"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\Serialization\"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\serialization\tokenizer.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\Serialization\"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\Serialization\"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Server"
-			>
-			<File
-				RelativePath="..\..\src\server\ban.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\Server\"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\Server\"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\server\forum_user_handler.cpp"
+				RelativePath="..\..\src\about.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\server\game.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\Server\"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\Server\"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\server\input_stream.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\Server\"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\Server\"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\server\mail.cpp"
+				RelativePath="..\..\src\config.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\server\metrics.cpp"
+				RelativePath="..\..\src\filesystem.hpp"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\Server\"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\Server\"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\src\server\player.cpp"
+				RelativePath="..\..\src\game_config.hpp"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\Server\"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\Server\"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\src\server\proxy.cpp"
+				RelativePath="..\..\src\gettext.hpp"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\Server\"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\Server\"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\src\server\server.cpp"
+				RelativePath="..\..\src\global.hpp"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\Server\"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\Server\"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\src\server\simple_wml.cpp"
+				RelativePath="..\..\src\loadscreen.hpp"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\Server\"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\Server\"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\src\server\user_handler.cpp"
+				RelativePath="..\..\src\log.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\map.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\network.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\network_worker.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\scoped_resource.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\thread.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\time.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\tstring.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\util.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\version.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\wesconfig.h"
 				>
 			</File>
 			<Filter
-				Name="jwsmtp"
+				Name="Server"
 				>
 				<File
-					RelativePath="..\..\src\server\jwsmtp\base64.cpp"
+					RelativePath="..\..\src\server\ban.hpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\src\server\jwsmtp\compat.cpp"
+					RelativePath="..\..\src\server\forum_user_handler.hpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\src\server\jwsmtp\mailer.cpp"
+					RelativePath="..\..\src\server\game.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\server\input_stream.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\server\metrics.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\server\player.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\server\proxy.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\server\sample_user_handler.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\server\simple_wml.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\server\user_handler.hpp"
+					>
+				</File>
+				<Filter
+					Name="Jwsmtp"
+					>
+					<File
+						RelativePath="..\..\src\server\jwsmtp\base64.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\server\jwsmtp\compat.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\server\jwsmtp\mailer.h"
+						>
+					</File>
+				</Filter>
+			</Filter>
+			<Filter
+				Name="Serialization"
+				>
+				<File
+					RelativePath="..\..\src\serialization\binary_or_text.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\serialization\binary_wml.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\serialization\parser.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\serialization\preprocessor.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\serialization\string_utils.hpp"
 					>
 				</File>
 			</Filter>
 		</Filter>
+		<Filter
+			Name="Others"
+			Filter="ii;i"
+			>
+			<File
+				RelativePath="..\..\src\filesystem_win32.ii"
+				>
+			</File>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>