diff --git a/orc-rt/include/orc-rt/Error.h b/orc-rt/include/orc-rt/Error.h
index 3ad277594336..7d0debdb0686 100644
--- a/orc-rt/include/orc-rt/Error.h
+++ b/orc-rt/include/orc-rt/Error.h
@@ -16,6 +16,7 @@
 #include "orc-rt/RTTI.h"
 
 #include <cassert>
+#include <cstdint>
 #include <cstdlib>
 #include <memory>
 #include <string>
diff --git a/orc-rt/lib/executor/Error.cpp b/orc-rt/lib/executor/Error.cpp
index 495df9c104af..5448dbd107b0 100644
--- a/orc-rt/lib/executor/Error.cpp
+++ b/orc-rt/lib/executor/Error.cpp
@@ -14,6 +14,7 @@
 #include "orc-rt/Error.h"
 #include "orc-rt-c/Error.h"
 
+#include <cstring>
 #include <system_error>
 
 namespace orc_rt {
diff --git a/orc-rt/lib/executor/SimpleNativeMemoryMap.cpp b/orc-rt/lib/executor/SimpleNativeMemoryMap.cpp
index c77994e6acb0..46b19ba7f5a6 100644
--- a/orc-rt/lib/executor/SimpleNativeMemoryMap.cpp
+++ b/orc-rt/lib/executor/SimpleNativeMemoryMap.cpp
@@ -15,6 +15,8 @@
 
 #include "orc-rt/SimpleNativeMemoryMap.h"
 #include "orc-rt/Session.h"
+
+#include <optional>
 #include <sstream>
 
 #if defined(__APPLE__) || defined(__linux__)