diff --git a/include/morphio/mitochondria.h b/include/morphio/mitochondria.h
index b43bcea6..a740db2f 100644
--- a/include/morphio/mitochondria.h
+++ b/include/morphio/mitochondria.h
@@ -4,6 +4,7 @@
  */
 #pragma once
 
+#include <cstdint>  // uint32_t
 #include <memory>
 #include <vector>
 
diff --git a/include/morphio/morphology.h b/include/morphio/morphology.h
index 81efb25c..01d0d1e3 100644
--- a/include/morphio/morphology.h
+++ b/include/morphio/morphology.h
@@ -4,6 +4,8 @@
  */
 #pragma once
 
+#include <cstdint>  // uint32_t
+
 #include <highfive/H5Group.hpp>
 
 #include <morphio/properties.h>
diff --git a/include/morphio/mut/endoplasmic_reticulum.h b/include/morphio/mut/endoplasmic_reticulum.h
index 9d460e1f..e8923286 100644
--- a/include/morphio/mut/endoplasmic_reticulum.h
+++ b/include/morphio/mut/endoplasmic_reticulum.h
@@ -4,6 +4,8 @@
  */
 #pragma once
 
+#include <cstdint>  // uint32_t
+
 #include <morphio/properties.h>
 #include <morphio/types.h>
 
diff --git a/include/morphio/mut/glial_cell.h b/include/morphio/mut/glial_cell.h
index 39ab8e55..468e6dd0 100644
--- a/include/morphio/mut/glial_cell.h
+++ b/include/morphio/mut/glial_cell.h
@@ -4,6 +4,8 @@
  */
 #pragma once
 
+#include <cstdint>  // uint32_t
+
 #include <string>  // std::string
 
 #include <morphio/mut/morphology.h>  // mut::Morphology
diff --git a/include/morphio/mut/mitochondria.h b/include/morphio/mut/mitochondria.h
index 80942eac..b38b2e4b 100644
--- a/include/morphio/mut/mitochondria.h
+++ b/include/morphio/mut/mitochondria.h
@@ -4,6 +4,7 @@
  */
 #pragma once
 
+#include <cstdint>  // uint32_t
 #include <map>
 #include <memory>
 
diff --git a/include/morphio/mut/morphology.h b/include/morphio/mut/morphology.h
index 9a315713..a2cebecf 100644
--- a/include/morphio/mut/morphology.h
+++ b/include/morphio/mut/morphology.h
@@ -4,6 +4,7 @@
  */
 #pragma once
 
+#include <cstdint>  // uint32_t
 #include <map>
 #include <memory>
 #include <string>
diff --git a/include/morphio/mut/section.h b/include/morphio/mut/section.h
index d7cca8c0..ff8b0885 100644
--- a/include/morphio/mut/section.h
+++ b/include/morphio/mut/section.h
@@ -4,6 +4,8 @@
  */
 #pragma once
 
+#include <cstdint>  // uint32_t
+
 #include <morphio/properties.h>
 #include <morphio/section.h>
 #include <morphio/types.h>
diff --git a/include/morphio/properties.h b/include/morphio/properties.h
index f5a3c4f1..9ec90752 100644
--- a/include/morphio/properties.h
+++ b/include/morphio/properties.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <cstdint>  // uint32_t
+#include <cstdint>  // int32_t, uint32_t
 
 #include <array>
 #include <map>
diff --git a/include/morphio/vasc/properties.h b/include/morphio/vasc/properties.h
index 30aa4e86..03e69c24 100644
--- a/include/morphio/vasc/properties.h
+++ b/include/morphio/vasc/properties.h
@@ -4,6 +4,7 @@
  */
 #pragma once
 
+#include <cstdint>  // uint32_t
 #include <map>
 #include <string>  // std::string
 #include <vector>  // std::vector
diff --git a/include/morphio/vasc/section.h b/include/morphio/vasc/section.h
index e79a1503..c0c1853a 100644
--- a/include/morphio/vasc/section.h
+++ b/include/morphio/vasc/section.h
@@ -4,6 +4,7 @@
  */
 #pragma once
 
+#include <cstdint>  // uint32_t
 #include <iosfwd>  // std::ostream
 #include <memory>  // std::shared_ptr
 #include <vector>  // std::vector
diff --git a/include/morphio/vasc/vasculature.h b/include/morphio/vasc/vasculature.h
index a2f38e02..8652d5ed 100644
--- a/include/morphio/vasc/vasculature.h
+++ b/include/morphio/vasc/vasculature.h
@@ -4,6 +4,7 @@
  */
 #pragma once
 
+#include <cstdint>  // uint32_t
 #include <memory>  // std::shared_ptr
 #include <string>  // std::string
 #include <vector>  // std::vector
diff --git a/include/morphio/warning_handling.h b/include/morphio/warning_handling.h
index 0c8ef28f..2a6aef71 100644
--- a/include/morphio/warning_handling.h
+++ b/include/morphio/warning_handling.h
@@ -4,6 +4,7 @@
  */
 #pragma once
 
+#include <cstdint>  // int32_t, uint32_t, uint64_t
 #include <iostream>
 #include <memory>
 #include <set>