diff --git a/cl_dll/MOTD.cpp b/cl_dll/MOTD.cpp
index 68030cf9..dfb587aa 100644
--- a/cl_dll/MOTD.cpp
+++ b/cl_dll/MOTD.cpp
@@ -26,7 +26,7 @@
 #include <string.h>
 #include <stdio.h>
 
-DECLARE_MESSAGE( m_MOTD, MOTD );
+DECLARE_MESSAGE( m_MOTD, MOTD )
 
 int CHudMOTD :: Init( void )
 {
diff --git a/cl_dll/saytext.cpp b/cl_dll/saytext.cpp
index 10cf6ef3..2f785b83 100644
--- a/cl_dll/saytext.cpp
+++ b/cl_dll/saytext.cpp
@@ -44,7 +44,7 @@ static float flScrollTime = 0;  // the time at which the lines next scroll up
 static int Y_START = 0;
 static int line_height = 0;
 
-DECLARE_MESSAGE( m_SayText, SayText );
+DECLARE_MESSAGE( m_SayText, SayText )
 
 int CHudSayText :: Init( void )
 {
diff --git a/cl_dll/scoreboard.cpp b/cl_dll/scoreboard.cpp
index 9fca2b7a..adcbb3e7 100644
--- a/cl_dll/scoreboard.cpp
+++ b/cl_dll/scoreboard.cpp
@@ -38,12 +38,12 @@ int g_iPlayerClass;
 
 //#include "vgui_TeamFortressViewport.h"
 
-DECLARE_COMMAND( m_Scoreboard, ShowScores );
-DECLARE_COMMAND( m_Scoreboard, HideScores );
+DECLARE_COMMAND( m_Scoreboard, ShowScores )
+DECLARE_COMMAND( m_Scoreboard, HideScores )
 
-DECLARE_MESSAGE( m_Scoreboard, ScoreInfo );
-DECLARE_MESSAGE( m_Scoreboard, TeamInfo );
-DECLARE_MESSAGE( m_Scoreboard, TeamScore );
+DECLARE_MESSAGE( m_Scoreboard, ScoreInfo )
+DECLARE_MESSAGE( m_Scoreboard, TeamInfo )
+DECLARE_MESSAGE( m_Scoreboard, TeamScore )
 
 int CHudScoreboard :: Init( void )
 {
diff --git a/cl_dll/status_icons.cpp b/cl_dll/status_icons.cpp
index 53a3e743..375c9d57 100644
--- a/cl_dll/status_icons.cpp
+++ b/cl_dll/status_icons.cpp
@@ -25,7 +25,7 @@
 #include "parsemsg.h"
 #include "event_api.h"
 
-DECLARE_MESSAGE( m_StatusIcons, StatusIcon );
+DECLARE_MESSAGE( m_StatusIcons, StatusIcon )
 
 int CHudStatusIcons::Init( void )
 {
diff --git a/cl_dll/statusbar.cpp b/cl_dll/statusbar.cpp
index 81566d1a..152fb9b1 100644
--- a/cl_dll/statusbar.cpp
+++ b/cl_dll/statusbar.cpp
@@ -26,8 +26,8 @@
 #include <string.h>
 #include <stdio.h>
 
-DECLARE_MESSAGE( m_StatusBar, StatusText );
-DECLARE_MESSAGE( m_StatusBar, StatusValue );
+DECLARE_MESSAGE( m_StatusBar, StatusText )
+DECLARE_MESSAGE( m_StatusBar, StatusValue )
 
 #define STATUSBAR_ID_LINE		1
 
diff --git a/cl_dll/text_message.cpp b/cl_dll/text_message.cpp
index 1228a07d..eb6f73a9 100644
--- a/cl_dll/text_message.cpp
+++ b/cl_dll/text_message.cpp
@@ -27,7 +27,7 @@
 #include "parsemsg.h"
 
 
-DECLARE_MESSAGE( m_TextMessage, TextMsg );
+DECLARE_MESSAGE( m_TextMessage, TextMsg )
 
 int CHudTextMessage::Init(void)
 {
@@ -38,7 +38,7 @@ int CHudTextMessage::Init(void)
 	Reset();
 
 	return 1;
-};
+}
 
 // Searches through the string for any msg names (indicated by a '#')
 // any found are looked up in titles.txt and the new message substituted
diff --git a/cl_dll/train.cpp b/cl_dll/train.cpp
index 0286c689..1cbbb444 100644
--- a/cl_dll/train.cpp
+++ b/cl_dll/train.cpp
@@ -36,14 +36,14 @@ int CHudTrain::Init(void)
 	gHUD.AddHudElem(this);
 
 	return 1;
-};
+}
 
 int CHudTrain::VidInit(void)
 {
 	m_hSprite = 0;
 
 	return 1;
-};
+}
 
 int CHudTrain::Draw(float fTime)
 {
diff --git a/cl_dll/tri.cpp b/cl_dll/tri.cpp
index 18dbc6b7..77d1d466 100644
--- a/cl_dll/tri.cpp
+++ b/cl_dll/tri.cpp
@@ -21,7 +21,7 @@ extern "C"
 {
 	void DLLEXPORT HUD_DrawNormalTriangles( void );
 	void DLLEXPORT HUD_DrawTransparentTriangles( void );
-};
+}
 
 //#define TEST_IT
 #if defined( TEST_IT )
diff --git a/common/bspfile.h b/common/bspfile.h
index 51452cd6..809e2fd0 100644
--- a/common/bspfile.h
+++ b/common/bspfile.h
@@ -119,7 +119,7 @@ enum
 	AMBIENT_SKY,		// wind
 	AMBIENT_SLIME,		// never used in quake
 	AMBIENT_LAVA,		// never used in quake
