diff --git a/public/basehandle.h b/public/basehandle.h
index 91eb02d0..0e35ddb3 100644
--- a/public/basehandle.h
+++ b/public/basehandle.h
@@ -30,7 +30,7 @@ public:
 
 	CBaseHandle();
 	CBaseHandle( const CBaseHandle &other );
-	CBaseHandle( unsigned long value );
+	CBaseHandle( uintp value );
 	CBaseHandle( int iEntry, int iSerialNumber );
 
 	void Init( int iEntry, int iSerialNumber );
@@ -63,7 +63,7 @@ public:
 protected:
 	// The low NUM_SERIAL_BITS hold the index. If this value is less than MAX_EDICTS, then the entity is networkable.
 	// The high NUM_SERIAL_NUM_BITS bits are the serial number.
-	unsigned long	m_Index;
+	uintp	m_Index;
 };
 
 
@@ -80,7 +80,7 @@ inline CBaseHandle::CBaseHandle( const CBaseHandle &other )
 	m_Index = other.m_Index;
 }
 
-inline CBaseHandle::CBaseHandle( unsigned long value )
+inline CBaseHandle::CBaseHandle( uintp value )
 {
 	m_Index = value;
 }
@@ -150,7 +150,7 @@ inline bool CBaseHandle::operator <( const CBaseHandle &other ) const
 
 inline bool CBaseHandle::operator <( const IHandleEntity *pEntity ) const
 {
-	unsigned long otherIndex = (pEntity) ? pEntity->GetRefEHandle().m_Index : INVALID_EHANDLE_INDEX;
+	uintp otherIndex = (pEntity) ? pEntity->GetRefEHandle().m_Index : INVALID_EHANDLE_INDEX;
 	return m_Index < otherIndex;
 }
 
diff --git a/public/saverestoretypes.h b/public/saverestoretypes.h
index 4bfb25b4..e470f662 100644
--- a/public/saverestoretypes.h
+++ b/public/saverestoretypes.h
@@ -102,7 +102,7 @@ struct levellist_t
 
 struct EHandlePlaceholder_t // Engine does some of the game writing (alas, probably shouldn't), but can't see ehandle.h
 {
-	unsigned long i;
+	uintp i;
 };
 
 //-------------------------------------