diff --git a/vcg/complex/algorithms/update/flag.h b/vcg/complex/algorithms/update/flag.h
index 2a7957c2..75c6860c 100644
--- a/vcg/complex/algorithms/update/flag.h
+++ b/vcg/complex/algorithms/update/flag.h
@@ -23,6 +23,10 @@
 #ifndef __VCG_TRI_UPDATE_FLAGS
 #define __VCG_TRI_UPDATE_FLAGS
 
+#include <vcg/simplex/face/pos.h>
+#include <vcg/simplex/tetrahedron/pos.h>
+#include <vcg/simplex/edge/pos.h>
+
 namespace vcg {
 namespace tri {
 /// \ingroup trimesh
diff --git a/vcg/complex/allocate.h b/vcg/complex/allocate.h
index 461684a9..60c370dc 100644
--- a/vcg/complex/allocate.h
+++ b/vcg/complex/allocate.h
@@ -26,6 +26,8 @@
 #include <vector>
 #include <set>
 
+#include <vcg/container/simple_temporary_data.h>
+
 #include "used_types.h"
 
 //#ifndef __VCG_MESH
diff --git a/vcg/complex/foreach.h b/vcg/complex/foreach.h
index a062e41c..58dc3d99 100644
--- a/vcg/complex/foreach.h
+++ b/vcg/complex/foreach.h
@@ -24,9 +24,11 @@
 #ifndef VCG__FOREACH_H
 #define VCG__FOREACH_H
 
-#ifndef __VCG_MESH
-#error "This file should not be included alone. It is automatically included by complex.h"
-#endif
+//#ifndef __VCG_MESH
+//#error "This file should not be included alone. It is automatically included by complex.h"
+//#endif
+
+#include <vcg/simplex/face/pos.h>
 
 namespace vcg {
 namespace tri {
diff --git a/vcg/simplex/edge/topology.h b/vcg/simplex/edge/topology.h
index 13904c05..b942c5a8 100644
--- a/vcg/simplex/edge/topology.h
+++ b/vcg/simplex/edge/topology.h
@@ -27,6 +27,9 @@
 #include <vector>
 #include <vcg/complex/allocate.h>
 
+#include "pos.h"
+#include "component.h"
+
 namespace vcg {
 namespace edge {
 /** \addtogroup edge */
diff --git a/vcg/simplex/face/topology.h b/vcg/simplex/face/topology.h
index bb07cec7..7caa961a 100644
--- a/vcg/simplex/face/topology.h
+++ b/vcg/simplex/face/topology.h
@@ -24,6 +24,8 @@
 #ifndef _VCG_FACE_TOPOLOGY
 #define _VCG_FACE_TOPOLOGY
 
+#include "pos.h"
+
 #include <vcg/complex/allocate.h>
 
 namespace vcg {
diff --git a/vcg/simplex/tetrahedron/pos.h b/vcg/simplex/tetrahedron/pos.h
index c9ed4629..d47348ce 100644
--- a/vcg/simplex/tetrahedron/pos.h
+++ b/vcg/simplex/tetrahedron/pos.h
@@ -30,6 +30,11 @@
 #ifndef __VCG_TETRA_POS
 #define __VCG_TETRA_POS
 
+#include <vector>
+#include <algorithm>
+
+#include "component.h"
+
 namespace vcg {
 namespace tetra {
 
@@ -87,7 +92,7 @@ public:
         return _vi;
     }
 
-    inline bool End(){return (Vt()==NULL);}
+	inline bool End(){return (Vt()==nullptr);}
 
     /// move on the next tetrahedron that share the vertex
     void operator++()
@@ -97,7 +102,7 @@ public:
         Vt() = tw->VTp(vi);
         Vi() = tw->VTi(vi);
 
-        assert((Vt()==NULL)||((tw->V(vi))==(Vt()->V(Vi()))));
+		assert((Vt()==nullptr)||((tw->V(vi))==(Vt()->V(Vi()))));
     }
 
 };
diff --git a/vcg/simplex/tetrahedron/topology.h b/vcg/simplex/tetrahedron/topology.h
index 5203af47..a72b8883 100644
--- a/vcg/simplex/tetrahedron/topology.h
+++ b/vcg/simplex/tetrahedron/topology.h
@@ -24,6 +24,8 @@
 #ifndef _VCG_TETRA_TOPOLOGY
 #define _VCG_TETRA_TOPOLOGY
 
+#include <cassert>
+
 namespace vcg {
 namespace tetrahedron {
 /** \addtogroup tetrahedron */