diff --git a/CARET_trace/include/caret_trace/data_container.hpp b/CARET_trace/include/caret_trace/data_container.hpp
index be51efe8..15c3474b 100644
--- a/CARET_trace/include/caret_trace/data_container.hpp
+++ b/CARET_trace/include/caret_trace/data_container.hpp
@@ -16,6 +16,7 @@
 #include "caret_trace/data_recorder.hpp"
 #include "caret_trace/recordable_data.hpp"
 
+#include <cstdint>
 #include <functional>
 #include <initializer_list>
 #include <memory>
diff --git a/CARET_trace/include/caret_trace/trace_node.hpp b/CARET_trace/include/caret_trace/trace_node.hpp
index 949c6596..8caf10a1 100644
--- a/CARET_trace/include/caret_trace/trace_node.hpp
+++ b/CARET_trace/include/caret_trace/trace_node.hpp
@@ -22,6 +22,7 @@
 #include "caret_msgs/msg/start.hpp"
 #include "caret_msgs/msg/status.hpp"
 
+#include <cstdint>
 #include <memory>
 #include <string>
 #include <utility>
diff --git a/CARET_trace/src/clock.cpp b/CARET_trace/src/clock.cpp
index 259b2b95..f8c38051 100644
--- a/CARET_trace/src/clock.cpp
+++ b/CARET_trace/src/clock.cpp
@@ -14,6 +14,8 @@
 
 #include <caret_trace/clock.hpp>
 
+#include <cstdint>
+
 Clock::Clock()
 {
   lttng_ust_trace_clock_get_read64_cb(&lttng_clock_);
diff --git a/CARET_trace/src/data_container.cpp b/CARET_trace/src/data_container.cpp
index 7958cb8d..e7b834cc 100644
--- a/CARET_trace/src/data_container.cpp
+++ b/CARET_trace/src/data_container.cpp
@@ -19,6 +19,7 @@
 #include "caret_trace/singleton.hpp"
 
 #include <cassert>
+#include <cstdint>
 #include <initializer_list>
 #include <memory>
 #include <stdexcept>
diff --git a/CARET_trace/src/hooked_trace_points.cpp b/CARET_trace/src/hooked_trace_points.cpp
index e57cb03c..b9723ec5 100644
--- a/CARET_trace/src/hooked_trace_points.cpp
+++ b/CARET_trace/src/hooked_trace_points.cpp
@@ -19,6 +19,7 @@
 
 #include <dlfcn.h>
 
+#include <cstdint>
 #include <functional>
 #include <iomanip>
 #include <iostream>
diff --git a/CARET_trace/src/ros_trace_points.cpp b/CARET_trace/src/ros_trace_points.cpp
index ac8b80a9..d5f618be 100644
--- a/CARET_trace/src/ros_trace_points.cpp
+++ b/CARET_trace/src/ros_trace_points.cpp
@@ -32,6 +32,7 @@
 #include <time.h>
 
 #include <cassert>
+#include <cstdint>
 #include <cstdlib>
 #include <fstream>
 #include <iomanip>
diff --git a/CARET_trace/test/include/test/mock.hpp b/CARET_trace/test/include/test/mock.hpp
index b7da1be8..71d5d653 100644
--- a/CARET_trace/test/include/test/mock.hpp
+++ b/CARET_trace/test/include/test/mock.hpp
@@ -21,6 +21,7 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
+#include <cstdint>
 #include <memory>
 #include <utility>
 
diff --git a/CARET_trace/test/test_data_container.cpp b/CARET_trace/test/test_data_container.cpp
index 53fcd24a..1498e623 100644
--- a/CARET_trace/test/test_data_container.cpp
+++ b/CARET_trace/test/test_data_container.cpp
@@ -16,6 +16,7 @@
 
 #include <gtest/gtest.h>
 
+#include <cstdint>
 #include <memory>
 #include <string>
 #include <utility>
diff --git a/CARET_trace/test/test_hashable_keys.cpp b/CARET_trace/test/test_hashable_keys.cpp
index 43159b79..662f455b 100644
--- a/CARET_trace/test/test_hashable_keys.cpp
+++ b/CARET_trace/test/test_hashable_keys.cpp
@@ -16,6 +16,7 @@
 
 #include <gtest/gtest.h>
 
+#include <cstdint>
 #include <memory>
 #include <string>
 #include <utility>