diff --git a/cl_dll/hud_redraw.cpp b/cl_dll/hud_redraw.cpp
index 57b024a0..ac585e87 100644
--- a/cl_dll/hud_redraw.cpp
+++ b/cl_dll/hud_redraw.cpp
@@ -29,7 +29,9 @@ int grgLogoFrame[MAX_LOGO_FRAMES] =
 	29, 29, 29, 29, 29, 28, 27, 26, 25, 24, 30, 31 
 };
 
-extern int g_iVisibleMouse;
+#if defined(SUPPORT_GOLDSOURCE_INPUT)
+extern int iVisibleMouse;
+#endif
 
 float HUD_GetFOV( void );
 
@@ -154,7 +156,8 @@ int CHud::Redraw( float flTime, int intermission )
 		SPR_DrawAdditive( i, x, y, NULL );
 	}
 
-	if( g_iVisibleMouse )
+#if defined(SUPPORT_GOLDSOURCE_INPUT)
+	if( iVisibleMouse )
 	{
 		void IN_GetMousePos( int *mx, int *my );
 		int mx, my;
@@ -173,6 +176,7 @@ int CHud::Redraw( float flTime, int intermission )
 		// Draw the logo at 20 fps
 		SPR_DrawAdditive( 0, mx, my, NULL );
 	}
+#endif
 
 	return 1;
 }
diff --git a/cl_dll/in_camera.cpp b/cl_dll/in_camera.cpp
index 9ac029ec..7e38be8c 100644
--- a/cl_dll/in_camera.cpp
+++ b/cl_dll/in_camera.cpp
@@ -74,7 +74,7 @@ cvar_t	*cam_maxDist;
 cvar_t	*cam_smooth;
 cvar_t	*cam_lookahead;
 
-extern	float camYaw;
+static float camYaw;
 
 // pitch, yaw, dist
 vec3_t cam_ofs;
diff --git a/cl_dll/input_goldsource.cpp b/cl_dll/input_goldsource.cpp
index d8c03d91..eedfc989 100644
--- a/cl_dll/input_goldsource.cpp
+++ b/cl_dll/input_goldsource.cpp
@@ -122,7 +122,7 @@ typedef unsigned int DWORD;
 
 #define MOUSE_BUTTON_COUNT 5
 
-float mouse_pos_extern[2];
+extern float mouse_pos_extern[2];
 
 // use IN_SetVisibleMouse to set:
 int iVisibleMouse = 1;
@@ -151,8 +151,6 @@ extern cvar_t *cl_forwardspeed;
 extern cvar_t *cl_pitchspeed;
 extern cvar_t *cl_movespeedkey;
 
-float camYaw;
-
 #ifdef _WIN32
 static double s_flRawInputUpdateTime = 0.0f;
 static bool m_bRawInput = false;
diff --git a/cl_dll/view.cpp b/cl_dll/view.cpp
index 9227d8eb..ae2742dc 100644
--- a/cl_dll/view.cpp
+++ b/cl_dll/view.cpp
@@ -67,7 +67,7 @@ void VectorAngles( const float *forward, float *angles );
 
 extern engine_studio_api_t IEngineStudio;
 
-extern float mouse_pos_extern[2];
+float mouse_pos_extern[2];
 extern cvar_t *cam_idealdist;
 extern cvar_t *cam_minDist;