diff --git a/src/Controls/SMESH_ControlsDef.hxx b/src/Controls/SMESH_ControlsDef.hxx
index d692a6e5d..dba5f8198 100644
--- a/src/Controls/SMESH_ControlsDef.hxx
+++ b/src/Controls/SMESH_ControlsDef.hxx
@@ -46,7 +46,7 @@
 #include "SMESH_Controls.hxx"
 
 #ifdef WNT
- #if defined SMESHCONTROLS_EXPORTS
+ #if defined SMESHCONTROLS_EXPORTS || defined SMESHControls_EXPORTS
   #define SMESHCONTROLS_EXPORT __declspec( dllexport )
  #else
   #define SMESHCONTROLS_EXPORT __declspec( dllimport )
diff --git a/src/Driver/Driver_Mesh.h b/src/Driver/Driver_Mesh.h
index 9840ed034..94d03ad5e 100644
--- a/src/Driver/Driver_Mesh.h
+++ b/src/Driver/Driver_Mesh.h
@@ -29,7 +29,7 @@
 #include <string>
 
 #ifdef WNT
- #if defined MESHDRIVER_EXPORTS
+ #if defined MESHDRIVER_EXPORTS || defined MeshDriver_EXPORTS
   #define MESHDRIVER_EXPORT __declspec( dllexport )
  #else
   #define MESHDRIVER_EXPORT __declspec( dllimport )
diff --git a/src/DriverDAT/SMESH_DriverDAT.hxx b/src/DriverDAT/SMESH_DriverDAT.hxx
index 9020c6fc1..182fd1122 100755
--- a/src/DriverDAT/SMESH_DriverDAT.hxx
+++ b/src/DriverDAT/SMESH_DriverDAT.hxx
@@ -27,7 +27,7 @@
 #define _SMESH_DriverDAT_HXX_
 
 #ifdef WNT
- #if defined MESHDRIVERDAT_EXPORTS
+ #if defined MESHDRIVERDAT_EXPORTS || defined MeshDriverDAT_EXPORTS
   #define MESHDRIVERDAT_EXPORT __declspec( dllexport )
  #else
   #define MESHDRIVERDAT_EXPORT __declspec( dllimport )
diff --git a/src/DriverMED/SMESH_DriverMED.hxx b/src/DriverMED/SMESH_DriverMED.hxx
index 0042f9366..83e948194 100755
--- a/src/DriverMED/SMESH_DriverMED.hxx
+++ b/src/DriverMED/SMESH_DriverMED.hxx
@@ -27,7 +27,7 @@
 #define _SMESH_DriverMED_HXX_
 
 #ifdef WNT
- #if defined MESHDRIVERMED_EXPORTS
+ #if defined MESHDRIVERMED_EXPORTS || defined MeshDriverMED_EXPORTS
   #define MESHDRIVERMED_EXPORT __declspec( dllexport )
  #else
   #define MESHDRIVERMED_EXPORT __declspec( dllimport )
diff --git a/src/DriverSTL/SMESH_DriverSTL.hxx b/src/DriverSTL/SMESH_DriverSTL.hxx
index 4246d18ad..f30ef50fe 100755
--- a/src/DriverSTL/SMESH_DriverSTL.hxx
+++ b/src/DriverSTL/SMESH_DriverSTL.hxx
@@ -27,7 +27,7 @@
 #define _SMESH_DriverSTL_HXX_
 
 #ifdef WNT
- #if defined MESHDRIVERSTL_EXPORTS
+ #if defined MESHDRIVERSTL_EXPORTS || defined MeshDriverSTL_EXPORTS
   #define MESHDRIVERSTL_EXPORT __declspec( dllexport )
  #else
   #define MESHDRIVERSTL_EXPORT __declspec( dllimport )
diff --git a/src/DriverUNV/SMESH_DriverUNV.hxx b/src/DriverUNV/SMESH_DriverUNV.hxx
index 106b6e939..212764429 100755
--- a/src/DriverUNV/SMESH_DriverUNV.hxx
+++ b/src/DriverUNV/SMESH_DriverUNV.hxx
@@ -27,7 +27,7 @@
 #define _SMESH_DriverUNV_HXX_
 
 #ifdef WNT
