diff --git a/CataclysmWin.cbp b/CataclysmWin.cbp
index a5b6a2953240f..e93e2ac57c368 100644
--- a/CataclysmWin.cbp
+++ b/CataclysmWin.cbp
@@ -333,339 +333,10 @@
 			<Add before='cmd /c for /F &quot;tokens=*&quot; %%i in (&apos;git describe --tags --always --dirty&apos;) do echo #define VERSION &quot;%%i&quot; &gt;  src/version.h' />
 			<Mode after="always" />
 		</ExtraCommands>
-		<Unit filename="src/action.cpp" />
-		<Unit filename="src/action.h" />
-		<Unit filename="src/active_item_cache.cpp" />
-		<Unit filename="src/active_item_cache.h" />
-		<Unit filename="src/activity_handlers.cpp" />
-		<Unit filename="src/activity_handlers.h" />
-		<Unit filename="src/activity_item_handling.cpp" />
-		<Unit filename="src/addiction.cpp" />
-		<Unit filename="src/addiction.h" />
-		<Unit filename="src/advanced_inv.cpp" />
-		<Unit filename="src/advanced_inv.h" />
-		<Unit filename="src/ammo.cpp" />
-		<Unit filename="src/ammo.h" />
-		<Unit filename="src/animation.cpp" />
-		<Unit filename="src/armor_layers.cpp" />
-		<Unit filename="src/artifact.cpp" />
-		<Unit filename="src/artifact.h" />
-		<Unit filename="src/auto_pickup.cpp" />
-		<Unit filename="src/auto_pickup.h" />
-		<Unit filename="src/basecamp.cpp" />
-		<Unit filename="src/basecamp.h" />
-		<Unit filename="src/bionics.cpp" />
-		<Unit filename="src/bionics.h" />
-		<Unit filename="src/bionics_ui.cpp" />
-		<Unit filename="src/bodypart.cpp" />
-		<Unit filename="src/bodypart.h" />
-		<Unit filename="src/bonuses.cpp" />
-		<Unit filename="src/bonuses.h" />
-		<Unit filename="src/calendar.cpp" />
-		<Unit filename="src/calendar.h" />
-		<Unit filename="src/cata_tiles.cpp" />
-		<Unit filename="src/cata_tiles.h" />
-		<Unit filename="src/cata_utility.cpp" />
-		<Unit filename="src/cata_utility.h" />
-		<Unit filename="src/catacharset.cpp" />
-		<Unit filename="src/catacharset.h" />
-		<Unit filename="src/catacurse.h" />
-		<Unit filename="src/catalua.cpp" />
-		<Unit filename="src/catalua.h" />
-		<Unit filename="src/char_validity_check.cpp" />
-		<Unit filename="src/char_validity_check.h" />
-		<Unit filename="src/character.cpp" />
-		<Unit filename="src/character.h" />
-		<Unit filename="src/clzones.cpp" />
-		<Unit filename="src/clzones.h" />
-		<Unit filename="src/color.cpp" />
-		<Unit filename="src/color.h" />
-		<Unit filename="src/compatibility.h" />
-		<Unit filename="src/computer.cpp" />
-		<Unit filename="src/computer.h" />
-		<Unit filename="src/construction.cpp" />
-		<Unit filename="src/construction.h" />
-		<Unit filename="src/consumption.cpp" />
-		<Unit filename="src/coordinate_conversions.cpp" />
-		<Unit filename="src/coordinate_conversions.h" />
-		<Unit filename="src/coordinates.h" />
-		<Unit filename="src/copyable_unique_ptr.h" />
-		<Unit filename="src/craft_command.cpp" />
-		<Unit filename="src/craft_command.h" />
-		<Unit filename="src/crafting.cpp" />
-		<Unit filename="src/crafting.h" />
-		<Unit filename="src/crafting_gui.cpp" />
-		<Unit filename="src/crafting_gui.h" />
-		<Unit filename="src/creature.cpp" />
-		<Unit filename="src/creature.h" />
-		<Unit filename="src/creature_tracker.cpp" />
-		<Unit filename="src/creature_tracker.h" />
-		<Unit filename="src/cursesdef.h" />
-		<Unit filename="src/cursesport.cpp" />
-		<Unit filename="src/damage.cpp" />
-		<Unit filename="src/damage.h" />
-		<Unit filename="src/debug.cpp" />
-		<Unit filename="src/debug.h" />
-		<Unit filename="src/defense.cpp" />
-		<Unit filename="src/dependency_tree.cpp" />
-		<Unit filename="src/dependency_tree.h" />
-		<Unit filename="src/dialogue.h" />
-		<Unit filename="src/drawing_primitives.cpp" />
-		<Unit filename="src/drawing_primitives.h" />
-		<Unit filename="src/dump.cpp" />
-		<Unit filename="src/editmap.cpp" />
-		<Unit filename="src/explosion.cpp" />
-		<Unit filename="src/editmap.h" />
-		<Unit filename="src/effect.cpp" />
-		<Unit filename="src/effect.h" />
-		<Unit filename="src/explosion.h" />
-		<Unit filename="src/enums.h" />
-		<Unit filename="src/event.cpp" />
-		<Unit filename="src/event.h" />
-		<Unit filename="src/faction.cpp" />
-		<Unit filename="src/faction.h" />
-		<Unit filename="src/fault.cpp" />
-		<Unit filename="src/fault.h" />
-		<Unit filename="src/field.cpp" />
-		<Unit filename="src/field.h" />
-		<Unit filename="src/filesystem.cpp" />
-		<Unit filename="src/filesystem.h" />
-		<Unit filename="src/fire.h" />
-		<Unit filename="src/game.cpp" />
-		<Unit filename="src/game.h" />
-		<Unit filename="src/game_constants.h" />
-		<Unit filename="src/game_inventory.cpp" />
-		<Unit filename="src/gamemode.cpp" />
-		<Unit filename="src/gamemode.h" />
-		<Unit filename="src/gates.cpp" />
-		<Unit filename="src/gates.h" />
-		<Unit filename="src/generic_factory.h" />
-		<Unit filename="src/get_version.h" />
-		<Unit filename="src/help.cpp" />
-		<Unit filename="src/help.h" />
-		<Unit filename="src/iexamine.cpp" />
-		<Unit filename="src/iexamine.h" />
-		<Unit filename="src/init.cpp" />
-		<Unit filename="src/init.h" />
-		<Unit filename="src/input.cpp" />
-		<Unit filename="src/input.h" />
-		<Unit filename="src/inventory.cpp" />
-		<Unit filename="src/inventory.h" />
-		<Unit filename="src/inventory_ui.cpp" />
-		<Unit filename="src/inventory_ui.h" />
-		<Unit filename="src/item.cpp" />
-		<Unit filename="src/item.h" />
-		<Unit filename="src/item_action.cpp" />
-		<Unit filename="src/item_action.h" />
-		<Unit filename="src/item_factory.cpp" />
-		<Unit filename="src/item_factory.h" />
-		<Unit filename="src/item_group.cpp" />
-		<Unit filename="src/item_group.h" />
-		<Unit filename="src/item_location.cpp" />
-		<Unit filename="src/item_location.h" />
-		<Unit filename="src/item_stack.h" />
-		<Unit filename="src/itype.cpp" />
-		<Unit filename="src/itype.h" />
-		<Unit filename="src/iuse.cpp" />
-		<Unit filename="src/iuse.h" />
-		<Unit filename="src/iuse_actor.cpp" />
-		<Unit filename="src/iuse_actor.h" />
-		<Unit filename="src/iuse_software.cpp" />
-		<Unit filename="src/iuse_software.h" />
-		<Unit filename="src/iuse_software_kitten.cpp" />
-		<Unit filename="src/iuse_software_kitten.h" />
-		<Unit filename="src/iuse_software_minesweeper.cpp" />
-		<Unit filename="src/iuse_software_minesweeper.h" />
-		<Unit filename="src/iuse_software_snake.cpp" />
-		<Unit filename="src/iuse_software_snake.h" />
-		<Unit filename="src/iuse_software_sokoban.cpp" />
-		<Unit filename="src/iuse_software_sokoban.h" />
-		<Unit filename="src/json.cpp" />
-		<Unit filename="src/json.h" />
-		<Unit filename="src/lightmap.cpp" />
-		<Unit filename="src/lightmap.h" />
-		<Unit filename="src/line.cpp" />
-		<Unit filename="src/line.h" />
-		<Unit filename="src/live_view.cpp" />
-		<Unit filename="src/live_view.h" />
-		<Unit filename="src/lua_console.cpp" />
-		<Unit filename="src/lua_console.h" />
-		<Unit filename="src/main.cpp" />
-		<Unit filename="src/main_menu.cpp" />
-		<Unit filename="src/map.cpp" />
-		<Unit filename="src/map.h" />
-		<Unit filename="src/map_selector.cpp" />
-		<Unit filename="src/map_selector.h" />
-		<Unit filename="src/mapbuffer.cpp" />
-		<Unit filename="src/mapbuffer.h" />
-		<Unit filename="src/mapdata.cpp" />
-		<Unit filename="src/mapdata.h" />
-		<Unit filename="src/mapgen.cpp" />
-		<Unit filename="src/mapgen.h" />
-		<Unit filename="src/mapgen_functions.cpp" />
-		<Unit filename="src/mapgen_functions.h" />
-		<Unit filename="src/mapgenformat.cpp" />
-		<Unit filename="src/mapgenformat.h" />
-		<Unit filename="src/mapsharing.cpp" />
-		<Unit filename="src/mapsharing.h" />
-		<Unit filename="src/martialarts.cpp" />
-		<Unit filename="src/martialarts.h" />
-		<Unit filename="src/material.cpp" />
-		<Unit filename="src/material.h" />
-		<Unit filename="src/mattack_actors.cpp" />
-		<Unit filename="src/mattack_actors.h" />
-		<Unit filename="src/melee.cpp" />
-		<Unit filename="src/messages.cpp" />
-		<Unit filename="src/messages.h" />
-		<Unit filename="src/mission.cpp" />
-		<Unit filename="src/mission.h" />
-		<Unit filename="src/mission_companion.cpp" />
-		<Unit filename="src/mission_end.cpp" />
-		<Unit filename="src/mission_fail.cpp" />
-		<Unit filename="src/mission_place.cpp" />
-		<Unit filename="src/mission_start.cpp" />
-		<Unit filename="src/missiondef.cpp" />
-		<Unit filename="src/mod_manager.cpp" />
-		<Unit filename="src/mod_manager.h" />
-		<Unit filename="src/mod_manager_ui.cpp" />
-		<Unit filename="src/monattack.cpp" />
-		<Unit filename="src/monattack.h" />
-		<Unit filename="src/mondeath.cpp" />
-		<Unit filename="src/mondeath.h" />
-		<Unit filename="src/mondefense.cpp" />
-		<Unit filename="src/mondefense.h" />
-		<Unit filename="src/monfaction.cpp" />
-		<Unit filename="src/monfaction.h" />
-		<Unit filename="src/mongroup.cpp" />
-		<Unit filename="src/mongroup.h" />
-		<Unit filename="src/monmove.cpp" />
-		<Unit filename="src/monster.cpp" />
-		<Unit filename="src/monster.h" />
-		<Unit filename="src/monstergenerator.cpp" />
-		<Unit filename="src/monstergenerator.h" />
-		<Unit filename="src/morale.cpp" />
-		<Unit filename="src/morale.h" />
-		<Unit filename="src/morale_types.h" />
-		<Unit filename="src/mtype.cpp" />
-		<Unit filename="src/mtype.h" />
-		<Unit filename="src/mutation.cpp" />
-		<Unit filename="src/mutation.h" />
-		<Unit filename="src/mutation_data.cpp" />
-		<Unit filename="src/mutation_ui.cpp" />
-		<Unit filename="src/name.cpp" />
-		<Unit filename="src/name.h" />
-		<Unit filename="src/newcharacter.cpp" />
-		<Unit filename="src/npc.cpp" />
-		<Unit filename="src/npc.h" />
-		<Unit filename="src/npc_class.cpp" />
-		<Unit filename="src/npc_class.h" />
-		<Unit filename="src/npc_favor.h" />
-		<Unit filename="src/npcmove.cpp" />
-		<Unit filename="src/npctalk.cpp" />
-		<Unit filename="src/omdata.h" />
-		<Unit filename="src/options.cpp" />
-		<Unit filename="src/options.h" />
-		<Unit filename="src/output.cpp" />
-		<Unit filename="src/output.h" />
-		<Unit filename="src/overlay_ordering.cpp" />
-		<Unit filename="src/overlay_ordering.h" />
-		<Unit filename="src/overmap.cpp" />
-		<Unit filename="src/overmap.h" />
-		<Unit filename="src/overmap_types.h" />
-		<Unit filename="src/overmapbuffer.cpp" />
-		<Unit filename="src/overmapbuffer.h" />
-		<Unit filename="src/path_info.cpp" />
-		<Unit filename="src/path_info.h" />
-		<Unit filename="src/pathfinding.cpp" />
-		<Unit filename="src/pathfinding.h" />
-		<Unit filename="src/projectile.cpp" />
-		<Unit filename="src/projectile.h" />
-		<Unit filename="src/pickup.cpp" />
-		<Unit filename="src/pickup.h" />
-		<Unit filename="src/platform_win.h" />
-		<Unit filename="src/player.cpp" />
-		<Unit filename="src/player.h" />
-		<Unit filename="src/player_activity.cpp" />
-		<Unit filename="src/player_activity.h" />
-		<Unit filename="src/pldata.h" />
-		<Unit filename="src/posix_time.cpp" />
-		<Unit filename="src/posix_time.h" />
-		<Unit filename="src/profession.cpp" />
-		<Unit filename="src/profession.h" />
-		<Unit filename="src/ranged.cpp" />
-		<Unit filename="src/recipe_dictionary.cpp" />
-		<Unit filename="src/recipe_dictionary.h" />
-		<Unit filename="src/requirements.cpp" />
-		<Unit filename="src/requirements.h" />
+		<UnitsGlob directory="src" recursive="0" />
 		<Unit filename="src/resource.rc">
 			<Option compilerVar="WINDRES" />
 		</Unit>
