diff --git a/dlls/bubblemod/BMOD_CameraPoint.cpp b/dlls/bubblemod/BMOD_CameraPoint.cpp
index 82f940da..84c897a2 100644
--- a/dlls/bubblemod/BMOD_CameraPoint.cpp
+++ b/dlls/bubblemod/BMOD_CameraPoint.cpp
@@ -50,7 +50,7 @@ void CCamPoint::Spawn( void )
 											// is set to 0 and blending is on
 	pev->rendermode = kRenderTransTexture;
 
-	SetThink ( Think );
+	SetThink( &CCamPoint::Think );
 	pev->nextthink = gpGlobals->time + 0.1;
 }
 
@@ -79,4 +79,4 @@ void CCamPoint::Think( void )
 
 	// Wait until it's time to think again.
 	pev->nextthink = gpGlobals->time + 0.01;
-}
\ No newline at end of file
+}
diff --git a/dlls/bubblemod/BMOD_boxmarker.cpp b/dlls/bubblemod/BMOD_boxmarker.cpp
index 4069098c..744a0e34 100644
--- a/dlls/bubblemod/BMOD_boxmarker.cpp
+++ b/dlls/bubblemod/BMOD_boxmarker.cpp
@@ -45,7 +45,7 @@ void CBoxMarker :: Spawn( void )
 	pev->movetype = MOVETYPE_FLY;
 	pev->solid = SOLID_NOT;
 
-	SetThink( PowerupThink );
+	SetThink( &CBoxMarker::PowerupThink );
 	pev->nextthink = gpGlobals->time + RANDOM_FLOAT(.1, 1);
 
 	m_vecExtents = Vector (16, 16, 16);
diff --git a/dlls/bubblemod/BMOD_flyingcrowbar.cpp b/dlls/bubblemod/BMOD_flyingcrowbar.cpp
index 9e0e0525..6c3811bb 100644
--- a/dlls/bubblemod/BMOD_flyingcrowbar.cpp
+++ b/dlls/bubblemod/BMOD_flyingcrowbar.cpp
@@ -61,11 +61,11 @@ void CFlyingCrowbar::Spawn( )
       m_hOwner = Instance( pev->owner );
 
    // Set the think funtion. 
-   SetThink( BubbleThink );
+   SetThink( &CFlyingCrowbar::BubbleThink );
    pev->nextthink = gpGlobals->time + 0.25;
 
    // Set the touch function.
-   SetTouch( SpinTouch );
+   SetTouch( &CFlyingCrowbar::SpinTouch );
 }
 
 
@@ -133,7 +133,7 @@ void CFlyingCrowbar::SpinTouch( CBaseEntity *pOther )
 
    // remove the weapon box after 4 mins.
    pWeaponBox->pev->nextthink = gpGlobals->time + 240; 
-   pWeaponBox->SetThink( CWeaponBox::Kill );
+   pWeaponBox->SetThink( &CWeaponBox::Kill );
 
    // Pack the crowbar in the weapon box
    pWeaponBox->PackWeapon( pItem );
@@ -163,7 +163,7 @@ void CFlyingCrowbar::SpinTouch( CBaseEntity *pOther )
    pWeaponBox->pev->velocity = tr.vecPlaneNormal * 300;
 
    // Remove this flying_crowbar from the world.
-   SetThink ( SUB_Remove );
+   SetThink( &CBaseEntity::SUB_Remove );
    pev->nextthink = gpGlobals->time + .1;
 }
 
diff --git a/dlls/bubblemod/BMOD_hornetgun.cpp b/dlls/bubblemod/BMOD_hornetgun.cpp
index b8935e5f..f13bc70d 100644
--- a/dlls/bubblemod/BMOD_hornetgun.cpp
+++ b/dlls/bubblemod/BMOD_hornetgun.cpp
@@ -107,7 +107,7 @@ void BMODSquidSpit::Shoot( entvars_t *Owner, Vector vecStart, Vector vecVelocity
 	pSpit->pev->owner = ENT(Owner);
         pSpit->pevOwner = Owner;
 
-        pSpit->SetThink ( Animate );
+        pSpit->SetThink( &BMODSquidSpit::Animate );
         pSpit->pev->nextthink = gpGlobals->time + 0.1;
 }
 
