diff --git a/projectfiles/CodeBlocks/wesnoth.cbp b/projectfiles/CodeBlocks/wesnoth.cbp
index 9b7355b1180c..ac617b1fb492 100644
--- a/projectfiles/CodeBlocks/wesnoth.cbp
+++ b/projectfiles/CodeBlocks/wesnoth.cbp
@@ -965,9 +965,9 @@
 		<Unit filename="..\..\src\serialization\validator.hpp" />
 		<Unit filename="..\..\src\settings.cpp" />
 		<Unit filename="..\..\src\settings.hpp" />
-		<Unit filename="..\..\src\sha1.cpp" />
-		<Unit filename="..\..\src\sha1.hpp" />
-		<Unit filename="..\..\src\shared_object.hpp" />
+		<Unit filename="..\..\src\utils\sha1.cpp" />
+		<Unit filename="..\..\src\utils\sha1.hpp" />
+		<Unit filename="..\..\src\utils\shared_object.hpp" />
 		<Unit filename="..\..\src\show_dialog.cpp" />
 		<Unit filename="..\..\src\show_dialog.hpp" />
 		<Unit filename="..\..\src\side_filter.cpp" />
diff --git a/projectfiles/VC9/wesnoth.vcproj b/projectfiles/VC9/wesnoth.vcproj
index 270fd9251a37..5f79bf2aff65 100644
--- a/projectfiles/VC9/wesnoth.vcproj
+++ b/projectfiles/VC9/wesnoth.vcproj
@@ -20953,15 +20953,15 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\src\sha1.cpp"
+			RelativePath="..\..\src\utils\sha1.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\src\sha1.hpp"
+			RelativePath="..\..\src\utils\sha1.hpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\src\shared_object.hpp"
+			RelativePath="..\..\src\utils\shared_object.hpp"
 			>
 		</File>
 		<File
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 47980217bf8f..cc1ab87b5555 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -874,7 +874,7 @@ set(wesnoth-main_SRC
 	scripting/lua_api.cpp
 	scripting/lua_types.cpp
 	settings.cpp
-	sha1.cpp
+	utils/sha1.cpp
 	side_filter.cpp
 	statistics.cpp
 	statistics_dialog.cpp
diff --git a/src/SConscript b/src/SConscript
index ebce20f1d912..5f0e2398967e 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -508,7 +508,6 @@ wesnoth_sources = Split("""
     scripting/lua_api.cpp
     scripting/lua_types.cpp
     settings.cpp
-    sha1.cpp
     side_filter.cpp
     statistics.cpp
     statistics_dialog.cpp
@@ -536,6 +535,7 @@ wesnoth_sources = Split("""
     unit_id.cpp
     unit_map.cpp
     unit_types.cpp
+    utils/sha1.cpp
     variable.cpp
     variant.cpp
     whiteboard/action.cpp
diff --git a/src/config_cache.cpp b/src/config_cache.cpp
index 4d422607d255..e488b31dafb1 100644
--- a/src/config_cache.cpp
+++ b/src/config_cache.cpp
@@ -22,7 +22,7 @@
 #include "log.hpp"
 #include "marked-up_text.hpp"
 #include "show_dialog.hpp"
-#include "sha1.hpp"
+#include "utils/sha1.hpp"
 #include "serialization/binary_or_text.hpp"
 #include "serialization/parser.hpp"
 #include "version.hpp"
diff --git a/src/tstring.cpp b/src/tstring.cpp
index 0844a8072bad..562a413627c2 100644
--- a/src/tstring.cpp
+++ b/src/tstring.cpp
@@ -26,6 +26,7 @@
 #include "tstring.hpp"
 #include "gettext.hpp"
 #include "log.hpp"
+#include "utils/shared_object.hpp"
 #include <boost/functional/hash.hpp>
 
 #include <boost/multi_index_container.hpp>
diff --git a/src/tstring.hpp b/src/tstring.hpp
index 06d708795592..4f2bb4f894b9 100644
--- a/src/tstring.hpp
+++ b/src/tstring.hpp
@@ -15,7 +15,7 @@
 #ifndef TSTRING_H_INCLUDED
 #define TSTRING_H_INCLUDED
 
-#include "shared_object.hpp"
+#include "utils/shared_object.hpp"
 
 #include <string>
 
diff --git a/src/sha1.cpp b/src/utils/sha1.cpp
similarity index 100%
rename from src/sha1.cpp
rename to src/utils/sha1.cpp
diff --git a/src/sha1.hpp b/src/utils/sha1.hpp
similarity index 100%
rename from src/sha1.hpp
rename to src/utils/sha1.hpp
diff --git a/src/shared_object.hpp b/src/utils/shared_object.hpp
similarity index 100%
rename from src/shared_object.hpp
rename to src/utils/shared_object.hpp