diff --git a/projectfiles/CodeBlocks-SCons/wesnoth.cbp b/projectfiles/CodeBlocks-SCons/wesnoth.cbp
index 2c9dbe0ef39..03aeba4fe1f 100644
--- a/projectfiles/CodeBlocks-SCons/wesnoth.cbp
+++ b/projectfiles/CodeBlocks-SCons/wesnoth.cbp
@@ -146,6 +146,7 @@
+
diff --git a/projectfiles/CodeBlocks-SCons/wesnothd.cbp b/projectfiles/CodeBlocks-SCons/wesnothd.cbp
index 8d65c5f2339..7d4853ee70f 100644
--- a/projectfiles/CodeBlocks-SCons/wesnothd.cbp
+++ b/projectfiles/CodeBlocks-SCons/wesnothd.cbp
@@ -50,6 +50,7 @@
+
@@ -59,6 +60,7 @@
+
diff --git a/projectfiles/CodeBlocks/wesnoth.cbp b/projectfiles/CodeBlocks/wesnoth.cbp
index 7d68277adf2..308f9876719 100644
--- a/projectfiles/CodeBlocks/wesnoth.cbp
+++ b/projectfiles/CodeBlocks/wesnoth.cbp
@@ -177,6 +177,7 @@
+
diff --git a/projectfiles/CodeBlocks/wesnothd.cbp b/projectfiles/CodeBlocks/wesnothd.cbp
index a5e688a6996..c658d0ab59d 100644
--- a/projectfiles/CodeBlocks/wesnothd.cbp
+++ b/projectfiles/CodeBlocks/wesnothd.cbp
@@ -63,6 +63,7 @@
+
@@ -72,6 +73,7 @@
+
diff --git a/projectfiles/Dev-C++/wesnoth.dev b/projectfiles/Dev-C++/wesnoth.dev
index d2ac7374caa..f82f2c511f7 100644
--- a/projectfiles/Dev-C++/wesnoth.dev
+++ b/projectfiles/Dev-C++/wesnoth.dev
@@ -1,7 +1,7 @@
[Project]
FileName=wesnoth.dev
Name=wesnoth
-UnitCount=208
+UnitCount=209
Type=0
Ver=1
ObjFiles=
@@ -930,7 +930,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit209]
-FileName=..\..\src\loadscreen.cpp
+FileName=..\..\src\image_function.cpp
CompileCpp=1
Folder=wesnoth
Compile=1
diff --git a/projectfiles/Dev-C++/wesnothd.dev b/projectfiles/Dev-C++/wesnothd.dev
index a96b8053e4a..fc43c9ab0db 100644
--- a/projectfiles/Dev-C++/wesnothd.dev
+++ b/projectfiles/Dev-C++/wesnothd.dev
@@ -1,7 +1,7 @@
[Project]
FileName=wesnothd.dev
Name=wesnothd
-UnitCount=33
+UnitCount=35
Type=1
Ver=1
ObjFiles=
@@ -2052,7 +2052,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit36]
-FileName=..\..\src\unit_animation.cpp
+FileName=..\..\src\server\sample_user_handler.cpp
CompileCpp=1
Folder=wesnothd
Compile=1
@@ -2242,7 +2242,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit35]
-FileName=..\..\src\terrain_filter.cpp
+FileName=..\..\src\server\forum_user_handler.cpp
CompileCpp=1
Folder=wesnothd
Compile=1
@@ -2521,16 +2521,6 @@ Priority=1000
OverrideBuildCmd=0
BuildCmd=
-[Unit34]
-FileName=..\..\src\version.cpp
-CompileCpp=1
-Folder=wesnothd
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
[Unit27]
FileName=..\..\src\time.cpp
CompileCpp=1
@@ -2540,4 +2530,3 @@ Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=
-
diff --git a/projectfiles/VC9/wesnoth.vcproj b/projectfiles/VC9/wesnoth.vcproj
index 560f2fa7022..04da810c6fe 100644
--- a/projectfiles/VC9/wesnoth.vcproj
+++ b/projectfiles/VC9/wesnoth.vcproj
@@ -408,6 +408,10 @@
RelativePath="..\..\src\image.cpp"
>
+
+
@@ -712,6 +716,1366 @@
RelativePath="..\..\src\wml_exception.cpp"
>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/projectfiles/VC9/wesnothd.vcproj b/projectfiles/VC9/wesnothd.vcproj
index 801806eedbf..3cd5d2b276c 100644
--- a/projectfiles/VC9/wesnothd.vcproj
+++ b/projectfiles/VC9/wesnothd.vcproj
@@ -226,6 +226,10 @@
RelativePath="..\..\src\util.cpp"
>
+
+
-
-
+
+
@@ -418,6 +422,10 @@
/>
+
+
@@ -518,6 +526,26 @@
/>
+
+
+
+
+
+
+
+
+
+