@@ -157,7 +157,7 @@ void BMODSquidSpit::Touch ( CBaseEntity *pOther )
 		ApplyMultiDamage( pev, pevOwner );
 	}
 
-        SetThink ( SUB_Remove );
+        SetThink( &CBaseEntity::SUB_Remove );
         pev->nextthink = gpGlobals->time;
 }
 
diff --git a/dlls/bubblemod/BMOD_rune.cpp b/dlls/bubblemod/BMOD_rune.cpp
index 9c5f3bdb..839d4282 100644
--- a/dlls/bubblemod/BMOD_rune.cpp
+++ b/dlls/bubblemod/BMOD_rune.cpp
@@ -57,10 +57,10 @@ void CRune::Spawn( void )
 	
 	UTIL_SetOrigin( pev, pev->origin );
 	UTIL_SetSize(pev, Vector(-16, -16, 0), Vector(16, 16, 16));
-	SetTouch(RuneTouch);
+	SetTouch( &CRune::RuneTouch );
 
 	pev->effects |= EF_NODRAW;
-	SetThink ( Materialize );
+	SetThink( &CRune::Materialize );
 	pev->nextthink = gpGlobals->time + RANDOM_FLOAT(.5, 2); 	
 
 	if (DROP_TO_FLOOR(ENT(pev)) == 0)
@@ -112,9 +112,9 @@ CBaseEntity* CRune::Respawn( void )
 	pev->effects |= EF_NODRAW;
 
 	if (m_randomize)
-		SetThink ( MaterializeRandom );
+		SetThink( &CRune::MaterializeRandom );
 	else
-		SetThink ( Materialize );
+		SetThink( &CRune::Materialize );
 
 	return this;
 }
@@ -203,7 +203,7 @@ void CRune::Materialize( void )
 		pev->effects &= ~EF_NODRAW;
 		pev->effects |= EF_MUZZLEFLASH;
 
-		SetTouch( RuneTouch );
+		SetTouch( &CRune::RuneTouch );
 	}
 	// EMIT_SOUND_DYN( ENT(pev), CHAN_WEAPON, "buttons/blip2.wav", 1, ATTN_NORM, 0, 150 );
 	pev->nextthink = gpGlobals->time + 2;
diff --git a/dlls/bubblemod/BMOD_snarkmine.cpp b/dlls/bubblemod/BMOD_snarkmine.cpp
index 79428fc0..22cab758 100644
--- a/dlls/bubblemod/BMOD_snarkmine.cpp
+++ b/dlls/bubblemod/BMOD_snarkmine.cpp
@@ -99,7 +99,7 @@ void CTripSnarkGrenade :: Spawn( void )
 		m_flPowerUp = gpGlobals->time + 2.5;
 	}
 
-	SetThink( PowerupThink );
+	SetThink( &CTripSnarkGrenade::PowerupThink );
 	pev->nextthink = gpGlobals->time + 0.2;
 
 	pev->takedamage = DAMAGE_YES;
@@ -140,7 +140,7 @@ void CTripSnarkGrenade :: WarningThink( void  )
 	// EMIT_SOUND( ENT(pev), CHAN_VOICE, "buttons/Blip2.wav", 1.0, ATTN_NORM );
 
 	// set to power up
-	SetThink( PowerupThink );
+	SetThink( &CTripSnarkGrenade::PowerupThink );
 	pev->nextthink = gpGlobals->time + 1.0;
 }
 
