diff --git a/src/Common/Common.hpp b/src/Common/Common.hpp
index 6f70f09beec..086edd03849 100644
--- a/src/Common/Common.hpp
+++ b/src/Common/Common.hpp
@@ -1 +1,4 @@
 #pragma once
+
+#include "Common/CommonImportExport.inl"
+
diff --git a/src/Common/Common.vcxproj b/src/Common/Common.vcxproj
index 302661b2a86..3ee45b4b1b5 100644
--- a/src/Common/Common.vcxproj
+++ b/src/Common/Common.vcxproj
@@ -210,6 +210,9 @@
   <ItemGroup>
     <ClCompile Include="NvMender2003\NVMeshMender.cpp" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="CommonImportExport.inl" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/src/Common/Common.vcxproj.filters b/src/Common/Common.vcxproj.filters
index 9713028862d..1735d591cbc 100644
--- a/src/Common/Common.vcxproj.filters
+++ b/src/Common/Common.vcxproj.filters
@@ -102,4 +102,7 @@
       <Filter>NvMender2003</Filter>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="CommonImportExport.inl" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Common/CommonImportExport.inl b/src/Common/CommonImportExport.inl
new file mode 100644
index 00000000000..9504e5e5c71
--- /dev/null
+++ b/src/Common/CommonImportExport.inl
@@ -0,0 +1,61 @@
+#pragma once
+
+#ifdef XRAPI_EXPORTS
+#define XRAPI_API XR_EXPORT
+#else
+#define XRAPI_API XR_IMPORT
+#endif
+
+#ifdef XRAICORE_EXPORTS
+#define XRAICORE_API XR_EXPORT
+#else
+#define XRAICORE_API XR_IMPORT
+#endif
+
+#ifdef XRCDB_EXPORTS
+#define XRCDB_API XR_EXPORT
+#else
+#define XRCDB_API XR_IMPORT
+#endif
+
+#ifdef XRCORE_EXPORTS
+#define XRCORE_API XR_EXPORT
+#else
+#define XRCORE_API XR_IMPORT
+#endif
+
+#ifdef XRGAMESPY_EXPORTS
+#define XRGAMESPY_API XR_EXPORT
+#else
+#define XRGAMESPY_API XR_IMPORT
+#endif
+
+#ifdef XR_NETSERVER_EXPORTS
+#define XRNETSERVER_API XR_EXPORT
+#else
+#define XRNETSERVER_API XR_IMPORT
+#endif
+
+#ifdef XR_PARTICLES_EXPORTS
+#define PARTICLES_API XR_EXPORT
+#else
+#define PARTICLES_API XR_IMPORT
+#endif
+
+#ifdef XRPHYSICS_EXPORTS
+#define XRPHYSICS_API XR_EXPORT
+#else
+#define XRPHYSICS_API XR_IMPORT
+#endif
+
+#ifdef XRSCRIPTENGINE_EXPORTS
+#define XRSCRIPTENGINE_API XR_EXPORT
+#else
+#define XRSCRIPTENGINE_API XR_IMPORT
+#endif
+
+#ifdef XRSOUND_EXPORTS
+#define XRSOUND_API XR_EXPORT
+#else
+#define XRSOUND_API XR_IMPORT
+#endif
diff --git a/src/Include/xrAPI/xrAPI.h b/src/Include/xrAPI/xrAPI.h
index 6c2f9d6572e..39f6e7e90af 100644
--- a/src/Include/xrAPI/xrAPI.h
+++ b/src/Include/xrAPI/xrAPI.h
@@ -1,11 +1,5 @@
 #pragma once
 
-#ifdef XRAPI_EXPORTS
-#define XRAPI_API XR_EXPORT
-#else
-#define XRAPI_API XR_IMPORT
-#endif
-
 class IRender;
 class IRenderFactory;
 class IDebugRender;
diff --git a/src/xrAICore/xrAICore.hpp b/src/xrAICore/xrAICore.hpp
index c9c7f9c96f7..6f70f09beec 100644
--- a/src/xrAICore/xrAICore.hpp
+++ b/src/xrAICore/xrAICore.hpp
@@ -1,7 +1 @@
 #pragma once
