diff --git a/libs/librrgraph/src/base/rr_graph_storage.h b/libs/librrgraph/src/base/rr_graph_storage.h
index 570576ba20e..db791e4cda3 100644
--- a/libs/librrgraph/src/base/rr_graph_storage.h
+++ b/libs/librrgraph/src/base/rr_graph_storage.h
@@ -15,8 +15,9 @@
 #include "vtr_memory.h"
 #include "vtr_strong_id_range.h"
 #include "vtr_array_view.h"
-#include<iostream>
+#include <iostream>
 #include <optional>
+#include <cstdint>
 
 /* Main structure describing one routing resource node.  Everything in       *
  * this structure should describe the graph -- information needed only       *
diff --git a/libs/librrgraph/src/base/rr_node_types.h b/libs/librrgraph/src/base/rr_node_types.h
index 1b38848f21b..3e9f89d4c82 100644
--- a/libs/librrgraph/src/base/rr_node_types.h
+++ b/libs/librrgraph/src/base/rr_node_types.h
@@ -7,6 +7,7 @@
 #include <vector>
 #include <array>
 #include <map>
+#include <cstdint>
 #include "vtr_range.h"
 #include "vtr_ndmatrix.h"
 
diff --git a/libs/libvtrutil/src/vtr_ragged_matrix.h b/libs/libvtrutil/src/vtr_ragged_matrix.h
index 18ba18f9b58..862047e0b1e 100644
--- a/libs/libvtrutil/src/vtr_ragged_matrix.h
+++ b/libs/libvtrutil/src/vtr_ragged_matrix.h
@@ -238,11 +238,11 @@ class FlatRaggedMatrix {
             return !(*this == other);
         }
 
-        int operator-(const RowLengthIterator& other) {
+        difference_type operator-(const RowLengthIterator& other) {
             return irow_ - other.irow_;
         }
 
-        size_t operator*() {
+        value_type operator*() {
             //Call the callback to get the row length
             return callback_(Index0(irow_));
         }
diff --git a/libs/libvtrutil/src/vtr_string_interning.h b/libs/libvtrutil/src/vtr_string_interning.h
index bbf22766170..65b611e6015 100644
--- a/libs/libvtrutil/src/vtr_string_interning.h
+++ b/libs/libvtrutil/src/vtr_string_interning.h
@@ -48,6 +48,7 @@
 #include <unordered_map>
 #include <stdexcept>
 #include <climits>
+#include <cstdint>
 #include <algorithm>
 #include <array>