From 804545548dd460645b676d70ec0c0de21058cf98 Mon Sep 17 00:00:00 2001
From: Paolo Cignoni <paolo.cignoni@isti.cnr.it>
Date: Tue, 14 Mar 2017 07:49:15 +0100
Subject: [PATCH] Cleaning Pass on samples

---
 apps/sample/colorspace/colorspace.cpp         | 22 +++++++++++++
 apps/sample/polygonmesh_base/polygonmesh.cpp  |  8 -----
 .../polygonmesh_dual/polygonmesh_dual.cpp     |  1 -
 .../polygonmesh_optimize.cpp                  |  1 -
 apps/sample/space_index_2d/space_index_2d.cpp |  8 ++---
 .../trimesh_ball_pivoting.cpp                 |  5 ---
 apps/sample/trimesh_base/trimesh_base.cpp     |  2 --
 .../trimesh_closest/trimesh_closest.cpp       | 32 +++++++++++++------
 .../trimesh_clustering/trimesh_clustering.cpp |  5 ---
 apps/sample/trimesh_color/trimesh_color.cpp   |  4 ---
 apps/sample/trimesh_copy/trimesh_copy.cpp     | 14 +-------
 .../trimesh_curvature/trimesh_curvature.cpp   |  9 +++---
 apps/sample/trimesh_edge/trimesh_edge.cpp     |  4 ---
 .../trimesh_fitting/trimesh_fitting.cpp       |  2 --
 apps/sample/trimesh_hole/trimesh_hole.cpp     | 10 ------
 .../trimesh_intersection.cpp                  |  3 --
 apps/sample/trimesh_join/trimesh_join.cpp     |  5 ---
 apps/sample/trimesh_normal/trimesh_normal.cpp |  2 --
 .../trimesh_optional/trimesh_optional.cpp     |  4 ---
 .../trimesh_pointmatching.cpp                 |  2 --
 apps/sample/trimesh_ray/trimesh_ray.cpp       | 30 +++++++++++++----
 apps/sample/trimesh_refine/trimesh_refine.cpp | 25 +++++++++++++--
 apps/sample/trimesh_smooth/trimesh_smooth.cpp |  3 --
 .../trimesh_texture/trimesh_texture.cpp       |  3 --
 .../trimesh_topology/trimesh_topology.cpp     |  4 ---
 25 files changed, 99 insertions(+), 109 deletions(-)

diff --git a/apps/sample/colorspace/colorspace.cpp b/apps/sample/colorspace/colorspace.cpp
index 6e58a340..b42b86af 100644
--- a/apps/sample/colorspace/colorspace.cpp
+++ b/apps/sample/colorspace/colorspace.cpp
@@ -1,3 +1,25 @@
+/****************************************************************************
+* VCGLib                                                            o o     *
+* Visual and Computer Graphics Library                            o     o   *
+*                                                                _   O  _   *
+* Copyright(C) 2004-2016                                           \/)\/    *
+* Visual Computing Lab                                            /\/|      *
+* ISTI - Italian National Research Council                           |      *
+*                                                                    \      *
+* All rights reserved.                                                      *
+*                                                                           *
+* This program is free software; you can redistribute it and/or modify      *
+* it under the terms of the GNU General Public License as published by      *
+* the Free Software Foundation; either version 2 of the License, or         *
+* (at your option) any later version.                                       *
+*                                                                           *
+* This program is distributed in the hope that it will be useful,           *
+* but WITHOUT ANY WARRANTY; without even the implied warranty of            *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             *
+* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)          *
+* for more details.                                                         *
+*                                                                           *
+****************************************************************************/
 
 // Standard headers
 #include <iostream>
diff --git a/apps/sample/polygonmesh_base/polygonmesh.cpp b/apps/sample/polygonmesh_base/polygonmesh.cpp
index d1f498ca..c9dda8d4 100644
--- a/apps/sample/polygonmesh_base/polygonmesh.cpp
+++ b/apps/sample/polygonmesh_base/polygonmesh.cpp
@@ -23,20 +23,12 @@
 
 #include <vcg/complex/complex.h>
 
