diff --git a/include/Surelog/CommandLine/CommandLineParser.h b/include/Surelog/CommandLine/CommandLineParser.h
index 52eb63d3e9..9861b4ab74 100644
--- a/include/Surelog/CommandLine/CommandLineParser.h
+++ b/include/Surelog/CommandLine/CommandLineParser.h
@@ -25,6 +25,9 @@
 #define SURELOG_COMMANDLINEPARSER_H
 #pragma once
 
+#include <functional>
+#include <utility>
+#include <string_view>
 #include <Surelog/Common/PathId.h>
 #include <Surelog/Common/SymbolId.h>
 
diff --git a/include/Surelog/Common/FileSystem.h b/include/Surelog/Common/FileSystem.h
index 4d2bf693c5..dfbde3361c 100644
--- a/include/Surelog/Common/FileSystem.h
+++ b/include/Surelog/Common/FileSystem.h
@@ -25,6 +25,10 @@
 #define SURELOG_FILESYSTEM_H
 #pragma once
 
+#include <functional>
+#include <set>
+#include <utility>
+#include <vector>
 #include <Surelog/Common/PathId.h>
 
 #include <cstdint>
diff --git a/include/Surelog/Common/PlatformFileSystem.h b/include/Surelog/Common/PlatformFileSystem.h
index 26f3ba6524..635d7a1a2a 100644
--- a/include/Surelog/Common/PlatformFileSystem.h
+++ b/include/Surelog/Common/PlatformFileSystem.h
@@ -25,6 +25,11 @@
 #define SURELOG_PLATFORMFILESYSTEM_H
 #pragma once
 
+#include <functional>
+#include <utility>
+#include <vector>
+#include <string_view>
+#include <string>
 #include <Surelog/Common/FileSystem.h>
 
 #include <memory>
diff --git a/include/Surelog/Design/DefParam.h b/include/Surelog/Design/DefParam.h
index 7e3dde5113..917bbe299a 100644
--- a/include/Surelog/Design/DefParam.h
+++ b/include/Surelog/Design/DefParam.h
@@ -25,6 +25,7 @@
 #define SURELOG_DEFPARAM_H
 #pragma once
 
+#include <string_view>
 #include <Surelog/Common/NodeId.h>
 
 #include <map>
diff --git a/include/Surelog/Design/Design.h b/include/Surelog/Design/Design.h
index 1464a606ef..41354248c1 100644
--- a/include/Surelog/Design/Design.h
+++ b/include/Surelog/Design/Design.h
@@ -25,6 +25,10 @@
 #define SURELOG_DESIGN_H
 #pragma once
 
+#include <functional>
+#include <utility>
+#include <string_view>
+#include <string>
 #include <Surelog/Common/Containers.h>
 #include <Surelog/Common/NodeId.h>
 #include <Surelog/Common/PathId.h>
diff --git a/include/Surelog/Design/DesignComponent.h b/include/Surelog/Design/DesignComponent.h
index 2caa012557..c3ea8b716c 100644
--- a/include/Surelog/Design/DesignComponent.h
+++ b/include/Surelog/Design/DesignComponent.h
@@ -25,6 +25,12 @@
 #define SURELOG_DESIGNCOMPONENT_H
 #pragma once
 
+#include <functional>
+#include <map>
+#include <utility>
+#include <vector>
+#include <string_view>
+#include <string>
 #include <Surelog/Common/Containers.h>
 #include <Surelog/Common/PathId.h>
 #include <Surelog/Common/PortNetHolder.h>
diff --git a/include/Surelog/Design/Enum.h b/include/Surelog/Design/Enum.h
index 969d25107d..b52c15ccda 100644
--- a/include/Surelog/Design/Enum.h
+++ b/include/Surelog/Design/Enum.h
@@ -25,6 +25,9 @@
 #define SURELOG_ENUM_H
 #pragma once
 
+#include <functional>
+#include <utility>
+#include <string_view>
 #include <Surelog/Common/SymbolId.h>
 #include <Surelog/Design/DataType.h>
 
diff --git a/include/Surelog/Design/FileContent.h b/include/Surelog/Design/FileContent.h
index 93851fe9e1..9759729e0d 100644
--- a/include/Surelog/Design/FileContent.h
+++ b/include/Surelog/Design/FileContent.h
@@ -25,6 +25,11 @@
 #define SURELOG_FILECONTENT_H
 #pragma once
 
+#include <functional>
+#include <set>
+#include <map>
+#include <string_view>
+#include <string>
 #include <Surelog/Common/Containers.h>
 #include <Surelog/Common/NodeId.h>
 #include <Surelog/Design/DesignComponent.h>
diff --git a/include/Surelog/Design/Function.h b/include/Surelog/Design/Function.h
index aec1c85510..3c7f932751 100644
--- a/include/Surelog/Design/Function.h
+++ b/include/Surelog/Design/Function.h
@@ -25,6 +25,8 @@
 #define SURELOG_FUNCTION_H
 #pragma once
 
+#include <vector>
+#include <string_view>
 #include <Surelog/Common/SymbolId.h>
 #include <Surelog/Design/Scope.h>
 #include <Surelog/Design/Statement.h>
diff --git a/include/Surelog/Design/ModuleDefinition.h b/include/Surelog/Design/ModuleDefinition.h
index 645e004d8d..12a4eacbab 100644
--- a/include/Surelog/Design/ModuleDefinition.h
+++ b/include/Surelog/Design/ModuleDefinition.h
@@ -25,6 +25,9 @@
 #define SURELOG_MODULEDEFINITION_H
 #pragma once
 
+#include <functional>
+#include <map>
+#include <string>
 #include <Surelog/Common/ClockingBlockHolder.h>
 #include <Surelog/Common/Containers.h>
 #include <Surelog/Common/SymbolId.h>
diff --git a/include/Surelog/Design/ModuleInstance.h b/include/Surelog/Design/ModuleInstance.h
index b41be6330f..b1a5dbf2d1 100644
--- a/include/Surelog/Design/ModuleInstance.h
+++ b/include/Surelog/Design/ModuleInstance.h
@@ -25,6 +25,10 @@
 #define SURELOG_MODULEINSTANCE_H
 #pragma once
 
+#include <set>
+#include <map>
+#include <vector>
+#include <string>
 #include <Surelog/Common/Containers.h>
 #include <Surelog/Common/NodeId.h>
 #include <Surelog/Common/SymbolId.h>
diff --git a/include/Surelog/Design/Netlist.h b/include/Surelog/Design/Netlist.h
index f189314104..150f37441c 100644
--- a/include/Surelog/Design/Netlist.h
+++ b/include/Surelog/Design/Netlist.h
@@ -26,6 +26,8 @@
 #pragma once
 
 // UHDM
+#include <functional>
+#include <utility>
 #include <uhdm/uhdm_forward_decl.h>
 
 #include <map>
diff --git a/include/Surelog/Design/Parameter.h b/include/Surelog/Design/Parameter.h
index 66045e1e17..478ae797ac 100644
--- a/include/Surelog/Design/Parameter.h
+++ b/include/Surelog/Design/Parameter.h
@@ -25,6 +25,7 @@
 #define SURELOG_PARAMETER_H
 #pragma once
 
+#include <string_view>
 #include <Surelog/Common/SymbolId.h>
 #include <Surelog/Design/DataType.h>
 
diff --git a/include/Surelog/Design/Scope.h b/include/Surelog/Design/Scope.h
index af82c14ee1..e13d41a7ef 100644
--- a/include/Surelog/Design/Scope.h
+++ b/include/Surelog/Design/Scope.h
@@ -25,6 +25,8 @@
 #define SURELOG_SCOPE_H
 #pragma once
 
+#include <functional>
+#include <string_view>
 #include <Surelog/Common/RTTI.h>
 
 #include <string>
diff --git a/include/Surelog/Design/Signal.h b/include/Surelog/Design/Signal.h
index 5d454569fd..4afd26361e 100644
--- a/include/Surelog/Design/Signal.h
+++ b/include/Surelog/Design/Signal.h
@@ -25,6 +25,8 @@
 #define SURELOG_SIGNAL_H
 #pragma once
 
+#include <vector>
+#include <string_view>
 #include <Surelog/Common/NodeId.h>
 #include <Surelog/SourceCompile/VObjectTypes.h>
 #include <uhdm/attribute.h>
diff --git a/include/Surelog/Design/Statement.h b/include/Surelog/Design/Statement.h
index d8d6af6dbe..9dff298a45 100644
--- a/include/Surelog/Design/Statement.h
+++ b/include/Surelog/Design/Statement.h
@@ -25,6 +25,8 @@
 #define SURELOG_STATEMENT_H
 #pragma once
 
+#include <utility>
+#include <string_view>
 #include <Surelog/Common/NodeId.h>
 #include <Surelog/Common/RTTI.h>
 #include <Surelog/Design/Scope.h>
diff --git a/include/Surelog/Design/Task.h b/include/Surelog/Design/Task.h
index 13f5db9683..26f5c5aa52 100644
--- a/include/Surelog/Design/Task.h
+++ b/include/Surelog/Design/Task.h
@@ -25,6 +25,7 @@
 #define SURELOG_TASK_H
 #pragma once
 
+#include <string_view>
 #include <Surelog/Common/SymbolId.h>
 #include <Surelog/Design/Function.h>
 
diff --git a/include/Surelog/Design/TfPortItem.h b/include/Surelog/Design/TfPortItem.h
index 2d8cf5fdab..b492cca587 100644
--- a/include/Surelog/Design/TfPortItem.h
+++ b/include/Surelog/Design/TfPortItem.h
@@ -25,6 +25,7 @@
 #define SURELOG_TFPORTITEM_H
 #pragma once
 