-	NUM_AMBIENTS,		// automatic ambient sounds
+	NUM_AMBIENTS		// automatic ambient sounds
 };
 
 //
@@ -243,4 +243,4 @@ typedef struct
 	int	lightofs;			// start of [numstyles*surfsize] samples
 } dface_t;
 
-#endif//BSPFILE_H
\ No newline at end of file
+#endif//BSPFILE_H
diff --git a/dlls/bullsquid.cpp b/dlls/bullsquid.cpp
index e295ffb5..63d847de 100644
--- a/dlls/bullsquid.cpp
+++ b/dlls/bullsquid.cpp
@@ -216,7 +216,7 @@ public:
 	int	Save( CSave &save ); 
 	int Restore( CRestore &restore );
 
-	CUSTOM_SCHEDULES;
+	CUSTOM_SCHEDULES
 	static TYPEDESCRIPTION m_SaveData[];
 
 	BOOL m_fCanThreatDisplay;// this is so the squid only does the "I see a headcrab!" dance one time. 
diff --git a/dlls/controller.cpp b/dlls/controller.cpp
index c3f57e0f..75754f62 100644
--- a/dlls/controller.cpp
+++ b/dlls/controller.cpp
@@ -59,7 +59,7 @@ public:
 	Schedule_t* GetScheduleOfType ( int Type );
 	void StartTask ( Task_t *pTask );
 	void RunTask ( Task_t *pTask );
-	CUSTOM_SCHEDULES;
+	CUSTOM_SCHEDULES
 
 	void Stop( void );
 	void Move ( float flInterval );
diff --git a/dlls/crossbow.cpp b/dlls/crossbow.cpp
index f84e6122..dee2562a 100644
--- a/dlls/crossbow.cpp
+++ b/dlls/crossbow.cpp
@@ -46,7 +46,8 @@ class CCrossbowBolt : public CBaseEntity
 public:
 	static CCrossbowBolt *BoltCreate( void );
 };
-LINK_ENTITY_TO_CLASS( crossbow_bolt, CCrossbowBolt );
+
+LINK_ENTITY_TO_CLASS( crossbow_bolt, CCrossbowBolt )
 
 CCrossbowBolt *CCrossbowBolt::BoltCreate( void )
 {
@@ -557,7 +558,8 @@ class CCrossbowAmmo : public CBasePlayerAmmo
 		return FALSE;
 	}
 };
-LINK_ENTITY_TO_CLASS( ammo_crossbow, CCrossbowAmmo );
+
+LINK_ENTITY_TO_CLASS( ammo_crossbow, CCrossbowAmmo )
 
 
 
diff --git a/dlls/func_tank.cpp b/dlls/func_tank.cpp
index 81b20986..a61e5c14 100644
--- a/dlls/func_tank.cpp
+++ b/dlls/func_tank.cpp
@@ -903,7 +903,7 @@ public:
 	void Fire( const Vector &barrelEnd, const Vector &forward, entvars_t *pevAttacker );
 };
 
-LINK_ENTITY_TO_CLASS( func_tankmortar, CFuncTankMortar );
+LINK_ENTITY_TO_CLASS( func_tankmortar, CFuncTankMortar )
 
 void CFuncTankMortar::KeyValue( KeyValueData *pkvd )
 {
diff --git a/dlls/gargantua.cpp b/dlls/gargantua.cpp
index 6c48a666..65878f7e 100644
--- a/dlls/gargantua.cpp
+++ b/dlls/gargantua.cpp
@@ -242,7 +242,7 @@ public:
 	virtual int		Restore( CRestore &restore );
 	static	TYPEDESCRIPTION m_SaveData[];
 
-	CUSTOM_SCHEDULES;
+	CUSTOM_SCHEDULES
 
 private:
 	static const char *pAttackHitSounds[];
diff --git a/dlls/hassassin.cpp b/dlls/hassassin.cpp
index d7a2e427..0889a2dd 100644
--- a/dlls/hassassin.cpp
+++ b/dlls/hassassin.cpp
@@ -80,7 +80,7 @@ public:
 	void RunTask ( Task_t *pTask );
 	void DeathSound ( void );
 	void IdleSound ( void );
-	CUSTOM_SCHEDULES;
+	CUSTOM_SCHEDULES
 
 	int	Save( CSave &save ); 
 	int Restore( CRestore &restore );
diff --git a/dlls/roach.cpp b/dlls/roach.cpp
index c92a5dfe..78ff1c19 100644
--- a/dlls/roach.cpp
+++ b/dlls/roach.cpp
@@ -57,7 +57,7 @@ public:
 	int		m_iMode;
 	// -----------------------------
 };
-LINK_ENTITY_TO_CLASS( monster_cockroach, CRoach );
+LINK_ENTITY_TO_CLASS( monster_cockroach, CRoach )
 
 //=========================================================
 // ISoundMask - returns a bit mask indicating which types
diff --git a/dlls/rpg.cpp b/dlls/rpg.cpp
index 6a7b0558..093faf38 100644
--- a/dlls/rpg.cpp
+++ b/dlls/rpg.cpp
@@ -71,7 +71,7 @@ void CLaserSpot::Spawn( void )
 
 	SET_MODEL(ENT(pev), "sprites/laserdot.spr");
 	UTIL_SetOrigin( pev, pev->origin );
-};
+}
 
 //=========================================================
 // Suspend- make the laser sight invisible. 
@@ -97,7 +97,7 @@ void CLaserSpot::Revive( void )
 void CLaserSpot::Precache( void )
 {
 	PRECACHE_MODEL("sprites/laserdot.spr");
-};
+}
 
 LINK_ENTITY_TO_CLASS( rpg_rocket, CRpgRocket )