diff --git a/cpp/core/Bincode.hpp b/cpp/core/Bincode.hpp
index 909f7bea..0bd6f9b2 100644
--- a/cpp/core/Bincode.hpp
+++ b/cpp/core/Bincode.hpp
@@ -11,6 +11,7 @@
 #include <vector>
 #include <array>
 #include <bit>
+#include <stdint.h>
 
 #include "Common.hpp"
 #include "Assert.hpp"
diff --git a/cpp/core/Crypto.hpp b/cpp/core/Crypto.hpp
index ce247c25..62ec4a8e 100644
--- a/cpp/core/Crypto.hpp
+++ b/cpp/core/Crypto.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <array>
+#include <stdint.h>
 
 #include "Common.hpp"
 
diff --git a/cpp/ktools/eggsktools.cpp b/cpp/ktools/eggsktools.cpp
index 0b94054d..f5881174 100644
--- a/cpp/ktools/eggsktools.cpp
+++ b/cpp/ktools/eggsktools.cpp
@@ -9,6 +9,7 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <time.h>
+#include <stdint.h>
 
 #define die(fmt, ...) do { fprintf(stderr, fmt "\n" __VA_OPT__(,) __VA_ARGS__); exit(1); } while(false)
 
diff --git a/cpp/rocksdb-stdint.diff b/cpp/rocksdb-stdint.diff
new file mode 100644
index 00000000..1ead7cc6
--- /dev/null
+++ b/cpp/rocksdb-stdint.diff
@@ -0,0 +1,24 @@
+diff --git a/table/block_based/data_block_hash_index.h b/table/block_based/data_block_hash_index.h
+index f356395f3..6eaf71735 100644
+--- a/table/block_based/data_block_hash_index.h
++++ b/table/block_based/data_block_hash_index.h
+@@ -7,6 +7,7 @@
+ 
+ #include <string>
+ #include <vector>
++#include <cstdint>
+ 
+ #include "rocksdb/slice.h"
+ 
+diff --git a/util/string_util.h b/util/string_util.h
+index 55d106fff..2adf1ec68 100644
+--- a/util/string_util.h
++++ b/util/string_util.h
+@@ -10,6 +10,7 @@
+ #include <string>
+ #include <unordered_map>
+ #include <vector>
++#include <cstdint>
+ 
+ #include "rocksdb/rocksdb_namespace.h"
+ 
diff --git a/cpp/thirdparty.cmake b/cpp/thirdparty.cmake
index a07d0593..b1e8575d 100644
--- a/cpp/thirdparty.cmake
+++ b/cpp/thirdparty.cmake
@@ -101,6 +101,9 @@ ExternalProject_Add(make_rocksdb
     # https://github.com/facebook/rocksdb/archive/refs/tags/v7.9.2.tar.gz
     URL https://REDACTED
     URL_HASH SHA256=886378093098a1b2521b824782db7f7dd86224c232cf9652fcaf88222420b292
+    # When we upgraded dev boxes to newer arch and therefore newer clang this was
+    # needed. New RocksDB (e.g. 8.10.0) compiles out of the box.
+    PATCH_COMMAND patch -N -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/rocksdb-stdint.diff
     PREFIX thirdparty/rocksdb
     UPDATE_COMMAND ""
     SOURCE_DIR ${make_rocksdb_SOURCE_DIR}