diff --git a/unittest/aba.cpp b/unittest/aba.cpp
index ac78668c5cd5acf5c4ed392e51bf4d4164035d51..89b6f73106e5e9fa59f875c7612d5f4e9c73dc76 100644
--- a/unittest/aba.cpp
+++ b/unittest/aba.cpp
@@ -15,7 +15,6 @@
 // Pinocchio If not, see
 // <http://www.gnu.org/licenses/>.
 
-
 #include "pinocchio/spatial/fwd.hpp"
 #include "pinocchio/spatial/se3.hpp"
 #include "pinocchio/multibody/visitor.hpp"
diff --git a/unittest/compute-all-terms.cpp b/unittest/compute-all-terms.cpp
index 79167de748d4e03faa7b91f0b61b89440a0e9f6a..ab96ecb5486436b4fb702c4443e08234a7e63dda 100644
--- a/unittest/compute-all-terms.cpp
+++ b/unittest/compute-all-terms.cpp
@@ -15,13 +15,6 @@
 // Pinocchio If not, see
 // <http://www.gnu.org/licenses/>.
 
-/*
- * Unittest of the RNE algorithm. The code simply test that the algorithm does
- * not cause any serious errors. The numerical values are not cross validated
- * in any way.
- *
- */
-
 #include "pinocchio/spatial/fwd.hpp"
 #include "pinocchio/spatial/se3.hpp"
 #include "pinocchio/multibody/visitor.hpp"
diff --git a/unittest/geom.cpp b/unittest/geom.cpp
index 5f331f2ea077a8c6ae4f5f96a15f848529a930cf..dc3c03db4125d50a292c010c92fe330b07799dfc 100644
--- a/unittest/geom.cpp
+++ b/unittest/geom.cpp
@@ -15,30 +15,16 @@
 // Pinocchio If not, see
 // <http://www.gnu.org/licenses/>.
 
-/*
- * Compare the value obtained with the RNEA with the values obtained from
- * RBDL. The test is not complete. It only validates the RNEA for the revolute
- * joints. The free-flyer is not tested. It should be extended to account for
- * the free flyer and for the other algorithms.
- *
- * Additionnal notes: the RNEA is an algorithm that can be used to validate
- * many others (in particular, the mass matrix (CRBA) can be numerically
- * validated from the RNEA, then the center-of-mass jacobian can be validated
- * from the mass matrix, etc.
- *
- */
-
 #include <iostream>
 #include <iomanip>
 
 #include "pinocchio/multibody/model.hpp"
-#include "pinocchio/parsers/sample-models.hpp"
-#include "pinocchio/algorithm/kinematics.hpp"
-#include "pinocchio/algorithm/geometry.hpp"
-#include "pinocchio/parsers/urdf.hpp"
-#include "pinocchio/spatial/explog.hpp"
 
+#include "pinocchio/spatial/explog.hpp"
 #include "pinocchio/multibody/geometry.hpp"
+#include "pinocchio/algorithm/kinematics.hpp"
+#include "pinocchio/algorithm/collisions.hpp"
+#include "pinocchio/parsers/urdf.hpp"
 
 #include <vector>
 
@@ -140,7 +126,6 @@ std::ostream& operator<<(std::ostream& os, const std::pair < se3::Model, se3::Ge
   return os;
 } 
 
-
 BOOST_AUTO_TEST_SUITE ( GeomTest )
 
 BOOST_AUTO_TEST_CASE ( simple_boxes )
diff --git a/unittest/joint-configurations.cpp b/unittest/joint-configurations.cpp
index a52e8f377901249aba5522d427542a2f60148dfd..a9fca0c2351a559fcbcba75a537eb723ef8a6947 100644
--- a/unittest/joint-configurations.cpp
+++ b/unittest/joint-configurations.cpp
@@ -15,19 +15,10 @@
 // Pinocchio If not, see
 // <http://www.gnu.org/licenses/>.
 
-
-#include <iostream>
-#include <iomanip>
-
 #include "pinocchio/multibody/model.hpp"
-#include "pinocchio/parsers/sample-models.hpp"
-#include "pinocchio/algorithm/kinematics.hpp"
 #include "pinocchio/algorithm/joint-configuration.hpp"
-#include "pinocchio/spatial/explog.hpp"
 #include "pinocchio/math/quaternion.hpp"
 
-#include <vector>
-
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE JointConfigurationsTest
 #include <boost/test/unit_test.hpp>
diff --git a/unittest/joint.cpp b/unittest/joint.cpp
index bdf1cfaee4367b394b83872f1a74898e73622d6a..0dd6a2734331a325a467b51f2513f0662fc10aec 100644
--- a/unittest/joint.cpp
+++ b/unittest/joint.cpp
@@ -137,16 +137,12 @@ BOOST_AUTO_TEST_SUITE ( JointTest)
 
 BOOST_AUTO_TEST_CASE ( test_all_joints )
 {
-  using namespace Eigen;
   using namespace se3;
 
   Model model;
   buildModels::humanoidSimple(model);
-  se3::Data data(model);
-
+  Data data(model);
 
   boost::mpl::for_each<JointModelVariant::types>(TestJoint());
-
-
 }
 BOOST_AUTO_TEST_SUITE_END ()