@@ -173,7 +173,7 @@ void CTripSnarkGrenade :: PowerupThink( void  )
 		{
 			STOP_SOUND( ENT(pev), CHAN_VOICE, "weapons/mine_deploy.wav" );
 			STOP_SOUND( ENT(pev), CHAN_BODY, "weapons/mine_charge.wav" );
-			SetThink( SUB_Remove );
+			SetThink( &CBaseEntity::SUB_Remove );
 			pev->nextthink = gpGlobals->time + 0.1;
 			ALERT( at_console, "WARNING:Tripmine at %.0f, %.0f, %.0f removed\n", pev->origin.x, pev->origin.y, pev->origin.z );
 			KillBeam();
@@ -187,7 +187,7 @@ void CTripSnarkGrenade :: PowerupThink( void  )
 		STOP_SOUND( ENT(pev), CHAN_BODY, "weapons/mine_charge.wav" );
 		CBaseEntity *pMine = Create( "weapon_snark", pev->origin + m_vecDir * 24, pev->angles );
 		pMine->pev->spawnflags |= SF_NORESPAWN;
-		SetThink( SUB_Remove );
+		SetThink( &CBaseEntity::SUB_Remove );
 		KillBeam();
 		pev->nextthink = gpGlobals->time + 0.1;
 		return;
@@ -238,7 +238,7 @@ void CTripSnarkGrenade :: MakeBeam( void )
 	m_flBeamLength = tr.flFraction;
 
 	// set to follow laser spot
-	SetThink( BeamBreakThink );
+	SetThink( &CTripSnarkGrenade::BeamBreakThink );
 	pev->nextthink = gpGlobals->time + 0.1;
 
 	Vector vecTmpEnd = pev->origin + m_vecDir * 2048 * m_flBeamLength;
@@ -318,7 +318,7 @@ int CTripSnarkGrenade :: TakeDamage( entvars_t *pevInflictor, entvars_t *pevAtta
 	{
 		// disable
 		// Create( "weapon_tripsnark", pev->origin + m_vecDir * 24, pev->angles );
-		SetThink( SUB_Remove );
+		SetThink( &CBaseEntity::SUB_Remove );
 		pev->nextthink = gpGlobals->time + 0.1;
 		KillBeam();
 		return FALSE;
@@ -336,7 +336,7 @@ void CTripSnarkGrenade::Killed( entvars_t *pevAttacker, int iGib )
 		pev->owner = ENT( pevAttacker );
 	}
 
-	SetThink( DelayDeathThink );
+	SetThink( &CTripSnarkGrenade::DelayDeathThink );
 	pev->nextthink = gpGlobals->time + RANDOM_FLOAT( 0.1, 0.3 );
 
 	EMIT_SOUND( ENT(pev), CHAN_BODY, "common/null.wav", 0.5, ATTN_NORM ); // shut off chargeup
@@ -380,7 +380,7 @@ void CTripSnarkGrenade::Explode( TraceResult *pTrace )
         pSqueak->pev->velocity = m_vecDir * 200;
 
 	// Tell the mine what do do for the next little while.
-	SetThink( RiftThink );
+	SetThink( &CTripSnarkGrenade::RiftThink );
 	pev->nextthink = gpGlobals->time + 0.1;
 	m_RiftTime = gpGlobals->time + 3;
 }
@@ -521,4 +521,4 @@ void DeactivateSnarkTrips( CBasePlayer *pOwner )
 
 		pFind = FIND_ENTITY_BY_CLASSNAME( pFind, "monster_tripsnark" );
 	}
-}
\ No newline at end of file
+}
diff --git a/dlls/bubblemod/BMOD_tripmines.cpp b/dlls/bubblemod/BMOD_tripmines.cpp
index 9859da95..a9298c96 100644
--- a/dlls/bubblemod/BMOD_tripmines.cpp
+++ b/dlls/bubblemod/BMOD_tripmines.cpp
@@ -82,7 +82,7 @@ void CTripmineGrenade::FlashBang( void )
 {
 #define FLASH_RANGE 600
 	pev->nextthink = gpGlobals->time + 0.3;
-	SetThink( Smoke );
+	SetThink( &CTripmineGrenade::Smoke );
 
 	// Find all players in range
 	CBaseEntity *pEntity = NULL;
@@ -152,4 +152,4 @@ void DeactivateTrips( CBasePlayer *pOwner )
 
 		pFind = FIND_ENTITY_BY_CLASSNAME( pFind, "monster_tripmine" );
 	}
-}
\ No newline at end of file
+}
diff --git a/dlls/bubblemod/BMOD_util.cpp b/dlls/bubblemod/BMOD_util.cpp
index d782a26b..4d11d2f0 100644
--- a/dlls/bubblemod/BMOD_util.cpp
+++ b/dlls/bubblemod/BMOD_util.cpp
@@ -255,10 +255,10 @@ char* UTIL_CountVotes()
 	static char string[128];
 	char maps[32][81];
 	int votes[32];
