diff --git a/ca/calib01.cpp b/ca/calib01.cpp
index 84c16fc80..d61df5119 100755
--- a/ca/calib01.cpp
+++ b/ca/calib01.cpp
@@ -5,6 +5,7 @@
 
 #include <mov.h>
 #include <pconti.h>
+#include <treectrl.h>
 
 #include "calib01.h"
 #include "calib02.h"
diff --git a/cg/cg2107.cpp b/cg/cg2107.cpp
index a5562e2ec..bc7bbe50e 100755
--- a/cg/cg2107.cpp
+++ b/cg/cg2107.cpp
@@ -7,7 +7,7 @@
 #include <defmask.h>
 #include <diction.h>
 #include <relation.h>
-#include <tree.h>
+#include <treectrl.h>
 
 ///////////////////////////////////////////////////////////
 // TPartite_cache
@@ -485,7 +485,8 @@ bool TEasySolder_mask::on_field_event(TOperable_field& o, TField_event e, long j
       t.set_root(_conto, _numreg, all);
       if (t.goto_root())
         t.expand();
-      tfield(F_PARTITE).win().force_update();
+      TTree_field& tfp = tfield(F_PARTITE);
+      tfp.win().force_update();
     }
     break;
   case F_PARTITE:
diff --git a/cg/cg2107.h b/cg/cg2107.h
index a27e30071..fe9b62dbf 100755
--- a/cg/cg2107.h
+++ b/cg/cg2107.h
@@ -9,6 +9,8 @@
 #include "cglib01.h"
 #endif
 
+#include <tree.h>
+
 class TEasySolder_mask : public TAutomask
 {                       
   TBill _conto;                // Conto fisso del cliente/fornitore
diff --git a/db/db0500.cpp b/db/db0500.cpp
index a1be85436..9a557fceb 100755
--- a/db/db0500.cpp
+++ b/db/db0500.cpp
@@ -5,6 +5,7 @@
 #include <progind.h>
 #include <relapp.h>
 #include <sheet.h>
+#include <treectrl.h>
 #include <utility.h>
 
 #include "db0.h"
diff --git a/db/db1300.cpp b/db/db1300.cpp
index 1bc1654c6..d950f5153 100755
--- a/db/db1300.cpp
+++ b/db/db1300.cpp
@@ -4,6 +4,7 @@
 #include <printer.h>
 #include <progind.h>
 #include <sheet.h>
+#include <treectrl.h>
 
 #include "dblib.h"
 
diff --git a/ve/velib06.cpp b/ve/velib06.cpp
index 739a6d579..9cc6628ed 100755
--- a/ve/velib06.cpp
+++ b/ve/velib06.cpp
@@ -3,13 +3,13 @@
 #include <dongle.h>
 #include <execp.h>
 #include <modaut.h>
+#include <postman.h>
 #include <recset.h>
 #include <sheet.h>
 #include <smartcard.h>
 #include <tabutil.h>
 #include <tree.h>
 #include <treectrl.h>
-#include <postman.h>
 #include <urldefid.h>
 #include <utility.h>