diff --git a/cl_dll/wscript b/cl_dll/wscript
index 3bc40d56..9b8c0acc 100644
--- a/cl_dll/wscript
+++ b/cl_dll/wscript
@@ -14,33 +14,88 @@ def configure(conf):
 		conf.check_cc(lib='dl')
 
 	if conf.env.DEST_OS == 'win32':
-		conf.check_cxx( lib='user32' )
+		conf.check_cxx(lib='user32')
 
 def build(bld):
 	source = bld.path.parent.ant_glob([
-		'pm_shared/*.c',
-		'dlls/crossbow.cpp', 'dlls/crowbar.cpp', 'dlls/egon.cpp', 'dlls/gauss.cpp', 'dlls/handgrenade.cpp',
-		'dlls/hornetgun.cpp', 'dlls/mp5.cpp', 'dlls/python.cpp', 'dlls/rpg.cpp', 'dlls/satchel.cpp',
-		'dlls/shotgun.cpp',	'dlls/squeakgrenade.cpp', 'dlls/tripmine.cpp', 'dlls/glock.cpp'
+		'pm_shared/*.c'
+	])
+	source += bld.path.ant_glob([
+		'hl/*.cpp'
+	])
+	source += bld.path.ant_glob([
+		'dlls/crossbow.cpp',
+		'dlls/crowbar.cpp',
+		'dlls/egon.cpp',
+		'dlls/gauss.cpp',
+		'dlls/glock.cpp',
+		'dlls/handgrenade.cpp',
+		'dlls/hornetgun.cpp',
+		'dlls/mp5.cpp',
+		'dlls/python.cpp',
+		'dlls/rpg.cpp',
+		'dlls/satchel.cpp',
+		'dlls/shotgun.cpp',
+		'dlls/squeakgrenade.cpp',
+		'dlls/tripmine.cpp'
 	])
-
-	source += bld.path.ant_glob(['hl/*.cpp'])
 	source += [
-		'ev_hldm.cpp', 'ammo.cpp', 'ammo_secondary.cpp', 'ammohistory.cpp',
-		'battery.cpp', 'cdll_int.cpp', 'com_weapons.cpp', 'death.cpp',
-		'demo.cpp', 'entity.cpp', 'ev_common.cpp', 'events.cpp',
-		'flashlight.cpp', 'GameStudioModelRenderer.cpp', 'geiger.cpp',
-		'health.cpp', 'hud.cpp', 'hud_msg.cpp', 'hud_redraw.cpp',
-		'hud_spectator.cpp', 'hud_update.cpp', 'in_camera.cpp',
-		'input.cpp', 'input_goldsource.cpp', 'input_mouse.cpp',
-		'input_xash3d.cpp', 'menu.cpp', 'message.cpp',
-		'overview.cpp', 'parsemsg.cpp', 'saytext.cpp',
-		'status_icons.cpp', 'statusbar.cpp', 'studio_util.cpp',
-		'StudioModelRenderer.cpp', 'text_message.cpp', 'train.cpp',
-		'tri.cpp', 'util.cpp', 'view.cpp', 'scoreboard.cpp', 'MOTD.cpp'
+		'GameStudioModelRenderer.cpp',
+		'MOTD.cpp',
+		'StudioModelRenderer.cpp',
+		'ammo.cpp',
+		'ammo_secondary.cpp',
+		'ammohistory.cpp',
+		'battery.cpp',
+		'cdll_int.cpp',
+		'com_weapons.cpp',
+		'death.cpp',
+		'demo.cpp',
+		'entity.cpp',
+		'ev_hldm.cpp',
+		'ev_common.cpp',
+		'events.cpp',
+		'flashlight.cpp',
+		'geiger.cpp',
+		'health.cpp',
+		'hud.cpp',
+		'hud_msg.cpp',
+		'hud_redraw.cpp',
+		'hud_spectator.cpp',
+		'hud_update.cpp',
+		'in_camera.cpp',
+		'input.cpp',
+		'input_goldsource.cpp',
+		'input_mouse.cpp',
+		'input_xash3d.cpp',
+		'menu.cpp',
+		'message.cpp',
+		'overview.cpp',
+		'parsemsg.cpp',
+		'saytext.cpp',
+		'scoreboard.cpp',
+		'status_icons.cpp',
+		'statusbar.cpp',
+		'studio_util.cpp',
+		'text_message.cpp',
+		'train.cpp',
+		'tri.cpp',
+		'util.cpp',
+		'view.cpp'
 	]
 