+#include <string_view>
 #include <Surelog/SourceCompile/VObjectTypes.h>
 #include <Surelog/Testbench/Variable.h>
 
diff --git a/include/Surelog/Design/VObject.h b/include/Surelog/Design/VObject.h
index ceb4a51c67..3813522d13 100644
--- a/include/Surelog/Design/VObject.h
+++ b/include/Surelog/Design/VObject.h
@@ -25,6 +25,7 @@
 #define SURELOG_VOBJECT_H
 #pragma once
 
+#include <string_view>
 #include <Surelog/Common/NodeId.h>
 #include <Surelog/Common/PathId.h>
 #include <Surelog/Common/SymbolId.h>
diff --git a/include/Surelog/Design/ValuedComponentI.h b/include/Surelog/Design/ValuedComponentI.h
index 0f53dab88b..9b6b175363 100644
--- a/include/Surelog/Design/ValuedComponentI.h
+++ b/include/Surelog/Design/ValuedComponentI.h
@@ -25,6 +25,7 @@
 #define SURELOG_VALUEDCOMPONENTI_H
 #pragma once
 
+#include <utility>
 #include <Surelog/Common/Containers.h>
 #include <Surelog/Common/RTTI.h>
 
diff --git a/include/Surelog/DesignCompile/CompileClass.h b/include/Surelog/DesignCompile/CompileClass.h
index 7a4c4facb6..7582c5a59b 100644
--- a/include/Surelog/DesignCompile/CompileClass.h
+++ b/include/Surelog/DesignCompile/CompileClass.h
@@ -25,6 +25,8 @@
 #define SURELOG_COMPILECLASS_H
 #pragma once
 
+#include <set>
+#include <string>
 #include <Surelog/DesignCompile/CompileHelper.h>
 #include <Surelog/Testbench/ClassDefinition.h>
 
diff --git a/include/Surelog/DesignCompile/CompileDesign.h b/include/Surelog/DesignCompile/CompileDesign.h
index a1de1993ee..b645d45320 100644
--- a/include/Surelog/DesignCompile/CompileDesign.h
+++ b/include/Surelog/DesignCompile/CompileDesign.h
@@ -25,6 +25,8 @@
 #define SURELOG_COMPILEDESIGN_H
 #pragma once
 
+#include <map>
+#include <vector>
 #include <Surelog/Design/Design.h>
 
 // UHDM
diff --git a/include/Surelog/DesignCompile/CompileHelper.h b/include/Surelog/DesignCompile/CompileHelper.h
index f3d95dfb53..461830ba62 100644
--- a/include/Surelog/DesignCompile/CompileHelper.h
+++ b/include/Surelog/DesignCompile/CompileHelper.h
@@ -25,6 +25,9 @@
 #define SURELOG_COMPILEHELPER_H
 #pragma once
 
+#include <utility>
+#include <vector>
+#include <string_view>
 #include <Surelog/Common/PathId.h>
 #include <Surelog/Design/ValuedComponentI.h>
 #include <Surelog/Expression/ExprBuilder.h>
diff --git a/include/Surelog/DesignCompile/DesignElaboration.h b/include/Surelog/DesignCompile/DesignElaboration.h
index c4fc8ddf9c..e7a51de1b5 100644
--- a/include/Surelog/DesignCompile/DesignElaboration.h
+++ b/include/Surelog/DesignCompile/DesignElaboration.h
@@ -25,6 +25,13 @@
 #define SURELOG_DESIGNELABORATION_H
 #pragma once
 
+#include <functional>
+#include <set>
+#include <map>
+#include <utility>
+#include <vector>
+#include <string_view>
+#include <string>
 #include <Surelog/Config/Config.h>
 #include <Surelog/DesignCompile/TestbenchElaboration.h>
 
diff --git a/include/Surelog/DesignCompile/ElaborationStep.h b/include/Surelog/DesignCompile/ElaborationStep.h
index 8ca6794bb7..97ebee70e0 100644
--- a/include/Surelog/DesignCompile/ElaborationStep.h
+++ b/include/Surelog/DesignCompile/ElaborationStep.h
@@ -25,6 +25,8 @@
 #define SURELOG_ELABORATIONSTEP_H
 #pragma once
 
+#include <map>
+#include <string_view>
 #include <Surelog/DesignCompile/CompileHelper.h>
 #include <Surelog/ErrorReporting/ErrorDefinition.h>
 #include <Surelog/Expression/ExprBuilder.h>
diff --git a/include/Surelog/DesignCompile/ElaboratorHarness.h b/include/Surelog/DesignCompile/ElaboratorHarness.h
index 4a85fc6e46..3c4c9f8c4f 100644
--- a/include/Surelog/DesignCompile/ElaboratorHarness.h
+++ b/include/Surelog/DesignCompile/ElaboratorHarness.h
@@ -25,6 +25,7 @@
 #define SURELOG_ELABORATORHARNESS_H
 #pragma once
 