-/*include the algorithms for updating: */
-#include <vcg/complex/algorithms/update/topology.h>
-#include <vcg/complex/algorithms/update/bounding.h>
-#include <vcg/complex/algorithms/update/normal.h>
-
 #include <vcg/complex/algorithms/clean.h>
 #include <vcg/complex/algorithms/create/platonic.h>
 
 #include <wrap/io_trimesh/import.h>
 #include <wrap/io_trimesh/export_ply.h>
 
-/* include the support for polygon meshes (function to convert from/to trimesh)*/
-//#include <vcg/complex/algorithms/polygon_support.h>
-
 /* include the support for half edges */
 #include <vcg/complex/algorithms/update/halfedge_indexed.h>
 
diff --git a/apps/sample/polygonmesh_dual/polygonmesh_dual.cpp b/apps/sample/polygonmesh_dual/polygonmesh_dual.cpp
index 4bd9b0c3..be16defc 100644
--- a/apps/sample/polygonmesh_dual/polygonmesh_dual.cpp
+++ b/apps/sample/polygonmesh_dual/polygonmesh_dual.cpp
@@ -24,7 +24,6 @@
 #include <vcg/complex/complex.h>
 
 /*include the algorithms for updating: */
-#include <vcg/complex/algorithms/update/topology.h>
 #include <vcg/complex/algorithms/update/bounding.h>
 #include <vcg/complex/algorithms/update/normal.h>
 
diff --git a/apps/sample/polygonmesh_optimize/polygonmesh_optimize.cpp b/apps/sample/polygonmesh_optimize/polygonmesh_optimize.cpp
index 93a730a2..7abe03ce 100644
--- a/apps/sample/polygonmesh_optimize/polygonmesh_optimize.cpp
+++ b/apps/sample/polygonmesh_optimize/polygonmesh_optimize.cpp
@@ -24,7 +24,6 @@
 #include <vcg/complex/complex.h>
 
 /*include the algorithms for updating: */
-#include <vcg/complex/algorithms/update/topology.h>
 #include <vcg/complex/algorithms/update/bounding.h>
 #include <vcg/complex/algorithms/update/normal.h>
 
diff --git a/apps/sample/space_index_2d/space_index_2d.cpp b/apps/sample/space_index_2d/space_index_2d.cpp
index a2d731e6..69678381 100644
--- a/apps/sample/space_index_2d/space_index_2d.cpp
+++ b/apps/sample/space_index_2d/space_index_2d.cpp
@@ -23,10 +23,10 @@
 #include <stdio.h>
 #include <time.h>
 #include <vcg/space/distance2.h>
-#include<vcg/space/segment2.h>
-#include<vcg/space/index/grid_static_ptr2d.h>
-#include<vcg/space/index/grid_closest2d.h>
-#include<vcg/space/intersection2.h>
+#include <vcg/space/segment2.h>
+#include <vcg/space/index/grid_static_ptr2d.h>
+#include <vcg/space/index/grid_closest2d.h>
+#include <vcg/space/intersection2.h>
 
 typedef double MyScalarType;
 typedef vcg::Point2<MyScalarType> MyCoordType;
diff --git a/apps/sample/trimesh_ball_pivoting/trimesh_ball_pivoting.cpp b/apps/sample/trimesh_ball_pivoting/trimesh_ball_pivoting.cpp
index d8dfcd65..054710fd 100644
--- a/apps/sample/trimesh_ball_pivoting/trimesh_ball_pivoting.cpp
+++ b/apps/sample/trimesh_ball_pivoting/trimesh_ball_pivoting.cpp
@@ -21,11 +21,6 @@
 *                                                                           *
 ****************************************************************************/
 #include<vcg/complex/complex.h>
-
-#include <vcg/complex/algorithms/update/bounding.h>
-#include <vcg/complex/algorithms/update/topology.h>
-#include <vcg/complex/algorithms/update/normal.h>
-#include <vcg/complex/algorithms/update/flag.h>
 #include <vcg/complex/algorithms/create/ball_pivoting.h>
 
 // input output