- #if defined MESHDRIVERUNV_EXPORTS
+ #if defined MESHDRIVERUNV_EXPORTS || defined MeshDriverUNV_EXPORTS
   #define MESHDRIVERUNV_EXPORT __declspec( dllexport )
  #else
   #define MESHDRIVERUNV_EXPORT __declspec( dllimport )
diff --git a/src/OBJECT/SMESH_Object.h b/src/OBJECT/SMESH_Object.h
index 638155200..3d4dbbf8b 100644
--- a/src/OBJECT/SMESH_Object.h
+++ b/src/OBJECT/SMESH_Object.h
@@ -29,7 +29,7 @@
 #define SMESH_OBJECT_H
 
 #ifdef WNT
- #if defined SMESHOBJECT_EXPORTS
+ #if defined SMESHOBJECT_EXPORTS || defined SMESHObject_EXPORTS
   #define SMESHOBJECT_EXPORT __declspec( dllexport )
  #else
   #define SMESHOBJECT_EXPORT __declspec( dllimport )
diff --git a/src/SMESH/SMESH_SMESH.hxx b/src/SMESH/SMESH_SMESH.hxx
index 249fc6a85..72923b2e9 100755
--- a/src/SMESH/SMESH_SMESH.hxx
+++ b/src/SMESH/SMESH_SMESH.hxx
@@ -27,7 +27,7 @@
 #define _SMESH_SMESH_HXX_
 
 #ifdef WNT
- #if defined SMESH_EXPORTS
+ #if defined SMESHimpl_EXPORTS
   #define SMESH_EXPORT __declspec( dllexport )
  #else
   #define SMESH_EXPORT __declspec( dllimport )
diff --git a/src/SMESHClient/SMESH_Client.hxx b/src/SMESHClient/SMESH_Client.hxx
index 99e3de4b8..ac2411676 100644
--- a/src/SMESHClient/SMESH_Client.hxx
+++ b/src/SMESHClient/SMESH_Client.hxx
@@ -32,7 +32,7 @@
 #include CORBA_SERVER_HEADER(SMESH_Mesh)
 
 #ifdef WNT
-# ifdef SMESHCLIENT_EXPORTS
+# if defined SMESHCLIENT_EXPORTS || defined SMESHClient_EXPORTS
 #  define SMESHCLIENT_EXPORT __declspec( dllexport )
 # else
 #  define SMESHCLIENT_EXPORT __declspec( dllimport )
diff --git a/src/SMESHFiltersSelection/SMESH_Type.h b/src/SMESHFiltersSelection/SMESH_Type.h
index 106110e09..881527ac1 100644
--- a/src/SMESHFiltersSelection/SMESH_Type.h
+++ b/src/SMESHFiltersSelection/SMESH_Type.h
@@ -30,7 +30,7 @@
 #define SMESH_TYPE_HEADER
 
 #ifdef WNT
- #if defined SMESHFILTERSSELECTION_EXPORTS
+ #if defined SMESHFILTERSSELECTION_EXPORTS || defined SMESHFiltersSelection_EXPORTS
   #define SMESHFILTERSSELECTION_EXPORT __declspec( dllexport )
  #else
   #define SMESHFILTERSSELECTION_EXPORT __declspec( dllimport )
diff --git a/src/SMESHGUI/SMESH_SMESHGUI.hxx b/src/SMESHGUI/SMESH_SMESHGUI.hxx
index 46a6cb93a..fb74c1828 100755
--- a/src/SMESHGUI/SMESH_SMESHGUI.hxx
+++ b/src/SMESHGUI/SMESH_SMESHGUI.hxx
@@ -26,7 +26,7 @@
 #define SMESH_SMESHGUI_HXX
 
 #ifdef WNT
- #if defined SMESHGUI_EXPORTS
+ #if defined SMESHGUI_EXPORTS || defined SMESH_EXPORTS
   #define SMESHGUI_EXPORT __declspec( dllexport )
  #else
   #define SMESHGUI_EXPORT __declspec( dllimport )
