diff --git a/engine/common/common.c b/engine/common/common.c
index 2896d826..fc4afaca 100644
--- a/engine/common/common.c
+++ b/engine/common/common.c
@@ -661,7 +661,7 @@ COM_MemFgets
 
 =============
 */
-char *COM_MemFgets( byte *pMemFile, int fileSize, int *filePos, char *pBuffer, int bufferSize )
+char *GAME_EXPORT COM_MemFgets( byte *pMemFile, int fileSize, int *filePos, char *pBuffer, int bufferSize )
 {
 	int	i, last, stop;
 
@@ -772,7 +772,7 @@ COM_LoadFile
 
 =============
 */
-byte *COM_LoadFile( const char *filename, int usehunk, int *pLength )
+byte *GAME_EXPORT COM_LoadFile( const char *filename, int usehunk, int *pLength )
 {
 	return COM_LoadFileForMe( filename, pLength );
 }
diff --git a/engine/common/pm_trace.c b/engine/common/pm_trace.c
index 375fc9bc..45a935b4 100644
--- a/engine/common/pm_trace.c
+++ b/engine/common/pm_trace.c
@@ -138,7 +138,7 @@ PM_HullPointContents
 
 ==================
 */
-int PM_HullPointContents( hull_t *hull, int num, const vec3_t p )
+int GAME_EXPORT PM_HullPointContents( hull_t *hull, int num, const vec3_t p )
 {
 	mplane_t		*plane;
 
diff --git a/engine/server/server.h b/engine/server/server.h
index d1e8990d..1ab434ff 100644
--- a/engine/server/server.h
+++ b/engine/server/server.h
@@ -558,7 +558,6 @@ void SV_ExecuteClientMessage( sv_client_t *cl, sizebuf_t *msg );
 void SV_ConnectionlessPacket( netadr_t from, sizebuf_t *msg );
 edict_t *SV_FakeConnect( const char *netname );
 void SV_ExecuteClientCommand( sv_client_t *cl, const char *s );
-void SV_RunCmd( sv_client_t *cl, usercmd_t *ucmd, int random_seed );
 void SV_BuildReconnect( sizebuf_t *msg );
 qboolean SV_IsPlayerIndex( int idx );
 int SV_CalcPing( sv_client_t *cl );
@@ -675,9 +674,8 @@ void SV_ClearGameState( void );
 //
 // sv_pmove.c
 //
-void SV_GetTrueOrigin( sv_client_t *cl, int edictnum, vec3_t origin );
-void SV_GetTrueMinMax( sv_client_t *cl, int edictnum, vec3_t mins, vec3_t maxs );
 qboolean SV_PlayerIsFrozen( edict_t *pClient );
+void SV_RunCmd( sv_client_t *cl, usercmd_t *ucmd, int random_seed );
 
 //
 // sv_world.c
diff --git a/engine/server/sv_pmove.c b/engine/server/sv_pmove.c
index 10ecf59d..b519c244 100644
--- a/engine/server/sv_pmove.c
+++ b/engine/server/sv_pmove.c
@@ -21,6 +21,7 @@ GNU General Public License for more details.
 #include "studio.h"
 
 static qboolean has_update = false;
+static void SV_GetTrueOrigin( sv_client_t *cl, int edictnum, vec3_t origin );
 
 qboolean SV_PlayerIsFrozen( edict_t *pClient )
 {
@@ -51,7 +52,7 @@ void SV_ClipPMoveToEntity( physent_t *pe, const vec3_t start, vec3_t mins, vec3_
 	}
 }
 
-qboolean SV_CopyEdictToPhysEnt( physent_t *pe, edict_t *ed )
+static qboolean SV_CopyEdictToPhysEnt( physent_t *pe, edict_t *ed )
 {
 	model_t	*mod = SV_ModelHandle( ed->v.modelindex );
 
@@ -145,7 +146,7 @@ qboolean SV_CopyEdictToPhysEnt( physent_t *pe, edict_t *ed )
 	return true;
 }
 
-qboolean SV_ShouldUnlagForPlayer( sv_client_t *cl )
+static qboolean SV_ShouldUnlagForPlayer( sv_client_t *cl )
 {
 	// can't unlag in singleplayer
 	if( svs.maxclients <= 1 )
@@ -165,7 +166,7 @@ qboolean SV_ShouldUnlagForPlayer( sv_client_t *cl )
 	return true;
 }
 
-void SV_GetTrueOrigin( sv_client_t *cl, int edictnum, vec3_t origin )
+static void SV_GetTrueOrigin( sv_client_t *cl, int edictnum, vec3_t origin )
 {
 	if( !SV_ShouldUnlagForPlayer( cl ))
 		return;
@@ -177,7 +178,7 @@ void SV_GetTrueOrigin( sv_client_t *cl, int edictnum, vec3_t origin )
 		VectorCopy( svgame.interp[edictnum-1].oldpos, origin );
 }
 
-void SV_GetTrueMinMax( sv_client_t *cl, int edictnum, vec3_t mins, vec3_t maxs )
+static void SV_GetTrueMinMax( sv_client_t *cl, int edictnum, vec3_t mins, vec3_t maxs )
 {
 	if( !SV_ShouldUnlagForPlayer( cl ))
 		return;
@@ -199,7 +200,7 @@ SV_AddLinksToPmove
 collect solid entities
 ====================
 */
-void SV_AddLinksToPmove( areanode_t *node, const vec3_t pmove_mins, const vec3_t pmove_maxs )
+static void SV_AddLinksToPmove( areanode_t *node, const vec3_t pmove_mins, const vec3_t pmove_maxs )
 {
 	link_t	*l, *next;
 	edict_t	*check, *pl;
@@ -291,7 +292,7 @@ void SV_AddLinksToPmove( areanode_t *node, const vec3_t pmove_mins, const vec3_t
 SV_AddLaddersToPmove
 ====================
 */
-void SV_AddLaddersToPmove( areanode_t *node, const vec3_t pmove_mins, const vec3_t pmove_maxs )
+static void SV_AddLaddersToPmove( areanode_t *node, const vec3_t pmove_mins, const vec3_t pmove_maxs )
 {
 	link_t	*l, *next;
 	edict_t	*check;
@@ -379,12 +380,12 @@ static pmtrace_t GAME_EXPORT pfnPlayerTrace( float *start, float *end, int trace
 	return PM_PlayerTraceExt( svgame.pmove, start, end, traceFlags, svgame.pmove->numphysent, svgame.pmove->physents, ignore_pe, NULL );
 }
 
-static pmtrace_t *pfnTraceLine( float *start, float *end, int flags, int usehull, int ignore_pe )
+static pmtrace_t *GAME_EXPORT pfnTraceLine( float *start, float *end, int flags, int usehull, int ignore_pe )
 {
 	return PM_TraceLine( svgame.pmove, start, end, flags, usehull, ignore_pe );
 }
 
-static hull_t *pfnHullForBsp( physent_t *pe, float *offset )
+static hull_t *GAME_EXPORT pfnHullForBsp( physent_t *pe, float *offset )
 {
 	return PM_HullForBsp( pe, svgame.pmove, offset );
 }
@@ -394,7 +395,7 @@ static float GAME_EXPORT pfnTraceModel( physent_t *pe, float *start, float *end,
 	return PM_TraceModel( svgame.pmove, pe, start, end, trace );
 }
 
-static const char *pfnTraceTexture( int ground, float *vstart, float *vend )
+static const char *GAME_EXPORT pfnTraceTexture( int ground, float *vstart, float *vend )
 {
 	return PM_TraceTexture( svgame.pmove, ground, vstart, vend );
 }
@@ -437,12 +438,12 @@ static int GAME_EXPORT pfnTestPlayerPositionEx( float *pos, pmtrace_t *ptrace, p
 	return PM_TestPlayerPosition( svgame.pmove, pos, ptrace, pmFilter );
 }
 
-static pmtrace_t *pfnTraceLineEx( float *start, float *end, int flags, int usehull, pfnIgnore pmFilter )
+static pmtrace_t *GAME_EXPORT pfnTraceLineEx( float *start, float *end, int flags, int usehull, pfnIgnore pmFilter )
 {
 	return PM_TraceLineEx( svgame.pmove, start, end, flags, usehull, pmFilter );
 }
 
-static struct msurface_s *pfnTraceSurface( int ground, float *vstart, float *vend )
+static struct msurface_s *GAME_EXPORT pfnTraceSurface( int ground, float *vstart, float *vend )
 {
 	return PM_TraceSurfacePmove( svgame.pmove, ground, vstart, vend );
 }
@@ -678,7 +679,7 @@ static void SV_FinishPMove( playermove_t *pmove, sv_client_t *cl )
 	pmove->runfuncs = false;
 }
 
-entity_state_t *SV_FindEntInPack( int index, client_frame_t *frame )
+static entity_state_t *SV_FindEntInPack( int index, client_frame_t *frame )
 {
 	entity_state_t	*state;
 	int		i;
@@ -693,7 +694,7 @@ entity_state_t *SV_FindEntInPack( int index, client_frame_t *frame )
 	return NULL;
 }
 
-qboolean SV_UnlagCheckTeleport( vec3_t old_pos, vec3_t new_pos )
+static qboolean SV_UnlagCheckTeleport( vec3_t old_pos, vec3_t new_pos )
 {
 	int	i;
 
@@ -705,7 +706,7 @@ qboolean SV_UnlagCheckTeleport( vec3_t old_pos, vec3_t new_pos )
 	return false;
 }
 
-void SV_SetupMoveInterpolant( sv_client_t *cl )
+static void SV_SetupMoveInterpolant( sv_client_t *cl )
 {
 	int		i, j, clientnum;
 	float		finalpush, lerp_msec;
@@ -855,7 +856,7 @@ void SV_SetupMoveInterpolant( sv_client_t *cl )
 	}
 }
 
-void SV_RestoreMoveInterpolant( sv_client_t *cl )
+static void SV_RestoreMoveInterpolant( sv_client_t *cl )
 {
 	sv_client_t	*check;
 	sv_interp_t	*oldlerp;