diff --git a/vcg/complex/trimesh/refine.h b/vcg/complex/trimesh/refine.h
index 67583b19..27931a77 100644
--- a/vcg/complex/trimesh/refine.h
+++ b/vcg/complex/trimesh/refine.h
@@ -24,6 +24,9 @@
   History
 
 $Log: not supported by cvs2svn $
+Revision 1.10  2006/05/03 21:42:10  cignoni
+HasPerWedgeTexture -> HasPerWedgeTexture(m)
+
 Revision 1.9  2005/12/22 11:24:09  cignoni
 removed div by zero bug in callback of refine (tnx to Mario Latronico)
 
@@ -68,6 +71,7 @@ first working version
 #include<vcg/complex/trimesh/allocate.h>
 #include<vcg/complex/trimesh/update/topology.h>
 #include<wrap/callback.h>
+#include <vcg/complex/trimesh/base.h>
 
 
 namespace vcg{
diff --git a/vcg/space/intersection3.h b/vcg/space/intersection3.h
index 23a7ee07..46059a06 100644
--- a/vcg/space/intersection3.h
+++ b/vcg/space/intersection3.h
@@ -24,6 +24,13 @@
   History
 
 $Log: not supported by cvs2svn $
+Revision 1.24  2006/06/01 08:38:02  pietroni
+Added functions:
+
+- Intersection_Segment_Triangle
+- Intersection_Plane_Box
+- Intersection_Triangle_Box
+
 Revision 1.23  2006/03/29 07:53:36  cignoni
 Missing ';' (thx Maarten)
 
@@ -556,7 +563,7 @@ bool Intersection_Plane_Box(const vcg::Plane3<ScalarType> &pl,
 							vcg::Box3<ScalarType> &bbox)
 {
 	
-	typedef typename Segment3<ScalarType> SegmentType;
+	typedef typename vcg::Segment3<ScalarType> SegmentType;
 	typedef typename vcg::Point3<ScalarType> CoordType;
 	SegmentType diag[4];
 	
diff --git a/vcg/space/segment3.h b/vcg/space/segment3.h
index e969bf43..de26dda3 100644
--- a/vcg/space/segment3.h
+++ b/vcg/space/segment3.h
@@ -24,6 +24,9 @@
   History
 
 $Log: not supported by cvs2svn $
+Revision 1.6  2006/03/07 16:39:38  pietroni
+compiled  and corrected ClosestPoint function
+
 Revision 1.5  2004/05/13 23:39:47  ponchio
 SegmentType -> Segment3 in constructor (g++ complained)
 
@@ -45,6 +48,7 @@ First Version (tarini)
 #define __VCGLIB_SEGMENT3
 
 #include <vcg/space/point3.h>
+#include <vcg/space/line3.h>
 #include <vcg/space/box3.h>
 
 namespace vcg {
diff --git a/vcg/space/tetra3.h b/vcg/space/tetra3.h
index df1c9251..f9fc6466 100644
--- a/vcg/space/tetra3.h
+++ b/vcg/space/tetra3.h
@@ -24,6 +24,9 @@
   History
 
 $Log: not supported by cvs2svn $
+Revision 1.12  2006/03/01 15:59:34  pietroni
+added InterpolationParameters function
+
 Revision 1.11  2005/12/12 11:15:26  ganovelli
 modifications to compile with gcc
 
@@ -110,8 +113,8 @@ Initial commit
 #define __VCG_TETRA3
 
 #include <vcg/space/point3.h>
-#include <vcg/math/Matrix44.h>
-#include <vcg/math/Matrix33.h>
+#include <vcg/math/matrix44.h>
+#include <vcg/math/matrix33.h>
 
 namespace vcg {
 /** \addtogroup space */
diff --git a/wrap/io_trimesh/import_stl.h b/wrap/io_trimesh/import_stl.h
index fcb7cc17..c9d06114 100644
--- a/wrap/io_trimesh/import_stl.h
+++ b/wrap/io_trimesh/import_stl.h
@@ -25,6 +25,9 @@
   History
 
 $Log: not supported by cvs2svn $
+Revision 1.12  2006/05/03 21:19:34  cignoni
+Added support for progress callback
+
 Revision 1.11  2006/01/30 15:02:50  cignoni
 Added mask filling in open
 
@@ -57,8 +60,9 @@ First working version!
 
 #ifndef __VCGLIB_IMPORT_STL
 #define __VCGLIB_IMPORT_STL
-
+#ifdef WIN32
 #include <io.h>
+#endif
 #include <stdio.h>
 #include <wrap/callback.h>
 #include <vcg/complex/trimesh/allocate.h>
@@ -204,6 +208,15 @@ static int OpenBinary( OpenMeshType &m, const char * filename, CallBackPos *cb=0
     {
       return E_CANTOPEN;
     }
+#ifdef WIN32
+    int fileLen=_filelength(_fileno(fp));
+#else
+		int fileLen = 0;
+		char temp;
+		while (getc(fp)!=EOF)
+			++fileLen;
+		rewind(fp);
+#endif
 
     m.Clear();
   
@@ -212,7 +225,6 @@ static int OpenBinary( OpenMeshType &m, const char * filename, CallBackPos *cb=0
 
     STLFacet f;
     int cnt=0;
-    int fileLen=_filelength(_fileno(fp));
     /* Read a single facet from an ASCII .STL file */
     while(!feof(fp))
     {