diff --git a/vcg/complex/trimesh/autoalign_4pcs.h b/vcg/complex/trimesh/autoalign_4pcs.h
index 2f181660..e1dbee1c 100644
--- a/vcg/complex/trimesh/autoalign_4pcs.h
+++ b/vcg/complex/trimesh/autoalign_4pcs.h
@@ -41,8 +41,8 @@ used in the paper pseudocode.
 #include <vcg/complex/trimesh/closest.h>
 #include <vcg/complex/trimesh/update/bounding.h>
 
-#include <vcg/simplex/vertexplus/base.h>
-#include <vcg/simplex/faceplus/base.h>
+#include <vcg/simplex/vertex/base.h>
+#include <vcg/simplex/face/base.h>
 #include <vcg/complex/trimesh/base.h>
 #include <vcg/complex/trimesh/stat.h>
 #include <wrap/io_trimesh/export_ply.h>
diff --git a/vcg/complex/trimesh/base.h b/vcg/complex/trimesh/base.h
index cbbe6449..75a4d7e2 100644
--- a/vcg/complex/trimesh/base.h
+++ b/vcg/complex/trimesh/base.h
@@ -141,7 +141,7 @@ Initial commit
 #include <vcg/math/shot.h>
 
 #include <vcg/container/simple_temporary_data.h>
-#include <vcg/simplex/edgeplus/base.h>
+#include <vcg/simplex/edge/base.h>
 /*
 People should subclass his vertex class from these one...
 */
diff --git a/vcg/complex/trimesh/update/curvature.h b/vcg/complex/trimesh/update/curvature.h
index 5731cf22..c04a3056 100644
--- a/vcg/complex/trimesh/update/curvature.h
+++ b/vcg/complex/trimesh/update/curvature.h
@@ -36,7 +36,7 @@ Revision 1.5  2008/03/25 11:00:56  ganovelli
 fixed  bugs sign of principal direction and mean curvature value
 
 Revision 1.4  2008/03/17 11:29:59  ganovelli
-taubin and desbrun estimates added (-> see vcg/simplex/vertexplus/component.h [component_ocf.h|component_occ.h ]
+taubin and desbrun estimates added (-> see vcg/simplex/vertex/component.h [component_ocf.h|component_occ.h ]
 
 Revision 1.3  2006/02/27 18:02:57  ponchio
 Area -> doublearea/2