diff --git a/cl_dll/wscript b/cl_dll/wscript
index e776a54d..cd3e1e11 100644
--- a/cl_dll/wscript
+++ b/cl_dll/wscript
@@ -45,7 +45,10 @@ def build(bld):
 	excluded_files = ['GameStudioModelRenderer_Sample.cpp',
 		'game_shared/voice_vgui_tweakdlg.cpp',
 		'game_shared/voice_gamemgr.cpp',
-		'game_shared/voice_status.cpp']
+		'game_shared/voice_status.cpp',
+		'zx/mp3.cpp',
+		'zx/bumpmap.cpp',
+		'zx/nvg.cpp']
 	
 	if bld.env.USE_VGUI:
 		defines += ['USE_VGUI']
@@ -83,7 +86,15 @@ def build(bld):
 		'dlls/satchel.cpp',
 		'dlls/shotgun.cpp',
 		'dlls/squeakgrenade.cpp',
-		'dlls/tripmine.cpp'
+		'dlls/tripmine.cpp',
+		'dlls/zx/ak47.cpp',
+		'dlls/zx/auto_shotgun.cpp',
+		'dlls/zx/eagel.cpp',
+		'dlls/zx/minigun.cpp',
+		'dlls/zx/mp41a.cpp',
+		'dlls/zx/shockgun.cpp',
+		'dlls/zx/swort.cpp',
+		'dlls/zx/uzi.cpp'
 	])
 
 
diff --git a/dlls/wscript b/dlls/wscript
index 00781777..d71833a7 100644
--- a/dlls/wscript
+++ b/dlls/wscript
@@ -20,7 +20,29 @@ def configure(conf):
 			conf.fatal("Could not find hl.def")
 
 def build(bld):
-	excluded_files = ['mpstubb.cpp', 'stats.cpp', 'Wxdebug.cpp']
+	excluded_files = ['mpstubb.cpp',
+			'stats.cpp',
+			'Wxdebug.cpp',
+			'zx/bumplight.cpp',
+			'zx/debugger.cpp',
+			'zx/teamdm.cpp',
+			'zx/bot_chat.cpp',
+			'zx/bot_client.cpp',
+			'zx/bot_models.cpp',
+			'zx/bot_navigate.cpp',
+			'zx/bot_start.cpp',
+			'zx/op_eagle.cpp',
+			'zx/namefunc.cpp',
+			'zx/hgrunt_blackop.cpp',
+			'zx/linkfunc.cpp',
+			'zx/hands.cpp',
+			'zx/engine.cpp',
+			'zx/waypoint.cpp',
+			'zx/dll.cpp',
+			'zx/game_config.cpp',
+			'zx/nvg.cpp',
+			'zx/observer.cpp'
+			]
 
 	source = bld.path.ant_glob('**/*.cpp', excl=excluded_files)
 	source += bld.path.parent.ant_glob('pm_shared/*.c')
@@ -33,6 +55,7 @@ def build(bld):
 
 	includes = [
 		'.',
+		'zx',
 		'../common',
 		'../engine',
 		'../pm_shared',