-
-#ifdef XRAICORE_EXPORTS
-#define XRAICORE_API XR_EXPORT
-#else
-#define XRAICORE_API XR_IMPORT
-#endif
diff --git a/src/xrCDB/xrCDB.h b/src/xrCDB/xrCDB.h
index 4e94e70dbb4..cb9c127497a 100644
--- a/src/xrCDB/xrCDB.h
+++ b/src/xrCDB/xrCDB.h
@@ -4,19 +4,6 @@
 
 #include "xrCore/Threading/Lock.hpp" // XXX: Remove from header. Put in .cpp.
 
-// The following ifdef block is the standard way of creating macros which make exporting
-// from a DLL simpler. All files within this DLL are compiled with the XRCDB_EXPORTS
-// symbol defined on the command line. this symbol should not be defined on any project
-// that uses this DLL. This way any other project whose source files include this file see
-// XRCDB_API functions as being imported from a DLL, wheras this DLL sees symbols
-// defined with this macro as being exported.
-
-#ifdef XRCDB_EXPORTS
-#define XRCDB_API XR_EXPORT
-#else
-#define XRCDB_API XR_IMPORT
-#endif
-
 // forward declarations
 class CFrustum;
 namespace Opcode
diff --git a/src/xrCore/FTimer.h b/src/xrCore/FTimer.h
index 1e01d6548cf..d6a845e3816 100644
--- a/src/xrCore/FTimer.h
+++ b/src/xrCore/FTimer.h
@@ -2,7 +2,6 @@
 #ifndef FTimerH
 #define FTimerH
 #include "_types.h"
-#include "xrCore_impexp.h"
 #include "xrCommon/xr_vector.h"
 //#include "_stl_extensions.h"
 #include "_math.h"
diff --git a/src/xrCore/Threading/Lock.hpp b/src/xrCore/Threading/Lock.hpp
index ec555ab1060..460ff51282b 100644
--- a/src/xrCore/Threading/Lock.hpp
+++ b/src/xrCore/Threading/Lock.hpp
@@ -1,6 +1,4 @@
 #pragma once
-#include "xrCore/xrCore_impexp.h"
-
 #include <mutex>
 #include <atomic>
 
diff --git a/src/xrCore/_compressed_normal.h b/src/xrCore/_compressed_normal.h
index bb53a2aa4e7..d98fa93b2ad 100644
--- a/src/xrCore/_compressed_normal.h
+++ b/src/xrCore/_compressed_normal.h
@@ -2,7 +2,6 @@
 #ifndef _COMPR_NORMAL_
 #define _COMPR_NORMAL_
 #include "xrCore/_types.h"
-#include "xrCore/xrCore_impexp.h"
 
 // fwd. decl.
 template <class T> struct _vector3; typedef _vector3<float> Fvector;
diff --git a/src/xrCore/_math.h b/src/xrCore/_math.h
index 444c82ccafb..d733df8b0b3 100644
--- a/src/xrCore/_math.h
+++ b/src/xrCore/_math.h
@@ -4,7 +4,6 @@
 
 #include "_types.h"
 #include "cpuid.h"
-#include "xrCore_impexp.h"
 #include "xrCommon/inlining_macros.h"
 #ifdef _MSC_VER
 #include <intrin.h> // __rdtsc
diff --git a/src/xrCore/_random.h b/src/xrCore/_random.h
index 85bea9541cc..c6e965cd52f 100644
--- a/src/xrCore/_random.h
+++ b/src/xrCore/_random.h
@@ -2,7 +2,6 @@
 #define _LOCAL_RAND
 #include "_types.h"
 #include "xrCommon/inlining_macros.h"
