diff --git a/MeshLib/Vtk/VtkMappedPropertyVectorTemplate.h b/MeshLib/Vtk/VtkMappedPropertyVectorTemplate.h
index 8373f6454e9a4fb2cdf7136288ec5efb75f96b29..642b1ee8b1d30a3236b7ed65b70847365368623e 100644
--- a/MeshLib/Vtk/VtkMappedPropertyVectorTemplate.h
+++ b/MeshLib/Vtk/VtkMappedPropertyVectorTemplate.h
@@ -18,20 +18,31 @@
 
 #include <vtkMappedDataArray.h>
 #include <vtkObjectFactory.h>  // for vtkStandardNewMacro
-#include <vtkTypeTemplate.h>   // For templated vtkObject API
 #include <vtkVersion.h>
 
+#if VTK_MAJOR_VERSION < 7 || VTK_MINOR_VERSION < 1
+#include <vtkTypeTemplate.h>   // For templated vtkObject API
+#endif
+
 #include "MeshLib/Elements/Element.h"
 
 namespace MeshLib {
-
 template <class Scalar>
 class VtkMappedPropertyVectorTemplate :
+#if VTK_MAJOR_VERSION >= 7 && VTK_MINOR_VERSION >= 1
+    public vtkMappedDataArray<Scalar>
+#else
     public vtkTypeTemplate<VtkMappedPropertyVectorTemplate<Scalar>,
-                           vtkMappedDataArray<Scalar> >
+                           vtkMappedDataArray<Scalar>>
+#endif // vtk version
 {
 public:
+#if VTK_MAJOR_VERSION >= 7 && VTK_MINOR_VERSION >= 1
+    vtkTemplateTypeMacro(VtkMappedPropertyVectorTemplate<Scalar>,
+                         vtkMappedDataArray<Scalar>);
+#else
     vtkMappedDataArrayNewInstanceMacro(VtkMappedPropertyVectorTemplate<Scalar>);
+#endif // vtk version
     static VtkMappedPropertyVectorTemplate* New();
     virtual void PrintSelf(std::ostream &os, vtkIndent indent) override;
 
diff --git a/MeshLib/Vtk/VtkMeshNodalCoordinatesTemplate.h b/MeshLib/Vtk/VtkMeshNodalCoordinatesTemplate.h
index 15bd4b72fb076b36bf9b1cdaae97b83d6d8ba97e..87333375af2e744e917eec01e7f3ce5c4d4728ae 100644
--- a/MeshLib/Vtk/VtkMeshNodalCoordinatesTemplate.h
+++ b/MeshLib/Vtk/VtkMeshNodalCoordinatesTemplate.h
@@ -18,9 +18,12 @@
 
 #include <vtkMappedDataArray.h>
 #include <vtkObjectFactory.h>  // for vtkStandardNewMacro
-#include <vtkTypeTemplate.h>   // For templated vtkObject API
 #include <vtkVersion.h>
 
+#if VTK_MAJOR_VERSION < 7 || VTK_MINOR_VERSION < 1
+#include <vtkTypeTemplate.h>   // For templated vtkObject API
+#endif
+
 namespace MeshLib
 {
     class Node;
@@ -28,14 +31,22 @@ namespace MeshLib
 
 namespace MeshLib
 {
-
 template <class Scalar>
-class VtkMeshNodalCoordinatesTemplate:
+class VtkMeshNodalCoordinatesTemplate :
+#if VTK_MAJOR_VERSION >= 7 && VTK_MINOR_VERSION >= 1
+    public vtkMappedDataArray<Scalar>
+#else
     public vtkTypeTemplate<VtkMeshNodalCoordinatesTemplate<Scalar>,
-                           vtkMappedDataArray<Scalar> >
+                           vtkMappedDataArray<Scalar>>
+#endif // vtk version
 {
 public:
+#if VTK_MAJOR_VERSION >= 7 && VTK_MINOR_VERSION >= 1
+    vtkTemplateTypeMacro(VtkMeshNodalCoordinatesTemplate<Scalar>,
+                         vtkMappedDataArray<Scalar>);
+#else
     vtkMappedDataArrayNewInstanceMacro(VtkMeshNodalCoordinatesTemplate<Scalar>);
+#endif // vtk version
     static VtkMeshNodalCoordinatesTemplate *New();
     virtual void PrintSelf(std::ostream &os, vtkIndent indent) override;