diff --git a/src/common/meshmodel.h b/src/common/meshmodel.h
index fff8547e0..246c966c6 100644
--- a/src/common/meshmodel.h
+++ b/src/common/meshmodel.h
@@ -36,9 +36,14 @@
 #include <vcg/simplex/face/topology.h>
 
 #include <vcg/complex/trimesh/base.h>
-#include <vcg/complex/trimesh/update/topology.h>
-#include <vcg/complex/trimesh/update/normal.h>
+#include <vcg/complex/trimesh/update/bounding.h>
+#include <vcg/complex/trimesh/update/color.h>
 #include <vcg/complex/trimesh/update/flag.h>
+#include <vcg/complex/trimesh/update/normal.h>
+#include <vcg/complex/trimesh/update/position.h>
+#include <vcg/complex/trimesh/update/quality.h>
+#include <vcg/complex/trimesh/update/selection.h>
+#include <vcg/complex/trimesh/update/topology.h>
 
 #include <wrap/gl/trimesh.h>
 #include <wrap/callback.h>
diff --git a/src/fgt/decorate_shadow/decorate_shadow.pro b/src/fgt/decorate_shadow/decorate_shadow.pro
index 1386a9b59..58f774bc2 100644
--- a/src/fgt/decorate_shadow/decorate_shadow.pro
+++ b/src/fgt/decorate_shadow/decorate_shadow.pro
@@ -8,9 +8,7 @@ HEADERS = decorate_shadow.h \
     variance_shadow_mapping_blur.h \
     ssao.h
 SOURCES = decorate_shadow.cpp \
-    shadow_mapping.cpp \
-    ../../common/filterparameter.cpp \
-    $$GLEWCODE \
+    shadow_mapping.cpp 
     ../../../../vcglib/wrap/gui/trackball.cpp \
     ../../../../vcglib/wrap/gui/trackmode.cpp \
     variance_shadow_mapping.cpp \
diff --git a/src/fgt/edit_hole/edit_hole.h b/src/fgt/edit_hole/edit_hole.h
index 8d55c7678..d4b89e135 100644
--- a/src/fgt/edit_hole/edit_hole.h
+++ b/src/fgt/edit_hole/edit_hole.h
@@ -27,7 +27,7 @@
 #include <QObject>
 #include "fillerDialog.h"
 #include "holeListModel.h"