diff --git a/src/SMESH_I/SMESH.hxx b/src/SMESH_I/SMESH.hxx
index 0bd99b692..be211311a 100644
--- a/src/SMESH_I/SMESH.hxx
+++ b/src/SMESH_I/SMESH.hxx
@@ -29,7 +29,7 @@
 #define _SMESH_I_SMESH_HXX_
 
 #ifdef WNT
- #if defined SMESH_I_EXPORTS
+ #if defined SMESH_I_EXPORTS || defined SMESHEngine_EXPORTS
   #define SMESH_I_EXPORT __declspec( dllexport )
  #else
   #define SMESH_I_EXPORT __declspec( dllimport )
diff --git a/src/SMESH_SWIG_WITHIHM/libSMESH_Swig.h b/src/SMESH_SWIG_WITHIHM/libSMESH_Swig.h
index a288506a1..bf60f35ff 100644
--- a/src/SMESH_SWIG_WITHIHM/libSMESH_Swig.h
+++ b/src/SMESH_SWIG_WITHIHM/libSMESH_Swig.h
@@ -27,7 +27,7 @@
 #define LIBSMESH_SWIG_H
 
 #ifdef WNT
-#if defined SMESH_SWIG_EXPORTS
+#if defined SMESH_SWIG_EXPORTS || defined _libSMESH_Swig_EXPORTS
   #define SMESH_SWIG_EXPORT __declspec( dllexport )
  #else
   #define SMESH_SWIG_EXPORT __declspec( dllimport )
diff --git a/src/StdMeshers/SMESH_StdMeshers.hxx b/src/StdMeshers/SMESH_StdMeshers.hxx
index be440c1bd..aeee7480d 100755
--- a/src/StdMeshers/SMESH_StdMeshers.hxx
+++ b/src/StdMeshers/SMESH_StdMeshers.hxx
@@ -28,7 +28,7 @@
 #define _SMESH_StdMeshers_HXX_
 
 #ifdef WNT
- #if defined STDMESHERS_EXPORTS
+ #if defined STDMESHERS_EXPORTS || defined StdMeshers_EXPORTS
   #define STDMESHERS_EXPORT __declspec( dllexport )
  #else
   #define STDMESHERS_EXPORT __declspec( dllimport )
diff --git a/src/StdMeshersGUI/SMESH_StdMeshersGUI.hxx b/src/StdMeshersGUI/SMESH_StdMeshersGUI.hxx
index 76ce2a2a2..78982bec9 100755
--- a/src/StdMeshersGUI/SMESH_StdMeshersGUI.hxx
+++ b/src/StdMeshersGUI/SMESH_StdMeshersGUI.hxx
@@ -26,7 +26,7 @@
 #define SMESH_STDMESHERSGUI_HXX
 
 #ifdef WNT
- #if defined STDMESHERSGUI_EXPORTS
+ #if defined STDMESHERSGUI_EXPORTS || defined StdMeshersGUI_EXPORTS
   #define STDMESHERSGUI_EXPORT __declspec( dllexport )
  #else
   #define STDMESHERSGUI_EXPORT __declspec( dllimport )
diff --git a/src/StdMeshers_I/SMESH_StdMeshers_I.hxx b/src/StdMeshers_I/SMESH_StdMeshers_I.hxx
index 70a1bda44..7a4eb769b 100755
--- a/src/StdMeshers_I/SMESH_StdMeshers_I.hxx
+++ b/src/StdMeshers_I/SMESH_StdMeshers_I.hxx
@@ -28,7 +28,7 @@
 #define _SMESH_StdMeshers_I_HXX_
 
 #ifdef WNT
- #if defined STDMESHERS_I_EXPORTS
+ #if defined STDMESHERS_I_EXPORTS || defined StdMeshersEngine_EXPORTS
   #define STDMESHERS_I_EXPORT __declspec( dllexport )
  #else
   #define STDMESHERS_I_EXPORT __declspec( dllimport )