diff --git a/cl_dll/compile.bat b/cl_dll/compile.bat
index 18b45459..d6c18bd0 100644
--- a/cl_dll/compile.bat
+++ b/cl_dll/compile.bat
@@ -7,7 +7,7 @@ set PATH=%MSVCDir%\VC98\Bin;%MSVCDir%\Common\MSDev98\Bin\;%PATH%
 echo -- Compiler is MSVC6
 
 set XASH3DSRC=..\..\Xash3D_original
-set INCLUDES=-I../common -I../engine -I../pm_shared -I../game_shared -I../public -I../external -I../dlls -I../utils/false_vgui/include
+set INCLUDES=-I. -I../common -I../engine -I../pm_shared -I../game_shared -I../public -I../external -I../dlls -I../dlls/gearbox -Igearbox -I../utils/false_vgui/include
 set SOURCES=../dlls/crossbow.cpp ^
 	../dlls/crowbar.cpp ^
 	../dlls/egon.cpp ^
@@ -22,11 +22,22 @@ set SOURCES=../dlls/crossbow.cpp ^
 	../dlls/squeakgrenade.cpp ^
 	../dlls/tripmine.cpp ^
 	../dlls/glock.cpp ^
+	../dlls/gearbox/displacer.cpp ^
+	../dlls/gearbox/knife.cpp ^
+	../dlls/gearbox/eagle.cpp ^
+	../dlls/gearbox/grapple.cpp ^
+	../dlls/gearbox/m249.cpp ^
+	../dlls/gearbox/penguin.cpp ^
+	../dlls/gearbox/pipewrench.cpp ^
+	../dlls/gearbox/shockrifle.cpp ^
+	../dlls/gearbox/sniperrifle.cpp ^
+	../dlls/gearbox/sporelauncher.cpp ^
 	ev_hldm.cpp ^
 	hl/hl_baseentity.cpp ^
 	hl/hl_events.cpp ^
 	hl/hl_objects.cpp ^
 	hl/hl_weapons.cpp ^
+	gearbox/hud_nightvision.cpp ^
 	ammo.cpp ^
 	ammo_secondary.cpp ^
 	ammohistory.cpp ^
diff --git a/dlls/client.cpp b/dlls/client.cpp
index 214ae8b9..710be3cd 100644
--- a/dlls/client.cpp
+++ b/dlls/client.cpp
@@ -45,7 +45,7 @@ extern DLL_GLOBAL BOOL		g_fGameOver;
 extern DLL_GLOBAL int		g_iSkillLevel;
 extern DLL_GLOBAL ULONG		g_ulFrameCount;
 
-char *GetTeamName( int team );
+const char *GetTeamName( int team );
 
 extern void CopyToBodyQue( entvars_t* pev );
 extern int giPrecacheGrunt;
diff --git a/dlls/compile.bat b/dlls/compile.bat
index f97806a5..2ed94dd2 100644
--- a/dlls/compile.bat
+++ b/dlls/compile.bat
@@ -7,8 +7,54 @@ set PATH=%MSVCDir%\VC98\Bin;%MSVCDir%\Common\MSDev98\Bin\;%PATH%
 echo -- Compiler is MSVC6
 
 set XASH3DSRC=..\..\Xash3D_original
-set INCLUDES=-I../common -I../engine -I../pm_shared -I../game_shared -I../public
-set SOURCES=agrunt.cpp ^
+set INCLUDES=-I. -I../common -I../engine -I../pm_shared -I../game_shared -I../public -Igearbox
+set SOURCES=gearbox/blkop_apache.cpp ^
+	gearbox/blkop_osprey.cpp ^
+	gearbox/cleansuit_scientist.cpp ^
+	gearbox/ctf_gamerules.cpp ^
+	gearbox/ctf_items.cpp ^
+	gearbox/ctf_powerups.cpp ^
+	gearbox/displacer.cpp ^
+	gearbox/drillsergeant.cpp ^
+	gearbox/eagle.cpp ^
+	gearbox/fgrunt.cpp ^
+	gearbox/func_tank_of.cpp ^
+	gearbox/gearbox_effects.cpp ^
+	gearbox/gearbox_triggers.cpp ^
+	gearbox/gearbox_utils.cpp ^
+	gearbox/generic_items.cpp ^
+	gearbox/geneworm.cpp ^
+	gearbox/gonome.cpp ^
+	gearbox/grapple_tonguetip.cpp ^
+	gearbox/grapple.cpp ^
+	gearbox/houndeye_dead.cpp ^
+	gearbox/islave_dead.cpp ^
+	gearbox/knife.cpp ^
+	gearbox/loader.cpp ^
+	gearbox/m249.cpp ^
+	gearbox/massn.cpp ^
+	gearbox/nuclearbomb.cpp ^
+	gearbox/op4mortar.cpp ^
+	gearbox/otis.cpp ^
+	gearbox/penguin.cpp ^
+	gearbox/pipewrench.cpp ^
+	gearbox/pitdrone.cpp ^
+	gearbox/pitworm.cpp ^
+	gearbox/recruit.cpp ^
+	gearbox/ropes.cpp ^
+	gearbox/shock.cpp ^
+	gearbox/shockrifle.cpp ^
+	gearbox/shockroach.cpp ^
+	gearbox/skeleton.cpp ^
+	gearbox/sniperrifle.cpp ^
+	gearbox/spore_ammo.cpp ^
+	gearbox/sporegrenade.cpp ^
+	gearbox/sporelauncher.cpp ^
+	gearbox/strooper.cpp ^
+	gearbox/voltigore.cpp ^
+	gearbox/zombie_barney.cpp ^
+	gearbox/zombie_soldier.cpp ^
+	agrunt.cpp ^
 	airtank.cpp ^
 	aflock.cpp ^
 	animating.cpp ^
diff --git a/dlls/gearbox/ctf_items.cpp b/dlls/gearbox/ctf_items.cpp
index ab383787..75985925 100644
--- a/dlls/gearbox/ctf_items.cpp
+++ b/dlls/gearbox/ctf_items.cpp
@@ -34,7 +34,7 @@ This contains the Flag entity information for the Half-Life : Opposing force CTF
 
 extern int gmsgCTFMsgs;
 
-extern char* GetTeamName(int team);
+extern const char* GetTeamName(int team);
 
 
 /*****************************************************