diff --git a/apps/sample/trimesh_base/trimesh_base.cpp b/apps/sample/trimesh_base/trimesh_base.cpp
index d766df1f..729c79d7 100644
--- a/apps/sample/trimesh_base/trimesh_base.cpp
+++ b/apps/sample/trimesh_base/trimesh_base.cpp
@@ -31,8 +31,6 @@ This file contain a minimal example of the library, showing how to load a mesh a
 
 #include<vcg/complex/complex.h>
 #include<wrap/io_trimesh/import_off.h>
-#include<vcg/complex/algorithms/update/topology.h>
-#include<vcg/complex/algorithms/update/normal.h>
 
 class MyVertex; class MyEdge; class MyFace;
 struct MyUsedTypes : public vcg::UsedTypes<vcg::Use<MyVertex>   ::AsVertexType,
diff --git a/apps/sample/trimesh_closest/trimesh_closest.cpp b/apps/sample/trimesh_closest/trimesh_closest.cpp
index fe72e45c..4fdc5d0a 100644
--- a/apps/sample/trimesh_closest/trimesh_closest.cpp
+++ b/apps/sample/trimesh_closest/trimesh_closest.cpp
@@ -1,21 +1,35 @@
+/****************************************************************************
+* VCGLib                                                            o o     *
+* Visual and Computer Graphics Library                            o     o   *
+*                                                                _   O  _   *
+* Copyright(C) 2004-2016                                           \/)\/    *
+* Visual Computing Lab                                            /\/|      *
+* ISTI - Italian National Research Council                           |      *
+*                                                                    \      *
+* All rights reserved.                                                      *
+*                                                                           *
+* This program is free software; you can redistribute it and/or modify      *
+* it under the terms of the GNU General Public License as published by      *
+* the Free Software Foundation; either version 2 of the License, or         *
+* (at your option) any later version.                                       *
+*                                                                           *
+* This program is distributed in the hope that it will be useful,           *
+* but WITHOUT ANY WARRANTY; without even the implied warranty of            *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             *
+* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)          *
+* for more details.                                                         *
+*                                                                           *
+****************************************************************************/
 
 // stuff to define the mesh
 #include <vcg/complex/complex.h>
 #include <vcg/simplex/face/component_ep.h>
-#include <vcg/complex/algorithms/point_sampling.h>
 #include <vcg/complex/algorithms/update/component_ep.h>
-#include <vcg/complex/algorithms/update/normal.h>
+#include <vcg/complex/algorithms/point_sampling.h>
 
-// io
 #include <wrap/io_trimesh/import.h>
 #include <wrap/io_trimesh/export_ply.h>
 
-#include <cstdlib>
-
-#include <sys/timeb.h>
-#include <iostream>
-#include <string>
-
 
 class BaseVertex;
 class BaseEdge;
diff --git a/apps/sample/trimesh_clustering/trimesh_clustering.cpp b/apps/sample/trimesh_clustering/trimesh_clustering.cpp
index 80ffbadf..b8ae8d53 100644
--- a/apps/sample/trimesh_clustering/trimesh_clustering.cpp
+++ b/apps/sample/trimesh_clustering/trimesh_clustering.cpp
@@ -28,13 +28,8 @@
 */
 #include<vcg/complex/complex.h>
 
-#include <vcg/complex/algorithms/update/bounding.h>
-#include <vcg/complex/algorithms/update/topology.h>
-#include <vcg/complex/algorithms/update/normal.h>
-#include <vcg/complex/algorithms/update/flag.h>
 #include <vcg/complex/algorithms/clustering.h>
 
-// input output
 #include <wrap/io_trimesh/import.h>
 #include <wrap/io_trimesh/export.h>
 
diff --git a/apps/sample/trimesh_color/trimesh_color.cpp b/apps/sample/trimesh_color/trimesh_color.cpp
index d5bf60e5..ad474ccb 100644
--- a/apps/sample/trimesh_color/trimesh_color.cpp
+++ b/apps/sample/trimesh_color/trimesh_color.cpp
@@ -28,11 +28,7 @@
 */
 #include<vcg/complex/complex.h>
 
