diff --git a/src/client/progs.src b/src/client/progs.src
index 3dbff7c..01e1112 100644
--- a/src/client/progs.src
+++ b/src/client/progs.src
@@ -20,7 +20,6 @@
 ../../../src/gs-entbase/shared.src
 ../shared/include.src
 
-../../../valve/src/client/predict.qc
 init.qc
 ../../../valve/src/client/player.qc
 entities.qc
@@ -31,7 +30,6 @@ obituary.qc
 hud.qc
 ../../../valve/src/client/hud_weaponselect.qc
 ../../../valve/src/client/scoreboard.qc
-../../../valve/src/client/input.qc
 
 ../../../base/src/client/modelevent.qc
 ../../../src/client/include.src
diff --git a/src/server/defs.h b/src/server/defs.h
index 465ac3d..38d4edb 100644
--- a/src/server/defs.h
+++ b/src/server/defs.h
@@ -16,3 +16,5 @@
 
 #include "gamerules.h"
 #include "../../../valve/src/server/items.h"
+#include "../../../valve/src/server/flashlight.h"
+#include "../../../valve/src/server/player.h"
diff --git a/src/server/progs.src b/src/server/progs.src
index 03a9427..d484a7d 100755
--- a/src/server/progs.src
+++ b/src/server/progs.src
@@ -15,10 +15,11 @@
 
 ../../../src/gs-entbase/server.src
 ../../../src/gs-entbase/shared.src
-../shared/include.src
 
 defs.h
 
+../shared/include.src
+
 ../../../valve/src/server/monster_scientist_dead.qc
 
 ../../../valve/src/server/player.qc
@@ -43,8 +44,6 @@ server.qc
 
 ../../../valve/src/server/flashlight.qc
 ../../../base/src/server/modelevent.qc
-
-input.qc
 ../../../valve/src/server/spawn.qc
 
 ../../../src/server/include.src
diff --git a/src/shared/include.src b/src/shared/include.src
index 9a22b26..ee28ec4 100644
--- a/src/shared/include.src
+++ b/src/shared/include.src
@@ -33,4 +33,5 @@ w_machette.qc
 w_sodalauncher.qc
 weapons.qc
 ../../../valve/src/shared/weapon_common.qc
+input.qc
 #endlist
diff --git a/src/server/input.qc b/src/shared/input.qc
similarity index 97%
rename from src/server/input.qc
rename to src/shared/input.qc
index 2f34ee3..023c992 100644
--- a/src/server/input.qc
+++ b/src/shared/input.qc
@@ -23,6 +23,7 @@ Handles impulse and whatnot
 */
 void Game_Input(void)
 {
+#ifdef SERVER
 	CGameRules rules = (CGameRules)g_grMode;
 
 	if (rules.m_iIntermission) {
@@ -30,16 +31,6 @@ void Game_Input(void)
 		return;
 	}
 
-	if (input_buttons & INPUT_BUTTON0) {
-		Weapons_Primary();
-	} else if (input_buttons & INPUT_BUTTON4) {
-		Weapons_Reload();
-	} else if (input_buttons & INPUT_BUTTON3) {
-		Weapons_Secondary();
-	} else {
-		Weapons_Release();
-	}
-
 	if (input_buttons & INPUT_BUTTON5) {
 		Player_UseDown(); 
 	} else {
@@ -49,9 +40,6 @@ void Game_Input(void)
 	if (self.impulse == 100) {
 		Flashlight_Toggle();
 	}
-	
-	if (self.impulse == 240)
-		Bot_AddQuick();
 
 	/* Uncomment rune weapons if you desire */
 	if (cvar("sv_cheats") == 1) {
@@ -74,4 +62,15 @@ void Game_Input(void)
 	}
 	
 	self.impulse = 0;
+#endif
+
+	if (input_buttons & INPUT_BUTTON0) {
+		Weapons_Primary();
+	} else if (input_buttons & INPUT_BUTTON4) {
+		Weapons_Reload();
+	} else if (input_buttons & INPUT_BUTTON3) {
+		Weapons_Secondary();
+	} else {
+		Weapons_Release();
+	}
 }