diff --git a/EgtExch3dm.rc b/EgtExch3dm.rc
index 74a29a8..8f77c5a 100644
Binary files a/EgtExch3dm.rc and b/EgtExch3dm.rc differ
diff --git a/Export3dm.cpp b/Export3dm.cpp
index 099fa03..c595d2d 100644
--- a/Export3dm.cpp
+++ b/Export3dm.cpp
@@ -15,30 +15,19 @@
 #include "stdafx.h"
 #include "Export3dm.h"
 #include "DllMain.h"
-#include "/EgtDev/Include/EE3DllMain.h"
-#include "/EgtDev/Include/EGkGeomDB.h"
-#include "/EgtDev/Include/EGkSurfFlatRegion.h"
-#include "/EgtDev/Include/EGkSurfTriMesh.h"
-#include "/EgtDev/Include/EGkSurfBezier.h"
+#include "/EgtDev/Include/EGkGeoPoint3d.h"
 #include "/EgtDev/Include/EGkCurveLine.h"
 #include "/EgtDev/Include/EGkCurveArc.h"
 #include "/EgtDev/Include/EGkCurveBezier.h"
 #include "/EgtDev/Include/EGkCurveComposite.h"
-#include "/EgtDev/Include/EGkGdbIterator.h"
-#include "/EgtDev/Include/EGkGeoObjType.h"
-#include "/EgtDev/Include/EGkGeoPoint3d.h"
-#include "/EgtDev/Include/EGnStringUtils.h"
-#include "/EgtDev/Include/SELkKeyProc.h"
-#include "/EgtDev/Include/EgtKeyCodes.h"
-#include "/EgtDev/Include/EgtStringConverter.h"
-#include "/EgtDev/Include/EgtPointerOwner.h"
-#include "/EgtDev/Include/EGnStringUtils.h"
+#include "/EgtDev/Include/EGkSurfFlatRegion.h"
+#include "/EgtDev/Include/EGkSurfTriMesh.h"
+#include "/EgtDev/Include/EGkSurfBezier.h"
 #include "/EgtDev/Include/EGkExtText.h"
 #include "/EgtDev/Include/EGkExtDimension.h"
-#include "/EgtDev/Extern/opennurbs/Include/opennurbs.h"
+#include "/EgtDev/Include/EGnStringUtils.h"
+#include "/EgtDev/Include/EgtKeyCodes.h"
 #include <fstream>
-#include <map>
-
 
 using namespace std ;
 //N.B.:
diff --git a/Export3dm.h b/Export3dm.h
index ea82169..6bd25d5 100644
--- a/Export3dm.h
+++ b/Export3dm.h
@@ -16,7 +16,6 @@
 #define NOMINMAX
 
 #include "/EgtDev/Include/EE3Export3dm.h"
-#include "/EgtDev/Include/EGnWriter.h"
 #include "/EgtDev/Include/EGkGeoObj.h"
 #include "/EgtDev/Include/EGkGdbIterator.h"
 #include "/EgtDev/Include/EGkFrame3d.h"
@@ -74,7 +73,6 @@ class Export3dm : public IExport3dm
    private :
       int      m_nFilter ;                         // filtro su livello, modo e stato, se l'oggeto da valutare è un oggetto geometrico
       int      m_nGroupFilter ;                    // filtro su livello, modo e stato, se l'oggetto da valutare è un gruppo
-      Writer   m_Writer ;                          // scrittore di file di testo
       ONX_Model m_model ;                          // modello opennurbs
       std::map<int,int> m_mLayer ;                 // mappa dei layer  <indice layer nge, indice del componente layer nel modello 3dm>
       std::map<std::string,int> m_mMaterial ;      // mappa dei materiali  <stringa del colore ( R,G,B), indice del componente material nel modello 3dm>
diff --git a/Import3dm.cpp b/Import3dm.cpp
index fba2d43..969476f 100644
--- a/Import3dm.cpp
+++ b/Import3dm.cpp
@@ -15,31 +15,25 @@
 #include "stdafx.h"
 #include "Import3dm.h"
 #include "DllMain.h"
-#include "/EgtDev/Include/EE3DllMain.h"
-#include "/EgtDev/Include/EGnStringUtils.h"
-#include "/EgtDev/Include/SELkKeyProc.h"
-#include "/EgtDev/Include/EgtKeyCodes.h"
-#include "/EgtDev/Include/EgtPointerOwner.h"
 #include "/EgtDev/Include/EGkGeoPoint3d.h"
 #include "/EgtDev/Include/EGkCurveLine.h"
 #include "/EgtDev/Include/EGkArcSpecial.h"
 #include "/EgtDev/Include/EGkCurveComposite.h"
 #include "/EgtDev/Include/EGkCurveBezier.h"
 #include "/EgtDev/Include/EGkCurveAux.h"
-#include "/EgtDev/Include/EGkSurfAux.h"
-#include "/EgtDev/Include/EGkStmFromCurves.h"
-#include "/EgtDev/Include/EGkSurfBezier.h"
-#include "/EgtDev/Include/EGkStmFromTriangleSoup.h"
 #include "/EgtDev/Include/EGkSfrCreate.h"
-#include "/EgtDev/Include/EXeConst.h"
-#include "/EgtDev/Include/EGkStringUtils3d.h"
+#include "/EgtDev/Include/EGkStmFromCurves.h"
+#include "/EgtDev/Include/EGkStmFromTriangleSoup.h"
+#include "/EgtDev/Include/EGkSurfBezier.h"
+#include "/EgtDev/Include/EGkSurfAux.h"
 #include "/EgtDev/Include/EGkExtText.h"
 #include "/EgtDev/Include/EGkExtDimension.h"
-#include "/EgtDev/Include/EGkVector3d.h"
-#include <map>
+#include "/EgtDev/Include/EGnStringUtils.h"
+#include "/EgtDev/Include/EgtKeyCodes.h"
 
 using namespace std ;
 
+//----------------------------------------------------------------------------
 // deviazione angolare standard (in gradi)
 const double ANG_TOL_STD_DEG = 15 ;
 // tolleranza lineare affinata
diff --git a/Import3dm.h b/Import3dm.h
index afd2d9f..c5243a4 100644
--- a/Import3dm.h
+++ b/Import3dm.h
@@ -13,6 +13,8 @@
 
 #pragma once
 
+#define NOMINMAX
+
 #include "/EgtDev/Include/EE3Import3dm.h"
 #include "/EgtDev/Include/EGkSurfTriMesh.h"
 #include "/EgtDev/Include/EGkSurfFlatRegion.h"