-#include <vcg/complex/algorithms/update/bounding.h>
 #include <vcg/complex/algorithms/update/color.h>
-#include <vcg/complex/algorithms/update/normal.h>
-#include <vcg/complex/algorithms/update/flag.h>
-#include <vcg/complex/algorithms/clustering.h>
 
 // input output
 #include <wrap/io_trimesh/import.h>
diff --git a/apps/sample/trimesh_copy/trimesh_copy.cpp b/apps/sample/trimesh_copy/trimesh_copy.cpp
index 302f7861..dca09167 100644
--- a/apps/sample/trimesh_copy/trimesh_copy.cpp
+++ b/apps/sample/trimesh_copy/trimesh_copy.cpp
@@ -1,27 +1,15 @@
 
-// stuff to define the mesh
 #include <vcg/complex/complex.h>
-#include <vcg/complex/append.h>
-// io
 #include <wrap/io_trimesh/import.h>
 #include <wrap/io_trimesh/export_ply.h>
 
-#include <cstdlib>
-
-#include <sys/timeb.h>
-#include <iostream>
-#include <string>
-
-
 class MyVertex;
 class MyEdge;
 class MyFace;
 
 struct MyUsedTypes: public vcg::UsedTypes<vcg::Use<MyVertex>::AsVertexType,vcg::Use<MyEdge>::AsEdgeType,vcg::Use<MyFace>::AsFaceType>{};
 
-class MyVertex  : public vcg::Vertex< MyUsedTypes,vcg::vertex::VFAdj,vcg::vertex::Coord3f,vcg::vertex::Normal3f,vcg::vertex::Mark,vcg::vertex::BitFlags  >
-{
-};
+class MyVertex  : public vcg::Vertex< MyUsedTypes,vcg::vertex::VFAdj,vcg::vertex::Coord3f,vcg::vertex::Normal3f,vcg::vertex::Mark,vcg::vertex::BitFlags  > {};
 
 class MyEdge : public vcg::Edge< MyUsedTypes> {};
 
diff --git a/apps/sample/trimesh_curvature/trimesh_curvature.cpp b/apps/sample/trimesh_curvature/trimesh_curvature.cpp
index edd787fc..e5458d72 100644
--- a/apps/sample/trimesh_curvature/trimesh_curvature.cpp
+++ b/apps/sample/trimesh_curvature/trimesh_curvature.cpp
@@ -28,13 +28,12 @@
 This file contain a minimal example of the library
 
 */
-#include<vcg/complex/complex.h>
+#include <vcg/complex/complex.h>
+
+#include <vcg/complex/algorithms/create/platonic.h>
+#include <vcg/complex/algorithms/update/curvature.h>
 
 #include<wrap/io_trimesh/export_off.h>
-#include <vcg/complex/algorithms/create/platonic.h>
-
-#include<vcg/complex/algorithms/update/curvature.h>
-#include<vcg/complex/algorithms/update/normal.h>
 
 class MyEdge;
 class MyFace;
diff --git a/apps/sample/trimesh_edge/trimesh_edge.cpp b/apps/sample/trimesh_edge/trimesh_edge.cpp
index ab7f74b7..c80cf6bb 100644
--- a/apps/sample/trimesh_edge/trimesh_edge.cpp
+++ b/apps/sample/trimesh_edge/trimesh_edge.cpp
@@ -34,16 +34,12 @@
 #endif
 
 #include<vcg/complex/complex.h>
-#include<vcg/complex/append.h>
 
 // input output
 #include<wrap/io_trimesh/import.h>
 #include<wrap/io_trimesh/export.h>
 
 // topology computation
-#include<vcg/complex/algorithms/update/topology.h>
-#include<vcg/complex/algorithms/update/bounding.h>
-#include<vcg/complex/algorithms/update/normal.h>
 #include <vcg/complex/algorithms/update/position.h>
 #include <vcg/complex/algorithms/update/quality.h>
 #include <vcg/complex/algorithms/stat.h>
