diff --git a/src/TNL/Meshes/Writers/VTIWriter.h b/src/TNL/Meshes/Writers/VTIWriter.h
index 19aa9122af37a45e2fa62cb732607456c59eac03..8772205718c859a031a16c5f73c1d88020a49888 100644
--- a/src/TNL/Meshes/Writers/VTIWriter.h
+++ b/src/TNL/Meshes/Writers/VTIWriter.h
@@ -14,7 +14,6 @@
 
 #include <type_traits>
 
-#include <TNL/Meshes/Grid.h>
 #include <TNL/Meshes/VTKTraits.h>
 
 namespace TNL {
diff --git a/src/TNL/Meshes/Writers/VTIWriter.hpp b/src/TNL/Meshes/Writers/VTIWriter.hpp
index a6718784b93059e0d76a51ffc767dc2fdfd794c3..0744850d3e1a0760410a1dfad3394ba5cc37cbd2 100644
--- a/src/TNL/Meshes/Writers/VTIWriter.hpp
+++ b/src/TNL/Meshes/Writers/VTIWriter.hpp
@@ -14,6 +14,7 @@
 
 #include <limits>
 
+#include <TNL/Containers/StaticVector.h>  // TNL::product
 #include <TNL/Meshes/Writers/VTIWriter.h>
 #include <TNL/Endianness.h>
 #include <TNL/base64.h>
diff --git a/src/TNL/Meshes/Writers/VTKWriter.h b/src/TNL/Meshes/Writers/VTKWriter.h
index 3053805a7f06babc90e8a7b10a2f773a1803b26c..fbff5c6428c46eadce16cecce8901f1a7f003657 100644
--- a/src/TNL/Meshes/Writers/VTKWriter.h
+++ b/src/TNL/Meshes/Writers/VTKWriter.h
@@ -10,8 +10,6 @@
 
 #pragma once
 
-#include <TNL/Meshes/Grid.h>
-#include <TNL/Meshes/Mesh.h>
 #include <TNL/Meshes/VTKTraits.h>
 
 namespace TNL {
diff --git a/src/TNL/Meshes/Writers/VTKWriter.hpp b/src/TNL/Meshes/Writers/VTKWriter.hpp
index b85a7c9449712b23cda402a83933ed65a0832b29..87b7950813cde6e7a2811962789e06c8c9faa677 100644
--- a/src/TNL/Meshes/Writers/VTKWriter.hpp
+++ b/src/TNL/Meshes/Writers/VTKWriter.hpp
@@ -14,6 +14,7 @@
 
 #include <TNL/Meshes/Writers/VTKWriter.h>
 #include <TNL/Meshes/Writers/VerticesPerEntity.h>
+#include <TNL/Meshes/Grid.h>
 #include <TNL/Endianness.h>
 
 namespace TNL {
diff --git a/src/TNL/Meshes/Writers/VTUWriter.h b/src/TNL/Meshes/Writers/VTUWriter.h
index 478ebd9a58755de72a68591757bd51d7d9cb018a..31a1175b8dfde2225fe3460ea6859a8af8bc90b7 100644
--- a/src/TNL/Meshes/Writers/VTUWriter.h
+++ b/src/TNL/Meshes/Writers/VTUWriter.h
@@ -12,8 +12,6 @@
 
 #pragma once
 
-#include <TNL/Meshes/Grid.h>
-#include <TNL/Meshes/Mesh.h>
 #include <TNL/Meshes/VTKTraits.h>
 
 namespace TNL {
diff --git a/src/TNL/Meshes/Writers/VTUWriter.hpp b/src/TNL/Meshes/Writers/VTUWriter.hpp
index 40c373907bdd577f731209ebe849da1530e3481c..e26b2942aeb44b7315d82effd43d6b48a362bb87 100644
--- a/src/TNL/Meshes/Writers/VTUWriter.hpp
+++ b/src/TNL/Meshes/Writers/VTUWriter.hpp
@@ -16,6 +16,7 @@
 
 #include <TNL/Meshes/Writers/VTUWriter.h>
 #include <TNL/Meshes/Writers/VerticesPerEntity.h>
+#include <TNL/Meshes/Grid.h>
 #include <TNL/Endianness.h>
 #include <TNL/base64.h>
 #ifdef HAVE_ZLIB