diff --git a/include/eigenpy/eigen-allocator.hpp b/include/eigenpy/eigen-allocator.hpp
index 1aa0b6a7bdad20b2dfa9a0f18ca1a8cd5691a83b..a9b8dc28254b9ff2490c026e06ce1ab455b861cf 100644
--- a/include/eigenpy/eigen-allocator.hpp
+++ b/include/eigenpy/eigen-allocator.hpp
@@ -171,11 +171,11 @@ template <typename MatType>
 struct eigen_allocator_impl_matrix;
 
 template <typename MatType>
-struct eigen_allocator_impl<MatType, Eigen::MatrixBase<MatType>>
+struct eigen_allocator_impl<MatType, Eigen::MatrixBase<MatType> >
     : eigen_allocator_impl_matrix<MatType> {};
 
 template <typename MatType>
-struct eigen_allocator_impl<const MatType, const Eigen::MatrixBase<MatType>>
+struct eigen_allocator_impl<const MatType, const Eigen::MatrixBase<MatType> >
     : eigen_allocator_impl_matrix<const MatType> {};
 
 template <typename MatType>
@@ -308,12 +308,12 @@ template <typename TensorType>
 struct eigen_allocator_impl_tensor;
 
 template <typename TensorType>
-struct eigen_allocator_impl<TensorType, Eigen::TensorBase<TensorType>>
+struct eigen_allocator_impl<TensorType, Eigen::TensorBase<TensorType> >
     : eigen_allocator_impl_tensor<TensorType> {};
 
 template <typename TensorType>
 struct eigen_allocator_impl<const TensorType,
-                            const Eigen::TensorBase<TensorType>>
+                            const Eigen::TensorBase<TensorType> >
     : eigen_allocator_impl_tensor<const TensorType> {};
 
 template <typename TensorType>
@@ -471,7 +471,7 @@ inline bool is_arr_layout_compatible_with_mat_type(PyArrayObject *pyArray) {
 }
 
 template <typename MatType, int Options, typename Stride>
-struct eigen_allocator_impl_matrix<Eigen::Ref<MatType, Options, Stride>> {
+struct eigen_allocator_impl_matrix<Eigen::Ref<MatType, Options, Stride> > {
   typedef Eigen::Ref<MatType, Options, Stride> RefType;
   typedef typename MatType::Scalar Scalar;
 
@@ -532,7 +532,7 @@ struct eigen_allocator_impl_matrix<Eigen::Ref<MatType, Options, Stride>> {
 
 template <typename MatType, int Options, typename Stride>
 struct eigen_allocator_impl_matrix<
-    const Eigen::Ref<const MatType, Options, Stride>> {
+    const Eigen::Ref<const MatType, Options, Stride> > {
   typedef const Eigen::Ref<const MatType, Options, Stride> RefType;
   typedef typename MatType::Scalar Scalar;
 
@@ -599,14 +599,14 @@ template <typename TensorType, typename TensorRef>
 struct eigen_allocator_impl_tensor_ref;
 
 template <typename TensorType>
-struct eigen_allocator_impl_tensor<Eigen::TensorRef<TensorType>>
+struct eigen_allocator_impl_tensor<Eigen::TensorRef<TensorType> >
     : eigen_allocator_impl_tensor_ref<TensorType,
-                                      Eigen::TensorRef<TensorType>> {};
+                                      Eigen::TensorRef<TensorType> > {};
 
 template <typename TensorType>
-struct eigen_allocator_impl_tensor<const Eigen::TensorRef<const TensorType>>
+struct eigen_allocator_impl_tensor<const Eigen::TensorRef<const TensorType> >
     : eigen_allocator_impl_tensor_ref<
-          const TensorType, const Eigen::TensorRef<const TensorType>> {};
+          const TensorType, const Eigen::TensorRef<const TensorType> > {};
 
 template <typename TensorType, typename RefType>
 struct eigen_allocator_impl_tensor_ref {
diff --git a/include/eigenpy/numpy-map.hpp b/include/eigenpy/numpy-map.hpp
index f085a03705f85a5abd32305995c78b99f2ab2334..798cfd7795d0254ddc71a2560756fc2e37a478be 100644
--- a/include/eigenpy/numpy-map.hpp
+++ b/include/eigenpy/numpy-map.hpp
@@ -24,13 +24,13 @@ struct numpy_map_impl;
 template <typename MatType, typename InputScalar, int AlignmentValue,
           typename Stride>
 struct numpy_map_impl<MatType, InputScalar, AlignmentValue, Stride,
-                      Eigen::MatrixBase<MatType>>
+                      Eigen::MatrixBase<MatType> >
     : numpy_map_impl_matrix<MatType, InputScalar, AlignmentValue, Stride> {};
 
 template <typename MatType, typename InputScalar, int AlignmentValue,
           typename Stride>
 struct numpy_map_impl<const MatType, InputScalar, AlignmentValue, Stride,
-                      const Eigen::MatrixBase<MatType>>
+                      const Eigen::MatrixBase<MatType> >
     : numpy_map_impl_matrix<const MatType, InputScalar, AlignmentValue,
                             Stride> {};
 
@@ -183,13 +183,13 @@ struct numpy_map_impl_tensor;
 template <typename TensorType, typename InputScalar, int AlignmentValue,
           typename Stride>
 struct numpy_map_impl<TensorType, InputScalar, AlignmentValue, Stride,
-                      Eigen::TensorBase<TensorType>>
+                      Eigen::TensorBase<TensorType> >
     : numpy_map_impl_tensor<TensorType, InputScalar, AlignmentValue, Stride> {};
 
 template <typename TensorType, typename InputScalar, int AlignmentValue,
           typename Stride>
 struct numpy_map_impl<const TensorType, InputScalar, AlignmentValue, Stride,
-                      const Eigen::TensorBase<TensorType>>
+                      const Eigen::TensorBase<TensorType> >
     : numpy_map_impl_tensor<const TensorType, InputScalar, AlignmentValue,
                             Stride> {};