-	int p = 0;
+	int i, p = 0;
 	int q = 0;
 
-	for (int i = 0; i < 32; i++)
+	for( i = 0; i < 32; i++ )
 	{
 		strcpy(maps[i], "");
 		votes[i] = 0;
diff --git a/dlls/bubblemod/BMOD_zapgunrift.cpp b/dlls/bubblemod/BMOD_zapgunrift.cpp
index 286980ed..ac07f9c0 100644
--- a/dlls/bubblemod/BMOD_zapgunrift.cpp
+++ b/dlls/bubblemod/BMOD_zapgunrift.cpp
@@ -76,7 +76,7 @@ void CZapRift::Spawn( void )
         m_pSprite->SetTransparency( kRenderGlow, 255, 255, 255, 180, kRenderFxNoDissipation );
         m_pSprite->pev->spawnflags |= SF_SPRITE_TEMPORARY;
 
-        SetThink ( Animate );
+        SetThink( &CZapRift::Animate );
         pev->nextthink = gpGlobals->time + 0.1;
         m_fLifeSpan = gpGlobals->time + 3;
         m_fNextElectrify = gpGlobals->time + 0.1;
@@ -104,7 +104,7 @@ void CZapRift::Animate( void )
         {
 			pev->effects |= EF_NODRAW;
             m_pSprite->Expand( 10, 100 );        
-            SetThink(SUB_Remove);
+            SetThink( &CBaseEntity::SUB_Remove );
 			pev->nextthink = gpGlobals->time + 5;
         }
 
@@ -255,7 +255,7 @@ void CZapBounce::Spawn( void )
 		m_iBounce = 5;
 		m_bFirstZap = TRUE;
 
-        SetThink ( BounceThink );
+        SetThink( &CZapBounce::BounceThink );
         pev->nextthink = gpGlobals->time + 0.2;       
 
         EMIT_SOUND_DYN( ENT(pev), CHAN_WEAPON, "debris/zap4.wav", 1, ATTN_NORM, 0,100 );
@@ -346,7 +346,7 @@ void CZapBounce::BounceThink( void )
 		if (m_iBounce < 1)
 		{
 			// UTIL_ClientPrintAll( HUD_PRINTTALK, "<SERVER> Zap bounce point destroyed.\n");
-            SetThink(SUB_Remove);
+			SetThink( &CBaseEntity::SUB_Remove );
 			pev->nextthink = gpGlobals->time + .1;
 			return;
 		}
diff --git a/dlls/bubblemod/squeakgrenade.h b/dlls/bubblemod/squeakgrenade.h
index f0816206..bd8d8d6b 100644
--- a/dlls/bubblemod/squeakgrenade.h
+++ b/dlls/bubblemod/squeakgrenade.h
@@ -43,7 +43,7 @@ class CSqueakGrenade : public CGrenade
 	void Killed( entvars_t *pevAttacker, int iGib );
 	void GibMonster( void );
 
-	CBaseEntity *CSqueakGrenade :: BMOD_BestVisibleEnemy ( void );
+	CBaseEntity *BMOD_BestVisibleEnemy( void );
 
 	virtual int		Save( CSave &save ); 
 	virtual int		Restore( CRestore &restore );
@@ -65,4 +65,4 @@ public:
 	BOOL m_bWasLaunched;
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/dlls/bullsquid.cpp b/dlls/bullsquid.cpp
index 18026b43..593c4964 100644
--- a/dlls/bullsquid.cpp
+++ b/dlls/bullsquid.cpp
@@ -71,7 +71,7 @@ public:
 	int m_maxFrame;
 };
 