-#include "xrCore_impexp.h"
 #include "xrCore/xrDebug.h"
 
 /*
diff --git a/src/xrCore/_std_extensions.h b/src/xrCore/_std_extensions.h
index 2ba71178417..59cd47896ed 100644
--- a/src/xrCore/_std_extensions.h
+++ b/src/xrCore/_std_extensions.h
@@ -5,7 +5,6 @@
 #include <math.h>
 #include <float.h>
 #include <stdio.h>
-#include "xrCore/xrCore_impexp.h"
 #include "xrCommon/math_funcs_inline.h"
 
 #define BREAK_AT_STRCMP
diff --git a/src/xrCore/log.h b/src/xrCore/log.h
index e8aaac809b3..e6f96f9e25a 100644
--- a/src/xrCore/log.h
+++ b/src/xrCore/log.h
@@ -1,7 +1,6 @@
 #pragma once
 #ifndef logH
 #define logH
-#include "xrCore_impexp.h"
 #include "xrCommon/xr_vector.h"
 
 // fwd. decl.
diff --git a/src/xrCore/memory_monitor.h b/src/xrCore/memory_monitor.h
index e962d87ab3f..b8350520a92 100644
--- a/src/xrCore/memory_monitor.h
+++ b/src/xrCore/memory_monitor.h
@@ -10,7 +10,6 @@
 
 #ifdef USE_MEMORY_MONITOR
 
-#include "xrCore_impexp.h"
 #include "_types.h"
 
 namespace memory_monitor
diff --git a/src/xrCore/xrCore.h b/src/xrCore/xrCore.h
index a6a2737786a..2e7a0b1843c 100644
--- a/src/xrCore/xrCore.h
+++ b/src/xrCore/xrCore.h
@@ -74,8 +74,6 @@
 #endif // frequently in release code due to large amount of VERIFY
 
 // Our headers
-#include "xrCore_impexp.h"
-
 #include "xrDebug.h"
 //#include "vector.h"
 
diff --git a/src/xrCore/xrCore_impexp.h b/src/xrCore/xrCore_impexp.h
deleted file mode 100644
index f1495c97168..00000000000
--- a/src/xrCore/xrCore_impexp.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-#ifndef XRCORE_IMPEXP_H
-#define XRCORE_IMPEXP_H
-
-#ifdef XRCORE_EXPORTS
-#define XRCORE_API XR_EXPORT
-#else
-#define XRCORE_API XR_IMPORT
-#endif
-
-#endif
diff --git a/src/xrCore/xrMemory.h b/src/xrCore/xrMemory.h
index b9d07e11f53..46594dedbf0 100644
--- a/src/xrCore/xrMemory.h
+++ b/src/xrCore/xrMemory.h
@@ -3,7 +3,6 @@
 #define xrMemoryH
 
 #include "memory_monitor.h"
-#include "xrCore/xrCore_impexp.h"
 
 #ifdef USE_MEMORY_MONITOR
 #define DEBUG_MEMORY_NAME
diff --git a/src/xrCore/xr_resource.h b/src/xrCore/xr_resource.h
index f283d0ab191..e6644e47b31 100644
--- a/src/xrCore/xr_resource.h
+++ b/src/xrCore/xr_resource.h
@@ -1,7 +1,6 @@
 #pragma once
 #ifndef xr_resourceH
 #define xr_resourceH
-#include "xrCore_impexp.h"
 #include "xrstring.h"
 
 // resource itself, the base class for all derived resources
diff --git a/src/xrCore/xrsharedmem.h b/src/xrCore/xrsharedmem.h
index c37bb082c91..b9497a8fa03 100644
--- a/src/xrCore/xrsharedmem.h
+++ b/src/xrCore/xrsharedmem.h
@@ -3,7 +3,6 @@
 #define xrsharedmemH
 
 //#include "_stl_extensions.h"
-#include "xrCore_impexp.h"
 #include "xrCommon/xr_vector.h"
 
 // fwd. decl.
diff --git a/src/xrCore/xrstring.h b/src/xrCore/xrstring.h
index 0478b0632b6..fc7a9365074 100644
--- a/src/xrCore/xrstring.h
+++ b/src/xrCore/xrstring.h
@@ -3,7 +3,6 @@
 #pragma once
 
 // TODO: tamlin: Get rid of _std_extensions.h as compile-time dependency, if possible.
-#include "xrCore_impexp.h"
 #include "_types.h"
 #include "_std_extensions.h"
 
diff --git a/src/xrEngine/xrEngine.vcxproj b/src/xrEngine/xrEngine.vcxproj
index c3def84af2d..b99a66fe598 100644
--- a/src/xrEngine/xrEngine.vcxproj
+++ b/src/xrEngine/xrEngine.vcxproj
@@ -261,7 +261,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalOptions>/ignore:4099 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>LuaJIT.lib;vfw32.lib;libogg_static.lib;libtheora_static.lib;oalib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>xrPhysics.lib;LuaJIT.lib;vfw32.lib;libogg_static.lib;libtheora_static.lib;oalib.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(xrExternals)OpenAutomate\libraries;$(xrExternals)libogg\win32\lib\$(Platform)\Debug;$(xrExternals)libtheora\win32\lib\$(Platform)\Debug;$(xrExternals)luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <MapExports>false</MapExports>
@@ -304,7 +304,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalOptions>/ignore:4099 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>LuaJIT.lib;vfw32.lib;libogg_static.lib;libtheora_static.lib;oalib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>xrPhysics.lib;LuaJIT.lib;vfw32.lib;libogg_static.lib;libtheora_static.lib;oalib.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(xrExternals)OpenAutomate\libraries;$(xrExternals)libogg\win32\lib\$(Platform)\Debug;$(xrExternals)libtheora\win32\lib\$(Platform)\Debug;$(xrExternals)luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <MapExports>false</MapExports>
@@ -344,7 +344,7 @@
       <Culture>0x0422</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>LuaJIT.lib;vfw32.lib;libogg_static.lib;libtheora_static.lib;oalib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>xrPhysics.lib;LuaJIT.lib;vfw32.lib;libogg_static.lib;libtheora_static.lib;oalib.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(xrExternals)OpenAutomate\libraries;$(xrExternals)libog\win32\lib\$(Platform)\Release;$(xrExternals)libtheora\win32\lib\$(Platform)\Release;$(xrLibRootDir)Mixed;$(xrExternals)luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <SubSystem>Windows</SubSystem>
@@ -381,7 +381,7 @@
       <Culture>0x0422</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>LuaJIT.lib;vfw32.lib;libogg_static.lib;libtheora_static.lib;oalib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>xrPhysics.lib;LuaJIT.lib;vfw32.lib;libogg_static.lib;libtheora_static.lib;oalib.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(xrExternals)OpenAutomate\libraries;$(xrExternals)libog\win32\lib\$(Platform)\Release;$(xrExternals)libtheora\win32\lib\$(Platform)\Release;$(xrLibRootDir)Mixed;$(xrExternals)luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <SubSystem>Windows</SubSystem>
@@ -421,7 +421,7 @@
       <Culture>0x0422</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>LuaJIT.lib;vfw32.lib;libogg_static.lib;libtheora_static.lib;oalib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>xrPhysics.lib;LuaJIT.lib;vfw32.lib;libogg_static.lib;libtheora_static.lib;oalib.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(xrExternals)OpenAutomate\libraries;$(xrExternals)libogg\win32\lib\$(Platform)\Release;$(xrExternals)libtheora\win32\lib\$(Platform)\Release;$(xrExternals)luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <SubSystem>Windows</SubSystem>
@@ -465,7 +465,7 @@
       <Culture>0x0422</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>LuaJIT.lib;vfw32.lib;libogg_static.lib;libtheora_static.lib;oalib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>xrPhysics.lib;LuaJIT.lib;vfw32.lib;libogg_static.lib;libtheora_static.lib;oalib.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(xrExternals)OpenAutomate\libraries;$(xrExternals)libogg\win32\lib\$(Platform)\Release;$(xrExternals)libtheora\win32\lib\$(Platform)\Release;$(xrExternals)luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <SubSystem>Windows</SubSystem>
@@ -509,7 +509,7 @@
       <Culture>0x0422</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>LuaJIT.lib;vfw32.lib;libogg_static.lib;libtheora_static.lib;oalib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>xrPhysics.lib;LuaJIT.lib;vfw32.lib;libogg_static.lib;libtheora_static.lib;oalib.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(xrExternals)OpenAutomate\libraries;$(xrExternals)libogg\win32\lib\$(Platform)\Debug;$(xrExternals)libtheora\win32\lib\$(Platform)\Debug;$(xrLibRootDir)$(Platform)\Debug;$(xrExternals)luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <MapExports>false</MapExports>
@@ -551,7 +551,7 @@
       <Culture>0x0422</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>LuaJIT.lib;vfw32.lib;libogg_static.lib;libtheora_static.lib;oalib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>xrPhysics.lib;LuaJIT.lib;vfw32.lib;libogg_static.lib;libtheora_static.lib;oalib.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(xrExternals)OpenAutomate\libraries;$(xrExternals)libogg\win32\lib\$(Platform)\Debug;$(xrExternals)libtheora\win32\lib\$(Platform)\Debug;$(xrLibRootDir)$(Platform)\Debug;$(xrExternals)luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <MapExports>false</MapExports>
@@ -590,7 +590,7 @@
       <Culture>0x0422</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>LuaJIT.lib;vfw32.lib;libogg_static.lib;libtheora_static.lib;oalib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>xrPhysics.lib;LuaJIT.lib;vfw32.lib;libogg_static.lib;libtheora_static.lib;oalib.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(xrExternals)OpenAutomate\libraries;$(xrExternals)libogg\win32\lib\$(Platform)\Release;$(xrExternals)libtheora\win32\lib\$(Platform)\Release;$(xrLibRootDir)$(Platform)\Mixed;$(xrExternals)luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <SubSystem>Windows</SubSystem>
@@ -629,7 +629,7 @@
       <Culture>0x0422</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>LuaJIT.lib;vfw32.lib;libogg_static.lib;libtheora_static.lib;oalib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>xrPhysics.lib;LuaJIT.lib;vfw32.lib;libogg_static.lib;libtheora_static.lib;oalib.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(xrExternals)OpenAutomate\libraries;$(xrExternals)libogg\win32\lib\$(Platform)\Release;$(xrExternals)libtheora\win32\lib\$(Platform)\Release;$(xrLibRootDir)$(Platform)\Mixed;$(xrExternals)luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <SubSystem>Windows</SubSystem>
@@ -669,7 +669,7 @@
       <Culture>0x0422</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>LuaJIT.lib;vfw32.lib;libogg_static.lib;libtheora_static.lib;oalib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>xrPhysics.lib;LuaJIT.lib;vfw32.lib;libogg_static.lib;libtheora_static.lib;oalib.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(xrExternals)OpenAutomate\libraries;$(xrExternals)libogg\win32\lib\$(Platform)\Release;$(xrExternals)libtheora\win32\lib\$(Platform)\Release;$(xrLibRootDir)$(Platform)\Release;$(xrExternals)luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <SubSystem>Windows</SubSystem>
@@ -713,7 +713,7 @@
       <Culture>0x0422</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>LuaJIT.lib;vfw32.lib;libogg_static.lib;libtheora_static.lib;oalib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>xrPhysics.lib;LuaJIT.lib;vfw32.lib;libogg_static.lib;libtheora_static.lib;oalib.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(xrExternals)OpenAutomate\libraries;$(xrExternals)libogg\win32\lib\$(Platform)\Release;$(xrExternals)libtheora\win32\lib\$(Platform)\Release;$(xrLibRootDir)$(Platform)\Release;$(xrExternals)luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <SubSystem>Windows</SubSystem>
@@ -1005,9 +1005,6 @@
     <ProjectReference Include="$(xrExternals)luabind\src\luabind.vcxproj">
       <Project>{ccd4afae-aa10-42c6-a452-fdee497ccdf1}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(SolutionDir)xrPhysics\xrPhysics.vcxproj">
-      <Project>{98d24a3d-7666-4c11-9d6e-b10393ce8cba}</Project>
-    </ProjectReference>
     <ProjectReference Include="$(SolutionDir)xrScriptEngine\xrScriptEngine.vcxproj">
       <Project>{132c62de-de85-4978-9675-c78ed4da46f0}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
@@ -1018,6 +1015,9 @@
     <ProjectReference Include="..\utils\xrMiscMath\xrMiscMath.vcxproj">
       <Project>{7885cf3c-ee04-4c67-9467-1fbf9a36b037}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\xrPhysics\xrPhysics.vcxproj">
+      <Project>{98d24a3d-7666-4c11-9d6e-b10393ce8cba}</Project>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/src/xrGame/xrGame.vcxproj b/src/xrGame/xrGame.vcxproj
index 9b1ef2508d1..d3c0bdf5341 100644
--- a/src/xrGame/xrGame.vcxproj
+++ b/src/xrGame/xrGame.vcxproj
@@ -160,7 +160,7 @@
       <AdditionalLibraryDirectories>$(xrExternals)OpenAutomate\libraries;$(xrExternals)jpeg\libraries\Release;$(xrExternals)luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <MapExports>false</MapExports>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <AdditionalDependencies>LuaJIT.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>xrPhysics.lib;LuaJIT.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <LargeAddressAware>true</LargeAddressAware>
       <SubSystem>Windows</SubSystem>
     </Link>
@@ -205,7 +205,7 @@
       <AdditionalLibraryDirectories>$(xrExternals)OpenAutomate\libraries;$(xrExternals)jpeg\libraries\Release;$(xrExternals)luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <MapExports>false</MapExports>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <AdditionalDependencies>LuaJIT.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>xrPhysics.lib;LuaJIT.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <LargeAddressAware>true</LargeAddressAware>
       <SubSystem>Windows</SubSystem>
     </Link>
@@ -249,7 +249,7 @@
       <LargeAddressAware>true</LargeAddressAware>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <ImportLibrary>$(xrLibDir)$(TargetName).lib</ImportLibrary>
-      <AdditionalDependencies>LuaJIT.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>xrPhysics.lib;LuaJIT.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SubSystem>Windows</SubSystem>
     </Link>
   </ItemDefinitionGroup>
@@ -292,7 +292,7 @@
       <LargeAddressAware>true</LargeAddressAware>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <ImportLibrary>$(xrLibDir)$(TargetName).lib</ImportLibrary>
-      <AdditionalDependencies>LuaJIT.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>xrPhysics.lib;LuaJIT.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SubSystem>Windows</SubSystem>
     </Link>
   </ItemDefinitionGroup>
@@ -340,7 +340,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <LinkTimeCodeGeneration />
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <AdditionalDependencies>LuaJIT.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>xrPhysics.lib;LuaJIT.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <LargeAddressAware>true</LargeAddressAware>
     </Link>
   </ItemDefinitionGroup>
@@ -389,7 +389,7 @@
       <LinkTimeCodeGeneration>
       </LinkTimeCodeGeneration>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <AdditionalDependencies>LuaJIT.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>xrPhysics.lib;LuaJIT.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <LargeAddressAware>true</LargeAddressAware>
     </Link>
   </ItemDefinitionGroup>
@@ -4049,10 +4049,6 @@
       <Project>{435bac9a-b225-457d-ab40-c9bd0cc8838c}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="$(SolutionDir)xrPhysics\xrPhysics.vcxproj">
-      <Project>{98d24a3d-7666-4c11-9d6e-b10393ce8cba}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
     <ProjectReference Include="$(xrExternals)cximage\cximage.vcxproj">
       <Project>{880cd250-ba77-4daf-a8d4-552f12dd3ae4}</Project>
     </ProjectReference>
@@ -4074,6 +4070,9 @@
     <ProjectReference Include="$(SolutionDir)xrScriptEngine\xrScriptEngine.vcxproj">
       <Project>{132c62de-de85-4978-9675-c78ed4da46f0}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\xrPhysics\xrPhysics.vcxproj">
+      <Project>{98d24a3d-7666-4c11-9d6e-b10393ce8cba}</Project>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/src/xrGameSpy/xrGameSpy.h b/src/xrGameSpy/xrGameSpy.h
index ed8ad506ac2..b7e366a53fb 100644
--- a/src/xrGameSpy/xrGameSpy.h
+++ b/src/xrGameSpy/xrGameSpy.h
@@ -1,11 +1,5 @@
 #pragma once
 
-#ifdef XRGAMESPY_EXPORTS
-#define XRGAMESPY_API XR_EXPORT
-#else
-#define XRGAMESPY_API XR_IMPORT
-#endif
-
 #include <GameSpy/Common/gsCommon.h>
 #include <GameSpy/Common/gsAvailable.h>
 #include <GameSpy/ghttp/ghttp.h>
diff --git a/src/xrNetServer/NET_Shared.h b/src/xrNetServer/NET_Shared.h
index ac9c3e4286b..26de894d9b7 100644
--- a/src/xrNetServer/NET_Shared.h
+++ b/src/xrNetServer/NET_Shared.h
@@ -2,12 +2,6 @@
 
 #include "xrCore/_types.h"
 
-#ifdef XR_NETSERVER_EXPORTS
-#define XRNETSERVER_API XR_EXPORT
-#else
-#define XRNETSERVER_API XR_IMPORT
-#endif
-
 // XXX: review and delete
 //#include "xrCore/net_utils.h"
 //#include <dplay/dplay8.h>
diff --git a/src/xrParticles/psystem.h b/src/xrParticles/psystem.h
index 30d80fff18e..a86c57229f4 100644
--- a/src/xrParticles/psystem.h
+++ b/src/xrParticles/psystem.h
@@ -1,15 +1,7 @@
 #pragma once
-#ifndef PSystemH
-#define PSystemH
 
 #include "xrCore/_vector3d.h"
 
-#ifdef XR_PARTICLES_EXPORTS
-#define PARTICLES_API XR_EXPORT
-#else
-#define PARTICLES_API XR_IMPORT
-#endif
-
 // Actually this must be < sqrt(MAXFLOAT) since we store this value squared.
 #define P_MAXFLOAT 1.0e16f
 
@@ -221,4 +213,3 @@ class IParticleManager
 
 PARTICLES_API IParticleManager* ParticleManager();
 }
-#endif // PSystemH
diff --git a/src/xrPhysics/xrPhysics.h b/src/xrPhysics/xrPhysics.h
index dbea519eb2a..6f70f09beec 100644
--- a/src/xrPhysics/xrPhysics.h
+++ b/src/xrPhysics/xrPhysics.h
@@ -1,12 +1 @@
 #pragma once
-
-#ifdef XRPHYSICS_EXPORTS
-#define XRPHYSICS_API XR_EXPORT
-#else
-#define XRPHYSICS_API XR_IMPORT
-#ifndef _EDITOR
-#pragma comment(lib, "xrPhysics.lib")
-#else
-#pragma comment(lib, "xrPhysicsB.lib")
-#endif
-#endif
diff --git a/src/xrScriptEngine/xrScriptEngine.hpp b/src/xrScriptEngine/xrScriptEngine.hpp
index 85ccc006ec4..196ccc99591 100644
--- a/src/xrScriptEngine/xrScriptEngine.hpp
+++ b/src/xrScriptEngine/xrScriptEngine.hpp
@@ -1,11 +1,5 @@
 #pragma once
 
-#ifdef XRSCRIPTENGINE_EXPORTS
-#define XRSCRIPTENGINE_API XR_EXPORT
-#else
-#define XRSCRIPTENGINE_API XR_IMPORT
-#endif
-
 #pragma warning(push)
 #pragma warning(disable : 4244)
 #pragma warning(disable : 4995)
diff --git a/src/xrSound/Sound.h b/src/xrSound/Sound.h
index 7fb63a22738..617cd550f5c 100644
--- a/src/xrSound/Sound.h
+++ b/src/xrSound/Sound.h
@@ -8,12 +8,6 @@
 #include "xrCore/_vector3d.h"
 #include "xrCommon/xr_vector.h" // DEFINE_VECTOR
 
-#ifdef XRSOUND_EXPORTS
-#define XRSOUND_API XR_EXPORT
-#else
-#define XRSOUND_API XR_IMPORT
-#endif
-
 #ifdef __BORLANDC__
 #define XRSOUND_EDITOR_API XRSOUND_API