diff --git a/src/client/entities.qc b/src/client/entities.qc
index 5c4f4a5..3e4da72 100644
--- a/src/client/entities.qc
+++ b/src/client/entities.qc
@@ -15,7 +15,7 @@
  */
 
 int
-Game_Entity_Update(float id, float new)
+ClientGame_EntityUpdate(float id, float new)
 {
 	switch (id) {
 	default:
diff --git a/src/client/game_event.qc b/src/client/game_event.qc
index 7edf3dc..b8fb2cc 100644
--- a/src/client/game_event.qc
+++ b/src/client/game_event.qc
@@ -15,7 +15,7 @@
  */
 
 void
-Game_Parse_Event(float fHeader)
+ClientGame_EventParse(float fHeader)
 {
 	switch (fHeader) {
 	case EV_OBITUARY:
diff --git a/src/client/init.qc b/src/client/init.qc
index 72dfb43..6301c0b 100644
--- a/src/client/init.qc
+++ b/src/client/init.qc
@@ -19,24 +19,24 @@ float(entity foo, float chanid) getchannellevel = #0;
 
 /*
 =================
-Client_Init
+ClientGame_Init
 
 Comparable to worldspawn in SSQC in that it's mostly used for precaches
 =================
 */
 void
-Client_Init(float apilevel, string enginename, float engineversion)
+ClientGame_Init(float apilevel, string enginename, float engineversion)
 {
 }
 
 void
-Client_InitDone(void)
+ClientGame_InitDone(void)
 {
 	Obituary_Init();
 }
 
 void
-Game_RendererRestarted(string rstr)
+ClientGame_RendererRestart(string rstr)
 {
 	FX_Blood_Init();
 	FX_BreakModel_Init();
diff --git a/src/client/progs.src b/src/client/progs.src
index 90bab0d..3dbff7c 100644
--- a/src/client/progs.src
+++ b/src/client/progs.src
@@ -36,7 +36,4 @@ hud.qc
 ../../../base/src/client/modelevent.qc
 ../../../src/client/include.src
 ../../../src/shared/include.src
-
 #endlist
-
-
diff --git a/src/shared/w_forks.qc b/src/shared/w_forks.qc
index 4bc81ac..2372a94 100644
--- a/src/shared/w_forks.qc
+++ b/src/shared/w_forks.qc
@@ -210,10 +210,10 @@ w_forks_secondary(void)
 
 	pl.ammo_forks--;
 	Sound_Play(pl, CHAN_WEAPON, "weapon_forks.throw");
-#else
+#endif
+
 	Weapons_ViewPunchAngle([-2,0,0]);
 	Weapons_ViewAnimation(FORKS_THROW);
-#endif
 
 	pl.w_attack_next = 0.5f;
 	pl.w_idle_next = 5.0f;