diff --git a/apps/sample/trimesh_fitting/trimesh_fitting.cpp b/apps/sample/trimesh_fitting/trimesh_fitting.cpp
index b4a21e62..d6f27ef7 100644
--- a/apps/sample/trimesh_fitting/trimesh_fitting.cpp
+++ b/apps/sample/trimesh_fitting/trimesh_fitting.cpp
@@ -32,8 +32,6 @@ Given a mesh (an icosahedron) for each face we get a few random samples over it,
 */
 
 #include<vcg/complex/complex.h>
-#include<vcg/complex/algorithms/update/topology.h>
-#include<vcg/complex/algorithms/update/normal.h>
 #include<vcg/complex/algorithms/create/platonic.h>
 #include<vcg/complex/algorithms/point_sampling.h>
 #include<wrap/io_trimesh/import_off.h>
diff --git a/apps/sample/trimesh_hole/trimesh_hole.cpp b/apps/sample/trimesh_hole/trimesh_hole.cpp
index 1ed126bc..814e6ff2 100644
--- a/apps/sample/trimesh_hole/trimesh_hole.cpp
+++ b/apps/sample/trimesh_hole/trimesh_hole.cpp
@@ -29,16 +29,6 @@
 #include<vcg/complex/algorithms/smooth.h>
 #include<vcg/complex/algorithms/refine.h>
 
-#include<vcg/complex/algorithms/update/selection.h>
-
-// topology computation
-#include<vcg/complex/algorithms/update/topology.h>
-#include <vcg/complex/algorithms/update/flag.h>
-#include <vcg/complex/algorithms/update/normal.h>
-
-// half edge iterators
-#include<vcg/simplex/face/pos.h>
-
 // input output
 #include <wrap/io_trimesh/import_ply.h>
 #include <wrap/io_trimesh/export_ply.h>
diff --git a/apps/sample/trimesh_intersection/trimesh_intersection.cpp b/apps/sample/trimesh_intersection/trimesh_intersection.cpp
index 8f3c0e94..68c8966b 100644
--- a/apps/sample/trimesh_intersection/trimesh_intersection.cpp
+++ b/apps/sample/trimesh_intersection/trimesh_intersection.cpp
@@ -22,9 +22,6 @@
 ****************************************************************************/
 
 #include <vcg/complex/complex.h>
-#include <vcg/complex/algorithms/update/topology.h>
-#include <vcg/complex/algorithms/update/bounding.h>
-#include <vcg/complex/algorithms/update/flag.h>
 #include <vcg/complex/algorithms/clean.h>
 #include <vcg/complex/algorithms/intersection.h>
 #include <vcg/space/index/grid_static_ptr.h>
diff --git a/apps/sample/trimesh_join/trimesh_join.cpp b/apps/sample/trimesh_join/trimesh_join.cpp
index f7d86a87..15daf89c 100644
--- a/apps/sample/trimesh_join/trimesh_join.cpp
+++ b/apps/sample/trimesh_join/trimesh_join.cpp
@@ -21,18 +21,13 @@
 *                                                                           *
 ****************************************************************************/
 #include<vcg/complex/complex.h>
-#include<vcg/complex/append.h>
 #include<vcg/complex/algorithms/clean.h>
 #include<vcg/complex/algorithms/clip.h>
-#include<vcg/complex/algorithms/update/bounding.h>
 
 // input output
 #include <wrap/io_trimesh/import_ply.h>
 #include <wrap/io_trimesh/export_ply.h>
 
-// std
-#include <vector>
-
 using namespace vcg;
 using namespace std;
 
diff --git a/apps/sample/trimesh_normal/trimesh_normal.cpp b/apps/sample/trimesh_normal/trimesh_normal.cpp
index fc7b928d..bbac413c 100644
--- a/apps/sample/trimesh_normal/trimesh_normal.cpp
+++ b/apps/sample/trimesh_normal/trimesh_normal.cpp
@@ -30,8 +30,6 @@
 
 #include<wrap/io_trimesh/import_off.h>
 
