diff --git a/pm_shared/pm_defs.h b/pm_shared/pm_defs.h
index 344d24e..36921bd 100644
--- a/pm_shared/pm_defs.h
+++ b/pm_shared/pm_defs.h
@@ -187,9 +187,9 @@ struct playermove_s
 	const char		*(*PM_Info_ValueForKey) ( const char *s, const char *key );
 	void			(*PM_Particle)( float *origin, int color, float life, int zpos, int zvel);
 	int				(*PM_TestPlayerPosition) (float *pos, pmtrace_t *ptrace );
-	void			(*Con_NPrintf)( int idx, char *fmt, ... );
-	void			(*Con_DPrintf)( char *fmt, ... );
-	void			(*Con_Printf)( char *fmt, ... );
+	void			(*Con_NPrintf)( int idx, const char *fmt, ... );
+	void			(*Con_DPrintf)( const char *fmt, ... );
+	void			(*Con_Printf)( const char *fmt, ... );
 	double			(*Sys_FloatTime)( void );
 	void			(*PM_StuckTouch)( int hitent, pmtrace_t *ptraceresult );
 	int				(*PM_PointContents) (float *p, int *truecontents /*filled in if this is non-null*/ );
@@ -203,8 +203,8 @@ struct playermove_s
 	void			(*PM_GetModelBounds)( struct model_s *mod, float *mins, float *maxs );
 	void			*(*PM_HullForBsp)( physent_t *pe, float *offset );
 	float			(*PM_TraceModel)( physent_t *pEnt, float *start, float *end, trace_t *trace );
-	int				(*COM_FileSize)(char *filename);
-	byte			*(*COM_LoadFile) (char *path, int usehunk, int *pLength);
+	int				(*COM_FileSize)(const char *filename);
+	byte			*(*COM_LoadFile) (const char *path, int usehunk, int *pLength);
 	void			(*COM_FreeFile) ( void *buffer );
 	char			*(*memfgets)( byte *pMemFile, int fileSize, int *pFilePos, char *pBuffer, int bufferSize );
 
diff --git a/pm_shared/pm_math.c b/pm_shared/pm_math.c
index 9e4572f..3420780 100644
--- a/pm_shared/pm_math.c
+++ b/pm_shared/pm_math.c
@@ -27,7 +27,9 @@
 
 #pragma warning(disable : 4244)
 
+#ifndef CLIENT_DLL
 vec3_t vec3_origin = {0,0,0};
+#endif
 int nanmask = 255<<23;
 
 float	anglemod(float a)
diff --git a/pm_shared/pm_shared.c b/pm_shared/pm_shared.c
index 1296549..f631eda 100644
--- a/pm_shared/pm_shared.c
+++ b/pm_shared/pm_shared.c
@@ -29,12 +29,12 @@
 
 #ifdef CLIENT_DLL
 	// Spectator Mode
-	#include "..\common\hltv.h"
-	float	vecNewViewAngles[3];
-	float	vecNewViewOrigin[3];
-	int		iHasNewViewAngles;
-	int		iHasNewViewOrigin;
-	int		iIsSpectator;
+	#include "../common/hltv.h"
+	extern float	vecNewViewAngles[3];
+	extern float	vecNewViewOrigin[3];
+	extern int		iHasNewViewAngles;
+	extern int		iHasNewViewOrigin;
+	extern int		iIsSpectator;
 	unsigned int	uiDirectorFlags;
 
 	int		iJumpSpectator;
@@ -238,7 +238,7 @@ int PM_FindSimilarTexture(char chTextureType,char *pszTextureName)
 	return 0;
 }
 
-void PM_ProcessMaterials(char *pszFilename)
+void PM_ProcessMaterials(const char *pszFilename)
 {
 	char buffer[512];
 	int i, j;