-LINK_ENTITY_TO_CLASS( squidspit, CSquidSpit )
+LINK_ENTITY_TO_CLASS( csquidspit, CSquidSpit )
 
 TYPEDESCRIPTION	CSquidSpit::m_SaveData[] =
 {
@@ -83,7 +83,7 @@ IMPLEMENT_SAVERESTORE( CSquidSpit, CBaseEntity )
 void CSquidSpit::Spawn( void )
 {
 	pev->movetype = MOVETYPE_FLY;
-	pev->classname = MAKE_STRING( "squidspit" );
+	pev->classname = MAKE_STRING( "csquidspit" );
 
 	pev->solid = SOLID_BBOX;
 	pev->rendermode = kRenderTransAlpha;
diff --git a/dlls/cbase.h b/dlls/cbase.h
index 47ce7595..ed182892 100644
--- a/dlls/cbase.h
+++ b/dlls/cbase.h
@@ -12,6 +12,8 @@
 *   without written permission from Valve LLC.
 *
 ****/
+#ifndef CBASE_H
+#define CBASE_H
 /*
 
 Class Hierachy
@@ -781,3 +783,4 @@ public:
 	void Precache( void );
 	void KeyValue( KeyValueData *pkvd );
 };
+#endif
diff --git a/dlls/client.cpp b/dlls/client.cpp
index 61459b5d..c8ba94de 100644
--- a/dlls/client.cpp
+++ b/dlls/client.cpp
@@ -296,7 +296,7 @@ void Host_Say( edict_t *pEntity, int teamonly )
 	if( (int)strlen( p ) > j )
 		p[j] = 0;
 
-	/ BMOD Start - Llamas!!
+	// BMOD Start - Llamas!!
 	if( ( (CBasePlayer*)CBasePlayer::Instance( pEntity ) )->m_IsLlama )
 	{
 		switch( RANDOM_LONG( 0, 3 ) )
diff --git a/dlls/enginecallback.h b/dlls/enginecallback.h
index 1c5ec1b2..1c67e17e 100644
--- a/dlls/enginecallback.h
+++ b/dlls/enginecallback.h
@@ -22,6 +22,7 @@
 extern enginefuncs_t g_engfuncs;
 
 // The actual engine callbacks
+#define ADD_SERVER_COMMAND	(*g_engfuncs.pfnAddServerCommand)
 #define GETPLAYERUSERID (*g_engfuncs.pfnGetPlayerUserId)
 #define PRECACHE_MODEL	(*g_engfuncs.pfnPrecacheModel)
 #define PRECACHE_SOUND	(*g_engfuncs.pfnPrecacheSound)
diff --git a/dlls/game.cpp b/dlls/game.cpp
index 01524671..0a59dbd7 100644
--- a/dlls/game.cpp
+++ b/dlls/game.cpp
@@ -1089,7 +1089,7 @@ void BModCmd_AdminSay( void )
 	char	text[128];
 	const char *cpSay = "say";
 	const char *cpSayTeam = "say_team";
-	const char *pcmd = CMD_ARGV(0);
+	const char *pc, *pcmd = CMD_ARGV(0);
 
 	// We can get a raw string now, without the "say " prepended
 	if( CMD_ARGC() < 2 )
@@ -1101,7 +1101,7 @@ void BModCmd_AdminSay( void )
 	p = (char *)CMD_ARGS();
 
 	// make sure the text has content
-	for( char *pc = p; pc != NULL && *pc != 0; pc++ )
+	for( pc = p; pc != NULL && *pc != 0; pc++ )
 	{
 		if( isprint( *pc ) && !isspace( *pc ) )
 		{
@@ -1137,7 +1137,7 @@ void BModCmd_AdminWhisper( void )
 	char	text[128];
 	const char *cpSay = "say";
 	const char *cpSayTeam = "say_team";
-	const char *pcmd = CMD_ARGV( 0 );
+	const char *pc, *pcmd = CMD_ARGV( 0 );
 
 	// We can get a raw string now, without the "say " prepended
 	if( CMD_ARGC() < 3 )
@@ -1164,7 +1164,7 @@ void BModCmd_AdminWhisper( void )
 		p++;
 
 	// make sure the text has content
-	for( char *pc = p; pc != NULL && *pc != 0; pc++ )
+	for( pc = p; pc != NULL && *pc != 0; pc++ )
 	{
 		if( isprint( *pc ) && !isspace( *pc ) )
 		{
@@ -1229,7 +1229,7 @@ void BModCmd_ShowSpawns( void )
 void BModCmd_SpeakAll( void )
 {
 	int	j;
-	char	*p;
+	char	*p, *pc;
 	char	text[128];
 
 	if( CMD_ARGC() < 2 )
@@ -1248,7 +1248,7 @@ void BModCmd_SpeakAll( void )
 	}
 
 	// make sure the text has content
-	for( char *pc = p; pc != NULL && *pc != 0; pc++ )
+	for( pc = p; pc != NULL && *pc != 0; pc++ )
 	{
 		if( isprint( *pc ) && !isspace( *pc ) )
 		{
diff --git a/dlls/gamerules.h b/dlls/gamerules.h
index 4e1725c8..c1216d40 100644
--- a/dlls/gamerules.h
+++ b/dlls/gamerules.h
@@ -12,6 +12,8 @@
 *   without written permission from Valve LLC.
 *
 ****/
+#ifndef GAMERULES_H
+#define GAMERULES_H
 //=========================================================
 // GameRules
 //=========================================================
@@ -378,3 +380,4 @@ protected:
 };
 
 extern DLL_GLOBAL CGameRules *g_pGameRules;
+#endif
diff --git a/dlls/ggrenade.cpp b/dlls/ggrenade.cpp
index 52ba6b86..b96a552c 100644
--- a/dlls/ggrenade.cpp
+++ b/dlls/ggrenade.cpp
@@ -63,12 +63,12 @@ void CGrenade::Explode( TraceResult *pTrace, int bitsDamageType )
 		pev->nextthink = gpGlobals->time + 0.1;
 		pev->dmg = 150;
 		m_iMegaSmokeFrame = 0;
-		SetThink( MegaSmoke );
+		SetThink( &CGrenade::MegaSmoke );
 	}
 	else
 	{
 		pev->nextthink = gpGlobals->time + 0.3;
-		SetThink( Smoke );
+		SetThink( &CGrenade::Smoke );
 	}
 	// BMOD End - Grenade Rune
 
