diff --git a/dlls/player.cpp b/dlls/player.cpp
index 48131855..2f67ac2f 100644
--- a/dlls/player.cpp
+++ b/dlls/player.cpp
@@ -2585,7 +2585,7 @@ BOOL IsSpawnPointValid( CBaseEntity *pPlayer, CBaseEntity *pSpot )
 	return TRUE;
 }
 
-DLL_GLOBAL CBaseEntity	*g_pLastSpawn;
+EHANDLE	g_pLastSpawn;
 inline int FNullEnt( CBaseEntity *ent ) { return ( ent == NULL ) || FNullEnt( ent->edict() ); }
 
 /*
diff --git a/dlls/world.cpp b/dlls/world.cpp
index fe119919..4ac56925 100644
--- a/dlls/world.cpp
+++ b/dlls/world.cpp
@@ -38,7 +38,7 @@
 extern CGraph WorldGraph;
 extern CSoundEnt *pSoundEnt;
 
-extern CBaseEntity				*g_pLastSpawn;
+extern EHANDLE				g_pLastSpawn;
 DLL_GLOBAL edict_t				*g_pBodyQueueHead;
 CGlobalState					gGlobalState;
 extern DLL_GLOBAL int				gDisplayTitle;