diff --git a/src/angle-axis.cpp b/src/angle-axis.cpp
index 4508ed7bbe10fe33a5b168208f85afc049731e3b..94c673b7512e66ed94b4b2c4580f141a467f9bc5 100644
--- a/src/angle-axis.cpp
+++ b/src/angle-axis.cpp
@@ -14,8 +14,8 @@
  * with eigenpy.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "eigenpy/angle-axis.hpp"
 #include "eigenpy/geometry.hpp"
+#include "eigenpy/angle-axis.hpp"
 
 namespace eigenpy
 {
diff --git a/src/angle-axis.hpp b/src/angle-axis.hpp
index e3811e5183942b2fcedeb56b262c9b91d82a1fe0..c04deef66d7e99119e27445e15806fc2232fb13c 100644
--- a/src/angle-axis.hpp
+++ b/src/angle-axis.hpp
@@ -21,8 +21,6 @@
 #include <Eigen/Core>
 #include <Eigen/Geometry>
 
-#include "eigenpy/eigenpy.hpp"
-
 namespace eigenpy
 {
   template<>
diff --git a/src/geometry.hpp b/src/geometry.hpp
index bdb7752a6068913fd16d7880efa77eaf3e11b89d..a0421a90c357ba387a60b978f3b1097de22d6ce2 100644
--- a/src/geometry.hpp
+++ b/src/geometry.hpp
@@ -17,18 +17,12 @@
 #ifndef __eigenpy_geometry_hpp__
 #define __eigenpy_geometry_hpp__
 
-#include "eigenpy/eigenpy.hpp"
-#include "eigenpy/quaternion.hpp"
-#include "eigenpy/angle-axis.hpp"
-
 namespace eigenpy
 {
-  typedef Eigen::Quaternion<double,Eigen::DontAlign> Quaterniond_fx;
-  //typedef Eigen::AngleAxis<double> AngleAxis_fx;
-
+  
   void exposeQuaternion();
   void exposeAngleAxis();
-
+  
 } // namespace eigenpy
 
 #endif // define __eigenpy_geometry_hpp__
diff --git a/src/quaternion.cpp b/src/quaternion.cpp
index 6e1360a3c53168ce7dd40318d0dd9f0aeade8b53..8bbdf04c0905f0cbe7f765ba19ac29f6a39943b2 100644
--- a/src/quaternion.cpp
+++ b/src/quaternion.cpp
@@ -15,6 +15,7 @@
  */
 
 #include "eigenpy/geometry.hpp"
+#include "eigenpy/quaternion.hpp"
 
 namespace eigenpy
 {
diff --git a/src/quaternion.hpp b/src/quaternion.hpp
index f93c30e41257c8000d23478918cb1a27a7fdacc6..97c53d0a632f1a2dc0e1019686198a0515ee7bae 100644
--- a/src/quaternion.hpp
+++ b/src/quaternion.hpp
@@ -19,7 +19,7 @@
 
 #include <Eigen/Core>
 #include <Eigen/Geometry>
-#include "eigenpy/eigenpy.hpp"
+
 #include "eigenpy/exception.hpp"
 
 namespace eigenpy
diff --git a/unittest/geometry.cpp b/unittest/geometry.cpp
index 8782d1b4c2f6f2c2a6eb36fc1d330133721b06b6..b8fcfd70e59a3e5cafc37abd7c536c18e366bf5c 100644
--- a/unittest/geometry.cpp
+++ b/unittest/geometry.cpp
@@ -42,12 +42,6 @@ double testInQuaternion( Eigen::Quaterniond q )
 {
   return q.norm(); 
 }
-double testInQuaternion_fx( eigenpy::Quaterniond_fx q )
-{
-  return q.norm(); 
-}
-
-
 
 BOOST_PYTHON_MODULE(geometry)
 {
@@ -61,7 +55,6 @@ BOOST_PYTHON_MODULE(geometry)
 
   bp::def("testOutQuaternion",&testOutQuaternion);
   bp::def("testInQuaternion",&testInQuaternion);
-  bp::def("testInQuaternion_fx",&testInQuaternion_fx);
 
 }
- 
+