-	includes = Utils.to_list('. hl/ ../dlls ../dlls/wpn_shared ../common ../engine ../pm_shared ../game_shared ../public ../utils/false_vgui/include')
+	includes = [
+		'.',
+		'hl/',
+		'../dlls',
+		'../dlls/wpn_shared',
+		'../common',
+		'../engine',
+		'../pm_shared',
+		'../game_shared',
+		'../public',
+		'../utils/false_vgui/include'
+	]
 
 	defines = ['CLIENT_DLL']
 	if bld.env.GOLDSRC:
diff --git a/dlls/wscript b/dlls/wscript
index 2a469153..5f17aefc 100644
--- a/dlls/wscript
+++ b/dlls/wscript
@@ -27,28 +27,106 @@ def build(bld):
 	])
 
 	source += [
-		'agrunt.cpp', 'airtank.cpp', 'aflock.cpp', 'animating.cpp', 'animation.cpp', 'apache.cpp', 
-		'barnacle.cpp', 'barney.cpp', 'bigmomma.cpp', 'bloater.cpp', 'bmodels.cpp', 'bullsquid.cpp', 'buttons.cpp', 
-		'cbase.cpp', 'client.cpp', 'combat.cpp', 'controller.cpp', 'crossbow.cpp', 'crowbar.cpp', 
-		'defaultai.cpp', 'doors.cpp', 
-		'effects.cpp', 'egon.cpp', 'explode.cpp', 
-		'flyingmonster.cpp', 'func_break.cpp', 'func_tank.cpp', 
-		'game.cpp', 'gamerules.cpp', 'gargantua.cpp', 'gauss.cpp', 'genericmonster.cpp', 'ggrenade.cpp', 'globals.cpp', 'glock.cpp', 'gman.cpp', 
-		'h_ai.cpp', 'h_battery.cpp', 'h_cine.cpp', 'h_cycler.cpp', 'h_export.cpp', 'handgrenade.cpp', 'hassassin.cpp', 'headcrab.cpp', 
-		'healthkit.cpp', 'hgrunt.cpp', 'hornet.cpp', 'hornetgun.cpp', 'houndeye.cpp', 
-		'ichthyosaur.cpp', 'islave.cpp', 'items.cpp', 
-		'leech.cpp', 'lights.cpp', 
-		'maprules.cpp', 'monstermaker.cpp', 'monsters.cpp', 'monsterstate.cpp', 'mortar.cpp', 'mp5.cpp', 'multiplay_gamerules.cpp', 
-		'nihilanth.cpp', 'nodes.cpp', 
-		'observer.cpp', 'osprey.cpp', 
-		'pathcorner.cpp', 'plane.cpp', 'plats.cpp', 'player.cpp', 'playermonster.cpp', 'python.cpp', 
-		'rat.cpp', 'roach.cpp', 'rpg.cpp', 
-		'satchel.cpp', 'schedule.cpp', 'scientist.cpp', 'scripted.cpp', 'shotgun.cpp', 'singleplay_gamerules.cpp', 'skill.cpp', 
-		'sound.cpp', 'soundent.cpp', 'spectator.cpp', 'squadmonster.cpp', 'squeakgrenade.cpp', 'subs.cpp', 
-		'talkmonster.cpp', 'teamplay_gamerules.cpp', 'tempmonster.cpp', 'tentacle.cpp', 
-		'triggers.cpp', 'tripmine.cpp', 'turret.cpp', 
+		'agrunt.cpp',
+		'airtank.cpp',
+		'aflock.cpp',
+		'animating.cpp',
+		'animation.cpp',
+		'apache.cpp', 
+		'barnacle.cpp',
+		'barney.cpp',
+		'bigmomma.cpp',
+		'bloater.cpp',
+		'bmodels.cpp',
+		'bullsquid.cpp',
+		'buttons.cpp', 
+		'cbase.cpp',
+		'client.cpp',
+		'combat.cpp',
+		'controller.cpp',
+		'crossbow.cpp',
+		'crowbar.cpp', 
+		'defaultai.cpp',
+		'doors.cpp', 
+		'effects.cpp',
+		'egon.cpp',
+		'explode.cpp', 
+		'flyingmonster.cpp',
+		'func_break.cpp',
+		'func_tank.cpp', 
+		'game.cpp',
+		'gamerules.cpp',
+		'gargantua.cpp',
+		'gauss.cpp',
+		'genericmonster.cpp',
+		'ggrenade.cpp',
+		'globals.cpp',
+		'glock.cpp',
+		'gman.cpp', 
+		'h_ai.cpp',
+		'h_battery.cpp',
+		'h_cine.cpp',
+		'h_cycler.cpp',
+		'h_export.cpp',
+		'handgrenade.cpp',
+		'hassassin.cpp',
+		'headcrab.cpp', 
+		'healthkit.cpp',
+		'hgrunt.cpp',
+		'hornet.cpp',
+		'hornetgun.cpp',
+		'houndeye.cpp', 
+		'ichthyosaur.cpp',
+		'islave.cpp',
+		'items.cpp', 
+		'leech.cpp',
+		'lights.cpp', 
+		'maprules.cpp',
+		'monstermaker.cpp',
+		'monsters.cpp',
+		'monsterstate.cpp',
+		'mortar.cpp',
+		'mp5.cpp',
+		'multiplay_gamerules.cpp', 
+		'nihilanth.cpp',
+		'nodes.cpp', 
+		'observer.cpp',
+		'osprey.cpp', 
+		'pathcorner.cpp',
+		'plane.cpp',
+		'plats.cpp',
+		'player.cpp',
+		'playermonster.cpp',
+		'python.cpp', 
+		'rat.cpp',
+		'roach.cpp',
+		'rpg.cpp', 
+		'satchel.cpp',
+		'schedule.cpp',
+		'scientist.cpp',
+		'scripted.cpp',
+		'shotgun.cpp',
+		'singleplay_gamerules.cpp',
+		'skill.cpp', 
+		'sound.cpp',
+		'soundent.cpp',
+		'spectator.cpp',
+		'squadmonster.cpp',
+		'squeakgrenade.cpp',
+		'subs.cpp', 
+		'talkmonster.cpp',
+		'teamplay_gamerules.cpp',
+		'tempmonster.cpp',
+		'tentacle.cpp', 
+		'triggers.cpp',
+		'tripmine.cpp',
+		'turret.cpp', 
 		'util.cpp', 
-		'weapons.cpp', 'world.cpp', 'xen.cpp', 'zombie.cpp']
+		'weapons.cpp',
+		'world.cpp',
+		'xen.cpp',
+		'zombie.cpp'
+	]
 
 	if bld.env.VOICEMGR:
 		source += bld.path.parent.ant_glob([
@@ -57,7 +135,15 @@ def build(bld):
 	else:
 		defines += ['NO_VOICEGAMEMGR']
 
-	includes = Utils.to_list('. wpn_shared ../common ../engine ../pm_shared ../game_shared ../public')
+	includes = [
+		'.',
+		'wpn_shared',
+		'../common',
+		'../engine',
+		'../pm_shared',
+		'../game_shared',
+		'../public'
+	]
 
 	libs = []