diff --git a/cl_dll/hl/hl_weapons.cpp b/cl_dll/hl/hl_weapons.cpp
index e47f48eb..c68aefc3 100644
--- a/cl_dll/hl/hl_weapons.cpp
+++ b/cl_dll/hl/hl_weapons.cpp
@@ -911,7 +911,7 @@ void _DLLEXPORT HUD_PostRunCmd( struct local_state_s *from, struct local_state_s
 {
 	g_runfuncs = runfuncs;
 
-#if defined( CLIENT_WEAPONS )
+#if CLIENT_WEAPONS
 	if( cl_lw && cl_lw->value )
 	{
 		HUD_WeaponsPostThink( from, to, cmd, time, random_seed );
diff --git a/dlls/hgrunt.h b/dlls/hgrunt.h
index cfddcc75..41dd6787 100644
--- a/dlls/hgrunt.h
+++ b/dlls/hgrunt.h
@@ -75,13 +75,8 @@ public:
 	int Restore( CRestore &restore );
 	
 	CBaseEntity	*Kick( void );
-#if defined ( NOFFICE_DLL )
-	virtual Schedule_t	*GetSchedule(void);
-	virtual Schedule_t  *GetScheduleOfType ( int Type );
-#else
 	Schedule_t	*GetSchedule( void );
 	Schedule_t  *GetScheduleOfType ( int Type );
-#endif // defined ( NOFFICE_DLL )
 	void TraceAttack( entvars_t *pevAttacker, float flDamage, Vector vecDir, TraceResult *ptr, int bitsDamageType);
 	int TakeDamage( entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType );
 
diff --git a/dlls/weapons.h b/dlls/weapons.h
index 79beb9e3..b01a59f5 100644
--- a/dlls/weapons.h
+++ b/dlls/weapons.h
@@ -984,7 +984,7 @@ public:
 
 	virtual BOOL UseDecrement( void )
 	{
-#if defined( CLIENT_WEAPONS )
+#if CLIENT_WEAPONS
 		return TRUE;
 #else
 		return FALSE;
@@ -996,7 +996,7 @@ class CTorch : public CBasePlayerWeapon
 {
 public:
 
-#ifndef CLIENT_DLL
+#if !CLIENT_DLL
 	int Save( CSave &save );
 	int Restore( CRestore &restore );
 	static TYPEDESCRIPTION m_SaveData[];
@@ -1015,7 +1015,7 @@ public:
 
 	virtual BOOL UseDecrement( void )
 	{
-#if defined( CLIENT_WEAPONS )
+#if CLIENT_WEAPONS
 		return TRUE;
 #else
 		return FALSE;