-#include<vcg/complex/algorithms/update/normal.h>
-
 using namespace vcg;
 using namespace std;
 
diff --git a/apps/sample/trimesh_optional/trimesh_optional.cpp b/apps/sample/trimesh_optional/trimesh_optional.cpp
index 18f21370..04f58057 100644
--- a/apps/sample/trimesh_optional/trimesh_optional.cpp
+++ b/apps/sample/trimesh_optional/trimesh_optional.cpp
@@ -34,10 +34,6 @@ This file shows how to dynamically allocate component that you do not need most
 #include<vcg/complex/complex.h>
 
 #include<vcg/complex/algorithms/create/platonic.h>
-#include<vcg/complex/algorithms/update/topology.h>
-#include<vcg/complex/algorithms/update/flag.h>
-#include<vcg/complex/algorithms/update/normal.h>
-#include<vcg/complex/algorithms/update/bounding.h>
 #include<vcg/complex/algorithms/update/curvature.h>
 #include <vcg/complex/algorithms/refine_loop.h>
 #include <wrap/io_trimesh/export_off.h>
diff --git a/apps/sample/trimesh_pointmatching/trimesh_pointmatching.cpp b/apps/sample/trimesh_pointmatching/trimesh_pointmatching.cpp
index fbf28bdd..5241fcc0 100644
--- a/apps/sample/trimesh_pointmatching/trimesh_pointmatching.cpp
+++ b/apps/sample/trimesh_pointmatching/trimesh_pointmatching.cpp
@@ -32,8 +32,6 @@ Given a mesh (an icosahedron) for each face we get a few random samples over it,
 */
 
 #include<vcg/complex/complex.h>
-#include<vcg/complex/algorithms/update/topology.h>
-#include<vcg/complex/algorithms/update/normal.h>
 #include<vcg/complex/algorithms/create/platonic.h>
 #include<vcg/complex/algorithms/point_sampling.h>
 #include<wrap/io_trimesh/import_off.h>
diff --git a/apps/sample/trimesh_ray/trimesh_ray.cpp b/apps/sample/trimesh_ray/trimesh_ray.cpp
index 1543da91..8ad9ba93 100644
--- a/apps/sample/trimesh_ray/trimesh_ray.cpp
+++ b/apps/sample/trimesh_ray/trimesh_ray.cpp
@@ -1,15 +1,30 @@
-#include <vector>
+/****************************************************************************
+* VCGLib                                                            o o     *
+* Visual and Computer Graphics Library                            o     o   *
+*                                                                _   O  _   *
+* Copyright(C) 2004-2016                                           \/)\/    *
+* Visual Computing Lab                                            /\/|      *
+* ISTI - Italian National Research Council                           |      *
+*                                                                    \      *
+* All rights reserved.                                                      *
+*                                                                           *
+* This program is free software; you can redistribute it and/or modify      *
+* it under the terms of the GNU General Public License as published by      *
+* the Free Software Foundation; either version 2 of the License, or         *
+* (at your option) any later version.                                       *
+*                                                                           *
+* This program is distributed in the hope that it will be useful,           *
+* but WITHOUT ANY WARRANTY; without even the implied warranty of            *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             *
+* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)          *
+* for more details.                                                         *
+*                                                                           *
+****************************************************************************/
 
-using namespace std;
-
-// VCG headers for triangular mesh processing
 #include <vcg/complex/complex.h>
-#include <vcg/complex/algorithms/update/topology.h>
 #include <vcg/complex/algorithms/update/component_ep.h>
-#include <vcg/complex/algorithms/update/bounding.h>
 #include <vcg/complex/algorithms/update/quality.h>
 #include <vcg/complex/algorithms/update/color.h>
-#include <vcg/complex/algorithms/update/flag.h>
 #include <vcg/complex/algorithms/stat.h>
 #include <vcg/complex/algorithms/clean.h>
 #include <vcg/complex/algorithms/intersection.h>
@@ -21,6 +36,7 @@ using namespace std;
 #include <wrap/io_trimesh/import.h>
 #include <wrap/io_trimesh/export_ply.h>
 
