diff --git a/include/Surelog/API/PythonAPI.h b/include/Surelog/API/PythonAPI.h
index 5302d560d6..e382a4d6e5 100644
--- a/include/Surelog/API/PythonAPI.h
+++ b/include/Surelog/API/PythonAPI.h
@@ -25,6 +25,7 @@
 #define SURELOG_PYTHONAPI_H
 #pragma once
 
+#include <cstdint>
 #include <filesystem>
 #include <string>
 #include <vector>
diff --git a/include/Surelog/API/SLAPI.h b/include/Surelog/API/SLAPI.h
index 720ae5cfd4..bdc6bf9c3d 100644
--- a/include/Surelog/API/SLAPI.h
+++ b/include/Surelog/API/SLAPI.h
@@ -28,6 +28,7 @@
 #include <Surelog/Common/NodeId.h>
 #include <Surelog/SourceCompile/VObjectTypes.h>
 
+#include <cstdint>
 #include <string>
 #include <vector>
 
diff --git a/include/Surelog/Cache/Cache.h b/include/Surelog/Cache/Cache.h
index b11b89ea93..d666ae8286 100644
--- a/include/Surelog/Cache/Cache.h
+++ b/include/Surelog/Cache/Cache.h
@@ -29,6 +29,7 @@
 #include <Surelog/Common/PathId.h>
 #include <Surelog/ErrorReporting/Error.h>
 
+#include <cstdint>
 #include <string_view>
 #include <vector>
 
diff --git a/include/Surelog/Cache/PPCache.h b/include/Surelog/Cache/PPCache.h
index 44bafc9d58..a1544fa549 100644
--- a/include/Surelog/Cache/PPCache.h
+++ b/include/Surelog/Cache/PPCache.h
@@ -28,6 +28,8 @@
 #include <Surelog/Cache/Cache.h>
 #include <Surelog/Cache/PPCache.capnp.h>
 
