diff --git a/game/shared/imovehelper.h b/game/shared/imovehelper.h
index 02b17957..4084175c 100644
--- a/game/shared/imovehelper.h
+++ b/game/shared/imovehelper.h
@@ -12,6 +12,7 @@
 #pragma once
 #endif
 
+#include "shareddefs.h"
 
 //-----------------------------------------------------------------------------
 // Forward declarations
diff --git a/public/string_t.h b/public/string_t.h
index 4d67e703..a1af4e7d 100644
--- a/public/string_t.h
+++ b/public/string_t.h
@@ -52,7 +52,7 @@ typedef int	string_t;
 struct string_t
 {
 public:
-	bool operator!() const							{ return ( pszValue == NULL );			}
+	bool operator!() const							{ return ( pszValue == nullptr );			}
 	bool operator==( const string_t &rhs ) const	{ return ( pszValue == rhs.pszValue );	}
 	bool operator!=( const string_t &rhs ) const	{ return ( pszValue != rhs.pszValue );	}
 	bool operator<( const string_t &rhs ) const		{ return ((void *)pszValue < (void *)rhs.pszValue ); }
@@ -67,7 +67,7 @@ protected:
 
 struct castable_string_t : public string_t // string_t is used in unions, hence, no constructor allowed
 {
-	castable_string_t()							{ pszValue = NULL; }
+	castable_string_t()							{ pszValue = nullptr; }
 	castable_string_t( const char *pszFrom )	{ pszValue = (pszFrom && *pszFrom) ? pszFrom : 0; }
 };