diff --git a/include/Surelog/DesignCompile/ElaboratorHarness.h b/include/Surelog/DesignCompile/ElaboratorHarness.h
index 329708eec0..eafc994050 100644
--- a/include/Surelog/DesignCompile/ElaboratorHarness.h
+++ b/include/Surelog/DesignCompile/ElaboratorHarness.h
@@ -27,6 +27,7 @@
 
 #include <string>
 #include <string_view>
+#include <tuple>
 
 namespace SURELOG {
 
diff --git a/include/Surelog/ErrorReporting/ErrorContainer.h b/include/Surelog/ErrorReporting/ErrorContainer.h
index 1deeb0f359..593663d6d3 100644
--- a/include/Surelog/ErrorReporting/ErrorContainer.h
+++ b/include/Surelog/ErrorReporting/ErrorContainer.h
@@ -31,6 +31,7 @@
 #include <set>
 #include <string>
 #include <string_view>
+#include <tuple>
 #include <utility>
 #include <vector>
 
diff --git a/include/Surelog/SourceCompile/CommonListenerHelper.h b/include/Surelog/SourceCompile/CommonListenerHelper.h
index 3f50bfa139..6482f6cc7d 100644
--- a/include/Surelog/SourceCompile/CommonListenerHelper.h
+++ b/include/Surelog/SourceCompile/CommonListenerHelper.h
@@ -34,6 +34,7 @@
 #include <map>
 #include <string>
 #include <string_view>
+#include <tuple>
 
 namespace antlr4 {
 class CommonTokenStream;
diff --git a/include/Surelog/SourceCompile/SV3_1aPpTreeListenerHelper.h b/include/Surelog/SourceCompile/SV3_1aPpTreeListenerHelper.h
index 65b705158a..b94aa14da9 100644
--- a/include/Surelog/SourceCompile/SV3_1aPpTreeListenerHelper.h
+++ b/include/Surelog/SourceCompile/SV3_1aPpTreeListenerHelper.h
@@ -35,6 +35,7 @@
 #include <cstdint>
 #include <set>
 #include <string_view>
+#include <tuple>
 #include <vector>
 
 namespace SURELOG {
diff --git a/include/Surelog/SourceCompile/SV3_1aTreeShapeHelper.h b/include/Surelog/SourceCompile/SV3_1aTreeShapeHelper.h
index 0e6d6b0ccf..01c808cffe 100644
--- a/include/Surelog/SourceCompile/SV3_1aTreeShapeHelper.h
+++ b/include/Surelog/SourceCompile/SV3_1aTreeShapeHelper.h
@@ -39,6 +39,7 @@
 #include <cstdint>
 #include <stack>
 #include <string_view>
+#include <tuple>
 #include <utility>
 
 namespace antlr4 {
diff --git a/src/DesignCompile/ElaboratorHarness.cpp b/src/DesignCompile/ElaboratorHarness.cpp
index c9346af33a..c744cd9e71 100644
--- a/src/DesignCompile/ElaboratorHarness.cpp
+++ b/src/DesignCompile/ElaboratorHarness.cpp
@@ -24,6 +24,7 @@
 #include "Surelog/DesignCompile/ElaboratorHarness.h"
 
 #include <string_view>
+#include <tuple>
 
 #include "Surelog/CommandLine/CommandLineParser.h"
 #include "Surelog/Design/Design.h"
diff --git a/src/ErrorReporting/ErrorContainer.cpp b/src/ErrorReporting/ErrorContainer.cpp
index 8a80eb2ecb..b635861289 100644
--- a/src/ErrorReporting/ErrorContainer.cpp
+++ b/src/ErrorReporting/ErrorContainer.cpp
@@ -29,6 +29,7 @@
 #include <map>
 #include <string>
 #include <string_view>
+#include <tuple>
 #include <utility>
 #include <vector>
 
diff --git a/src/SourceCompile/SV3_1aPpTreeListenerHelper.cpp b/src/SourceCompile/SV3_1aPpTreeListenerHelper.cpp
index a53b7f3f24..2ea20ce9cd 100644
--- a/src/SourceCompile/SV3_1aPpTreeListenerHelper.cpp
+++ b/src/SourceCompile/SV3_1aPpTreeListenerHelper.cpp
@@ -25,6 +25,7 @@
 
 #include <cstdint>
 #include <string_view>
+#include <tuple>
 #include <vector>
 
 #include "Surelog/CommandLine/CommandLineParser.h"
diff --git a/src/SourceCompile/SV3_1aTreeShapeHelper.cpp b/src/SourceCompile/SV3_1aTreeShapeHelper.cpp
index bb921fbdf8..1c8747cda0 100644
--- a/src/SourceCompile/SV3_1aTreeShapeHelper.cpp
+++ b/src/SourceCompile/SV3_1aTreeShapeHelper.cpp
@@ -26,6 +26,7 @@
 #include <cstdint>
 #include <string>
 #include <string_view>
+#include <tuple>
 #include <utility>
 #include <vector>
 
diff --git a/src/roundtrip.cpp b/src/roundtrip.cpp
index 5fb96c729d..63ba5f17fd 100644
--- a/src/roundtrip.cpp
+++ b/src/roundtrip.cpp
@@ -44,6 +44,7 @@
 #include <stack>
 #include <string>
 #include <string_view>
+#include <tuple>
 #include <unordered_map>
 #include <unordered_set>
 #include <utility>