diff --git a/src/xrCore/FS.h b/src/xrCore/FS.h
index 749c0c9a220..899092fcf14 100644
--- a/src/xrCore/FS.h
+++ b/src/xrCore/FS.h
@@ -12,6 +12,7 @@
 #include "_vector3d.h"
 #include "_vector4.h"
 #include "_color.h"
+#include "xrstring.h"
 #include "xrCommon/math_funcs.h"
 #include "xrCommon/xr_stack.h"
 
diff --git a/src/xrCore/net_utils.h b/src/xrCore/net_utils.h
index ec1f2742236..f8b649293bd 100644
--- a/src/xrCore/net_utils.h
+++ b/src/xrCore/net_utils.h
@@ -3,6 +3,7 @@
 #define _INCDEF_NETUTILS_H_
 #include <string.h>
 #include "xrCore/_types.h"
+#include "xrCore/_matrix.h"
 #include "client_id.h"
 #include "xrCommon/xr_string.h"
 
@@ -13,7 +14,6 @@ template <class T> struct _vector4;
 typedef _vector4<float> Fvector4;
 class shared_str;
 
-
 #pragma pack(push, 1)
 
 const u32 NET_PacketSizeLimit = 16 * 1024;
diff --git a/src/xrCore/xrMemory.h b/src/xrCore/xrMemory.h
index 94d4aa1b08c..a5ee69e8860 100644
--- a/src/xrCore/xrMemory.h
+++ b/src/xrCore/xrMemory.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "Common/Common.hpp"
 #include "_types.h"
 
 #include "tbb/tbb_allocator.h"
diff --git a/src/xrServerEntities/PHNetState.cpp b/src/xrServerEntities/PHNetState.cpp
index 65b74d7c0e1..24290a59b7a 100644
--- a/src/xrServerEntities/PHNetState.cpp
+++ b/src/xrServerEntities/PHNetState.cpp
@@ -1,7 +1,8 @@
-#include "stdafx.h"
 #pragma hdrstop
 
 #include "PHNetState.h"
+#include "xrCore/net_utils.h"
+#include "xrCore/FS.h"
 
 //////////////////////////////////////8/////////////////////////////////////////////////////
 
diff --git a/src/xrServerEntities/PHNetState.h b/src/xrServerEntities/PHNetState.h
index 9dc4d79e377..762f16713fa 100644
--- a/src/xrServerEntities/PHNetState.h
+++ b/src/xrServerEntities/PHNetState.h
@@ -6,6 +6,8 @@
 #include "xrCommon/xr_vector.h"
 
 class NET_Packet;
+class IReader;
+class IWriter;
 
 struct SPHNetState
 {