-		<Unit filename="src/rng.cpp" />
-		<Unit filename="src/rng.h" />
-		<Unit filename="src/savegame.cpp" />
-		<Unit filename="src/savegame_json.cpp" />
-		<Unit filename="src/savegame_legacy.cpp" />
-		<Unit filename="src/scenario.cpp" />
-		<Unit filename="src/scenario.h" />
-		<Unit filename="src/scent_map.cpp" />
-		<Unit filename="src/scent_map.h" />
-		<Unit filename="src/sdltiles.cpp" />
-		<Unit filename="src/shadowcasting.h" />
-		<Unit filename="src/simplexnoise.cpp" />
-		<Unit filename="src/simplexnoise.h" />
-		<Unit filename="src/skill.cpp" />
-		<Unit filename="src/skill.h" />
-		<Unit filename="src/sounds.cpp" />
-		<Unit filename="src/sounds.h" />
-		<Unit filename="src/speech.cpp" />
-		<Unit filename="src/speech.h" />
-		<Unit filename="src/start_location.cpp" />
-		<Unit filename="src/start_location.h" />
-		<Unit filename="src/submap.cpp" />
-		<Unit filename="src/submap.h" />
-		<Unit filename="src/text_snippets.cpp" />
-		<Unit filename="src/text_snippets.h" />
-		<Unit filename="src/tile_id_data.h" />
-		<Unit filename="src/tileray.cpp" />
-		<Unit filename="src/tileray.h" />
-		<Unit filename="src/translations.cpp" />
-		<Unit filename="src/translations.h" />
-		<Unit filename="src/trap.cpp" />
-		<Unit filename="src/trap.h" />
-		<Unit filename="src/trapfunc.cpp" />
-		<Unit filename="src/turret.cpp" />
-		<Unit filename="src/tutorial.cpp" />
-		<Unit filename="src/tutorial.h" />
-		<Unit filename="src/ui.cpp" />
-		<Unit filename="src/ui.h" />
-		<Unit filename="src/uistate.h" />
-		<Unit filename="src/veh_interact.cpp" />
-		<Unit filename="src/veh_interact.h" />
-		<Unit filename="src/veh_type.cpp" />
-		<Unit filename="src/veh_type.h" />
-		<Unit filename="src/vehicle.cpp" />
-		<Unit filename="src/vehicle.h" />
-		<Unit filename="src/vehicle_group.cpp" />
-		<Unit filename="src/vehicle_group.h" />
-		<Unit filename="src/vehicle_selector.cpp" />
-		<Unit filename="src/vehicle_selector.h" />
-		<Unit filename="src/version.cpp" />
-		<Unit filename="src/vitamin.cpp" />
-		<Unit filename="src/vitamin.h" />
-		<Unit filename="src/visitable.cpp" />
-		<Unit filename="src/visitable.h" />
-		<Unit filename="src/wcwidth.h" />
-		<Unit filename="src/wdirent.h" />
-		<Unit filename="src/weather.cpp" />
-		<Unit filename="src/weather.h" />
-		<Unit filename="src/weather_data.cpp" />
-		<Unit filename="src/weather_gen.cpp" />
-		<Unit filename="src/weather_gen.h" />
-		<Unit filename="src/weighted_list.h" />
-		<Unit filename="src/wincurse.cpp" />
-		<Unit filename="src/wish.cpp" />
-		<Unit filename="src/worldfactory.cpp" />
-		<Unit filename="src/worldfactory.h" />
 		<Extensions>
 			<code_completion />
 			<debugger />