+#include <string_view>
 #include <string>
 
 namespace SURELOG {
diff --git a/include/Surelog/DesignCompile/NetlistElaboration.h b/include/Surelog/DesignCompile/NetlistElaboration.h
index 803ecaf113..1969fcffbb 100644
--- a/include/Surelog/DesignCompile/NetlistElaboration.h
+++ b/include/Surelog/DesignCompile/NetlistElaboration.h
@@ -25,6 +25,8 @@
 #define SURELOG_NETLISTELABORATION_H
 #pragma once
 
+#include <map>
+#include <string_view>
 #include <Surelog/DesignCompile/TestbenchElaboration.h>
 
 namespace SURELOG {
diff --git a/include/Surelog/DesignCompile/ResolveSymbols.h b/include/Surelog/DesignCompile/ResolveSymbols.h
index 68df4f4aeb..3c51d298d0 100644
--- a/include/Surelog/DesignCompile/ResolveSymbols.h
+++ b/include/Surelog/DesignCompile/ResolveSymbols.h
@@ -25,6 +25,8 @@
 #define SURELOG_RESOLVESYMBOLS_H
 #pragma once
 
+#include <vector>
+#include <string_view>
 #include <Surelog/Common/SymbolId.h>
 #include <Surelog/DesignCompile/CompileStep.h>
 
diff --git a/include/Surelog/DesignCompile/UhdmChecker.h b/include/Surelog/DesignCompile/UhdmChecker.h
index f0b43e2c30..7ee487a538 100644
--- a/include/Surelog/DesignCompile/UhdmChecker.h
+++ b/include/Surelog/DesignCompile/UhdmChecker.h
@@ -25,6 +25,8 @@
 #define SURELOG_UHDMCHECKER_H
 #pragma once
 
+#include <utility>
+#include <string_view>
 #include <Surelog/Common/PathId.h>
 
 #include <map>
diff --git a/include/Surelog/DesignCompile/UhdmWriter.h b/include/Surelog/DesignCompile/UhdmWriter.h
index b37b92e0b4..90d4298874 100644
--- a/include/Surelog/DesignCompile/UhdmWriter.h
+++ b/include/Surelog/DesignCompile/UhdmWriter.h
@@ -25,6 +25,10 @@
 #define SURELOG_UHDMWRITER_H
 #pragma once
 
+#include <functional>
+#include <map>
+#include <vector>
+#include <string_view>
 #include <Surelog/Design/DesignComponent.h>
 #include <Surelog/DesignCompile/CompileHelper.h>
 #include <Surelog/SourceCompile/VObjectTypes.h>
diff --git a/include/Surelog/ErrorReporting/ErrorContainer.h b/include/Surelog/ErrorReporting/ErrorContainer.h
index a811a06d3c..c6b503e2d8 100644
--- a/include/Surelog/ErrorReporting/ErrorContainer.h
+++ b/include/Surelog/ErrorReporting/ErrorContainer.h
@@ -25,6 +25,8 @@
 #define SURELOG_ERRORCONTAINER_H
 #pragma once
 
+#include <utility>
+#include <string_view>
 #include <Surelog/ErrorReporting/Error.h>
 
 #include <set>
diff --git a/include/Surelog/ErrorReporting/LogListener.h b/include/Surelog/ErrorReporting/LogListener.h
index 1a648cf467..d493f170b6 100644
--- a/include/Surelog/ErrorReporting/LogListener.h
+++ b/include/Surelog/ErrorReporting/LogListener.h
@@ -25,6 +25,7 @@
 #define SURELOG_LOGLISTENER_H
 #pragma once
 
+#include <string_view>
 #include <deque>
 #include <mutex>
 #include <ostream>
diff --git a/include/Surelog/ErrorReporting/Waiver.h b/include/Surelog/ErrorReporting/Waiver.h
index 89c346f05d..fd9cf14d5d 100644
--- a/include/Surelog/ErrorReporting/Waiver.h
+++ b/include/Surelog/ErrorReporting/Waiver.h
@@ -25,6 +25,7 @@
 #define SURELOG_WAIVER_H
 #pragma once
 
+#include <functional>
 #include <Surelog/ErrorReporting/ErrorDefinition.h>
 
 #include <map>
diff --git a/include/Surelog/Expression/ExprBuilder.h b/include/Surelog/Expression/ExprBuilder.h
index aa664c67de..3a9737e8da 100644
--- a/include/Surelog/Expression/ExprBuilder.h
+++ b/include/Surelog/Expression/ExprBuilder.h
@@ -25,6 +25,7 @@
 #define SURELOG_EXPRBUILDER_H
 #pragma once
 
+#include <string_view>
 #include <Surelog/Expression/Value.h>
 
 namespace SURELOG {
diff --git a/include/Surelog/Library/AntlrLibParserErrorListener.h b/include/Surelog/Library/AntlrLibParserErrorListener.h
index d62a007552..9ebfd371f1 100644
--- a/include/Surelog/Library/AntlrLibParserErrorListener.h
+++ b/include/Surelog/Library/AntlrLibParserErrorListener.h
@@ -25,6 +25,7 @@
 #define SURELOG_ANTLRLIBPARSERERRORLISTENER_H
 #pragma once
 
+#include <string>
 #include <ANTLRErrorListener.h>
 
 #include <cstddef>
diff --git a/include/Surelog/Library/SVLibShapeListener.h b/include/Surelog/Library/SVLibShapeListener.h
index 43f79eaf6f..f6d32102b3 100644
--- a/include/Surelog/Library/SVLibShapeListener.h
+++ b/include/Surelog/Library/SVLibShapeListener.h
@@ -25,6 +25,7 @@
 #define SURELOG_SVLIBSHAPELISTENER_H
 #pragma once
 
+#include <string_view>
 #include <Surelog/Common/PathId.h>
 #include <Surelog/SourceCompile/SV3_1aTreeShapeHelper.h>
 #include <parser/SV3_1aParserBaseListener.h>
diff --git a/include/Surelog/Package/Precompiled.h b/include/Surelog/Package/Precompiled.h
index 5345834760..5400977877 100644
--- a/include/Surelog/Package/Precompiled.h
+++ b/include/Surelog/Package/Precompiled.h
@@ -25,6 +25,7 @@
 #define SURELOG_PRECOMPILED_H
 #pragma once
 
+#include <functional>
 #include <map>
 #include <set>
 #include <string>
diff --git a/include/Surelog/SourceCompile/AntlrParserErrorListener.h b/include/Surelog/SourceCompile/AntlrParserErrorListener.h
index 5ba1ad3e14..d6bbf3a761 100644
--- a/include/Surelog/SourceCompile/AntlrParserErrorListener.h
+++ b/include/Surelog/SourceCompile/AntlrParserErrorListener.h
@@ -25,6 +25,7 @@
 #define SURELOG_ANTLRPARSERERRORLISTENER_H
 #pragma once
 
+#include <string>
 #include <Surelog/Common/PathId.h>
 #include <ANTLRErrorListener.h>
 
diff --git a/include/Surelog/SourceCompile/CommonListenerHelper.h b/include/Surelog/SourceCompile/CommonListenerHelper.h
index 85596c15c1..63b0a97410 100644
--- a/include/Surelog/SourceCompile/CommonListenerHelper.h
+++ b/include/Surelog/SourceCompile/CommonListenerHelper.h
@@ -25,6 +25,7 @@
 #define SURELOG_COMMONLISTENERHELPER_H
 #pragma once
 
+#include <string_view>
 #include <Surelog/Common/NodeId.h>
 #include <Surelog/Common/PathId.h>
 #include <Surelog/SourceCompile/VObjectTypes.h>
diff --git a/include/Surelog/SourceCompile/CompilationUnit.h b/include/Surelog/SourceCompile/CompilationUnit.h
index f4c347fe74..adffefd6d7 100644
--- a/include/Surelog/SourceCompile/CompilationUnit.h
+++ b/include/Surelog/SourceCompile/CompilationUnit.h
@@ -25,6 +25,8 @@
 #define SURELOG_COMPILATIONUNIT_H
 #pragma once
 
+#include <vector>
+#include <string_view>
 #include <Surelog/Common/Containers.h>
 #include <Surelog/Common/NodeId.h>
 #include <Surelog/Design/TimeInfo.h>
diff --git a/include/Surelog/SourceCompile/CompileSourceFile.h b/include/Surelog/SourceCompile/CompileSourceFile.h
index 226e14fea0..59e0c3bccd 100644
--- a/include/Surelog/SourceCompile/CompileSourceFile.h
+++ b/include/Surelog/SourceCompile/CompileSourceFile.h
@@ -25,6 +25,7 @@
 #define SURELOG_COMPILESOURCEFILE_H
 #pragma once
 
+#include <string_view>
 #include <Surelog/Common/SymbolId.h>
 #include <Surelog/SourceCompile/PreprocessFile.h>
 
diff --git a/include/Surelog/SourceCompile/Compiler.h b/include/Surelog/SourceCompile/Compiler.h
index 6d84282008..a7ba267181 100644
--- a/include/Surelog/SourceCompile/Compiler.h
+++ b/include/Surelog/SourceCompile/Compiler.h
@@ -25,6 +25,7 @@ limitations under the License.
 #define SURELOG_COMPILER_H
 #pragma once
 
+#include <string_view>
 #include <Surelog/Common/PathId.h>
 #include <Surelog/Common/SymbolId.h>
 #include <Surelog/ErrorReporting/ErrorContainer.h>
diff --git a/include/Surelog/SourceCompile/ParseFile.h b/include/Surelog/SourceCompile/ParseFile.h
index ce7e1645e2..3db1467718 100644
--- a/include/Surelog/SourceCompile/ParseFile.h
+++ b/include/Surelog/SourceCompile/ParseFile.h
@@ -25,6 +25,8 @@
 #define SURELOG_PARSEFILE_H
 #pragma once
 
+#include <vector>
+#include <string_view>
 #include <Surelog/ErrorReporting/Error.h>
 
 #include <string>
diff --git a/include/Surelog/SourceCompile/ParseTreeListener.template.hpp b/include/Surelog/SourceCompile/ParseTreeListener.template.hpp
index b58d3195ec..b084f1cdb3 100644
--- a/include/Surelog/SourceCompile/ParseTreeListener.template.hpp
+++ b/include/Surelog/SourceCompile/ParseTreeListener.template.hpp
@@ -27,6 +27,7 @@
 #define SURELOG_PARSETREELISTENER_H
 #pragma once
 
+#include <string>
 #include <Surelog/Common/NodeId.h>
 #include <Surelog/Common/PathId.h>
 #include <Surelog/SourceCompile/VObjectTypes.h>
diff --git a/include/Surelog/SourceCompile/ParseTreeTraceListener.template.hpp b/include/Surelog/SourceCompile/ParseTreeTraceListener.template.hpp
index 8f2768a6ed..fefd3a8677 100644
--- a/include/Surelog/SourceCompile/ParseTreeTraceListener.template.hpp
+++ b/include/Surelog/SourceCompile/ParseTreeTraceListener.template.hpp
@@ -27,6 +27,8 @@
 #define SURELOG_PARSETREETRACELISTENER_H
 #pragma once
 
+#include <string_view>
+#include <string>
 #include <Surelog/SourceCompile/ParseTreeListener.h>
 
 #include <filesystem>
diff --git a/include/Surelog/SourceCompile/ParserHarness.h b/include/Surelog/SourceCompile/ParserHarness.h
index ce8d01dddd..46b7bbe2c2 100644
--- a/include/Surelog/SourceCompile/ParserHarness.h
+++ b/include/Surelog/SourceCompile/ParserHarness.h
@@ -25,6 +25,7 @@
 #define SURELOG_PARSERHARNESS_H
 #pragma once
 
+#include <string_view>
 #include <memory>
 #include <string>
 
diff --git a/include/Surelog/SourceCompile/PreprocessFile.h b/include/Surelog/SourceCompile/PreprocessFile.h
index 0a812e11b2..a5495b3ac3 100644
--- a/include/Surelog/SourceCompile/PreprocessFile.h
+++ b/include/Surelog/SourceCompile/PreprocessFile.h
@@ -25,6 +25,9 @@
 #define SURELOG_PREPROCESSFILE_H
 #pragma once
 
+#include <utility>
+#include <string_view>
+#include <string>
 #include <Surelog/Common/Containers.h>
 #include <Surelog/Common/PathId.h>
 #include <Surelog/Common/SymbolId.h>
diff --git a/include/Surelog/SourceCompile/PreprocessHarness.h b/include/Surelog/SourceCompile/PreprocessHarness.h
index f4000ba282..2c75df9403 100644
--- a/include/Surelog/SourceCompile/PreprocessHarness.h
+++ b/include/Surelog/SourceCompile/PreprocessHarness.h
@@ -25,6 +25,8 @@
 #define SURELOG_PREPROCESSHARNESS_H
 #pragma once
 
+#include <string_view>
+#include <string>
 #include <Surelog/ErrorReporting/ErrorContainer.h>
 #include <Surelog/SourceCompile/CompilationUnit.h>
 #include <Surelog/SourceCompile/SymbolTable.h>
diff --git a/include/Surelog/SourceCompile/SV3_1aPpTreeListenerHelper.h b/include/Surelog/SourceCompile/SV3_1aPpTreeListenerHelper.h
index 91961936a9..148c741d41 100644
--- a/include/Surelog/SourceCompile/SV3_1aPpTreeListenerHelper.h
+++ b/include/Surelog/SourceCompile/SV3_1aPpTreeListenerHelper.h
@@ -25,6 +25,7 @@
 #define SURELOG_SV3_1APPTREELISTENERHELPER_H
 #pragma once
 
+#include <string_view>
 #include <Surelog/Common/SymbolId.h>
 #include <Surelog/ErrorReporting/ErrorDefinition.h>
 #include <Surelog/ErrorReporting/Location.h>
diff --git a/include/Surelog/SourceCompile/SV3_1aTreeShapeHelper.h b/include/Surelog/SourceCompile/SV3_1aTreeShapeHelper.h
index 68e566e2c4..0e08b96b42 100644
--- a/include/Surelog/SourceCompile/SV3_1aTreeShapeHelper.h
+++ b/include/Surelog/SourceCompile/SV3_1aTreeShapeHelper.h
@@ -25,6 +25,7 @@
 #define SURELOG_SV3_1ATREESHAPEHELPER_H
 #pragma once
 
+#include <utility>
 #include <Surelog/Design/DesignElement.h>
 #include <Surelog/ErrorReporting/ErrorDefinition.h>
 #include <Surelog/ErrorReporting/Location.h>
diff --git a/include/Surelog/Testbench/ClassDefinition.h b/include/Surelog/Testbench/ClassDefinition.h
index 2f1f37a278..7efce7e6c0 100644
--- a/include/Surelog/Testbench/ClassDefinition.h
+++ b/include/Surelog/Testbench/ClassDefinition.h
@@ -25,6 +25,8 @@
 #define SURELOG_CLASSDEFINITION_H
 #pragma once
 
+#include <map>
+#include <string>
 #include <Surelog/Common/Containers.h>
 #include <Surelog/Design/DataType.h>
 #include <Surelog/Design/DesignComponent.h>
diff --git a/include/Surelog/Testbench/ClassObject.h b/include/Surelog/Testbench/ClassObject.h
index 3a97065511..8e0999d9c9 100644
--- a/include/Surelog/Testbench/ClassObject.h
+++ b/include/Surelog/Testbench/ClassObject.h
@@ -25,6 +25,9 @@
 #define SURELOG_CLASSOBJECT_H
 #pragma once
 
+#include <functional>
+#include <utility>
+#include <string_view>
 #include <map>
 #include <string>
 
diff --git a/include/Surelog/Testbench/FunctionMethod.h b/include/Surelog/Testbench/FunctionMethod.h
index 22e9e23ff4..fb4d8ed893 100644
--- a/include/Surelog/Testbench/FunctionMethod.h
+++ b/include/Surelog/Testbench/FunctionMethod.h
@@ -25,6 +25,7 @@
 #define SURELOG_FUNCTIONMETHOD_H
 #pragma once
 
+#include <string_view>
 #include <Surelog/Design/Function.h>
 
 namespace SURELOG {
diff --git a/include/Surelog/Testbench/Program.h b/include/Surelog/Testbench/Program.h
index a4a39a1f0d..17c3b22461 100644
--- a/include/Surelog/Testbench/Program.h
+++ b/include/Surelog/Testbench/Program.h
@@ -25,6 +25,7 @@
 #define SURELOG_PROGRAM_H
 #pragma once
 
+#include <string_view>
 #include <Surelog/Common/ClockingBlockHolder.h>
 #include <Surelog/Common/Containers.h>
 #include <Surelog/Common/SymbolId.h>
diff --git a/include/Surelog/Testbench/Property.h b/include/Surelog/Testbench/Property.h
index 74b58f0531..e3cf011560 100644
--- a/include/Surelog/Testbench/Property.h
+++ b/include/Surelog/Testbench/Property.h
@@ -25,6 +25,7 @@
 #define SURELOG_PROPERTY_H
 #pragma once
 
+#include <string_view>
 #include <Surelog/Testbench/Variable.h>
 
 namespace SURELOG {
diff --git a/include/Surelog/Testbench/TypeDef.h b/include/Surelog/Testbench/TypeDef.h
index db680fe10c..d114eb3654 100644
--- a/include/Surelog/Testbench/TypeDef.h
+++ b/include/Surelog/Testbench/TypeDef.h
@@ -25,6 +25,7 @@
 #define SURELOG_TYPEDEF_H
 #pragma once
 
+#include <string_view>
 #include <Surelog/Common/SymbolId.h>
 #include <Surelog/Design/DataType.h>
 
diff --git a/include/Surelog/Utils/ParseUtils.h b/include/Surelog/Utils/ParseUtils.h
index 6066d09ed8..78a1e555a9 100644
--- a/include/Surelog/Utils/ParseUtils.h
+++ b/include/Surelog/Utils/ParseUtils.h
@@ -25,6 +25,9 @@
 #define SURELOG_PARSEUTILS_H
 #pragma once
 
+#include <utility>
+#include <vector>
+#include <string>
 #include <ParserRuleContext.h>
 
 namespace SURELOG {
diff --git a/src/API/PythonAPI.cpp b/src/API/PythonAPI.cpp
index 3454b1284b..768c154fdf 100644
--- a/src/API/PythonAPI.cpp
+++ b/src/API/PythonAPI.cpp
@@ -25,6 +25,9 @@
 
 #include <antlr4-runtime.h>
 
+#include <string>
+#include <vector>
+
 #include "Surelog/Common/FileSystem.h"
 #include "Surelog/Design/Design.h"
 #include "Surelog/ErrorReporting/ErrorContainer.h"
diff --git a/src/API/SLAPI.cpp b/src/API/SLAPI.cpp
index 7b867b7429..7c013ddefd 100644
--- a/src/API/SLAPI.cpp
+++ b/src/API/SLAPI.cpp
@@ -31,6 +31,8 @@
 #include <antlr4-runtime.h>
 
 #include <iostream>
+#include <string>
+#include <vector>
 
 #include "Surelog/Common/FileSystem.h"
 #include "Surelog/Design/Design.h"
diff --git a/src/API/Surelog.cpp b/src/API/Surelog.cpp
index 365ba75f0d..6c000b480c 100644
--- a/src/API/Surelog.cpp
+++ b/src/API/Surelog.cpp
@@ -16,6 +16,8 @@
 
 #include "Surelog/API/Surelog.h"
 
+#include <vector>
+
 #include "Surelog/CommandLine/CommandLineParser.h"
 #include "Surelog/Common/FileSystem.h"
 #include "Surelog/Design/Design.h"
diff --git a/src/Cache/Cache.cpp b/src/Cache/Cache.cpp
index d6def85836..fa0f3bd915 100644
--- a/src/Cache/Cache.cpp
+++ b/src/Cache/Cache.cpp
@@ -28,6 +28,9 @@
 #include <filesystem>
 #include <functional>
 #include <iostream>
+#include <string>
+#include <string_view>
+#include <vector>
 
 #include "Surelog/CommandLine/CommandLineParser.h"
 #include "Surelog/Common/FileSystem.h"
diff --git a/src/Cache/PPCache.cpp b/src/Cache/PPCache.cpp
index 4c22b3f9a8..dced474aa0 100644
--- a/src/Cache/PPCache.cpp
+++ b/src/Cache/PPCache.cpp
@@ -28,6 +28,10 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
+#include <string>
+#include <string_view>
+#include <vector>
+
 #include "Surelog/CommandLine/CommandLineParser.h"
 #include "Surelog/Common/FileSystem.h"
 #include "Surelog/Design/Design.h"
diff --git a/src/Cache/PPCache_test.cpp b/src/Cache/PPCache_test.cpp
index 12156a96a6..c65d8eb520 100644
--- a/src/Cache/PPCache_test.cpp
+++ b/src/Cache/PPCache_test.cpp
@@ -26,6 +26,7 @@
 #include <chrono>
 #include <filesystem>
 #include <fstream>
+#include <iostream>
 #include <map>
 #include <string>
 #include <thread>
diff --git a/src/Cache/ParseCache.cpp b/src/Cache/ParseCache.cpp
index 8885ef9f82..fa58904e6e 100644
--- a/src/Cache/ParseCache.cpp
+++ b/src/Cache/ParseCache.cpp
@@ -28,6 +28,10 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
+#include <string>
+#include <string_view>
+#include <vector>
+
 #include "Surelog/CommandLine/CommandLineParser.h"
 #include "Surelog/Common/FileSystem.h"
 #include "Surelog/Design/Design.h"
diff --git a/src/Cache/PythonAPICache.cpp b/src/Cache/PythonAPICache.cpp
index 88cadfa059..219b241893 100644
--- a/src/Cache/PythonAPICache.cpp
+++ b/src/Cache/PythonAPICache.cpp
@@ -28,6 +28,10 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
+#include <string>
+#include <string_view>
+#include <vector>
+
 #include "Surelog/API/PythonAPI.h"
 #include "Surelog/Cache/Cache.h"
 #include "Surelog/CommandLine/CommandLineParser.h"
diff --git a/src/CommandLine/CommandLineParser.cpp b/src/CommandLine/CommandLineParser.cpp
index 461c533c13..0d8cf400c4 100644
--- a/src/CommandLine/CommandLineParser.cpp
+++ b/src/CommandLine/CommandLineParser.cpp
@@ -23,7 +23,12 @@
 
 #include "Surelog/CommandLine/CommandLineParser.h"
 
+#include <map>
 #include <nlohmann/json.hpp>
+#include <string>
+#include <string_view>
+#include <utility>
+#include <vector>
 
 #include "Surelog/API/PythonAPI.h"
 #include "Surelog/Common/PlatformFileSystem.h"
diff --git a/src/Common/FileSystem.cpp b/src/Common/FileSystem.cpp
index ff8080fd31..01a551ddd9 100644
--- a/src/Common/FileSystem.cpp
+++ b/src/Common/FileSystem.cpp
@@ -28,6 +28,11 @@
 #if defined(_WIN32)
 #define NOMINMAX
 #include <Windows.h>
+
+#include <iostream>
+#include <string>
+#include <string_view>
+#include <vector>
 #elif defined(__APPLE__)
 #include <mach-o/dyld.h>
 #include <sys/param.h>
diff --git a/src/Common/PlatformFileSystem.cpp b/src/Common/PlatformFileSystem.cpp
index 1cbc941c7d..2d1f6d0f69 100644
--- a/src/Common/PlatformFileSystem.cpp
+++ b/src/Common/PlatformFileSystem.cpp
@@ -27,6 +27,11 @@
 #include <fstream>
 #include <iostream>
 #include <mutex>
+#include <set>
+#include <string>
+#include <string_view>
+#include <utility>
+#include <vector>
 
 #include "Surelog/SourceCompile/SymbolTable.h"
 #include "Surelog/Utils/StringUtils.h"
diff --git a/src/Common/PlatformFileSystem_test.cpp b/src/Common/PlatformFileSystem_test.cpp
index c092b4dd78..57704c41b1 100644
--- a/src/Common/PlatformFileSystem_test.cpp
+++ b/src/Common/PlatformFileSystem_test.cpp
@@ -25,6 +25,11 @@
 
 #include <gtest/gtest.h>
 
+#include <iostream>
+#include <set>
+#include <string_view>
+#include <utility>
+
 #include "Surelog/CommandLine/CommandLineParser.h"
 #include "Surelog/Design/Design.h"
 #include "Surelog/Library/Library.h"
diff --git a/src/Config/Config.cpp b/src/Config/Config.cpp
index c871831e7c..20e3fd4b47 100644
--- a/src/Config/Config.cpp
+++ b/src/Config/Config.cpp
@@ -23,6 +23,8 @@
 
 #include "Surelog/Config/Config.h"
 
+#include <string_view>
+
 namespace SURELOG {
 UseClause* Config::getInstanceUseClause(std::string_view instance) {
   const auto found = m_instanceUseClauses.find(instance);
diff --git a/src/Config/ConfigSet.cpp b/src/Config/ConfigSet.cpp
index 3a24af1467..ca49cbfe54 100644
--- a/src/Config/ConfigSet.cpp
+++ b/src/Config/ConfigSet.cpp
@@ -23,6 +23,8 @@
 
 #include "Surelog/Config/ConfigSet.h"
 
+#include <string_view>
+
 namespace SURELOG {
 Config* ConfigSet::getMutableConfigByName(std::string_view configName) {
   for (auto& config : m_configs) {
diff --git a/src/DesignCompile/Builtin.cpp b/src/DesignCompile/Builtin.cpp
index d389001dd2..27825803a4 100644
--- a/src/DesignCompile/Builtin.cpp
+++ b/src/DesignCompile/Builtin.cpp
@@ -44,6 +44,7 @@
 #include <uhdm/Serializer.h>
 #include <uhdm/package.h>
 
+#include <string>
 #include <string_view>
 #include <vector>
 
diff --git a/src/DesignCompile/CompileAssertion.cpp b/src/DesignCompile/CompileAssertion.cpp
index 1265dde9ed..208ea550fa 100644
--- a/src/DesignCompile/CompileAssertion.cpp
+++ b/src/DesignCompile/CompileAssertion.cpp
@@ -31,6 +31,7 @@
 #include <uhdm/uhdm.h>
 
 #include <iostream>
+#include <string_view>
 
 namespace SURELOG {
 
diff --git a/src/DesignCompile/CompileClass.cpp b/src/DesignCompile/CompileClass.cpp
index 9426b25786..4742ca65c2 100644
--- a/src/DesignCompile/CompileClass.cpp
+++ b/src/DesignCompile/CompileClass.cpp
@@ -41,6 +41,10 @@
 #include <uhdm/class_defn.h>
 
 #include <stack>
+#include <string>
+#include <string_view>
+#include <utility>
+#include <vector>
 
 namespace SURELOG {
 int32_t FunctorCompileClass::operator()() const {
diff --git a/src/DesignCompile/CompileDesign.cpp b/src/DesignCompile/CompileDesign.cpp
index 993edf88c6..9ca467e502 100644
--- a/src/DesignCompile/CompileDesign.cpp
+++ b/src/DesignCompile/CompileDesign.cpp
@@ -55,7 +55,12 @@
 #include <uhdm/vpi_visitor.h>
 
 #include <climits>
+#include <iostream>
+#include <map>
+#include <string>
+#include <string_view>
 #include <thread>
+#include <vector>
 
 #ifdef USETBB
 #include <tbb/task.h>
diff --git a/src/DesignCompile/CompileExpression.cpp b/src/DesignCompile/CompileExpression.cpp
index d222b989c5..4362489dec 100644
--- a/src/DesignCompile/CompileExpression.cpp
+++ b/src/DesignCompile/CompileExpression.cpp
@@ -24,6 +24,12 @@
 #include <algorithm>
 #include <cmath>
 #include <cstring>
+#include <iostream>
+#include <set>
+#include <string>
+#include <string_view>
+#include <utility>
+#include <vector>
 
 #include "Surelog/CommandLine/CommandLineParser.h"
 #include "Surelog/Common/FileSystem.h"
diff --git a/src/DesignCompile/CompileExpression_test.cpp b/src/DesignCompile/CompileExpression_test.cpp
index d0c7314933..6eeb2ea845 100644
--- a/src/DesignCompile/CompileExpression_test.cpp
+++ b/src/DesignCompile/CompileExpression_test.cpp
@@ -17,6 +17,9 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
+#include <string>
+#include <vector>
+
 #include "Surelog/Design/FileContent.h"
 #include "Surelog/DesignCompile/CompileDesign.h"
 #include "Surelog/DesignCompile/CompileHelper.h"
diff --git a/src/DesignCompile/CompileFileContent.cpp b/src/DesignCompile/CompileFileContent.cpp
index f10bd8fc2d..06129ec325 100644
--- a/src/DesignCompile/CompileFileContent.cpp
+++ b/src/DesignCompile/CompileFileContent.cpp
@@ -24,6 +24,7 @@
 #include "Surelog/DesignCompile/CompileFileContent.h"
 
 #include <stack>
+#include <vector>
 
 #include "Surelog/Design/FileContent.h"
 
diff --git a/src/DesignCompile/CompileHelper.cpp b/src/DesignCompile/CompileHelper.cpp
index 84c36d3bac..e7a4042454 100644
--- a/src/DesignCompile/CompileHelper.cpp
+++ b/src/DesignCompile/CompileHelper.cpp
@@ -64,8 +64,12 @@
 
 #include <climits>
 #include <cstring>
+#include <functional>
 #include <iostream>
+#include <map>
 #include <string>
+#include <string_view>
+#include <utility>
 #include <vector>
 
 namespace SURELOG {
diff --git a/src/DesignCompile/CompileHelper_test.cpp b/src/DesignCompile/CompileHelper_test.cpp
index 6e451689dc..77366165c0 100644
--- a/src/DesignCompile/CompileHelper_test.cpp
+++ b/src/DesignCompile/CompileHelper_test.cpp
@@ -21,6 +21,7 @@
 #include <uhdm/constant.h>
 
 #include <limits>
+#include <string_view>
 
 namespace SURELOG {
 
diff --git a/src/DesignCompile/CompileModule.cpp b/src/DesignCompile/CompileModule.cpp
index a937bb24e9..0f90341662 100644
--- a/src/DesignCompile/CompileModule.cpp
+++ b/src/DesignCompile/CompileModule.cpp
@@ -49,6 +49,10 @@
 #include <uhdm/udp_defn.h>
 
 #include <stack>
+#include <string>
+#include <string_view>
+#include <utility>
+#include <vector>
 
 namespace SURELOG {
 
diff --git a/src/DesignCompile/CompilePackage.cpp b/src/DesignCompile/CompilePackage.cpp
index d038b8a9ac..209017e800 100644
--- a/src/DesignCompile/CompilePackage.cpp
+++ b/src/DesignCompile/CompilePackage.cpp
@@ -38,6 +38,9 @@
 #include <uhdm/package.h>
 
 #include <stack>
+#include <string>
+#include <string_view>
+#include <vector>
 
 namespace SURELOG {
 
diff --git a/src/DesignCompile/CompileProgram.cpp b/src/DesignCompile/CompileProgram.cpp
index add547155a..00c913a8a3 100644
--- a/src/DesignCompile/CompileProgram.cpp
+++ b/src/DesignCompile/CompileProgram.cpp
@@ -27,6 +27,9 @@
 #include <uhdm/initial.h>
 
 #include <stack>
+#include <string>
+#include <string_view>
+#include <vector>
 
 #include "Surelog/CommandLine/CommandLineParser.h"
 #include "Surelog/Design/FileContent.h"
diff --git a/src/DesignCompile/CompileStmt.cpp b/src/DesignCompile/CompileStmt.cpp
index 37d1840e6c..318cd10c06 100644
--- a/src/DesignCompile/CompileStmt.cpp
+++ b/src/DesignCompile/CompileStmt.cpp
@@ -53,7 +53,13 @@
 #include <uhdm/ElaboratorListener.h>
 #include <uhdm/uhdm.h>
 
+#include <functional>
 #include <iostream>
+#include <map>
+#include <string>
+#include <string_view>
+#include <utility>
+#include <vector>
 
 namespace SURELOG {
 
diff --git a/src/DesignCompile/CompileType.cpp b/src/DesignCompile/CompileType.cpp
index 5ba59a4137..c3bbb6eb80 100644
--- a/src/DesignCompile/CompileType.cpp
+++ b/src/DesignCompile/CompileType.cpp
@@ -55,6 +55,9 @@
 #include <uhdm/uhdm.h>
 
 #include <stack>
+#include <string>
+#include <string_view>
+#include <vector>
 
 namespace SURELOG {
 
diff --git a/src/DesignCompile/DesignElaboration.cpp b/src/DesignCompile/DesignElaboration.cpp
index 92491da4aa..1e73f198a0 100644
--- a/src/DesignCompile/DesignElaboration.cpp
+++ b/src/DesignCompile/DesignElaboration.cpp
@@ -51,8 +51,14 @@
 #include <uhdm/uhdm.h>
 
 #include <cstring>
+#include <functional>
+#include <iostream>
 #include <queue>
+#include <set>
+#include <string>
 #include <unordered_set>
+#include <utility>
+#include <vector>
 
 namespace SURELOG {
 DesignElaboration::DesignElaboration(CompileDesign* compileDesign)
diff --git a/src/DesignCompile/ElaborationStep.cpp b/src/DesignCompile/ElaborationStep.cpp
index b5e6700297..123491c5f0 100644
--- a/src/DesignCompile/ElaborationStep.cpp
+++ b/src/DesignCompile/ElaborationStep.cpp
@@ -24,7 +24,13 @@
 #include "Surelog/DesignCompile/ElaborationStep.h"
 
 #include <cstring>
+#include <functional>
+#include <map>
 #include <queue>
+#include <string>
+#include <string_view>
+#include <utility>
+#include <vector>
 
 #include "Surelog/CommandLine/CommandLineParser.h"
 #include "Surelog/Common/FileSystem.h"
diff --git a/src/DesignCompile/Elaboration_test.cpp b/src/DesignCompile/Elaboration_test.cpp
index 099bf5a783..ee12b5184f 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 <iostream>
 #include <string>
 #include <string_view>
 #include <tuple>
diff --git a/src/DesignCompile/ElaboratorHarness.cpp b/src/DesignCompile/ElaboratorHarness.cpp
index 2f4099747a..c9346af33a 100644
--- a/src/DesignCompile/ElaboratorHarness.cpp
+++ b/src/DesignCompile/ElaboratorHarness.cpp
@@ -23,6 +23,8 @@
 
 #include "Surelog/DesignCompile/ElaboratorHarness.h"
 
+#include <string_view>
+
 #include "Surelog/CommandLine/CommandLineParser.h"
 #include "Surelog/Design/Design.h"
 #include "Surelog/ErrorReporting/ErrorContainer.h"
diff --git a/src/DesignCompile/EvalFunc.cpp b/src/DesignCompile/EvalFunc.cpp
index 5ae2eb18e1..f365a3f282 100644
--- a/src/DesignCompile/EvalFunc.cpp
+++ b/src/DesignCompile/EvalFunc.cpp
@@ -37,6 +37,9 @@
 
 #include <bitset>
 #include <iostream>
+#include <string>
+#include <string_view>
+#include <vector>
 
 namespace SURELOG {
 
diff --git a/src/DesignCompile/NetlistElaboration.cpp b/src/DesignCompile/NetlistElaboration.cpp
index e9f1bc389c..cab04719ba 100644
--- a/src/DesignCompile/NetlistElaboration.cpp
+++ b/src/DesignCompile/NetlistElaboration.cpp
@@ -24,6 +24,10 @@
 #include "Surelog/DesignCompile/NetlistElaboration.h"
 
 #include <algorithm>
+#include <map>
+#include <set>
+#include <string>
+#include <vector>
 
 #include "Surelog/CommandLine/CommandLineParser.h"
 #include "Surelog/Common/FileSystem.h"
diff --git a/src/DesignCompile/ResolveSymbols.cpp b/src/DesignCompile/ResolveSymbols.cpp
index 257a242e75..1bb10396a0 100644
--- a/src/DesignCompile/ResolveSymbols.cpp
+++ b/src/DesignCompile/ResolveSymbols.cpp
@@ -37,6 +37,10 @@
 // UHDM
 #include <uhdm/package.h>
 
+#include <string>
+#include <string_view>
+#include <vector>
+
 namespace SURELOG {
 
 int32_t FunctorCreateLookup::operator()() const {
diff --git a/src/DesignCompile/TestbenchElaboration.cpp b/src/DesignCompile/TestbenchElaboration.cpp
index da3dcb094b..e032b9a191 100644
--- a/src/DesignCompile/TestbenchElaboration.cpp
+++ b/src/DesignCompile/TestbenchElaboration.cpp
@@ -44,6 +44,9 @@
 #include <uhdm/ref_typespec.h>
 
 #include <queue>
+#include <string>
+#include <string_view>
+#include <vector>
 
 namespace SURELOG {
 
diff --git a/src/DesignCompile/UhdmChecker.cpp b/src/DesignCompile/UhdmChecker.cpp
index ff60729192..6ad6c05230 100644
--- a/src/DesignCompile/UhdmChecker.cpp
+++ b/src/DesignCompile/UhdmChecker.cpp
@@ -41,8 +41,12 @@
 #include <uhdm/vpi_visitor.h>
 
 #include <iomanip>
+#include <set>
 #include <sstream>
 #include <stack>
+#include <string>
+#include <string_view>
+#include <vector>
 
 namespace SURELOG {
 using UHDM::BaseClass;
diff --git a/src/DesignCompile/UhdmWriter.cpp b/src/DesignCompile/UhdmWriter.cpp
index 9157bc2316..056ffe04e8 100644
--- a/src/DesignCompile/UhdmWriter.cpp
+++ b/src/DesignCompile/UhdmWriter.cpp
@@ -24,7 +24,14 @@
 #include "Surelog/DesignCompile/UhdmWriter.h"
 
 #include <cstring>
+#include <iostream>
+#include <map>
 #include <queue>
+#include <set>
+#include <string>
+#include <string_view>
+#include <utility>
+#include <vector>
 
 #include "Surelog/CommandLine/CommandLineParser.h"
 #include "Surelog/Common/FileSystem.h"
diff --git a/src/ErrorReporting/Error.cpp b/src/ErrorReporting/Error.cpp
index 0175bf1e20..f9b6aeb397 100644
--- a/src/ErrorReporting/Error.cpp
+++ b/src/ErrorReporting/Error.cpp
@@ -23,6 +23,8 @@
 
 #include "Surelog/ErrorReporting/Error.h"
 
+#include <vector>
+
 namespace SURELOG {
 
 Error::Error(ErrorDefinition::ErrorType errorId, const Location& loc,
diff --git a/src/ErrorReporting/ErrorContainer.cpp b/src/ErrorReporting/ErrorContainer.cpp
index 3ef960482f..8fc33c5f08 100644
--- a/src/ErrorReporting/ErrorContainer.cpp
+++ b/src/ErrorReporting/ErrorContainer.cpp
@@ -25,6 +25,11 @@
 
 #include <cstdio>
 #include <iostream>
+#include <map>
+#include <string>
+#include <string_view>
+#include <utility>
+#include <vector>
 
 #include "Surelog/API/PythonAPI.h"
 #include "Surelog/CommandLine/CommandLineParser.h"
diff --git a/src/ErrorReporting/ErrorDefinition.cpp b/src/ErrorReporting/ErrorDefinition.cpp
index a11e48c616..785da0f1eb 100644
--- a/src/ErrorReporting/ErrorDefinition.cpp
+++ b/src/ErrorReporting/ErrorDefinition.cpp
@@ -22,6 +22,9 @@
  */
 #include "Surelog/ErrorReporting/ErrorDefinition.h"
 
+#include <string>
+#include <string_view>
+
 #include "Surelog/Utils/NumUtils.h"
 #include "Surelog/Utils/StringUtils.h"
 
diff --git a/src/ErrorReporting/LogListener.cpp b/src/ErrorReporting/LogListener.cpp
index 7d1ccc19df..a0e44d752b 100644
--- a/src/ErrorReporting/LogListener.cpp
+++ b/src/ErrorReporting/LogListener.cpp
@@ -23,6 +23,9 @@
 
 #include "Surelog/ErrorReporting/LogListener.h"
 
+#include <iostream>
+#include <string_view>
+
 #include "Surelog/Common/FileSystem.h"
 
 namespace SURELOG {
diff --git a/src/ErrorReporting/Report.cpp b/src/ErrorReporting/Report.cpp
index 60f79633fe..1a679d15b4 100644
--- a/src/ErrorReporting/Report.cpp
+++ b/src/ErrorReporting/Report.cpp
@@ -27,7 +27,10 @@
 #include <filesystem>
 #include <iostream>
 #include <regex>
+#include <string>
+#include <string_view>
 #include <thread>
+#include <utility>
 
 #include "Surelog/CommandLine/CommandLineParser.h"
 #include "Surelog/Common/FileSystem.h"
diff --git a/src/ErrorReporting/Waiver.cpp b/src/ErrorReporting/Waiver.cpp
index 2644a7c254..55847b39dd 100644
--- a/src/ErrorReporting/Waiver.cpp
+++ b/src/ErrorReporting/Waiver.cpp
@@ -23,7 +23,10 @@
 
 #include "Surelog/ErrorReporting/Waiver.h"
 
+#include <functional>
+#include <set>
 #include <string>
+#include <string_view>
 
 #include "Surelog/ErrorReporting/ErrorDefinition.h"
 
diff --git a/src/Expression/ExprBuilder.cpp b/src/Expression/ExprBuilder.cpp
index 8ccc9d45ed..7605561fd4 100644
--- a/src/Expression/ExprBuilder.cpp
+++ b/src/Expression/ExprBuilder.cpp
@@ -23,6 +23,9 @@
 #include "Surelog/Expression/ExprBuilder.h"
 
 #include <cmath>
+#include <string>
+#include <string_view>
+#include <vector>
 
 #include "Surelog/Design/Design.h"
 #include "Surelog/Design/FileContent.h"
diff --git a/src/Expression/Value.cpp b/src/Expression/Value.cpp
index ade10a6c58..c844f3eb88 100644
--- a/src/Expression/Value.cpp
+++ b/src/Expression/Value.cpp
@@ -24,6 +24,7 @@
 #include "Surelog/Expression/Value.h"
 
 #include <cmath>
+#include <string>
 
 #include "Surelog/Utils/NumUtils.h"
 #include "Surelog/Utils/StringUtils.h"
diff --git a/src/Library/AntlrLibParserErrorListener.cpp b/src/Library/AntlrLibParserErrorListener.cpp
index 41fe5706ed..2e4c8a655d 100644
--- a/src/Library/AntlrLibParserErrorListener.cpp
+++ b/src/Library/AntlrLibParserErrorListener.cpp
@@ -23,6 +23,8 @@
 
 #include "Surelog/Library/AntlrLibParserErrorListener.h"
 
+#include <string>
+
 #include "Surelog/ErrorReporting/ErrorContainer.h"
 #include "Surelog/Library/ParseLibraryDef.h"
 #include "Surelog/SourceCompile/SymbolTable.h"
diff --git a/src/Library/Library.cpp b/src/Library/Library.cpp
index e9d03b9e01..e48a38050d 100644
--- a/src/Library/Library.cpp
+++ b/src/Library/Library.cpp
@@ -23,6 +23,9 @@
 
 #include "Surelog/Library/Library.h"
 
+#include <iostream>
+#include <string_view>
+
 #include "Surelog/Design/ModuleDefinition.h"
 #include "Surelog/SourceCompile/SymbolTable.h"
 
diff --git a/src/Library/LibrarySet.cpp b/src/Library/LibrarySet.cpp
index cd36c962b4..609291616c 100644
--- a/src/Library/LibrarySet.cpp
+++ b/src/Library/LibrarySet.cpp
@@ -23,7 +23,11 @@
 
 #include "Surelog/Library/LibrarySet.h"
 
+#include <iostream>
+#include <map>
 #include <sstream>
+#include <string>
+#include <string_view>
 
 #include "Surelog/ErrorReporting/ErrorContainer.h"
 #include "Surelog/Library/Library.h"
diff --git a/src/Library/ParseLibraryDef.cpp b/src/Library/ParseLibraryDef.cpp
index 77f1213f88..bc6346f7f2 100644
--- a/src/Library/ParseLibraryDef.cpp
+++ b/src/Library/ParseLibraryDef.cpp
@@ -26,6 +26,10 @@
 #include <parser/SV3_1aLexer.h>
 #include <parser/SV3_1aParser.h>
 
+#include <iostream>
+#include <string>
+#include <vector>
+
 #include "Surelog/CommandLine/CommandLineParser.h"
 #include "Surelog/Common/FileSystem.h"
 #include "Surelog/Config/ConfigSet.h"
diff --git a/src/Library/SVLibShapeListener.cpp b/src/Library/SVLibShapeListener.cpp
index 21cc17286e..a418611c70 100644
--- a/src/Library/SVLibShapeListener.cpp
+++ b/src/Library/SVLibShapeListener.cpp
@@ -24,6 +24,8 @@
 #include "Surelog/Library/SVLibShapeListener.h"
 
 #include <regex>
+#include <string>
+#include <string_view>
 
 #include "Surelog/CommandLine/CommandLineParser.h"
 #include "Surelog/Common/FileSystem.h"
diff --git a/src/Package/Package.cpp b/src/Package/Package.cpp
index a125ec2e01..2d13e0c75a 100644
--- a/src/Package/Package.cpp
+++ b/src/Package/Package.cpp
@@ -23,6 +23,8 @@
 
 #include "Surelog/Package/Package.h"
 
+#include <string_view>
+
 #include "Surelog/Design/FileContent.h"
 #include "Surelog/Testbench/ClassDefinition.h"
 
diff --git a/src/Package/Precompiled.cpp b/src/Package/Precompiled.cpp
index 32e4c515ef..090236fd34 100644
--- a/src/Package/Precompiled.cpp
+++ b/src/Package/Precompiled.cpp
@@ -23,6 +23,8 @@
 
 #include "Surelog/Package/Precompiled.h"
 
+#include <string>
+
 #include "Surelog/Common/FileSystem.h"
 #include "Surelog/Common/PathId.h"
 #include "Surelog/SourceCompile/SymbolTable.h"
diff --git a/src/SourceCompile/AnalyzeFile.cpp b/src/SourceCompile/AnalyzeFile.cpp
index 68fb12e286..ec4d877baf 100644
--- a/src/SourceCompile/AnalyzeFile.cpp
+++ b/src/SourceCompile/AnalyzeFile.cpp
@@ -23,8 +23,12 @@
 
 #include "Surelog/SourceCompile/AnalyzeFile.h"
 
+#include <iostream>
 #include <regex>
 #include <sstream>
+#include <string>
+#include <string_view>
+#include <vector>
 
 #include "Surelog/CommandLine/CommandLineParser.h"
 #include "Surelog/Common/FileSystem.h"
diff --git a/src/SourceCompile/AntlrParserErrorListener.cpp b/src/SourceCompile/AntlrParserErrorListener.cpp
index 2ae634b054..0245fa258e 100644
--- a/src/SourceCompile/AntlrParserErrorListener.cpp
+++ b/src/SourceCompile/AntlrParserErrorListener.cpp
@@ -23,6 +23,8 @@
 
 #include "Surelog/SourceCompile/AntlrParserErrorListener.h"
 
+#include <string>
+
 #include "Surelog/Common/FileSystem.h"
 #include "Surelog/SourceCompile/CompileSourceFile.h"
 #include "Surelog/SourceCompile/ParseFile.h"
diff --git a/src/SourceCompile/CheckCompile.cpp b/src/SourceCompile/CheckCompile.cpp
index 0e33feaff5..76593219e2 100644
--- a/src/SourceCompile/CheckCompile.cpp
+++ b/src/SourceCompile/CheckCompile.cpp
@@ -23,6 +23,9 @@
 
 #include "Surelog/SourceCompile/CheckCompile.h"
 
+#include <string>
+#include <vector>
+
 #include "Surelog/CommandLine/CommandLineParser.h"
 #include "Surelog/Common/FileSystem.h"
 #include "Surelog/Design/Design.h"
diff --git a/src/SourceCompile/CommonListenerHelper.cpp b/src/SourceCompile/CommonListenerHelper.cpp
index 2002d92646..a8ef4cb376 100644
--- a/src/SourceCompile/CommonListenerHelper.cpp
+++ b/src/SourceCompile/CommonListenerHelper.cpp
@@ -25,6 +25,9 @@
 
 #include <antlr4-runtime.h>
 
+#include <string_view>
+#include <vector>
+
 #include "Surelog/Design/DesignElement.h"
 #include "Surelog/Design/FileContent.h"
 
diff --git a/src/SourceCompile/CompilationUnit.cpp b/src/SourceCompile/CompilationUnit.cpp
index edfa9329ea..51c26e0b70 100644
--- a/src/SourceCompile/CompilationUnit.cpp
+++ b/src/SourceCompile/CompilationUnit.cpp
@@ -22,6 +22,9 @@
  */
 #include "Surelog/SourceCompile/CompilationUnit.h"
 
+#include <string_view>
+#include <vector>
+
 namespace SURELOG {
 
 CompilationUnit::CompilationUnit(bool fileunit)
diff --git a/src/SourceCompile/CompileSourceFile.cpp b/src/SourceCompile/CompileSourceFile.cpp
index 3c750e050e..c3ad5601f4 100644
--- a/src/SourceCompile/CompileSourceFile.cpp
+++ b/src/SourceCompile/CompileSourceFile.cpp
@@ -36,6 +36,9 @@
 #ifdef SURELOG_WITH_PYTHON
 #include <Python.h>
 
+#include <string_view>
+#include <vector>
+
 #include "Surelog/API/PythonAPI.h"
 #include "Surelog/SourceCompile/PythonListen.h"
 #endif
diff --git a/src/SourceCompile/Compiler.cpp b/src/SourceCompile/Compiler.cpp
index ef46ccd911..2f03ffba06 100644
--- a/src/SourceCompile/Compiler.cpp
+++ b/src/SourceCompile/Compiler.cpp
@@ -26,8 +26,12 @@
 #include <climits>
 #include <filesystem>
 #include <fstream>
+#include <iostream>
+#include <map>
 #include <nlohmann/json.hpp>
+#include <string_view>
 #include <thread>
+#include <vector>
 
 #include "Surelog/API/PythonAPI.h"
 #include "Surelog/CommandLine/CommandLineParser.h"
diff --git a/src/SourceCompile/LoopCheck.cpp b/src/SourceCompile/LoopCheck.cpp
index 4b88989711..2beac5b034 100644
--- a/src/SourceCompile/LoopCheck.cpp
+++ b/src/SourceCompile/LoopCheck.cpp
@@ -23,7 +23,9 @@
 
 #include "Surelog/SourceCompile/LoopCheck.h"
 
+#include <map>
 #include <queue>
+#include <vector>
 
 namespace SURELOG {
 
diff --git a/src/SourceCompile/MacroInfo.cpp b/src/SourceCompile/MacroInfo.cpp
index 6144d84e6d..23eb78793a 100644
--- a/src/SourceCompile/MacroInfo.cpp
+++ b/src/SourceCompile/MacroInfo.cpp
@@ -23,6 +23,10 @@
 
 #include "Surelog/SourceCompile/MacroInfo.h"
 
+#include <string>
+#include <string_view>
+#include <vector>
+
 namespace SURELOG {
 MacroInfo::MacroInfo(std::string_view name, int32_t type, PathId fileId,
                      uint32_t startLine, uint16_t startColumn, uint32_t endLine,
diff --git a/src/SourceCompile/ParseFile.cpp b/src/SourceCompile/ParseFile.cpp
index ea0ee43330..2c041c6cc8 100644
--- a/src/SourceCompile/ParseFile.cpp
+++ b/src/SourceCompile/ParseFile.cpp
@@ -27,6 +27,9 @@
 #include <parser/SV3_1aLexer.h>
 #include <parser/SV3_1aParser.h>
 
+#include <iostream>
+#include <string_view>
+
 #include "Surelog/Cache/ParseCache.h"
 #include "Surelog/CommandLine/CommandLineParser.h"
 #include "Surelog/Common/FileSystem.h"
diff --git a/src/SourceCompile/ParseTreeListener.template.cxx b/src/SourceCompile/ParseTreeListener.template.cxx
index c9cbcc7c95..905b70c6f6 100644
--- a/src/SourceCompile/ParseTreeListener.template.cxx
+++ b/src/SourceCompile/ParseTreeListener.template.cxx
@@ -23,6 +23,8 @@
  *
  */
 
+#include <vector>
+#include <string>
 #include <Surelog/Common/FileSystem.h>
 #include <Surelog/Design/VObject.h>
 #include <Surelog/SourceCompile/ParseTreeListener.h>
diff --git a/src/SourceCompile/ParserHarness.cpp b/src/SourceCompile/ParserHarness.cpp
index ae9adcfbee..b606545400 100644
--- a/src/SourceCompile/ParserHarness.cpp
+++ b/src/SourceCompile/ParserHarness.cpp
@@ -23,6 +23,8 @@
 
 #include "Surelog/SourceCompile/ParserHarness.h"
 
+#include <string_view>
+
 #include "Surelog/CommandLine/CommandLineParser.h"
 #include "Surelog/Design/FileContent.h"
 #include "Surelog/ErrorReporting/ErrorContainer.h"
diff --git a/src/SourceCompile/PreprocessFile.cpp b/src/SourceCompile/PreprocessFile.cpp
index 2c158c6055..4066918bfd 100644
--- a/src/SourceCompile/PreprocessFile.cpp
+++ b/src/SourceCompile/PreprocessFile.cpp
@@ -27,9 +27,13 @@
 #include <parser/SV3_1aPpLexer.h>
 #include <parser/SV3_1aPpParser.h>
 
+#include <functional>
 #include <iostream>
 #include <regex>
+#include <set>
 #include <string_view>
+#include <utility>
+#include <vector>
 
 #include "Surelog/Cache/PPCache.h"
 #include "Surelog/CommandLine/CommandLineParser.h"
diff --git a/src/SourceCompile/PreprocessHarness.cpp b/src/SourceCompile/PreprocessHarness.cpp
index 378ca7837e..2fe98d54e0 100644
--- a/src/SourceCompile/PreprocessHarness.cpp
+++ b/src/SourceCompile/PreprocessHarness.cpp
@@ -23,6 +23,9 @@
 
 #include "Surelog/SourceCompile/PreprocessHarness.h"
 
+#include <string>
+#include <string_view>
+
 #include "Surelog/CommandLine/CommandLineParser.h"
 #include "Surelog/Library/Library.h"
 #include "Surelog/SourceCompile/CompilationUnit.h"
diff --git a/src/SourceCompile/SV3_1aPpTreeListenerHelper.cpp b/src/SourceCompile/SV3_1aPpTreeListenerHelper.cpp
index bf1c0d6c83..5ecc6e9134 100644
--- a/src/SourceCompile/SV3_1aPpTreeListenerHelper.cpp
+++ b/src/SourceCompile/SV3_1aPpTreeListenerHelper.cpp
@@ -23,6 +23,9 @@
 
 #include "Surelog/SourceCompile/SV3_1aPpTreeListenerHelper.h"
 
+#include <string_view>
+#include <vector>
+
 #include "Surelog/CommandLine/CommandLineParser.h"
 #include "Surelog/ErrorReporting/ErrorContainer.h"
 #include "Surelog/SourceCompile/CompileSourceFile.h"
diff --git a/src/SourceCompile/SV3_1aPpTreeShapeListener.cpp b/src/SourceCompile/SV3_1aPpTreeShapeListener.cpp
index c63af382a9..d2b0b699c9 100644
--- a/src/SourceCompile/SV3_1aPpTreeShapeListener.cpp
+++ b/src/SourceCompile/SV3_1aPpTreeShapeListener.cpp
@@ -16,7 +16,12 @@
 
 #include "Surelog/SourceCompile/SV3_1aPpTreeShapeListener.h"
 
+#include <iostream>
 #include <regex>
+#include <set>
+#include <string>
+#include <string_view>
+#include <vector>
 
 #include "Surelog/CommandLine/CommandLineParser.h"
 #include "Surelog/Common/FileSystem.h"
diff --git a/src/SourceCompile/SV3_1aTreeShapeHelper.cpp b/src/SourceCompile/SV3_1aTreeShapeHelper.cpp
index 570f3b00fa..2ef1129815 100644
--- a/src/SourceCompile/SV3_1aTreeShapeHelper.cpp
+++ b/src/SourceCompile/SV3_1aTreeShapeHelper.cpp
@@ -23,6 +23,11 @@
 
 #include "Surelog/SourceCompile/SV3_1aTreeShapeHelper.h"
 
+#include <string>
+#include <string_view>
+#include <utility>
+#include <vector>
+
 #include "Surelog/CommandLine/CommandLineParser.h"
 #include "Surelog/Design/FileContent.h"
 #include "Surelog/ErrorReporting/ErrorContainer.h"
diff --git a/src/SourceCompile/SV3_1aTreeShapeListener.cpp b/src/SourceCompile/SV3_1aTreeShapeListener.cpp
index 76e5735769..60d0b0b61d 100644
--- a/src/SourceCompile/SV3_1aTreeShapeListener.cpp
+++ b/src/SourceCompile/SV3_1aTreeShapeListener.cpp
@@ -24,6 +24,9 @@
 #include "Surelog/SourceCompile/SV3_1aTreeShapeListener.h"
 
 #include <regex>
+#include <string>
+#include <string_view>
+#include <vector>
 
 #include "Surelog/CommandLine/CommandLineParser.h"
 #include "Surelog/Common/FileSystem.h"
diff --git a/src/Testbench/ClassObject.cpp b/src/Testbench/ClassObject.cpp
index dd414bf6d8..1ca026ed1c 100644
--- a/src/Testbench/ClassObject.cpp
+++ b/src/Testbench/ClassObject.cpp
@@ -23,6 +23,8 @@
 
 #include "Surelog/Testbench/ClassObject.h"
 
+#include <string_view>
+
 #include "Surelog/Testbench/ClassDefinition.h"
 
 namespace SURELOG {
diff --git a/src/Testbench/TypeDef.cpp b/src/Testbench/TypeDef.cpp
index 3ca20d032e..a545472229 100644
--- a/src/Testbench/TypeDef.cpp
+++ b/src/Testbench/TypeDef.cpp
@@ -23,6 +23,8 @@
 
 #include "Surelog/Testbench/TypeDef.h"
 
+#include <string_view>
+
 #include "Surelog/Design/FileContent.h"
 
 namespace SURELOG {
diff --git a/src/Utils/NumUtils.cpp b/src/Utils/NumUtils.cpp
index 219e8c0f81..81dae38cc2 100644
--- a/src/Utils/NumUtils.cpp
+++ b/src/Utils/NumUtils.cpp
@@ -25,6 +25,8 @@
 
 #include <bitset>
 #include <cstring>
+#include <string>
+#include <string_view>
 
 namespace SURELOG {
 
diff --git a/src/Utils/ParseUtils.cpp b/src/Utils/ParseUtils.cpp
index c15ce4c67f..a8dcfddf39 100644
--- a/src/Utils/ParseUtils.cpp
+++ b/src/Utils/ParseUtils.cpp
@@ -25,6 +25,9 @@
 
 #include <antlr4-runtime.h>
 
+#include <string>
+#include <vector>
+
 namespace SURELOG {
 
 ParseUtils::LineColumn ParseUtils::getLineColumn(antlr4::Token* token) {
diff --git a/src/Utils/StringUtils.cpp b/src/Utils/StringUtils.cpp
index b467841d89..80922f3a83 100644
--- a/src/Utils/StringUtils.cpp
+++ b/src/Utils/StringUtils.cpp
@@ -30,6 +30,9 @@
 #include <map>
 #include <regex>
 #include <sstream>
+#include <string>
+#include <string_view>
+#include <vector>
 
 namespace SURELOG {
 
diff --git a/src/Utils/StringUtils_test.cpp b/src/Utils/StringUtils_test.cpp
index 7877032dd5..ce1bd320e0 100644
--- a/src/Utils/StringUtils_test.cpp
+++ b/src/Utils/StringUtils_test.cpp
@@ -20,6 +20,10 @@
 #include <gtest/gtest.h>
 #include <stdlib.h>
 
+#include <string>
+#include <string_view>
+#include <vector>
+
 namespace SURELOG {
 using ::testing::ElementsAre;
 
diff --git a/src/hellodesign.cpp b/src/hellodesign.cpp
index 4be3ed6bba..ec8c1416f4 100644
--- a/src/hellodesign.cpp
+++ b/src/hellodesign.cpp
@@ -27,6 +27,7 @@
 
 #include <functional>
 #include <iostream>
+#include <string_view>
 
 #include "Surelog/API/Surelog.h"
 #include "Surelog/CommandLine/CommandLineParser.h"
diff --git a/src/hellouhdm.cpp b/src/hellouhdm.cpp
index b5f45b579d..0c1b7e1f08 100644
--- a/src/hellouhdm.cpp
+++ b/src/hellouhdm.cpp
@@ -27,6 +27,7 @@
 
 #include <functional>
 #include <iostream>
+#include <string>
 
 #include "Surelog/API/Surelog.h"
 #include "Surelog/CommandLine/CommandLineParser.h"
diff --git a/src/main.cpp b/src/main.cpp
index fc0bb9eec9..bf4aa6dfd2 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -24,6 +24,9 @@
 #if defined(_MSC_VER)
 #include <direct.h>
 #include <process.h>
+
+#include <string_view>
+#include <utility>
 #else
 #include <sys/param.h>
 #include <unistd.h>
diff --git a/src/roundtrip.cpp b/src/roundtrip.cpp
index 600f4e5332..5f6767b137 100644
--- a/src/roundtrip.cpp
+++ b/src/roundtrip.cpp
@@ -37,8 +37,10 @@
 #include <sstream>
 #include <stack>
 #include <string>
+#include <string_view>
 #include <unordered_map>
 #include <unordered_set>
+#include <utility>
 #include <vector>
 
 #include "Surelog/API/Surelog.h"