diff --git a/projectfiles/CodeBlocks/wesnoth.cbp b/projectfiles/CodeBlocks/wesnoth.cbp
index 22f1e35a818..02382b409c9 100644
--- a/projectfiles/CodeBlocks/wesnoth.cbp
+++ b/projectfiles/CodeBlocks/wesnoth.cbp
@@ -860,14 +860,14 @@
 		<Unit filename="../../src/hotkey/command_executor.hpp" />
 		<Unit filename="../../src/hotkey/hotkey_command.cpp" />
 		<Unit filename="../../src/hotkey/hotkey_command.hpp" />
+		<Unit filename="../../src/hotkey/hotkey_handler.cpp" />
+		<Unit filename="../../src/hotkey/hotkey_handler.hpp" />
 		<Unit filename="../../src/hotkey/hotkey_handler_mp.cpp" />
 		<Unit filename="../../src/hotkey/hotkey_handler_mp.hpp" />
 		<Unit filename="../../src/hotkey/hotkey_handler_replay.cpp" />
 		<Unit filename="../../src/hotkey/hotkey_handler_replay.hpp" />
 		<Unit filename="../../src/hotkey/hotkey_handler_sp.cpp" />
 		<Unit filename="../../src/hotkey/hotkey_handler_sp.hpp" />
-		<Unit filename="../../src/hotkey/hotkey_handler.cpp" />
-		<Unit filename="../../src/hotkey/hotkey_handler.hpp" />
 		<Unit filename="../../src/hotkey/hotkey_item.cpp" />
 		<Unit filename="../../src/hotkey/hotkey_item.hpp" />
 		<Unit filename="../../src/hotkey/hotkey_manager.cpp" />
@@ -923,13 +923,13 @@
 		<Unit filename="../../src/lua/lzio.h" />
 		<Unit filename="../../src/lua_jailbreak_exception.cpp" />
 		<Unit filename="../../src/lua_jailbreak_exception.hpp" />
-		<Unit filename="../../src/map/map.cpp" />
-		<Unit filename="../../src/map/map.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/location.hpp" />
+		<Unit filename="../../src/map/map.cpp" />
+		<Unit filename="../../src/map/map.hpp" />
 		<Unit filename="../../src/map/utils.hpp" />
 		<Unit filename="../../src/marked-up_text.cpp" />
 		<Unit filename="../../src/marked-up_text.hpp" />
@@ -1132,12 +1132,12 @@
 		<Unit filename="../../src/team.hpp" />
 		<Unit filename="../../src/teambuilder.cpp" />
 		<Unit filename="../../src/teambuilder.hpp" />
-		<Unit filename="../../src/terrain/terrain.cpp" />
-		<Unit filename="../../src/terrain/terrain.hpp" />
 		<Unit filename="../../src/terrain/builder.cpp" />
 		<Unit filename="../../src/terrain/builder.hpp" />
 		<Unit filename="../../src/terrain/filter.cpp" />
 		<Unit filename="../../src/terrain/filter.hpp" />
+		<Unit filename="../../src/terrain/terrain.cpp" />
+		<Unit filename="../../src/terrain/terrain.hpp" />
 		<Unit filename="../../src/terrain/translation.cpp" />
 		<Unit filename="../../src/terrain/translation.hpp" />
 		<Unit filename="../../src/terrain/type_data.cpp" />
@@ -1160,8 +1160,6 @@
 		<Unit filename="../../src/tracer.hpp" />
 		<Unit filename="../../src/tstring.cpp" />
 		<Unit filename="../../src/tstring.hpp" />
-		<Unit filename="../../src/units/unit.cpp" />
-		<Unit filename="../../src/units/unit.hpp" />
 		<Unit filename="../../src/units/abilities.cpp" />
 		<Unit filename="../../src/units/abilities.hpp" />
 		<Unit filename="../../src/units/animation.cpp" />
@@ -1170,8 +1168,6 @@
 		<Unit filename="../../src/units/animation_component.hpp" />
 		<Unit filename="../../src/units/attack_type.cpp" />
 		<Unit filename="../../src/units/attack_type.hpp" />
-		<Unit filename="../../src/units/udisplay.cpp" />
-		<Unit filename="../../src/units/udisplay.hpp" />
 		<Unit filename="../../src/units/drawer.cpp" />
 		<Unit filename="../../src/units/drawer.hpp" />
 		<Unit filename="../../src/units/filter.cpp" />
@@ -1189,6 +1185,10 @@
 		<Unit filename="../../src/units/ptr.hpp" />
 		<Unit filename="../../src/units/types.cpp" />
 		<Unit filename="../../src/units/types.hpp" />
+		<Unit filename="../../src/units/udisplay.cpp" />
+		<Unit filename="../../src/units/udisplay.hpp" />
+		<Unit filename="../../src/units/unit.cpp" />
+		<Unit filename="../../src/units/unit.hpp" />
 		<Unit filename="../../src/util.cpp" />
 		<Unit filename="../../src/util.hpp" />
 		<Unit filename="../../src/utils/boost_function_guarded.hpp" />
@@ -1206,8 +1206,6 @@
 		<Unit filename="../../src/variable.hpp" />
 		<Unit filename="../../src/variable_info.cpp" />
 		<Unit filename="../../src/variable_info.hpp" />
-		<Unit filename="../../src/variant.cpp" />
-		<Unit filename="../../src/variant.hpp" />
 		<Unit filename="../../src/version.cpp" />
 		<Unit filename="../../src/version.hpp" />
 		<Unit filename="../../src/video.cpp" />