diff --git a/dlls/hornet.h b/dlls/hornet.h
index dc78fc40..e74aafc3 100644
--- a/dlls/hornet.h
+++ b/dlls/hornet.h
@@ -12,6 +12,8 @@
 *   without written permission from Valve LLC.
 *
 ****/
+#ifndef CHORNET_H
+#define CHORNET_H
 //=========================================================
 // Hornets
 //=========================================================
@@ -55,3 +57,4 @@ public:
 	int m_iHornetType;
 	float m_flFlySpeed;
 };
+#endif
diff --git a/dlls/hornetgun.cpp b/dlls/hornetgun.cpp
index e37db8ca..91545d5d 100644
--- a/dlls/hornetgun.cpp
+++ b/dlls/hornetgun.cpp
@@ -134,7 +134,7 @@ void BMODSquidSpit::Shoot( entvars_t *Owner, Vector vecStart, Vector vecVelocity
 	pSpit->pev->owner = ENT( Owner );
 	pSpit->pevOwner = Owner;
 
-	pSpit->SetThink( Animate );
+	pSpit->SetThink( &BMODSquidSpit::Animate );
 	pSpit->pev->nextthink = gpGlobals->time + 0.1;
 }
 
@@ -184,7 +184,7 @@ void BMODSquidSpit::Touch( CBaseEntity *pOther )
 		ApplyMultiDamage( pev, pevOwner );
 	}
 
-	SetThink( SUB_Remove );
+	SetThink( &CBaseEntity::SUB_Remove );
 	pev->nextthink = gpGlobals->time;
 }
 
@@ -1061,7 +1061,7 @@ void CHgun::OldSecondaryAttack( void )
 
 void CHgun::Reload( void )
 {
-	m_iMaxammo = (bm_hornet_mod.value) ? 12 : 8
+	m_iMaxammo = (bm_hornet_mod.value) ? 12 : 8;
 	if( m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType] >= m_iMaxammo )
 		return;
 
