diff --git a/apps/tetraviewer/main.cpp b/apps/tetraviewer/main.cpp
index 0afb8c69..2ae70b92 100644
--- a/apps/tetraviewer/main.cpp
+++ b/apps/tetraviewer/main.cpp
@@ -9,16 +9,16 @@
 
 
 //#include <tetrastats.h>
-#include <myglwidget.h>
+#include "myglwidget.h"
 
 
 MyTetraMesh TM;
 MyTetraMesh *tm;
 TetraStats<MyTetraMesh> Stats;
-vcg::tetra::io::ImporterTS<MyTetraMesh> ImpTS;
-vcg::tetra::UpdateTetraTopology<MyTetraMesh::VertexContainer ,MyTetraMesh::TetraContainer > UT;
-vcg::tetra::UpdateNormals<MyTetraMesh> UN;
-vcg::tetra::UpdateBounding<MyTetraMesh> UB;
+typedef vcg::tetra::io::ImporterTS<MyTetraMesh> ImpTS;
+typedef vcg::tetra::UpdateTetraTopology<MyTetraMesh::VertexContainer ,MyTetraMesh::TetraContainer > UT;
+typedef vcg::tetra::UpdateNormals<MyTetraMesh> UN;
+typedef vcg::tetra::UpdateBounding<MyTetraMesh> UB;
 
 
 void openTetraMesh(const char* filename)
@@ -29,14 +29,15 @@ void openTetraMesh(const char* filename)
 	TM=MyTetraMesh();
 
 	if (ext==".ts")
-		ImpTS.Open(TM,filename);
+		ImpTS::Open(TM,filename);
 	else
 		vcg::tetra::io::ImporterPLY<MyTetraMesh> ::Open(TM,filename);
 	
-	UT.TTTopology(TM.vert,TM.tetra);
-	UT.VTTopology(TM.vert,TM.tetra);
-	UN.PerVertex(TM);
-	UB.Box(TM);
+	UT::TTTopology(TM.vert,TM.tetra);
+	UT::ClearVTTopology(TM.vert,TM.tetra);
+	UT::VTTopology(TM.vert,TM.tetra);
+	UN::PerVertex(TM);
+	UB::Box(TM);
 	tm=&TM;
 	Stats.SetTetraMesh(tm);
 	Stats.Update();
diff --git a/apps/tetraviewer/mainframe.cpp b/apps/tetraviewer/mainframe.cpp
index 92f63fd2..ecfb43dc 100644
--- a/apps/tetraviewer/mainframe.cpp
+++ b/apps/tetraviewer/mainframe.cpp
@@ -2,7 +2,7 @@
 ** Form implementation generated from reading ui file 'MainFrame.ui'
 **
 ** Created: Mon Oct 4 19:00:57 2004
-**      by: The User Interface Compiler ($Id: mainframe.cpp,v 1.1 2004-10-04 18:01:36 ganovelli Exp $)
+**      by: The User Interface Compiler ($Id: mainframe.cpp,v 1.2 2004-10-04 18:45:48 ganovelli Exp $)
 **
 ** WARNING! All changes made in this file will be lost!
 ****************************************************************************/
@@ -10,7 +10,7 @@
 #include "mainframe.h"
 
 #include <qvariant.h>
-#include <D:/TetraView/myglwidget.h>
+#include "myglwidget.h"
 #include <qgroupbox.h>
 #include <qpushbutton.h>
 #include <qbuttongroup.h>
diff --git a/apps/tetraviewer/myglwidget.cpp b/apps/tetraviewer/myglwidget.cpp
index 521ddfab..849462d7 100644
--- a/apps/tetraviewer/myglwidget.cpp
+++ b/apps/tetraviewer/myglwidget.cpp
@@ -1,4 +1,4 @@
-#include <myglwidget.h>
+#include "myglwidget.h"
 #include <vcg\space\tetra3.h>
 #include <vcg\space\point3.h>
 extern MyTetraMesh *tm;
diff --git a/apps/tetraviewer/myglwidget.h b/apps/tetraviewer/myglwidget.h
index 3aee9c35..8cb4b45e 100644
--- a/apps/tetraviewer/myglwidget.h
+++ b/apps/tetraviewer/myglwidget.h
@@ -1,10 +1,10 @@
-#include <GL\glew.h>
+#include <GL/glew.h>
 #include <qgl.h>
-#include <wrap\gl\glwraptetra.h>
-#include <wrap\gl\pick.h>
-#include <wrap\gui\trackball.h>
-#include <myclasses.h>
-#include <tetrastats.h>
+#include <wrap/gl/glwraptetra.h>
+#include <wrap/gl/pick.h>
+#include <wrap/gui/trackball.h>
+#include "myclasses.h"
+#include "tetrastats.h"