diff --git a/Code/IO/otbKMLVectorDataIO.h b/Code/IO/otbKMLVectorDataIO.h
index 840eb1f628e4733463c18717250736f74ecfea38..e8cf68d9084dd2956fe8b4b4fa714dc38c39d765 100644
--- a/Code/IO/otbKMLVectorDataIO.h
+++ b/Code/IO/otbKMLVectorDataIO.h
@@ -18,7 +18,6 @@
 #ifndef __otbKMLVectorDataIO_h
 #define __otbKMLVectorDataIO_h
 
-#include "otbVectorDataIOBase.h"
 #include <fstream>
 #include <string>
 #include <vector>
@@ -26,6 +25,9 @@
 #include "kml/dom.h"
 #include "kml/base/file.h"
 
+#include "otbVectorDataIOBase.h"
+#include "otbVectorData.h"
+
 namespace otb
 {
 
@@ -56,7 +58,7 @@ public:
   typedef typename Superclass::ByteOrder ByteOrder;
 
   /** Data typedef */
-  typedef TData                                           VectorDataType;
+  typedef VectorData<double, 2>                           VectorDataType;
   typedef typename VectorDataType::DataTreeType           DataTreeType;
   typedef typename DataTreeType::TreeNodeType             InternalTreeNodeType;
   typedef typename InternalTreeNodeType::ChildrenListType ChildrenListType;
diff --git a/Code/IO/otbOGRVectorDataIO.h b/Code/IO/otbOGRVectorDataIO.h
index 028ff34bde32a3f7e8070e9d4ca1f56b1199473b..13c02a35cd616a008b84bf8f8e873836c577f2f2 100644
--- a/Code/IO/otbOGRVectorDataIO.h
+++ b/Code/IO/otbOGRVectorDataIO.h
@@ -18,7 +18,6 @@
 #ifndef __otbOGRVectorDataIO_h
 #define __otbOGRVectorDataIO_h
 
-#include "otbVectorDataIOBase.h"
 #include <fstream>
 #include <string>
 #include <vector>
@@ -26,6 +25,9 @@
 
 #include "ogrsf_frmts.h"
 
+#include "otbVectorDataIOBase.h"
+#include "otbVectorData.h"
+
 namespace otb
 {
 
@@ -59,7 +61,7 @@ public:
   typedef typename Superclass::ByteOrder ByteOrder;
 
   /** Data typedef */
-  typedef TData                                           VectorDataType;
+  typedef VectorData<double, 2>                           VectorDataType;
   typedef typename VectorDataType::DataTreeType           DataTreeType;
   typedef typename DataTreeType::TreeNodeType             InternalTreeNodeType;
   typedef typename InternalTreeNodeType::ChildrenListType ChildrenListType;