+using namespace std;
 using namespace vcg;
 
 class MyFace;
diff --git a/apps/sample/trimesh_refine/trimesh_refine.cpp b/apps/sample/trimesh_refine/trimesh_refine.cpp
index 348b180d..59ab0631 100644
--- a/apps/sample/trimesh_refine/trimesh_refine.cpp
+++ b/apps/sample/trimesh_refine/trimesh_refine.cpp
@@ -1,8 +1,27 @@
+/****************************************************************************
+* VCGLib                                                            o o     *
+* Visual and Computer Graphics Library                            o     o   *
+*                                                                _   O  _   *
+* Copyright(C) 2004-2016                                           \/)\/    *
+* Visual Computing Lab                                            /\/|      *
+* ISTI - Italian National Research Council                           |      *
+*                                                                    \      *
+* All rights reserved.                                                      *
+*                                                                           *
+* This program is free software; you can redistribute it and/or modify      *
+* it under the terms of the GNU General Public License as published by      *
+* the Free Software Foundation; either version 2 of the License, or         *
+* (at your option) any later version.                                       *
+*                                                                           *
+* This program is distributed in the hope that it will be useful,           *
+* but WITHOUT ANY WARRANTY; without even the implied warranty of            *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             *
+* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)          *
+* for more details.                                                         *
+*                                                                           *
+****************************************************************************/
 #include<vcg/complex/complex.h>
 
-#include <vcg/complex/algorithms/update/topology.h>
-#include <vcg/complex/algorithms/update/normal.h>
-#include <vcg/complex/algorithms/update/flag.h>
 #include <vcg/complex/algorithms/refine.h>
 #include <vcg/complex/algorithms/refine_loop.h>
 
diff --git a/apps/sample/trimesh_smooth/trimesh_smooth.cpp b/apps/sample/trimesh_smooth/trimesh_smooth.cpp
index 590f2b53..2fa35900 100644
--- a/apps/sample/trimesh_smooth/trimesh_smooth.cpp
+++ b/apps/sample/trimesh_smooth/trimesh_smooth.cpp
@@ -30,13 +30,10 @@ This file contain a minimal example of the library
 */
 
 #include<vcg/complex/complex.h>
-#include <vcg/complex/algorithms/update/topology.h>
-#include <vcg/complex/algorithms/update/normal.h>
 
 #include<vcg/complex/algorithms/clean.h>
 #include<vcg/complex/algorithms/smooth.h>
 
-// input output
 #include <wrap/io_trimesh/import.h>
 #include <wrap/io_trimesh/export_ply.h>
 
diff --git a/apps/sample/trimesh_texture/trimesh_texture.cpp b/apps/sample/trimesh_texture/trimesh_texture.cpp
index e8a56bea..b6cdc986 100644
--- a/apps/sample/trimesh_texture/trimesh_texture.cpp
+++ b/apps/sample/trimesh_texture/trimesh_texture.cpp
@@ -28,11 +28,8 @@
 #include <wrap/io_trimesh/import_ply.h>
 #include <wrap/io_trimesh/export_ply.h>
 
-#include<vcg/complex/algorithms/update/topology.h>
 #include<vcg/complex/algorithms/outline_support.h>
 
-#include<vcg/simplex/face/pos.h>
-
 #include <vcg/space/outline2_packer.h>
 #include <wrap/qt/outline2_rasterizer.h>
 
diff --git a/apps/sample/trimesh_topology/trimesh_topology.cpp b/apps/sample/trimesh_topology/trimesh_topology.cpp
index 553206fe..7a7ba174 100644
--- a/apps/sample/trimesh_topology/trimesh_topology.cpp
+++ b/apps/sample/trimesh_topology/trimesh_topology.cpp
@@ -24,10 +24,6 @@
 #include<vcg/complex/complex.h>
 #include<vcg/complex/algorithms/create/platonic.h>
 
-#include<vcg/complex/algorithms/update/topology.h>
-
-#include<vcg/simplex/face/pos.h>
-
 using namespace vcg;
 
 class MyEdge;