diff --git a/mp/src/game/client/hl2/hud_ammo.cpp b/mp/src/game/client/hl2/hud_ammo.cpp
index c04efa34e..9f294481c 100644
--- a/mp/src/game/client/hl2/hud_ammo.cpp
+++ b/mp/src/game/client/hl2/hud_ammo.cpp
@@ -508,5 +508,6 @@ class CHudSecondaryAmmo : public CHudNumericDisplay, public CHudElement
 	int		m_iAmmo;
 };
 
+#ifndef NEO
 DECLARE_HUDELEMENT( CHudSecondaryAmmo );
-
+#endif
\ No newline at end of file
diff --git a/mp/src/game/client/hl2/hud_battery.cpp b/mp/src/game/client/hl2/hud_battery.cpp
index c07943c10..ac153aaae 100644
--- a/mp/src/game/client/hl2/hud_battery.cpp
+++ b/mp/src/game/client/hl2/hud_battery.cpp
@@ -46,8 +46,10 @@ class CHudBattery : public CHudNumericDisplay, public CHudElement
 	int		m_iNewBat;
 };
 
+#ifndef NEO
 DECLARE_HUDELEMENT( CHudBattery );
 DECLARE_HUD_MESSAGE( CHudBattery, Battery );
+#endif
 
 //-----------------------------------------------------------------------------
 // Purpose: Constructor
@@ -62,7 +64,9 @@ CHudBattery::CHudBattery( const char *pElementName ) : BaseClass(NULL, "HudSuit"
 //-----------------------------------------------------------------------------
 void CHudBattery::Init( void )
 {
+#ifndef NEO
 	HOOK_HUD_MESSAGE( CHudBattery, Battery);
+#endif
 	Reset();
 	m_iBat		= INIT_BAT;
 	m_iNewBat   = 0;
diff --git a/mp/src/game/client/hl2/hud_credits.cpp b/mp/src/game/client/hl2/hud_credits.cpp
index 6ad1488ba..117cd289b 100644
--- a/mp/src/game/client/hl2/hud_credits.cpp
+++ b/mp/src/game/client/hl2/hud_credits.cpp
@@ -164,9 +164,11 @@ void CHudCredits::PrepareCredits( const char *pKeyName )
 
 using namespace vgui;
 
+#ifndef NEO // CNHudCredits
 DECLARE_HUDELEMENT( CHudCredits );
 DECLARE_HUD_MESSAGE( CHudCredits, CreditsMsg );
 DECLARE_HUD_MESSAGE( CHudCredits, LogoTimeMsg );
+#endif
 
 //-----------------------------------------------------------------------------
 // Purpose: Constructor
@@ -196,8 +198,11 @@ void CHudCredits::Clear( void )
 //-----------------------------------------------------------------------------
 void CHudCredits::Init()
 {
+
+#ifndef NEO // CNEOHud_Ammo
 	HOOK_HUD_MESSAGE( CHudCredits, CreditsMsg );
 	HOOK_HUD_MESSAGE( CHudCredits, LogoTimeMsg );
+#endif
 	SetActive( false );
 }
 
diff --git a/mp/src/game/client/hl2/hud_quickinfo.cpp b/mp/src/game/client/hl2/hud_quickinfo.cpp
index 37db4c310..15fb15b52 100644
--- a/mp/src/game/client/hl2/hud_quickinfo.cpp
+++ b/mp/src/game/client/hl2/hud_quickinfo.cpp
@@ -89,7 +89,9 @@ class CHUDQuickInfo : public CHudElement, public vgui::Panel
 	CHudTexture	*m_icon_lbe;	// left bracket, empty
 };
 
+#ifndef NEO // CNHudQuickInfo
 DECLARE_HUDELEMENT( CHUDQuickInfo );
+#endif
 
 CHUDQuickInfo::CHUDQuickInfo( const char *pElementName ) :
 	CHudElement( pElementName ), BaseClass( NULL, "HUDQuickInfo" )
diff --git a/mp/src/game/client/hl2/hud_suitpower.cpp b/mp/src/game/client/hl2/hud_suitpower.cpp
index 416c9300c..ec849b0fb 100644
--- a/mp/src/game/client/hl2/hud_suitpower.cpp
+++ b/mp/src/game/client/hl2/hud_suitpower.cpp
@@ -20,7 +20,9 @@ using namespace vgui;
 // memdbgon must be the last include file in a .cpp file!!!
 #include "tier0/memdbgon.h"
 
+#ifndef NEO // CHudSuitPower
 DECLARE_HUDELEMENT( CHudSuitPower );
+#endif
 
 #define SUITPOWER_INIT -1
 
diff --git a/mp/src/game/client/hl2/hud_zoom.cpp b/mp/src/game/client/hl2/hud_zoom.cpp
index 8b47e8797..d5851431a 100644
--- a/mp/src/game/client/hl2/hud_zoom.cpp
+++ b/mp/src/game/client/hl2/hud_zoom.cpp
@@ -56,7 +56,9 @@ class CHudZoom : public vgui::Panel, public CHudElement
 	CMaterialReference m_ZoomMaterial;
 };
 
+#ifndef NEO // CHudZoom
 DECLARE_HUDELEMENT( CHudZoom );
+#endif
 
 using namespace vgui;
 
diff --git a/mp/src/game/client/hl2mp/hl2mp_hud_team.cpp b/mp/src/game/client/hl2mp/hl2mp_hud_team.cpp
index c3f0c058c..1c1c70ab3 100644
--- a/mp/src/game/client/hl2mp/hl2mp_hud_team.cpp
+++ b/mp/src/game/client/hl2mp/hl2mp_hud_team.cpp
@@ -50,7 +50,9 @@ class CTeamPlayHud : public vgui::Panel, public CHudElement
 	CPanelAnimationVarAliasType( int, m_iTextY, "text_ypos", "8", "proportional_int" );
 };
 
+#ifndef NEO
 DECLARE_HUDELEMENT( CTeamPlayHud );
+#endif
 
 //-----------------------------------------------------------------------------
 // Purpose: Constructor
diff --git a/mp/src/game/server/player.cpp b/mp/src/game/server/player.cpp
index 56d67822a..161ba4df6 100644
--- a/mp/src/game/server/player.cpp
+++ b/mp/src/game/server/player.cpp
@@ -6852,6 +6852,7 @@ void CBasePlayer::UpdateClientData( void )
 	{
 		m_iClientBattery = m_ArmorValue;
 
+#ifndef NEO
 		// send "battery" update message
 		if ( usermessages->LookupUserMessage( "Battery" ) != -1 )
 		{
@@ -6859,6 +6860,7 @@ void CBasePlayer::UpdateClientData( void )
 				WRITE_SHORT( (int)m_ArmorValue);
 			MessageEnd();
 		}
+#endif
 	}
 
 #if 0 // BYE BYE!!