+#include <cstdint>
+
 namespace SURELOG {
 
 class PreprocessFile;
diff --git a/include/Surelog/CommandLine/CommandLineParser.h b/include/Surelog/CommandLine/CommandLineParser.h
index 75a8f19b24..ca76b41804 100644
--- a/include/Surelog/CommandLine/CommandLineParser.h
+++ b/include/Surelog/CommandLine/CommandLineParser.h
@@ -28,6 +28,7 @@
 #include <Surelog/Common/PathId.h>
 #include <Surelog/Common/SymbolId.h>
 
+#include <cstdint>
 #include <filesystem>
 #include <functional>
 #include <map>
diff --git a/include/Surelog/Common/PlatformFileSystem.h b/include/Surelog/Common/PlatformFileSystem.h
index f76420ffa9..057f862303 100644
--- a/include/Surelog/Common/PlatformFileSystem.h
+++ b/include/Surelog/Common/PlatformFileSystem.h
@@ -27,6 +27,7 @@
 
 #include <Surelog/Common/FileSystem.h>
 
+#include <cstdint>
 #include <functional>
 #include <memory>
 #include <mutex>
diff --git a/include/Surelog/Design/Design.h b/include/Surelog/Design/Design.h
index 8bb8cfff86..84c93df77f 100644
--- a/include/Surelog/Design/Design.h
+++ b/include/Surelog/Design/Design.h
@@ -29,6 +29,7 @@
 #include <Surelog/Common/NodeId.h>
 #include <Surelog/Common/PathId.h>
 
+#include <cstdint>
 #include <functional>
 #include <map>
 #include <mutex>
diff --git a/include/Surelog/Design/DesignComponent.h b/include/Surelog/Design/DesignComponent.h
index 4c22f949fc..e347c611b6 100644
--- a/include/Surelog/Design/DesignComponent.h
+++ b/include/Surelog/Design/DesignComponent.h
@@ -34,6 +34,7 @@
 #include <Surelog/Design/ValuedComponentI.h>
 #include <Surelog/SourceCompile/VObjectTypes.h>
 
+#include <cstdint>
 #include <functional>
 #include <map>
 #include <string>
diff --git a/include/Surelog/Design/DesignElement.h b/include/Surelog/Design/DesignElement.h
index 768abd860a..c722b5927b 100644
--- a/include/Surelog/Design/DesignElement.h
+++ b/include/Surelog/Design/DesignElement.h
@@ -30,6 +30,7 @@
 #include <Surelog/Common/SymbolId.h>
 #include <Surelog/Design/TimeInfo.h>
 
+#include <cstdint>
 #include <ostream>
 
 namespace SURELOG {
diff --git a/include/Surelog/Design/Enum.h b/include/Surelog/Design/Enum.h
index 28775b7b32..9eb217c83c 100644
--- a/include/Surelog/Design/Enum.h
+++ b/include/Surelog/Design/Enum.h
@@ -28,6 +28,7 @@
 #include <Surelog/Common/SymbolId.h>
 #include <Surelog/Design/DataType.h>
 
+#include <cstdint>
 #include <functional>
 #include <string_view>
 #include <utility>
diff --git a/include/Surelog/Design/FileContent.h b/include/Surelog/Design/FileContent.h
index 1491fa1e4d..8ae61d523a 100644
--- a/include/Surelog/Design/FileContent.h
+++ b/include/Surelog/Design/FileContent.h
@@ -30,6 +30,7 @@
 #include <Surelog/Design/DesignComponent.h>
 #include <Surelog/Design/VObject.h>
 
+#include <cstdint>
 #include <functional>
 #include <map>
 #include <set>
diff --git a/include/Surelog/Design/ModuleDefinition.h b/include/Surelog/Design/ModuleDefinition.h
index 558decd145..b65e99592a 100644
--- a/include/Surelog/Design/ModuleDefinition.h
+++ b/include/Surelog/Design/ModuleDefinition.h
@@ -31,6 +31,7 @@
 #include <Surelog/Design/DesignComponent.h>
 #include <Surelog/Design/ModPort.h>
 
+#include <cstdint>
 #include <functional>
 #include <map>
 #include <string>
diff --git a/include/Surelog/Design/ModuleInstance.h b/include/Surelog/Design/ModuleInstance.h
index ee6dfbb6ac..77208a2b44 100644
--- a/include/Surelog/Design/ModuleInstance.h
+++ b/include/Surelog/Design/ModuleInstance.h
@@ -32,6 +32,7 @@
 #include <Surelog/SourceCompile/VObjectTypes.h>
 #include <uhdm/Serializer.h>
 
+#include <cstdint>
 #include <map>
 #include <set>
 #include <string>
diff --git a/include/Surelog/Design/TimeInfo.h b/include/Surelog/Design/TimeInfo.h
index 09a6e039a7..5996cfaddd 100644
--- a/include/Surelog/Design/TimeInfo.h
+++ b/include/Surelog/Design/TimeInfo.h
@@ -28,6 +28,7 @@
 #include <Surelog/Common/PathId.h>
 #include <Surelog/SourceCompile/VObjectTypes.h>
 
+#include <cstdint>
 #include <string_view>
 
 namespace SURELOG {
diff --git a/include/Surelog/Design/VObject.h b/include/Surelog/Design/VObject.h
index c7bde4015b..e1d56d1db0 100644
--- a/include/Surelog/Design/VObject.h
+++ b/include/Surelog/Design/VObject.h
@@ -30,6 +30,7 @@
 #include <Surelog/Common/SymbolId.h>
 #include <Surelog/SourceCompile/VObjectTypes.h>
 
+#include <cstdint>
 #include <ostream>
 #include <string>
 #include <string_view>
diff --git a/include/Surelog/Design/ValuedComponentI.h b/include/Surelog/Design/ValuedComponentI.h
index 520a95aa93..0954da3df0 100644
--- a/include/Surelog/Design/ValuedComponentI.h
+++ b/include/Surelog/Design/ValuedComponentI.h
@@ -28,6 +28,7 @@
 #include <Surelog/Common/Containers.h>
 #include <Surelog/Common/RTTI.h>
 
+#include <cstdint>
 #include <utility>
 
 // UHDM
diff --git a/include/Surelog/DesignCompile/CompileClass.h b/include/Surelog/DesignCompile/CompileClass.h
index fdd72f132c..12a7ad77b6 100644
--- a/include/Surelog/DesignCompile/CompileClass.h
+++ b/include/Surelog/DesignCompile/CompileClass.h
@@ -28,6 +28,7 @@
 #include <Surelog/DesignCompile/CompileHelper.h>
 #include <Surelog/Testbench/ClassDefinition.h>
 
+#include <cstdint>
 #include <set>
 #include <string>
 
diff --git a/include/Surelog/DesignCompile/CompileDesign.h b/include/Surelog/DesignCompile/CompileDesign.h
index 3038559bb7..907567609b 100644
--- a/include/Surelog/DesignCompile/CompileDesign.h
+++ b/include/Surelog/DesignCompile/CompileDesign.h
@@ -27,6 +27,7 @@
 
 #include <Surelog/Design/Design.h>
 
+#include <cstdint>
 #include <map>
 #include <vector>
 
diff --git a/include/Surelog/DesignCompile/CompileFileContent.h b/include/Surelog/DesignCompile/CompileFileContent.h
index 035084f7be..b550770a63 100644
--- a/include/Surelog/DesignCompile/CompileFileContent.h
+++ b/include/Surelog/DesignCompile/CompileFileContent.h
@@ -27,6 +27,8 @@
 
 #include <Surelog/DesignCompile/CompileHelper.h>
 
+#include <cstdint>
+
 namespace SURELOG {
 
 class CompileDesign;
diff --git a/include/Surelog/DesignCompile/CompileHelper.h b/include/Surelog/DesignCompile/CompileHelper.h
index d4ce370d0c..0179523245 100644
--- a/include/Surelog/DesignCompile/CompileHelper.h
+++ b/include/Surelog/DesignCompile/CompileHelper.h
@@ -30,6 +30,7 @@
 #include <Surelog/Expression/ExprBuilder.h>
 #include <Surelog/SourceCompile/VObjectTypes.h>
 
+#include <cstdint>
 #include <string>
 #include <string_view>
 #include <unordered_map>
diff --git a/include/Surelog/DesignCompile/CompileModule.h b/include/Surelog/DesignCompile/CompileModule.h
index b2b3c66229..0487a2bc05 100644
--- a/include/Surelog/DesignCompile/CompileModule.h
+++ b/include/Surelog/DesignCompile/CompileModule.h
@@ -27,6 +27,8 @@
 
 #include <Surelog/DesignCompile/CompileHelper.h>
 
+#include <cstdint>
+
 namespace SURELOG {
 
 class CompileDesign;
diff --git a/include/Surelog/DesignCompile/CompilePackage.h b/include/Surelog/DesignCompile/CompilePackage.h
index f96716875f..3577d16fba 100644
--- a/include/Surelog/DesignCompile/CompilePackage.h
+++ b/include/Surelog/DesignCompile/CompilePackage.h
@@ -27,6 +27,8 @@
 
 #include <Surelog/DesignCompile/CompileHelper.h>
 
+#include <cstdint>
+
 namespace SURELOG {
 
 class CompileDesign;
diff --git a/include/Surelog/DesignCompile/CompileProgram.h b/include/Surelog/DesignCompile/CompileProgram.h
index 6deeb4e81f..68197b4966 100644
--- a/include/Surelog/DesignCompile/CompileProgram.h
+++ b/include/Surelog/DesignCompile/CompileProgram.h
@@ -28,6 +28,8 @@
 #include <Surelog/DesignCompile/CompileHelper.h>
 #include <Surelog/DesignCompile/CompileToolbox.h>
 
+#include <cstdint>
+
 namespace SURELOG {
 
 class CompileDesign;
diff --git a/include/Surelog/DesignCompile/CompileStep.h b/include/Surelog/DesignCompile/CompileStep.h
index e0f2c6431f..fa04116458 100644
--- a/include/Surelog/DesignCompile/CompileStep.h
+++ b/include/Surelog/DesignCompile/CompileStep.h
@@ -29,6 +29,7 @@
 #include <Surelog/Common/SymbolId.h>
 #include <Surelog/SourceCompile/VObjectTypes.h>
 
+#include <cstdint>
 #include <string_view>
 #include <vector>
 
diff --git a/include/Surelog/DesignCompile/DesignElaboration.h b/include/Surelog/DesignCompile/DesignElaboration.h
index 7b668312c2..451e3d8892 100644
--- a/include/Surelog/DesignCompile/DesignElaboration.h
+++ b/include/Surelog/DesignCompile/DesignElaboration.h
@@ -28,6 +28,7 @@
 #include <Surelog/Config/Config.h>
 #include <Surelog/DesignCompile/TestbenchElaboration.h>
 
+#include <cstdint>
 #include <functional>
 #include <map>
 #include <set>
diff --git a/include/Surelog/DesignCompile/ElaborationStep.h b/include/Surelog/DesignCompile/ElaborationStep.h
index 33a47c8f6f..e5417350bf 100644
--- a/include/Surelog/DesignCompile/ElaborationStep.h
+++ b/include/Surelog/DesignCompile/ElaborationStep.h
@@ -29,6 +29,7 @@
 #include <Surelog/ErrorReporting/ErrorDefinition.h>
 #include <Surelog/Expression/ExprBuilder.h>
 
+#include <cstdint>
 #include <map>
 #include <string_view>
 
diff --git a/include/Surelog/DesignCompile/NetlistElaboration.h b/include/Surelog/DesignCompile/NetlistElaboration.h
index 5fd78c7e2d..368c3f1c78 100644
--- a/include/Surelog/DesignCompile/NetlistElaboration.h
+++ b/include/Surelog/DesignCompile/NetlistElaboration.h
@@ -27,6 +27,7 @@
 
 #include <Surelog/DesignCompile/TestbenchElaboration.h>
 
+#include <cstdint>
 #include <map>
 #include <string_view>
 
diff --git a/include/Surelog/DesignCompile/ResolveSymbols.h b/include/Surelog/DesignCompile/ResolveSymbols.h
index da58aa0404..aea6101614 100644
--- a/include/Surelog/DesignCompile/ResolveSymbols.h
+++ b/include/Surelog/DesignCompile/ResolveSymbols.h
@@ -28,6 +28,7 @@
 #include <Surelog/Common/SymbolId.h>
 #include <Surelog/DesignCompile/CompileStep.h>
 
+#include <cstdint>
 #include <string_view>
 #include <unordered_set>
 #include <vector>
diff --git a/include/Surelog/DesignCompile/UhdmChecker.h b/include/Surelog/DesignCompile/UhdmChecker.h
index 7ba160661d..9eb1b6018d 100644
--- a/include/Surelog/DesignCompile/UhdmChecker.h
+++ b/include/Surelog/DesignCompile/UhdmChecker.h
@@ -27,6 +27,7 @@
 
 #include <Surelog/Common/PathId.h>
 
+#include <cstdint>
 #include <map>
 #include <set>
 #include <string_view>
diff --git a/include/Surelog/DesignCompile/UhdmWriter.h b/include/Surelog/DesignCompile/UhdmWriter.h
index 27d2b2945e..5d7592e272 100644
--- a/include/Surelog/DesignCompile/UhdmWriter.h
+++ b/include/Surelog/DesignCompile/UhdmWriter.h
@@ -29,6 +29,7 @@
 #include <Surelog/DesignCompile/CompileHelper.h>
 #include <Surelog/SourceCompile/VObjectTypes.h>
 
+#include <cstdint>
 #include <functional>
 #include <map>
 #include <string_view>
diff --git a/include/Surelog/ErrorReporting/ErrorContainer.h b/include/Surelog/ErrorReporting/ErrorContainer.h
index 711481bf6c..1deeb0f359 100644
--- a/include/Surelog/ErrorReporting/ErrorContainer.h
+++ b/include/Surelog/ErrorReporting/ErrorContainer.h
@@ -27,6 +27,7 @@
 
 #include <Surelog/ErrorReporting/Error.h>
 
+#include <cstdint>
 #include <set>
 #include <string>
 #include <string_view>
diff --git a/include/Surelog/ErrorReporting/Location.h b/include/Surelog/ErrorReporting/Location.h
index 9d73ea9686..a3fdfc451c 100644
--- a/include/Surelog/ErrorReporting/Location.h
+++ b/include/Surelog/ErrorReporting/Location.h
@@ -28,6 +28,7 @@
 #include <Surelog/Common/PathId.h>
 #include <Surelog/Common/SymbolId.h>
 
+#include <cstdint>
 #include <ostream>
 
 namespace SURELOG {
diff --git a/include/Surelog/ErrorReporting/LogListener.h b/include/Surelog/ErrorReporting/LogListener.h
index 761b553850..b95b79011e 100644
--- a/include/Surelog/ErrorReporting/LogListener.h
+++ b/include/Surelog/ErrorReporting/LogListener.h
@@ -27,6 +27,7 @@
 
 #include <Surelog/Common/PathId.h>
 
+#include <cstdint>
 #include <deque>
 #include <mutex>
 #include <ostream>
diff --git a/include/Surelog/Expression/ExprBuilder.h b/include/Surelog/Expression/ExprBuilder.h
index db32798555..9f61f2a69d 100644
--- a/include/Surelog/Expression/ExprBuilder.h
+++ b/include/Surelog/Expression/ExprBuilder.h
@@ -27,6 +27,7 @@
 
 #include <Surelog/Expression/Value.h>
 
+#include <cstdint>
 #include <string_view>
 
 namespace SURELOG {
diff --git a/include/Surelog/Package/Package.h b/include/Surelog/Package/Package.h
index 3936d715e2..f8308ceceb 100644
--- a/include/Surelog/Package/Package.h
+++ b/include/Surelog/Package/Package.h
@@ -29,6 +29,7 @@
 #include <Surelog/Design/DesignComponent.h>
 #include <Surelog/Expression/ExprBuilder.h>
 
+#include <cstdint>
 #include <string_view>
 
 // UHDM
diff --git a/include/Surelog/SourceCompile/AnalyzeFile.h b/include/Surelog/SourceCompile/AnalyzeFile.h
index 9727d827b6..80902edae0 100644
--- a/include/Surelog/SourceCompile/AnalyzeFile.h
+++ b/include/Surelog/SourceCompile/AnalyzeFile.h
@@ -29,6 +29,7 @@
 #include <Surelog/Design/DesignElement.h>
 #include <Surelog/SourceCompile/IncludeFileInfo.h>
 
+#include <cstdint>
 #include <stack>
 #include <string>
 #include <string_view>
diff --git a/include/Surelog/SourceCompile/AntlrParserErrorListener.h b/include/Surelog/SourceCompile/AntlrParserErrorListener.h
index 121707d41c..a4741b9b66 100644
--- a/include/Surelog/SourceCompile/AntlrParserErrorListener.h
+++ b/include/Surelog/SourceCompile/AntlrParserErrorListener.h
@@ -28,6 +28,7 @@
 #include <ANTLRErrorListener.h>
 #include <Surelog/Common/PathId.h>
 
+#include <cstdint>
 #include <string>
 #include <vector>
 
diff --git a/include/Surelog/SourceCompile/CommonListenerHelper.h b/include/Surelog/SourceCompile/CommonListenerHelper.h
index 2d343c9ec8..8da22848aa 100644
--- a/include/Surelog/SourceCompile/CommonListenerHelper.h
+++ b/include/Surelog/SourceCompile/CommonListenerHelper.h
@@ -29,6 +29,7 @@
 #include <Surelog/Common/PathId.h>
 #include <Surelog/SourceCompile/VObjectTypes.h>
 
+#include <cstdint>
 #include <map>
 #include <string>
 #include <string_view>
diff --git a/include/Surelog/SourceCompile/CompilationUnit.h b/include/Surelog/SourceCompile/CompilationUnit.h
index 4c183ae3b3..8563fa2f73 100644
--- a/include/Surelog/SourceCompile/CompilationUnit.h
+++ b/include/Surelog/SourceCompile/CompilationUnit.h
@@ -29,6 +29,7 @@
 #include <Surelog/Common/NodeId.h>
 #include <Surelog/Design/TimeInfo.h>
 
+#include <cstdint>
 #include <string_view>
 #include <vector>
 
diff --git a/include/Surelog/SourceCompile/CompileSourceFile.h b/include/Surelog/SourceCompile/CompileSourceFile.h
index 2c1bcd14e1..c318fb6e27 100644
--- a/include/Surelog/SourceCompile/CompileSourceFile.h
+++ b/include/Surelog/SourceCompile/CompileSourceFile.h
@@ -28,6 +28,7 @@
 #include <Surelog/Common/SymbolId.h>
 #include <Surelog/SourceCompile/PreprocessFile.h>
 
+#include <cstdint>
 #include <map>
 #include <string>
 #include <string_view>
diff --git a/include/Surelog/SourceCompile/IncludeFileInfo.h b/include/Surelog/SourceCompile/IncludeFileInfo.h
index b4e0b622b1..5ee58ef986 100644
--- a/include/Surelog/SourceCompile/IncludeFileInfo.h
+++ b/include/Surelog/SourceCompile/IncludeFileInfo.h
@@ -28,6 +28,8 @@
 #include <Surelog/Common/PathId.h>
 #include <Surelog/Common/SymbolId.h>
 
+#include <cstdint>
+
 namespace SURELOG {
 
 class IncludeFileInfo {
diff --git a/include/Surelog/SourceCompile/MacroInfo.h b/include/Surelog/SourceCompile/MacroInfo.h
index f6c5d67ad2..50cd67a9fe 100644
--- a/include/Surelog/SourceCompile/MacroInfo.h
+++ b/include/Surelog/SourceCompile/MacroInfo.h
@@ -27,6 +27,7 @@
 
 #include <Surelog/Common/PathId.h>
 
+#include <cstdint>
 #include <string>
 #include <string_view>
 #include <vector>
diff --git a/include/Surelog/SourceCompile/ParseFile.h b/include/Surelog/SourceCompile/ParseFile.h
index 579b749c44..26e3beb391 100644
--- a/include/Surelog/SourceCompile/ParseFile.h
+++ b/include/Surelog/SourceCompile/ParseFile.h
@@ -27,6 +27,7 @@
 
 #include <Surelog/ErrorReporting/Error.h>
 
+#include <cstdint>
 #include <string>
 #include <string_view>
 #include <vector>
diff --git a/include/Surelog/SourceCompile/PreprocessFile.h b/include/Surelog/SourceCompile/PreprocessFile.h
index d490ccb931..5276131cd1 100644
--- a/include/Surelog/SourceCompile/PreprocessFile.h
+++ b/include/Surelog/SourceCompile/PreprocessFile.h
@@ -31,6 +31,7 @@
 #include <Surelog/SourceCompile/IncludeFileInfo.h>
 #include <Surelog/SourceCompile/LoopCheck.h>
 
+#include <cstdint>
 #include <set>
 #include <string>
 #include <string_view>
diff --git a/include/Surelog/SourceCompile/SV3_1aPpTreeListenerHelper.h b/include/Surelog/SourceCompile/SV3_1aPpTreeListenerHelper.h
index f6bca88e0a..05a4de108f 100644
--- a/include/Surelog/SourceCompile/SV3_1aPpTreeListenerHelper.h
+++ b/include/Surelog/SourceCompile/SV3_1aPpTreeListenerHelper.h
@@ -31,6 +31,7 @@
 #include <Surelog/SourceCompile/CommonListenerHelper.h>
 #include <Surelog/SourceCompile/PreprocessFile.h>
 
+#include <cstdint>
 #include <set>
 #include <string_view>
 #include <vector>
diff --git a/include/Surelog/SourceCompile/SV3_1aTreeShapeHelper.h b/include/Surelog/SourceCompile/SV3_1aTreeShapeHelper.h
index 13497cb5c3..a69eeb1eda 100644
--- a/include/Surelog/SourceCompile/SV3_1aTreeShapeHelper.h
+++ b/include/Surelog/SourceCompile/SV3_1aTreeShapeHelper.h
@@ -32,6 +32,7 @@
 #include <Surelog/SourceCompile/IncludeFileInfo.h>
 #include <parser/SV3_1aParser.h>
 
+#include <cstdint>
 #include <stack>
 #include <string_view>
 #include <utility>
diff --git a/include/Surelog/Testbench/ClassDefinition.h b/include/Surelog/Testbench/ClassDefinition.h
index 594ebffe33..bc040e06b5 100644
--- a/include/Surelog/Testbench/ClassDefinition.h
+++ b/include/Surelog/Testbench/ClassDefinition.h
@@ -30,6 +30,7 @@
 #include <Surelog/Design/DesignComponent.h>
 #include <Surelog/Testbench/TaskMethod.h>
 
+#include <cstdint>
 #include <map>
 #include <string>
 #include <string_view>
diff --git a/include/Surelog/Testbench/Program.h b/include/Surelog/Testbench/Program.h
index cd7c44fcb1..5b0a8942ee 100644
--- a/include/Surelog/Testbench/Program.h
+++ b/include/Surelog/Testbench/Program.h
@@ -30,6 +30,7 @@
 #include <Surelog/Common/SymbolId.h>
 #include <Surelog/Design/DesignComponent.h>
 
+#include <cstdint>
 #include <string_view>
 
 // UHDM
diff --git a/include/Surelog/Utils/ParseUtils.h b/include/Surelog/Utils/ParseUtils.h
index e18c319c0d..fb08dffc23 100644
--- a/include/Surelog/Utils/ParseUtils.h
+++ b/include/Surelog/Utils/ParseUtils.h
@@ -27,6 +27,7 @@
 
 #include <ParserRuleContext.h>
 
+#include <cstdint>
 #include <string>
 #include <utility>
 #include <vector>
diff --git a/include/Surelog/Utils/StringUtils.h b/include/Surelog/Utils/StringUtils.h
index b26a0a7bee..2638ca8fe4 100644
--- a/include/Surelog/Utils/StringUtils.h
+++ b/include/Surelog/Utils/StringUtils.h
@@ -25,6 +25,7 @@
 #define SURELOG_STRINGUTILS_H
 #pragma once
 
+#include <cstdint>
 #include <sstream>
 #include <string>
 #include <string_view>
diff --git a/src/API/PythonAPI.cpp b/src/API/PythonAPI.cpp
index 3941b97abd..5f69513e2f 100644
--- a/src/API/PythonAPI.cpp
+++ b/src/API/PythonAPI.cpp
@@ -25,6 +25,7 @@
 
 #include <antlr4-runtime.h>
 
+#include <cstdint>
 #include <string>
 #include <vector>
 
diff --git a/src/API/SLAPI.cpp b/src/API/SLAPI.cpp
index f950025395..ef315dc311 100644
--- a/src/API/SLAPI.cpp
+++ b/src/API/SLAPI.cpp
@@ -30,6 +30,7 @@
 
 #include <antlr4-runtime.h>
 
+#include <cstdint>
 #include <iostream>
 #include <string>
 #include <vector>
diff --git a/src/API/SV3_1aPythonListener.cpp b/src/API/SV3_1aPythonListener.cpp
index 452a77f4ec..da25c90ffb 100644
--- a/src/API/SV3_1aPythonListener.cpp
+++ b/src/API/SV3_1aPythonListener.cpp
@@ -23,6 +23,8 @@
 
 #include "Surelog/API/SV3_1aPythonListener.h"
 
+#include <cstdint>
+
 #include "Surelog/ErrorReporting/ErrorContainer.h"
 #include "Surelog/SourceCompile/PythonListen.h"
 #include "Surelog/SourceCompile/SymbolTable.h"
diff --git a/src/Cache/Cache.cpp b/src/Cache/Cache.cpp
index fa0f3bd915..f85c816a73 100644
--- a/src/Cache/Cache.cpp
+++ b/src/Cache/Cache.cpp
@@ -25,6 +25,7 @@
 
 #include <capnp/serialize-packed.h>
 
+#include <cstdint>
 #include <filesystem>
 #include <functional>
 #include <iostream>
diff --git a/src/Cache/PPCache.cpp b/src/Cache/PPCache.cpp
index dced474aa0..d384b3faca 100644
--- a/src/Cache/PPCache.cpp
+++ b/src/Cache/PPCache.cpp
@@ -28,6 +28,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
+#include <cstdint>
 #include <string>
 #include <string_view>
 #include <vector>
diff --git a/src/Cache/ParseCache.cpp b/src/Cache/ParseCache.cpp
index fa58904e6e..f4ddbb8b82 100644
--- a/src/Cache/ParseCache.cpp
+++ b/src/Cache/ParseCache.cpp
@@ -28,6 +28,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
+#include <cstdint>
 #include <string>
 #include <string_view>
 #include <vector>
diff --git a/src/Cache/PythonAPICache.cpp b/src/Cache/PythonAPICache.cpp
index 219b241893..cd3e9cb83c 100644
--- a/src/Cache/PythonAPICache.cpp
+++ b/src/Cache/PythonAPICache.cpp
@@ -28,6 +28,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
+#include <cstdint>
 #include <string>
 #include <string_view>
 #include <vector>
diff --git a/src/CommandLine/CommandLineParser.cpp b/src/CommandLine/CommandLineParser.cpp
index 78cf950580..570ec4fb0e 100644
--- a/src/CommandLine/CommandLineParser.cpp
+++ b/src/CommandLine/CommandLineParser.cpp
@@ -23,6 +23,7 @@
 
 #include "Surelog/CommandLine/CommandLineParser.h"
 
+#include <cstdint>
 #include <map>
 #include <nlohmann/json.hpp>
 #include <string>
diff --git a/src/Common/FileSystem.cpp b/src/Common/FileSystem.cpp
index 01a551ddd9..b373347d1d 100644
--- a/src/Common/FileSystem.cpp
+++ b/src/Common/FileSystem.cpp
@@ -29,6 +29,7 @@
 #define NOMINMAX
 #include <Windows.h>
 
+#include <cstdint>
 #include <iostream>
 #include <string>
 #include <string_view>
diff --git a/src/Common/PlatformFileSystem.cpp b/src/Common/PlatformFileSystem.cpp
index 2d1f6d0f69..913846b13d 100644
--- a/src/Common/PlatformFileSystem.cpp
+++ b/src/Common/PlatformFileSystem.cpp
@@ -23,6 +23,7 @@
 
 #include "Surelog/Common/PlatformFileSystem.h"
 
+#include <cstdint>
 #include <filesystem>
 #include <fstream>
 #include <iostream>
diff --git a/src/Common/PlatformFileSystem_test.cpp b/src/Common/PlatformFileSystem_test.cpp
index 7cef6c2aeb..9e8416bae0 100644
--- a/src/Common/PlatformFileSystem_test.cpp
+++ b/src/Common/PlatformFileSystem_test.cpp
@@ -25,6 +25,7 @@
 
 #include <gtest/gtest.h>
 
+#include <cstdint>
 #include <iostream>
 #include <set>
 #include <string_view>
diff --git a/src/Design/DefParam.cpp b/src/Design/DefParam.cpp
index bb213be762..ad2181b6a9 100644
--- a/src/Design/DefParam.cpp
+++ b/src/Design/DefParam.cpp
@@ -23,6 +23,7 @@
  * Created on January 7, 2018, 8:55 PM
  */
 
+#include <cstdint>
 #include <string>
 #include <vector>
 
diff --git a/src/Design/Design.cpp b/src/Design/Design.cpp
index 86c48504c2..a100990d52 100644
--- a/src/Design/Design.cpp
+++ b/src/Design/Design.cpp
@@ -22,6 +22,7 @@
  * Created on July 1, 2017, 1:23 PM
  */
 
+#include <cstdint>
 #include <iterator>
 #include <map>
 #include <queue>
diff --git a/src/Design/DesignElement.cpp b/src/Design/DesignElement.cpp
index 6ba400ef5a..5b09d92340 100644
--- a/src/Design/DesignElement.cpp
+++ b/src/Design/DesignElement.cpp
@@ -22,6 +22,7 @@
  * Created on June 8, 2017, 8:05 PM
  */
 
+#include <cstdint>
 #include <ostream>
 
 namespace SURELOG {
diff --git a/src/Design/FileContent.cpp b/src/Design/FileContent.cpp
index 0036fb8117..cca5c9da64 100644
--- a/src/Design/FileContent.cpp
+++ b/src/Design/FileContent.cpp
@@ -23,6 +23,7 @@
  * Created on June 8, 2017, 8:22 PM
  */
 
+#include <cstdint>
 #include <iostream>
 #include <stack>
 #include <string>
diff --git a/src/Design/ModuleDefinition.cpp b/src/Design/ModuleDefinition.cpp
index a727e8db46..2d8768c9f9 100644
--- a/src/Design/ModuleDefinition.cpp
+++ b/src/Design/ModuleDefinition.cpp
@@ -23,6 +23,7 @@
  * Created on October 20, 2017, 10:29 PM
  */
 
+#include <cstdint>
 #include <string_view>
 #include <vector>
 
diff --git a/src/Design/ModuleInstance.cpp b/src/Design/ModuleInstance.cpp
index 1f8450e22b..fa9a66ee96 100644
--- a/src/Design/ModuleInstance.cpp
+++ b/src/Design/ModuleInstance.cpp
@@ -22,6 +22,7 @@
  * Created on October 16, 2017, 10:48 PM
  */
 
+#include <cstdint>
 #include <set>
 #include <string_view>
 #include <vector>
diff --git a/src/Design/TimeInfo.cpp b/src/Design/TimeInfo.cpp
index de75f9d331..cdcb4ccb39 100644
--- a/src/Design/TimeInfo.cpp
+++ b/src/Design/TimeInfo.cpp
@@ -22,6 +22,7 @@
  *
  * Created on June 8, 2017, 8:27 PM
  */
+#include <cstdint>
 #include <string_view>
 
 namespace SURELOG {
diff --git a/src/Design/ValuedComponentI.cpp b/src/Design/ValuedComponentI.cpp
index bf49422635..3b98f782b4 100644
--- a/src/Design/ValuedComponentI.cpp
+++ b/src/Design/ValuedComponentI.cpp
@@ -22,6 +22,7 @@
  * Created on May 20, 2019, 21:03 PM
  */
 
+#include <cstdint>
 #include <map>
 #include <string>
 #include <string_view>
diff --git a/src/DesignCompile/CompileAssertion.cpp b/src/DesignCompile/CompileAssertion.cpp
index 208ea550fa..f1dfaf46e0 100644
--- a/src/DesignCompile/CompileAssertion.cpp
+++ b/src/DesignCompile/CompileAssertion.cpp
@@ -30,6 +30,7 @@
 #include <uhdm/clone_tree.h>
 #include <uhdm/uhdm.h>
 
+#include <cstdint>
 #include <iostream>
 #include <string_view>
 
diff --git a/src/DesignCompile/CompileClass.cpp b/src/DesignCompile/CompileClass.cpp
index 7087bc3379..ea5623d400 100644
--- a/src/DesignCompile/CompileClass.cpp
+++ b/src/DesignCompile/CompileClass.cpp
@@ -40,6 +40,7 @@
 // UHDM
 #include <uhdm/class_defn.h>
 
+#include <cstdint>
 #include <stack>
 #include <string>
 #include <string_view>
diff --git a/src/DesignCompile/CompileDesign.cpp b/src/DesignCompile/CompileDesign.cpp
index 9ca467e502..2968d5f2a9 100644
--- a/src/DesignCompile/CompileDesign.cpp
+++ b/src/DesignCompile/CompileDesign.cpp
@@ -55,6 +55,7 @@
 #include <uhdm/vpi_visitor.h>
 
 #include <climits>
+#include <cstdint>
 #include <iostream>
 #include <map>
 #include <string>
diff --git a/src/DesignCompile/CompileExpression.cpp b/src/DesignCompile/CompileExpression.cpp
index 27ba8e13d3..34d51918ad 100644
--- a/src/DesignCompile/CompileExpression.cpp
+++ b/src/DesignCompile/CompileExpression.cpp
@@ -23,6 +23,7 @@
 
 #include <algorithm>
 #include <cmath>
+#include <cstdint>
 #include <cstring>
 #include <iostream>
 #include <set>
diff --git a/src/DesignCompile/CompileFileContent.cpp b/src/DesignCompile/CompileFileContent.cpp
index 06129ec325..933b0f26be 100644
--- a/src/DesignCompile/CompileFileContent.cpp
+++ b/src/DesignCompile/CompileFileContent.cpp
@@ -23,6 +23,7 @@
 
 #include "Surelog/DesignCompile/CompileFileContent.h"
 
+#include <cstdint>
 #include <stack>
 #include <vector>
 
diff --git a/src/DesignCompile/CompileHelper.cpp b/src/DesignCompile/CompileHelper.cpp
index 6759d4b787..6f3f2fd023 100644
--- a/src/DesignCompile/CompileHelper.cpp
+++ b/src/DesignCompile/CompileHelper.cpp
@@ -63,6 +63,7 @@
 #include <uhdm/uhdm.h>
 
 #include <climits>
+#include <cstdint>
 #include <cstring>
 #include <functional>
 #include <iostream>
diff --git a/src/DesignCompile/CompileHelper_test.cpp b/src/DesignCompile/CompileHelper_test.cpp
index 77366165c0..a5f900a626 100644
--- a/src/DesignCompile/CompileHelper_test.cpp
+++ b/src/DesignCompile/CompileHelper_test.cpp
@@ -20,6 +20,7 @@
 #include <uhdm/Serializer.h>
 #include <uhdm/constant.h>
 
+#include <cstdint>
 #include <limits>
 #include <string_view>
 
diff --git a/src/DesignCompile/CompileModule.cpp b/src/DesignCompile/CompileModule.cpp
index 0f90341662..4f35fbf707 100644
--- a/src/DesignCompile/CompileModule.cpp
+++ b/src/DesignCompile/CompileModule.cpp
@@ -48,6 +48,7 @@
 #include <uhdm/table_entry.h>
 #include <uhdm/udp_defn.h>
 
+#include <cstdint>
 #include <stack>
 #include <string>
 #include <string_view>
diff --git a/src/DesignCompile/CompilePackage.cpp b/src/DesignCompile/CompilePackage.cpp
index 209017e800..034d05a13d 100644
--- a/src/DesignCompile/CompilePackage.cpp
+++ b/src/DesignCompile/CompilePackage.cpp
@@ -37,6 +37,7 @@
 // UHDM
 #include <uhdm/package.h>
 
+#include <cstdint>
 #include <stack>
 #include <string>
 #include <string_view>
diff --git a/src/DesignCompile/CompileProgram.cpp b/src/DesignCompile/CompileProgram.cpp
index 00c913a8a3..6058c69b69 100644
--- a/src/DesignCompile/CompileProgram.cpp
+++ b/src/DesignCompile/CompileProgram.cpp
@@ -26,6 +26,7 @@
 #include <uhdm/final_stmt.h>
 #include <uhdm/initial.h>
 
+#include <cstdint>
 #include <stack>
 #include <string>
 #include <string_view>
diff --git a/src/DesignCompile/CompileStmt.cpp b/src/DesignCompile/CompileStmt.cpp
index 7caf277791..de235e8ada 100644
--- a/src/DesignCompile/CompileStmt.cpp
+++ b/src/DesignCompile/CompileStmt.cpp
@@ -53,6 +53,7 @@
 #include <uhdm/ElaboratorListener.h>
 #include <uhdm/uhdm.h>
 
+#include <cstdint>
 #include <functional>
 #include <iostream>
 #include <map>
diff --git a/src/DesignCompile/CompileType.cpp b/src/DesignCompile/CompileType.cpp
index c3bbb6eb80..03a5a706b2 100644
--- a/src/DesignCompile/CompileType.cpp
+++ b/src/DesignCompile/CompileType.cpp
@@ -54,6 +54,7 @@
 #include <uhdm/clone_tree.h>
 #include <uhdm/uhdm.h>
 
+#include <cstdint>
 #include <stack>
 #include <string>
 #include <string_view>
diff --git a/src/DesignCompile/DesignElaboration.cpp b/src/DesignCompile/DesignElaboration.cpp
index 0ac390c4eb..503192c779 100644
--- a/src/DesignCompile/DesignElaboration.cpp
+++ b/src/DesignCompile/DesignElaboration.cpp
@@ -50,6 +50,7 @@
 #include <uhdm/clone_tree.h>
 #include <uhdm/uhdm.h>
 
+#include <cstdint>
 #include <cstring>
 #include <functional>
 #include <iostream>
diff --git a/src/DesignCompile/ElaborationStep.cpp b/src/DesignCompile/ElaborationStep.cpp
index 89c6ec836e..6a4ac3b064 100644
--- a/src/DesignCompile/ElaborationStep.cpp
+++ b/src/DesignCompile/ElaborationStep.cpp
@@ -23,6 +23,7 @@
 
 #include "Surelog/DesignCompile/ElaborationStep.h"
 
+#include <cstdint>
 #include <cstring>
 #include <functional>
 #include <map>
diff --git a/src/DesignCompile/Elaboration_test.cpp b/src/DesignCompile/Elaboration_test.cpp
index ee12b5184f..700aa0ca2f 100644
--- a/src/DesignCompile/Elaboration_test.cpp
+++ b/src/DesignCompile/Elaboration_test.cpp
@@ -17,6 +17,7 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
+#include <cstdint>
 #include <iostream>
 #include <string>
 #include <string_view>
diff --git a/src/DesignCompile/EvalFunc.cpp b/src/DesignCompile/EvalFunc.cpp
index f365a3f282..3757be1d3c 100644
--- a/src/DesignCompile/EvalFunc.cpp
+++ b/src/DesignCompile/EvalFunc.cpp
@@ -36,6 +36,7 @@
 #include <uhdm/uhdm.h>
 
 #include <bitset>
+#include <cstdint>
 #include <iostream>
 #include <string>
 #include <string_view>
diff --git a/src/DesignCompile/NetlistElaboration.cpp b/src/DesignCompile/NetlistElaboration.cpp
index ab43ccef51..86e486dc1d 100644
--- a/src/DesignCompile/NetlistElaboration.cpp
+++ b/src/DesignCompile/NetlistElaboration.cpp
@@ -24,6 +24,7 @@
 #include "Surelog/DesignCompile/NetlistElaboration.h"
 
 #include <algorithm>
+#include <cstdint>
 #include <map>
 #include <set>
 #include <string>
diff --git a/src/DesignCompile/ResolveSymbols.cpp b/src/DesignCompile/ResolveSymbols.cpp
index 1bb10396a0..e0c1ffefb6 100644
--- a/src/DesignCompile/ResolveSymbols.cpp
+++ b/src/DesignCompile/ResolveSymbols.cpp
@@ -37,6 +37,7 @@
 // UHDM
 #include <uhdm/package.h>
 
+#include <cstdint>
 #include <string>
 #include <string_view>
 #include <vector>
diff --git a/src/DesignCompile/TestbenchElaboration.cpp b/src/DesignCompile/TestbenchElaboration.cpp
index 0b6362186f..f14a74e0a9 100644
--- a/src/DesignCompile/TestbenchElaboration.cpp
+++ b/src/DesignCompile/TestbenchElaboration.cpp
@@ -43,6 +43,7 @@
 #include <uhdm/extends.h>
 #include <uhdm/ref_typespec.h>
 
+#include <cstdint>
 #include <queue>
 #include <string>
 #include <string_view>
diff --git a/src/DesignCompile/UhdmChecker.cpp b/src/DesignCompile/UhdmChecker.cpp
index 6ad6c05230..1e15a15c1a 100644
--- a/src/DesignCompile/UhdmChecker.cpp
+++ b/src/DesignCompile/UhdmChecker.cpp
@@ -40,6 +40,7 @@
 #include <uhdm/uhdm.h>
 #include <uhdm/vpi_visitor.h>
 
+#include <cstdint>
 #include <iomanip>
 #include <set>
 #include <sstream>
diff --git a/src/DesignCompile/UhdmWriter.cpp b/src/DesignCompile/UhdmWriter.cpp
index 966519a463..f0f686bd2b 100644
--- a/src/DesignCompile/UhdmWriter.cpp
+++ b/src/DesignCompile/UhdmWriter.cpp
@@ -23,6 +23,7 @@
 
 #include "Surelog/DesignCompile/UhdmWriter.h"
 
+#include <cstdint>
 #include <cstring>
 #include <iostream>
 #include <map>
diff --git a/src/ErrorReporting/Error.cpp b/src/ErrorReporting/Error.cpp
index f9b6aeb397..b288587c7a 100644
--- a/src/ErrorReporting/Error.cpp
+++ b/src/ErrorReporting/Error.cpp
@@ -23,6 +23,7 @@
 
 #include "Surelog/ErrorReporting/Error.h"
 
+#include <cstdint>
 #include <vector>
 
 namespace SURELOG {
diff --git a/src/ErrorReporting/ErrorContainer.cpp b/src/ErrorReporting/ErrorContainer.cpp
index 8fc33c5f08..a00395c2ea 100644
--- a/src/ErrorReporting/ErrorContainer.cpp
+++ b/src/ErrorReporting/ErrorContainer.cpp
@@ -23,6 +23,7 @@
 
 #include "Surelog/ErrorReporting/ErrorContainer.h"
 
+#include <cstdint>
 #include <cstdio>
 #include <iostream>
 #include <map>
diff --git a/src/ErrorReporting/ErrorDefinition.cpp b/src/ErrorReporting/ErrorDefinition.cpp
index 785da0f1eb..e6bc035584 100644
--- a/src/ErrorReporting/ErrorDefinition.cpp
+++ b/src/ErrorReporting/ErrorDefinition.cpp
@@ -22,6 +22,7 @@
  */
 #include "Surelog/ErrorReporting/ErrorDefinition.h"
 
+#include <cstdint>
 #include <string>
 #include <string_view>
 
diff --git a/src/ErrorReporting/LogListener.cpp b/src/ErrorReporting/LogListener.cpp
index a0e44d752b..95c5932807 100644
--- a/src/ErrorReporting/LogListener.cpp
+++ b/src/ErrorReporting/LogListener.cpp
@@ -23,6 +23,7 @@
 
 #include "Surelog/ErrorReporting/LogListener.h"
 
+#include <cstdint>
 #include <iostream>
 #include <string_view>
 
diff --git a/src/ErrorReporting/Report.cpp b/src/ErrorReporting/Report.cpp
index 1a679d15b4..43063da498 100644
--- a/src/ErrorReporting/Report.cpp
+++ b/src/ErrorReporting/Report.cpp
@@ -24,6 +24,7 @@
 #include "Surelog/ErrorReporting/Report.h"
 
 #include <chrono>
+#include <cstdint>
 #include <filesystem>
 #include <iostream>
 #include <regex>
diff --git a/src/ErrorReporting/Waiver.cpp b/src/ErrorReporting/Waiver.cpp
index 55847b39dd..812df81ff9 100644
--- a/src/ErrorReporting/Waiver.cpp
+++ b/src/ErrorReporting/Waiver.cpp
@@ -23,6 +23,7 @@
 
 #include "Surelog/ErrorReporting/Waiver.h"
 
+#include <cstdint>
 #include <functional>
 #include <set>
 #include <string>
diff --git a/src/Expression/ExprBuilder.cpp b/src/Expression/ExprBuilder.cpp
index 908de03b37..43c5f2056b 100644
--- a/src/Expression/ExprBuilder.cpp
+++ b/src/Expression/ExprBuilder.cpp
@@ -23,6 +23,7 @@
 #include "Surelog/Expression/ExprBuilder.h"
 
 #include <cmath>
+#include <cstdint>
 #include <string>
 #include <string_view>
 #include <vector>
diff --git a/src/Expression/ExprBuilder_test.cpp b/src/Expression/ExprBuilder_test.cpp
index e3cffee720..acf3d78118 100644
--- a/src/Expression/ExprBuilder_test.cpp
+++ b/src/Expression/ExprBuilder_test.cpp
@@ -18,6 +18,7 @@
 
 #include <gtest/gtest.h>
 
+#include <cstdint>
 #include <memory>
 #include <vector>
 
diff --git a/src/Expression/Value.cpp b/src/Expression/Value.cpp
index 4445815d63..552d777061 100644
--- a/src/Expression/Value.cpp
+++ b/src/Expression/Value.cpp
@@ -24,6 +24,7 @@
 #include "Surelog/Expression/Value.h"
 
 #include <cmath>
+#include <cstdint>
 #include <string>
 
 #include "Surelog/Utils/NumUtils.h"
diff --git a/src/Package/Package.cpp b/src/Package/Package.cpp
index 2d13e0c75a..78c21ecd28 100644
--- a/src/Package/Package.cpp
+++ b/src/Package/Package.cpp
@@ -23,6 +23,7 @@
 
 #include "Surelog/Package/Package.h"
 
+#include <cstdint>
 #include <string_view>
 
 #include "Surelog/Design/FileContent.h"
diff --git a/src/SourceCompile/AnalyzeFile.cpp b/src/SourceCompile/AnalyzeFile.cpp
index ec4d877baf..780b0b7be3 100644
--- a/src/SourceCompile/AnalyzeFile.cpp
+++ b/src/SourceCompile/AnalyzeFile.cpp
@@ -23,6 +23,7 @@
 
 #include "Surelog/SourceCompile/AnalyzeFile.h"
 
+#include <cstdint>
 #include <iostream>
 #include <regex>
 #include <sstream>
diff --git a/src/SourceCompile/AntlrParserErrorListener.cpp b/src/SourceCompile/AntlrParserErrorListener.cpp
index 0245fa258e..34284f8efa 100644
--- a/src/SourceCompile/AntlrParserErrorListener.cpp
+++ b/src/SourceCompile/AntlrParserErrorListener.cpp
@@ -23,6 +23,7 @@
 
 #include "Surelog/SourceCompile/AntlrParserErrorListener.h"
 
+#include <cstdint>
 #include <string>
 
 #include "Surelog/Common/FileSystem.h"
diff --git a/src/SourceCompile/CommonListenerHelper.cpp b/src/SourceCompile/CommonListenerHelper.cpp
index a8ef4cb376..d35222c499 100644
--- a/src/SourceCompile/CommonListenerHelper.cpp
+++ b/src/SourceCompile/CommonListenerHelper.cpp
@@ -25,6 +25,7 @@
 
 #include <antlr4-runtime.h>
 
+#include <cstdint>
 #include <string_view>
 #include <vector>
 
diff --git a/src/SourceCompile/CompilationUnit.cpp b/src/SourceCompile/CompilationUnit.cpp
index 51c26e0b70..98397465f5 100644
--- a/src/SourceCompile/CompilationUnit.cpp
+++ b/src/SourceCompile/CompilationUnit.cpp
@@ -22,6 +22,7 @@
  */
 #include "Surelog/SourceCompile/CompilationUnit.h"
 
+#include <cstdint>
 #include <string_view>
 #include <vector>
 
diff --git a/src/SourceCompile/CompileSourceFile.cpp b/src/SourceCompile/CompileSourceFile.cpp
index c3ad5601f4..87f4b6c4ba 100644
--- a/src/SourceCompile/CompileSourceFile.cpp
+++ b/src/SourceCompile/CompileSourceFile.cpp
@@ -36,6 +36,7 @@
 #ifdef SURELOG_WITH_PYTHON
 #include <Python.h>
 
+#include <cstdint>
 #include <string_view>
 #include <vector>
 
diff --git a/src/SourceCompile/Compiler.cpp b/src/SourceCompile/Compiler.cpp
index cf369763ae..cb0e6d7ab0 100644
--- a/src/SourceCompile/Compiler.cpp
+++ b/src/SourceCompile/Compiler.cpp
@@ -24,6 +24,7 @@
 #include "Surelog/SourceCompile/Compiler.h"
 
 #include <climits>
+#include <cstdint>
 #include <filesystem>
 #include <fstream>
 #include <iostream>
diff --git a/src/SourceCompile/MacroInfo.cpp b/src/SourceCompile/MacroInfo.cpp
index 23eb78793a..dd64612ff3 100644
--- a/src/SourceCompile/MacroInfo.cpp
+++ b/src/SourceCompile/MacroInfo.cpp
@@ -23,6 +23,7 @@
 
 #include "Surelog/SourceCompile/MacroInfo.h"
 
+#include <cstdint>
 #include <string>
 #include <string_view>
 #include <vector>
diff --git a/src/SourceCompile/ParseFile.cpp b/src/SourceCompile/ParseFile.cpp
index f6e097b188..a442e11082 100644
--- a/src/SourceCompile/ParseFile.cpp
+++ b/src/SourceCompile/ParseFile.cpp
@@ -27,6 +27,7 @@
 #include <parser/SV3_1aLexer.h>
 #include <parser/SV3_1aParser.h>
 
+#include <cstdint>
 #include <iostream>
 #include <string_view>
 
diff --git a/src/SourceCompile/PreprocessFile.cpp b/src/SourceCompile/PreprocessFile.cpp
index c70b80a39e..f8e86fa701 100644
--- a/src/SourceCompile/PreprocessFile.cpp
+++ b/src/SourceCompile/PreprocessFile.cpp
@@ -27,6 +27,7 @@
 #include <parser/SV3_1aPpLexer.h>
 #include <parser/SV3_1aPpParser.h>
 
+#include <cstdint>
 #include <functional>
 #include <iostream>
 #include <regex>
diff --git a/src/SourceCompile/SV3_1aPpTreeListenerHelper.cpp b/src/SourceCompile/SV3_1aPpTreeListenerHelper.cpp
index 5ecc6e9134..31c7e31be1 100644
--- a/src/SourceCompile/SV3_1aPpTreeListenerHelper.cpp
+++ b/src/SourceCompile/SV3_1aPpTreeListenerHelper.cpp
@@ -23,6 +23,7 @@
 
 #include "Surelog/SourceCompile/SV3_1aPpTreeListenerHelper.h"
 
+#include <cstdint>
 #include <string_view>
 #include <vector>
 
diff --git a/src/SourceCompile/SV3_1aPpTreeShapeListener.cpp b/src/SourceCompile/SV3_1aPpTreeShapeListener.cpp
index 4b55bfcf0e..e4553db309 100644
--- a/src/SourceCompile/SV3_1aPpTreeShapeListener.cpp
+++ b/src/SourceCompile/SV3_1aPpTreeShapeListener.cpp
@@ -16,6 +16,7 @@
 
 #include "Surelog/SourceCompile/SV3_1aPpTreeShapeListener.h"
 
+#include <cstdint>
 #include <iostream>
 #include <regex>
 #include <set>
diff --git a/src/SourceCompile/SV3_1aTreeShapeHelper.cpp b/src/SourceCompile/SV3_1aTreeShapeHelper.cpp
index 2ef1129815..571b4973ce 100644
--- a/src/SourceCompile/SV3_1aTreeShapeHelper.cpp
+++ b/src/SourceCompile/SV3_1aTreeShapeHelper.cpp
@@ -23,6 +23,7 @@
 
 #include "Surelog/SourceCompile/SV3_1aTreeShapeHelper.h"
 
+#include <cstdint>
 #include <string>
 #include <string_view>
 #include <utility>
diff --git a/src/SourceCompile/SV3_1aTreeShapeListener.cpp b/src/SourceCompile/SV3_1aTreeShapeListener.cpp
index fe8e95f28c..f3f37c0bb4 100644
--- a/src/SourceCompile/SV3_1aTreeShapeListener.cpp
+++ b/src/SourceCompile/SV3_1aTreeShapeListener.cpp
@@ -23,6 +23,7 @@
 
 #include "Surelog/SourceCompile/SV3_1aTreeShapeListener.h"
 
+#include <cstdint>
 #include <regex>
 #include <string>
 #include <string_view>
diff --git a/src/SourceCompile/SymbolTable_test.cpp b/src/SourceCompile/SymbolTable_test.cpp
index 791189016d..90ac77e309 100644
--- a/src/SourceCompile/SymbolTable_test.cpp
+++ b/src/SourceCompile/SymbolTable_test.cpp
@@ -19,6 +19,7 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
+#include <cstdint>
 #include <string>
 #include <string_view>
 #include <vector>
diff --git a/src/Testbench/ClassDefinition.cpp b/src/Testbench/ClassDefinition.cpp
index 6478835da4..e5b8c328ab 100644
--- a/src/Testbench/ClassDefinition.cpp
+++ b/src/Testbench/ClassDefinition.cpp
@@ -22,6 +22,7 @@
  */
 #include "Surelog/Testbench/ClassDefinition.h"
 
+#include <cstdint>
 #include <string_view>
 
 #include "Surelog/Design/FileContent.h"
diff --git a/src/Testbench/Program.cpp b/src/Testbench/Program.cpp
index 0e6eeec1a1..eff5e5b39a 100644
--- a/src/Testbench/Program.cpp
+++ b/src/Testbench/Program.cpp
@@ -23,6 +23,7 @@
 
 #include "Surelog/Testbench/Program.h"
 
+#include <cstdint>
 #include <string_view>
 
 #include "Surelog/Design/DesignComponent.h"
diff --git a/src/Utils/NumUtils.cpp b/src/Utils/NumUtils.cpp
index 9c7d4eff7b..15bb30996f 100644
--- a/src/Utils/NumUtils.cpp
+++ b/src/Utils/NumUtils.cpp
@@ -24,6 +24,7 @@
 #include "Surelog/Utils/NumUtils.h"
 
 #include <bitset>
+#include <cstdint>
 #include <cstring>
 #include <string>
 #include <string_view>
diff --git a/src/Utils/NumUtils_test.cpp b/src/Utils/NumUtils_test.cpp
index b37a54bcc2..2eeca58434 100644
--- a/src/Utils/NumUtils_test.cpp
+++ b/src/Utils/NumUtils_test.cpp
@@ -18,6 +18,8 @@
 
 #include <gtest/gtest.h>
 
+#include <cstdint>
+
 namespace SURELOG {
 TEST(NumUtilsTest, ParseDecimalInt) {
   int64_t value;
diff --git a/src/Utils/ParseUtils.cpp b/src/Utils/ParseUtils.cpp
index a8dcfddf39..97243ea04a 100644
--- a/src/Utils/ParseUtils.cpp
+++ b/src/Utils/ParseUtils.cpp
@@ -25,6 +25,7 @@
 
 #include <antlr4-runtime.h>
 
+#include <cstdint>
 #include <string>
 #include <vector>
 
diff --git a/src/hellodesign.cpp b/src/hellodesign.cpp
index 34aeb36e78..b16f9dd21f 100644
--- a/src/hellodesign.cpp
+++ b/src/hellodesign.cpp
@@ -25,6 +25,7 @@
 // cd tests/UnitElabBlock
 // hellodesign top.v -parse -mutestdout
 
+#include <cstdint>
 #include <functional>
 #include <iostream>
 #include <string_view>
diff --git a/src/hellosureworld.cpp b/src/hellosureworld.cpp
index a22655fb83..57b0d7d239 100644
--- a/src/hellosureworld.cpp
+++ b/src/hellosureworld.cpp
@@ -24,6 +24,7 @@
 // Example of usage:
 // cd tests/UnitElabBlock
 // hellouhdm top.v -parse -mutestdout
+#include <cstdint>
 #include <functional>
 #include <iostream>
 
diff --git a/src/main.cpp b/src/main.cpp
index bf4aa6dfd2..f00453c216 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -25,6 +25,7 @@
 #include <direct.h>
 #include <process.h>
 
+#include <cstdint>
 #include <string_view>
 #include <utility>
 #else
diff --git a/src/roundtrip.cpp b/src/roundtrip.cpp
index e4e58c022f..b13033d685 100644
--- a/src/roundtrip.cpp
+++ b/src/roundtrip.cpp
@@ -30,6 +30,7 @@
 #include <uhdm/uhdm.h>
 
 #include <algorithm>
+#include <cstdint>
 #include <fstream>
 #include <iostream>
 #include <map>