-#include <meshlab/interfaces.h>
+#include <common/interfaces.h>
 
 class EditHoleAutoBridgingCB : public AutoBridgingCallback
 {
diff --git a/src/fgt/edit_hole/edit_hole.pro b/src/fgt/edit_hole/edit_hole.pro
index d4f249b5b..bd323f967 100644
--- a/src/fgt/edit_hole/edit_hole.pro
+++ b/src/fgt/edit_hole/edit_hole.pro
@@ -6,15 +6,12 @@ HEADERS       = edit_hole_factory.h \
 		    holeListModel.h \
 		    fgtHole.h \
 		    fgtBridge.h \
-		    holeSetManager.h \
-		    ../../meshlab/meshmodel.h
+		    holeSetManager.h 
 
 SOURCES       = edit_hole_factory.cpp \
 		    edit_hole.cpp \
 		    fillerDialog.cpp\
-		    holeListModel.cpp \
-		    ../../meshlab/meshmodel.cpp \
-		    $$GLEWCODE
+		    holeListModel.cpp
 
 TARGET        = edit_hole
 
diff --git a/src/fgt/edit_hole/edit_hole_factory.h b/src/fgt/edit_hole/edit_hole_factory.h
index bb3bea854..cd3e918c9 100644
--- a/src/fgt/edit_hole/edit_hole_factory.h
+++ b/src/fgt/edit_hole/edit_hole_factory.h
@@ -25,9 +25,8 @@
 #ifndef EditHoleFactoryPLUGIN_H
 #define EditHoleFactoryPLUGIN_H
 
-#include <meshlab/interfaces.h>
 #include <QObject>
-#include <QList>
+#include <common/interfaces.h>
 
 class EditHoleFactory : public QObject, public MeshEditInterfaceFactory
 {
diff --git a/src/fgt/edit_hole/holeListModel.h b/src/fgt/edit_hole/holeListModel.h
index 4acc0653f..e31a37974 100644
--- a/src/fgt/edit_hole/holeListModel.h
+++ b/src/fgt/edit_hole/holeListModel.h
@@ -26,7 +26,7 @@
 #include <QWidget>
 #include <QHeaderView>
 #include <QtGui>
-#include "meshlab/meshmodel.h"
+#include <common/meshmodel.h>
 #include "fgtHole.h"
 #include "fgtBridge.h"
 #include "holeSetManager.h"
diff --git a/src/fgt/edit_quality/common/meshmethods.h b/src/fgt/edit_quality/common/meshmethods.h
index c1f143203..5135c445d 100644
--- a/src/fgt/edit_quality/common/meshmethods.h
+++ b/src/fgt/edit_quality/common/meshmethods.h
@@ -19,12 +19,6 @@
 * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)          *
 * for more details.                                                         *
 *                                                                           *
-****************************************************************************/
-/****************************************************************************
-History
-Revision 1.0 2008/02/20 Alessandro Maione, Federico Bellucci
-FIRST RELEASE
-
 ****************************************************************************/
 
 #ifndef _MESHMETHODS_H_
@@ -33,7 +27,7 @@ FIRST RELEASE
 #include "const_types.h"
 #include "transferfunction.h"
 #include <vcg/math/histogram.h>
-#include <meshlab/meshmodel.h>
+#include <common/meshmodel.h>
 #include <cassert>
 #include <utility> // for pair<T,T>
 
diff --git a/src/fgt/edit_quality/edit_quality_factory.h b/src/fgt/edit_quality/edit_quality_factory.h
index e30920325..3f60cfea5 100644
--- a/src/fgt/edit_quality/edit_quality_factory.h
+++ b/src/fgt/edit_quality/edit_quality_factory.h
@@ -25,9 +25,8 @@
 #ifndef QualityMapperFactoryPLUGIN_H
 #define QualityMapperFactoryPLUGIN_H
 
-#include <meshlab/interfaces.h>
 #include <QObject>
-#include <QList>
+#include <common/interfaces.h>
 
 class QualityMapperFactory : public QObject, public MeshEditInterfaceFactory
 {
diff --git a/src/fgt/edit_quality/qualitymapper.h b/src/fgt/edit_quality/qualitymapper.h
index 605103700..f488beb9b 100644
--- a/src/fgt/edit_quality/qualitymapper.h
+++ b/src/fgt/edit_quality/qualitymapper.h
@@ -34,9 +34,7 @@ FIRST RELEASE
 #include <QAction>
 #include <QList>
 
-#include <meshlab/meshmodel.h>
-#include <meshlab/interfaces.h>
-//#include <vcg/complex/trimesh/update/color.h>
+#include <common/interfaces.h>
 #include "qualitymapperdialog.h"
 
 //This class defines the plugin interface
diff --git a/src/fgt/edit_quality/qualitymapperdialog.h b/src/fgt/edit_quality/qualitymapperdialog.h
index babbd07cd..33b3ec56f 100644
--- a/src/fgt/edit_quality/qualitymapperdialog.h
+++ b/src/fgt/edit_quality/qualitymapperdialog.h
@@ -32,7 +32,7 @@ FIRST RELEASE
 
 #include <QDockWidget>
 #include <QGraphicsItem>
-#include <meshlab/meshmodel.h>
+#include <common/meshmodel.h>
 #include <vcg/math/histogram.h>
 #include <vcg/complex/trimesh/stat.h> // for ComputePerVertexQualityMinMax
 #include <meshlab/glarea.h>
diff --git a/src/fgt/edit_texture/edit_texture.pro b/src/fgt/edit_texture/edit_texture.pro
index 4942167ef..b91b2e242 100644
--- a/src/fgt/edit_texture/edit_texture.pro
+++ b/src/fgt/edit_texture/edit_texture.pro
@@ -4,17 +4,14 @@ HEADERS       = edit_texture_factory.h \
 		edittexture.h \
 		textureeditor.h \
 		renderarea.h \
-		../../meshlab/GLLogStream.h \
 		$$VCGDIR/wrap/gui/trackball.h
 		
 SOURCES       = edit_texture_factory.cpp \
 		edittexture.cpp \
 		textureeditor.cpp \
 		renderarea.cpp \
-		../../meshlab/GLLogStream.cpp \
 		$$VCGDIR/wrap/gui/trackball.cpp \
-		$$VCGDIR/wrap/gui/trackmode.cpp \
-		$$GLEWCODE
+		$$VCGDIR/wrap/gui/trackmode.cpp 
 
 TARGET        = edit_texture
 
diff --git a/src/fgt/edit_texture/edit_texture_factory.h b/src/fgt/edit_texture/edit_texture_factory.h
index aab8cfd93..6f3ce6c55 100644
--- a/src/fgt/edit_texture/edit_texture_factory.h
+++ b/src/fgt/edit_texture/edit_texture_factory.h
@@ -25,9 +25,8 @@
 #ifndef EditTextureFactoryPLUGIN_H
 #define EditTextureFactoryPLUGIN_H
 
-#include <meshlab/interfaces.h>
 #include <QObject>
-#include <QList>
+#include <common/interfaces.h>
 
 class EditTextureFactory : public QObject, public MeshEditInterfaceFactory
 {
diff --git a/src/fgt/edit_texture/edittexture.cpp b/src/fgt/edit_texture/edittexture.cpp
index 4a5317725..e888515e3 100644
--- a/src/fgt/edit_texture/edittexture.cpp
+++ b/src/fgt/edit_texture/edittexture.cpp
@@ -21,21 +21,13 @@
 *                                                                           *
 ****************************************************************************/
 
-#include <QtGui>
-#include <QString>
-
-#include <math.h>
-#include <stdlib.h>
+#include <common/interfaces.h>
 #include <meshlab/glarea.h>
 #include "edittexture.h"
 #include "renderarea.h"
 #include <wrap/gl/pick.h>
 #include <wrap/gl/picking.h>
-#include<limits>
-#include <meshlab/interfaces.h>
 
-#include <vcg/complex/trimesh/update/topology.h>
-#include <vcg/complex/trimesh/update/flag.h>
 #include <vcg/complex/trimesh/clean.h>
 
 using namespace vcg;
diff --git a/src/fgt/edit_texture/edittexture.h b/src/fgt/edit_texture/edittexture.h
index 6657652d9..74c024077 100644
--- a/src/fgt/edit_texture/edittexture.h
+++ b/src/fgt/edit_texture/edittexture.h
@@ -24,12 +24,7 @@
 #ifndef EDITTEXTUREPLUGIN_H
 #define EDITTEXTUREPLUGIN_H
 
-#include <QObject>
-#include <QList>
-#include <QDockWidget>
-
-#include <meshlab/meshmodel.h>
-#include <meshlab/interfaces.h>
+#include <common/interfaces.h>
 #include "textureeditor.h"
 #include "ui_textureeditor.h"
 
diff --git a/src/fgt/edit_texture/renderarea.h b/src/fgt/edit_texture/renderarea.h
index 7dbbad0fa..438b71857 100644
--- a/src/fgt/edit_texture/renderarea.h
+++ b/src/fgt/edit_texture/renderarea.h
@@ -27,7 +27,7 @@
 #include <QBrush>
 #include <QPen>
 #include <QPixmap>
-#include <meshlab/meshmodel.h>
+#include <common/meshmodel.h>
 #include <wrap/gui/trackball.h>
 #include <stdio.h>
 #include <QGLWidget>
diff --git a/src/fgt/edit_topo/edit_topo.h b/src/fgt/edit_topo/edit_topo.h
index 801c55fae..d925d57b4 100644
--- a/src/fgt/edit_topo/edit_topo.h
+++ b/src/fgt/edit_topo/edit_topo.h
@@ -28,10 +28,7 @@ $Log: edit_topo.h,v $
 #ifndef edit_topo_H
 #define edit_topo_H
 
-#include <QList>
-
-#include <meshlab/meshmodel.h>
-#include <meshlab/interfaces.h>
+#include <common/interfaces.h>
 #include <meshlab/glarea.h>
 
 #include <stdlib.h>
@@ -39,11 +36,6 @@ $Log: edit_topo.h,v $
 #include <wrap/gl/pick.h>
 #include <wrap/gl/picking.h>
 
-#include <vcg/complex/trimesh/append.h>
-#include <vcg/complex/trimesh/update/normal.h>
-#include <vcg/complex/trimesh/update/bounding.h>
-#include <vcg/complex/trimesh/update/color.h>
-
 #include "edit_topodialog.h"
 #include "edit_topomeshbuilder.h"
 
diff --git a/src/fgt/edit_topo/edit_topo.pro b/src/fgt/edit_topo/edit_topo.pro
index 6ea751357..6b3ee87e5 100644
--- a/src/fgt/edit_topo/edit_topo.pro
+++ b/src/fgt/edit_topo/edit_topo.pro
@@ -5,14 +5,11 @@ FORMS 			+= 	edit_topodialog.ui
 HEADERS       	= 	edit_topo_factory.h \
 					edit_topo.h \
 					edit_topodialog.h \
-					edit_topomeshbuilder.h \
-					../../meshlab/meshmodel.h
-
+					edit_topomeshbuilder.h 
+					
 SOURCES      	= 	edit_topo_factory.cpp \
 					edit_topo.cpp \
-					edit_topodialog.cpp \
-					../../meshlab/meshmodel.cpp \
-					$$GLEWCODE
+					edit_topodialog.cpp 
 				
 TARGET        	= 	edit_topo
 
diff --git a/src/fgt/edit_topo/edit_topo_factory.h b/src/fgt/edit_topo/edit_topo_factory.h
index caef23dee..4a36f1483 100644
--- a/src/fgt/edit_topo/edit_topo_factory.h
+++ b/src/fgt/edit_topo/edit_topo_factory.h
@@ -25,9 +25,8 @@
 #ifndef EditTopoFactoryPLUGIN_H
 #define EditTopoFactoryPLUGIN_H
 
-#include <meshlab/interfaces.h>
 #include <QObject>
-#include <QList>
+#include <common/interfaces.h>
 
 class EditTopoFactory : public QObject, public MeshEditInterfaceFactory
 {
diff --git a/src/fgt/edit_topo/edit_topodialog.h b/src/fgt/edit_topo/edit_topodialog.h
index 725f01877..b13e713a1 100644
--- a/src/fgt/edit_topo/edit_topodialog.h
+++ b/src/fgt/edit_topo/edit_topodialog.h
@@ -29,7 +29,7 @@
 #include <QWidget>
 
 #include <QtGui/QApplication>
-#include <meshlab/interfaces.h>
+#include <common/interfaces.h>
 
 #include "ui_edit_topodialog.h"
 
diff --git a/src/fgt/edit_topo/edit_topomeshbuilder.h b/src/fgt/edit_topo/edit_topomeshbuilder.h
index fa55b7eaf..370969acb 100644
--- a/src/fgt/edit_topo/edit_topomeshbuilder.h
+++ b/src/fgt/edit_topo/edit_topomeshbuilder.h
@@ -25,19 +25,13 @@
 #ifndef edit_topomeshbuilder_H
 #define edit_topomeshbuilder_H
 
-#include <QList>
-
-#include <meshlab/meshmodel.h>
-#include <meshlab/interfaces.h>
+#include <common/interfaces.h>
 
 #include <vcg/complex/intersection.h>
 #include <vcg/complex/trimesh/clean.h>
-#include <vcg/complex/trimesh/update/bounding.h>
-#include <vcg/complex/trimesh/update/normal.h>
 #include <vcg/space/index/grid_static_ptr.h>
 #include <vcg/complex/trimesh/closest.h>
 
-#include <vcg/math/base.h>
 #include <vcg/space/index/grid_static_ptr.h>
 #include <vcg/space/index/aabb_binary_tree/aabb_binary_tree.h>
 #include <vcg/space/index/octree.h>
@@ -45,11 +39,7 @@
 
 #include <vcg/complex/trimesh/refine.h>
 #include <vcg/complex/trimesh/append.h>
-#include <vcg/complex/trimesh/update/normal.h>
-#include <vcg/complex/trimesh/update/bounding.h>
-#include <vcg/complex/trimesh/update/color.h>
 #include <vcg/complex/trimesh/smooth.h>
-#include <vcg/complex/trimesh/update/selection.h>
 
 #include "edit_topodialog.h"
 
diff --git a/src/fgt/edit_topo/filter_topo/filter_topo.pro b/src/fgt/edit_topo/filter_topo/filter_topo.pro
index 0287e5d1a..6b21575f3 100644
--- a/src/fgt/edit_topo/filter_topo/filter_topo.pro
+++ b/src/fgt/edit_topo/filter_topo/filter_topo.pro
@@ -1,4 +1,4 @@
-include (../../sharedfilter.pri)
+include (../../shared.pri)
 
 HEADERS       += filter_topo.h \
 				../edit_topomeshbuilder.h
diff --git a/src/fgt/filter_aging/edgepred.h b/src/fgt/filter_aging/edgepred.h
index 39fff56f2..add078aaa 100644
--- a/src/fgt/filter_aging/edgepred.h
+++ b/src/fgt/filter_aging/edgepred.h
@@ -24,15 +24,8 @@
 #ifndef EDGEPRED_H_
 #define EDGEPRED_H_
 
-
-#include <vector>
-
-#include <meshlab/meshmodel.h>
-
-
-using namespace vcg;
-
-
+namespace vcg
+{
 class QualityEdgePred
 {
 	public:
@@ -143,5 +136,5 @@ class AngleEdgePred
 		float athVal;			// edge angle threshold value
 };
 
-
+}
 #endif /*EDGEPRED_H_*/
diff --git a/src/fgt/filter_aging/filter_aging.cpp b/src/fgt/filter_aging/filter_aging.cpp
index 932e8014c..a86d72889 100644
--- a/src/fgt/filter_aging/filter_aging.cpp
+++ b/src/fgt/filter_aging/filter_aging.cpp
@@ -28,13 +28,9 @@
 
 /* Local includes */
 #include "filter_aging.h"
-
+using namespace vcg;
 /* VCG includes */
-#include <vcg/complex/trimesh/update/position.h>
-#include <vcg/complex/trimesh/update/selection.h>
-#include <vcg/complex/trimesh/update/flag.h>
 #include <vcg/complex/trimesh/update/curvature.h>
-#include <vcg/complex/trimesh/update/quality.h>
 #include <vcg/complex/trimesh/stat.h>
 #include <vcg/complex/trimesh/clean.h>
 #include <vcg/complex/trimesh/smooth.h>
diff --git a/src/fgt/filter_aging/filter_aging.h b/src/fgt/filter_aging/filter_aging.h
index 525a2832f..ba1e67a94 100644
--- a/src/fgt/filter_aging/filter_aging.h
+++ b/src/fgt/filter_aging/filter_aging.h
@@ -28,8 +28,7 @@
 
 #include <QObject>
 
-#include <meshlab/meshmodel.h>
-#include <meshlab/interfaces.h>
+#include <common/interfaces.h>
 #include <vcg/complex/trimesh/refine.h>
 #include <vcg/space/index/grid_static_ptr.h>
 
@@ -59,9 +58,9 @@ class GeometryAgingPlugin : public QObject, public MeshFilterInterface
 
 		
 	protected:
-		void refineMesh(CMeshO &m, QualityEdgePred &ep, bool selection, vcg::CallBackPos *cb);
+        void refineMesh(CMeshO &m, vcg::QualityEdgePred &ep, bool selection, vcg::CallBackPos *cb);
 		double generateNoiseValue(int Octaves, const CVertexO::CoordType &p);
-		bool faceIntersections(CMeshO &m, face::Pos<CMeshO::FaceType> p, GridStaticPtr<CFaceO, CMeshO::ScalarType> &gM);
+        bool faceIntersections(CMeshO &m, vcg::face::Pos<CMeshO::FaceType> p, vcg::GridStaticPtr<CFaceO, CMeshO::ScalarType> &gM);
 		void smoothPeaks(CMeshO &m, bool selected, bool updateErosionAttr);
 		void computeMeanCurvature(CMeshO &m);
 };
diff --git a/src/fgt/filter_aging/filter_aging.pro b/src/fgt/filter_aging/filter_aging.pro
index 866166633..407af264e 100644
--- a/src/fgt/filter_aging/filter_aging.pro
+++ b/src/fgt/filter_aging/filter_aging.pro
@@ -1,4 +1,4 @@
-include (../../sharedfilter.pri)
+include (../../shared.pri)
 
 HEADERS       += filter_aging.h \
 		edgepred.h
diff --git a/src/fgt/filter_break/filter_break.pro b/src/fgt/filter_break/filter_break.pro
index 88393feff..90ed4d87d 100644
--- a/src/fgt/filter_break/filter_break.pro
+++ b/src/fgt/filter_break/filter_break.pro
@@ -1,8 +1,7 @@
-include (../../sharedfilter.pri)
+include (../../shared.pri)
 
 HEADERS       += filter_dirt.h
-SOURCES       += filter_dirt.cpp \
-                $$GLEWCODE
+SOURCES       += filter_dirt.cpp 
 TARGET        = filter_dirt
 TEMPLATE      = lib
 QT           += opengl