diff --git a/wrap/ForwardDeclaration.h b/wrap/ForwardDeclaration.h
index 5506dd778..5ec022ca4 100644
--- a/wrap/ForwardDeclaration.h
+++ b/wrap/ForwardDeclaration.h
@@ -27,6 +27,7 @@ namespace wrap {
     std::string name;
     bool isVirtual;
     ForwardDeclaration() : isVirtual(false) {}
+    ForwardDeclaration(const std::string& s) : name(s), isVirtual(false) {}
   };
 
-}
\ No newline at end of file
+}
diff --git a/wrap/Module.cpp b/wrap/Module.cpp
index 277845889..912397f21 100644
--- a/wrap/Module.cpp
+++ b/wrap/Module.cpp
@@ -416,6 +416,11 @@ void Module::parseMarkup(const std::string& data) {
   // Create type attributes table and check validity
   typeAttributes.addClasses(expandedClasses);
   typeAttributes.addForwardDeclarations(forward_declarations);
+  // add Eigen types as template arguments are also checked ?
+  vector<ForwardDeclaration> eigen;
+  eigen.push_back(ForwardDeclaration("Vector"));
+  eigen.push_back(ForwardDeclaration("Matrix"));
+  typeAttributes.addForwardDeclarations(eigen);
   typeAttributes.checkValidity(expandedClasses);
 }