diff --git a/dlls/multiplay_gamerules.cpp b/dlls/multiplay_gamerules.cpp
index 9eb37aa1..5dcd532b 100644
--- a/dlls/multiplay_gamerules.cpp
+++ b/dlls/multiplay_gamerules.cpp
@@ -1811,7 +1811,8 @@ int CountPlayers( void )
 
 	for( int i = 1; i <= gpGlobals->maxClients; i++ )
 	{
-		CBaseEntity *pEnt = UTIL_PlayerByIndex( i );
+		//CBaseEntity *pEnt = UTIL_PlayerByIndex( i );
+		CBasePlayer *pEnt = (CBasePlayer*)UTIL_PlayerByIndex( i );
 
 		// BMOD Edit - Only count connected players.
 		//if( pEnt )
diff --git a/dlls/nodes.h b/dlls/nodes.h
index 27b890ed..f7ac740b 100644
--- a/dlls/nodes.h
+++ b/dlls/nodes.h
@@ -12,6 +12,8 @@
 *   use or distribution of this code by or to any unlicensed person is illegal.
 *
 ****/
+#ifndef NODES_H
+#define NODES_H
 //=========================================================
 // nodes.h
 //=========================================================
@@ -370,3 +372,4 @@ enum
 };
 
 extern CGraph WorldGraph;
+#endif
diff --git a/dlls/player.cpp b/dlls/player.cpp
index ce3a11b4..aa8181f6 100644
--- a/dlls/player.cpp
+++ b/dlls/player.cpp
@@ -2888,8 +2888,9 @@ void CBasePlayer::Spawn( void )
 	//m_LeetSpeak = FALSE;
 
 	// Spawn Runes
-	if (!g_runes_exist)
+	if( !g_runes_exist )
 	{
+		int i;
 		g_runes_exist = true;
 
 		CBaseEntity *pSpot = NULL;
@@ -2898,7 +2899,7 @@ void CBasePlayer::Spawn( void )
 		while( !pSpot );
 
 		// Spawn random runes
-		for( int i = 0; i < CVAR_GET_FLOAT( "bm_rune_rand" ); i++ )
+		for( i = 0; i < CVAR_GET_FLOAT( "bm_rune_rand" ); i++ )
 		{
 			CRune *rune = (CRune *)CBaseEntity::Create( "item_CrowbarRune", pSpot->pev->origin, Vector( 0, 0, 0 ), edict() );
 			rune->m_randomize = TRUE;
diff --git a/dlls/skill.h b/dlls/skill.h
index 5e784bed..d0973018 100644
--- a/dlls/skill.h
+++ b/dlls/skill.h
@@ -12,6 +12,8 @@
 *   without written permission from Valve LLC.
 *
 ****/
+#ifndef SKILL_H
+#define SKILL_H
 //=========================================================
 // skill.h - skill level concerns
 //=========================================================
@@ -143,3 +145,4 @@ extern DLL_GLOBAL int		g_iSkillLevel;
 #define SKILL_EASY		1
 #define SKILL_MEDIUM	2
 #define SKILL_HARD		3
+#endif
diff --git a/dlls/teamplay_gamerules.cpp b/dlls/teamplay_gamerules.cpp
index 70ab4b93..903cc4c8 100644
--- a/dlls/teamplay_gamerules.cpp
+++ b/dlls/teamplay_gamerules.cpp
@@ -554,6 +554,7 @@ const char *CHalfLifeTeamplay::TeamWithFewestPlayers( void )
 //=========================================================
 void CHalfLifeTeamplay::RecountTeams( bool bResendInfo )
 {
+	int i;
 	char *pName;
 	char teamlist[TEAMPLAY_TEAMLISTLENGTH];
 
@@ -585,7 +586,7 @@ void CHalfLifeTeamplay::RecountTeams( bool bResendInfo )
 	memset( team_scores, 0, sizeof(team_scores) );
 
 	// loop through all clients
-	for( int i = 1; i <= gpGlobals->maxClients; i++ )
+	for( i = 1; i <= gpGlobals->maxClients; i++ )
 	{
 		CBaseEntity *plr = UTIL_PlayerByIndex( i );
 
diff --git a/dlls/util.h b/dlls/util.h
index e89d8c32..c1763bce 100644
--- a/dlls/util.h
+++ b/dlls/util.h
@@ -12,6 +12,8 @@
 *   without written permission from Valve LLC.
 *
 ****/
+#ifndef UTIL_H
+#define UTIL_H
 //
 // Misc utility code
 //
@@ -585,3 +587,4 @@ void UTIL_Speak_2_l33t( char *szTarget, char *szString );
 void UTIL_SayTime( void );
 int UTIL_axtoi( char *hexStg );
 // BMOD End - Custom UTIL functions
+#endif