diff --git a/rehlds/engine/server.h b/rehlds/engine/server.h
index f22b2d6..7e93c96 100644
--- a/rehlds/engine/server.h
+++ b/rehlds/engine/server.h
@@ -241,12 +241,6 @@ typedef struct client_s
 	int m_sendrescount;
 } client_t;
 
-typedef enum sv_delta_s
-{
-	sv_packet_nodelta,
-	sv_packet_delta,
-} sv_delta_t;
-
 enum
 {
 	SND_ANYPLAYER,
diff --git a/rehlds/msvc/ReHLDS.vcxproj b/rehlds/msvc/ReHLDS.vcxproj
index f531046..08e33fb 100644
--- a/rehlds/msvc/ReHLDS.vcxproj
+++ b/rehlds/msvc/ReHLDS.vcxproj
@@ -499,6 +499,8 @@
     <ClInclude Include="..\public\rehlds\hookchains.h" />
     <ClInclude Include="..\public\rehlds\keydefs.h" />
     <ClInclude Include="..\public\rehlds\maintypes.h" />
+    <ClInclude Include="..\public\rehlds\model.h" />
+    <ClInclude Include="..\public\rehlds\modelgen.h" />
     <ClInclude Include="..\public\rehlds\osconfig.h" />
     <ClInclude Include="..\public\rehlds\progdefs.h" />
     <ClInclude Include="..\public\rehlds\progs.h" />
@@ -506,7 +508,9 @@
     <ClInclude Include="..\public\rehlds\rehlds_interfaces.h" />
     <ClInclude Include="..\public\rehlds\Sequence.h" />
     <ClInclude Include="..\public\rehlds\shake.h" />
+    <ClInclude Include="..\public\rehlds\spritegn.h" />
     <ClInclude Include="..\public\rehlds\static_map.h" />
+    <ClInclude Include="..\public\rehlds\studio.h" />
     <ClInclude Include="..\public\rehlds\sys_shared.h" />
     <ClInclude Include="..\public\rehlds\userid_rehlds.h" />
     <ClInclude Include="..\public\savegame_version.h" />
diff --git a/rehlds/msvc/ReHLDS.vcxproj.filters b/rehlds/msvc/ReHLDS.vcxproj.filters
index 73f0a7a..82168c5 100644
--- a/rehlds/msvc/ReHLDS.vcxproj.filters
+++ b/rehlds/msvc/ReHLDS.vcxproj.filters
@@ -1080,6 +1080,18 @@
     <ClInclude Include="..\engine\sse_mathfun.h">
       <Filter>engine</Filter>
     </ClInclude>
+    <ClInclude Include="..\public\rehlds\model.h">
+      <Filter>public\rehlds</Filter>
+    </ClInclude>
+    <ClInclude Include="..\public\rehlds\modelgen.h">
+      <Filter>public\rehlds</Filter>
+    </ClInclude>
+    <ClInclude Include="..\public\rehlds\spritegn.h">
+      <Filter>public\rehlds</Filter>
+    </ClInclude>
+    <ClInclude Include="..\public\rehlds\studio.h">
+      <Filter>public\rehlds</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\linux\appversion.sh">
diff --git a/rehlds/public/rehlds/maintypes.h b/rehlds/public/rehlds/maintypes.h
index 131a18c..dbb69e3 100644
--- a/rehlds/public/rehlds/maintypes.h
+++ b/rehlds/public/rehlds/maintypes.h
@@ -47,6 +47,16 @@
 #define BIT(n) (1<<(n))
 
 
-typedef unsigned int string_t;		// from engine's pr_comp.h;
+// From engine/pr_comp.h;
+typedef unsigned int string_t;
+
+
+// From engine/server.h
+typedef enum sv_delta_s
+{
+	sv_packet_nodelta,
+	sv_packet_delta,
+} sv_delta_t;
+
 
 #endif // MAINTYPES_H
diff --git a/rehlds/public/rehlds/rehlds_api.h b/rehlds/public/rehlds/rehlds_api.h
index a51d81c..245d9cb 100644
--- a/rehlds/public/rehlds/rehlds_api.h
+++ b/rehlds/public/rehlds/rehlds_api.h
@@ -268,7 +268,7 @@ struct RehldsFuncs_t {
 	cvar_t*(*GetCvarVars)();
 	int (*SV_GetChallenge)(const netadr_t& adr);
 	void (*SV_AddResource)(resourcetype_t type, const char *name, int size, unsigned char flags, int index);
-	int(*MSG_ReadShort)(void);
+	int(*MSG_ReadShort)();
 	int(*MSG_ReadBuf)(int iSize, void *pbuf);
 	void(*MSG_WriteBuf)(sizebuf_t *sb, int iSize, void *buf);
 	void(*MSG_WriteByte)(sizebuf_t *sb, int c);