From ec658e175d44a35e5f0da44657f536cd843b56f4 Mon Sep 17 00:00:00 2001
From: Henner Zeller <h.zeller@acm.org>
Date: Tue, 12 Nov 2024 22:39:19 -0800
Subject: [PATCH] Add a couple of missing uhdm headers.

---
 include/Surelog/Design/ModuleDefinition.h     |  9 ++++--
 include/Surelog/Design/ModuleInstance.h       |  1 +
 include/Surelog/DesignCompile/CompileClass.h  |  3 ++
 include/Surelog/DesignCompile/CompileDesign.h |  2 ++
 include/Surelog/DesignCompile/CompileHelper.h | 30 +++++++++++++++++--
 include/Surelog/DesignCompile/CompileModule.h |  3 ++
 .../Surelog/DesignCompile/CompilePackage.h    |  3 ++
 .../Surelog/DesignCompile/CompileProgram.h    |  1 +
 .../Surelog/DesignCompile/ElaborationStep.h   |  7 +++--
 .../DesignCompile/NetlistElaboration.h        |  8 ++++-
 include/Surelog/DesignCompile/UhdmWriter.h    |  2 ++
 src/DesignCompile/CompileClass.cpp            |  2 ++
 src/DesignCompile/CompileModule.cpp           |  8 +++++
 src/DesignCompile/CompilePackage.cpp          |  4 +++
 src/DesignCompile/CompileProgram.cpp          | 10 +++++--
 src/DesignCompile/ResolveSymbols.cpp          |  1 +
 src/DesignCompile/TestbenchElaboration.cpp    |  4 +++
 src/Testbench/ClassDefinition.cpp             |  2 ++
 18 files changed, 88 insertions(+), 12 deletions(-)

diff --git a/include/Surelog/Design/ModuleDefinition.h b/include/Surelog/Design/ModuleDefinition.h
index ce0fb63874..8fb307e1fe 100644
--- a/include/Surelog/Design/ModuleDefinition.h
+++ b/include/Surelog/Design/ModuleDefinition.h
@@ -38,12 +38,15 @@
 #include <functional>
 #include <map>
 #include <string>
+#include <string_view>
+#include <vector>
 
 // UHDM
 #include <uhdm/containers.h>
-
-#include <string_view>
-#include <vector>
+#include <uhdm/gen_stmt.h>
+#include <uhdm/module_array.h>
+#include <uhdm/ref_module.h>
+#include <uhdm/udp_defn.h>
 
 namespace SURELOG {
 
diff --git a/include/Surelog/Design/ModuleInstance.h b/include/Surelog/Design/ModuleInstance.h
index 65704ad48c..630e7e1d57 100644
--- a/include/Surelog/Design/ModuleInstance.h
+++ b/include/Surelog/Design/ModuleInstance.h
@@ -33,6 +33,7 @@
 #include <Surelog/SourceCompile/VObjectTypes.h>
 #include <uhdm/Serializer.h>
 #include <uhdm/expr.h>
+#include <uhdm/module_array.h>
 
 #include <cstdint>
 #include <map>
diff --git a/include/Surelog/DesignCompile/CompileClass.h b/include/Surelog/DesignCompile/CompileClass.h
index 12a7ad77b6..2999229629 100644
--- a/include/Surelog/DesignCompile/CompileClass.h
+++ b/include/Surelog/DesignCompile/CompileClass.h
@@ -32,6 +32,9 @@
 #include <set>
 #include <string>
 
+// UHDM
+#include <uhdm/containers.h>
+
 namespace SURELOG {
 
 struct FunctorCompileClass {
diff --git a/include/Surelog/DesignCompile/CompileDesign.h b/include/Surelog/DesignCompile/CompileDesign.h
index 642dce43bb..ad286eabdd 100644
--- a/include/Surelog/DesignCompile/CompileDesign.h
+++ b/include/Surelog/DesignCompile/CompileDesign.h
@@ -34,7 +34,9 @@
 
 // UHDM
 #include <uhdm/Serializer.h>
+#include <uhdm/containers.h>
 #include <uhdm/sv_vpi_user.h>
+#include <uhdm/typespec.h>
 
 #include <mutex>
 
diff --git a/include/Surelog/DesignCompile/CompileHelper.h b/include/Surelog/DesignCompile/CompileHelper.h
index 480984d91d..8ff3fb249b 100644
--- a/include/Surelog/DesignCompile/CompileHelper.h
+++ b/include/Surelog/DesignCompile/CompileHelper.h
@@ -30,8 +30,6 @@
 #include <Surelog/Design/ValuedComponentI.h>
 #include <Surelog/Expression/ExprBuilder.h>
 #include <Surelog/SourceCompile/VObjectTypes.h>
-#include <uhdm/expr.h>
-#include <uhdm/uhdm_types.h>
 
 #include <cstdint>
 #include <string>
@@ -41,8 +39,36 @@
 #include <vector>
 
 // UHDM
+#include <uhdm/always.h>
+#include <uhdm/array_var.h>
+#include <uhdm/assignment.h>
+#include <uhdm/atomic_stmt.h>
+#include <uhdm/attribute.h>
+#include <uhdm/clocking_block.h>
 #include <uhdm/constant.h>
+#include <uhdm/cont_assign.h>
 #include <uhdm/containers.h>
+#include <uhdm/event_control.h>
+#include <uhdm/expr.h>
+#include <uhdm/final_stmt.h>
+#include <uhdm/function.h>
+#include <uhdm/hier_path.h>
+#include <uhdm/initial.h>
+#include <uhdm/int_typespec.h>
+#include <uhdm/io_decl.h>
+#include <uhdm/method_func_call.h>
+#include <uhdm/module_array.h>
+#include <uhdm/module_inst.h>
+#include <uhdm/primitive.h>
+#include <uhdm/property_decl.h>
+#include <uhdm/range.h>
+#include <uhdm/ref_module.h>
+#include <uhdm/sequence_decl.h>
+#include <uhdm/task_func.h>
+#include <uhdm/typespec.h>
+#include <uhdm/typespec_member.h>
+#include <uhdm/uhdm_types.h>
+#include <uhdm/variables.h>
 
 namespace SURELOG {
 
diff --git a/include/Surelog/DesignCompile/CompileModule.h b/include/Surelog/DesignCompile/CompileModule.h
index 0487a2bc05..fb8868d79d 100644
--- a/include/Surelog/DesignCompile/CompileModule.h
+++ b/include/Surelog/DesignCompile/CompileModule.h
@@ -29,6 +29,9 @@
 
 #include <cstdint>
 
+// UHDM
+#include <uhdm/containers.h>
+
 namespace SURELOG {
 
 class CompileDesign;
diff --git a/include/Surelog/DesignCompile/CompilePackage.h b/include/Surelog/DesignCompile/CompilePackage.h
index 3577d16fba..94f670ecec 100644
--- a/include/Surelog/DesignCompile/CompilePackage.h
+++ b/include/Surelog/DesignCompile/CompilePackage.h
@@ -29,6 +29,9 @@
 
 #include <cstdint>
 
+// UHDM
+#include <uhdm/containers.h>
+
 namespace SURELOG {
 
 class CompileDesign;
diff --git a/include/Surelog/DesignCompile/CompileProgram.h b/include/Surelog/DesignCompile/CompileProgram.h
index 68197b4966..a72eb2b9ef 100644
--- a/include/Surelog/DesignCompile/CompileProgram.h
+++ b/include/Surelog/DesignCompile/CompileProgram.h
@@ -27,6 +27,7 @@
 
 #include <Surelog/DesignCompile/CompileHelper.h>
 #include <Surelog/DesignCompile/CompileToolbox.h>
+#include <uhdm/containers.h>
 
 #include <cstdint>
 
diff --git a/include/Surelog/DesignCompile/ElaborationStep.h b/include/Surelog/DesignCompile/ElaborationStep.h
index e5417350bf..d2d2a60ec3 100644
--- a/include/Surelog/DesignCompile/ElaborationStep.h
+++ b/include/Surelog/DesignCompile/ElaborationStep.h
@@ -31,14 +31,15 @@
 
 #include <cstdint>
 #include <map>
+#include <string>
 #include <string_view>
+#include <vector>
 
 // UHDM
+#include <uhdm/Serializer.h>
+#include <uhdm/containers.h>
 #include <uhdm/uhdm_forward_decl.h>
 
-#include <string>
-#include <vector>
-
 namespace SURELOG {
 
 class CompileDesign;
diff --git a/include/Surelog/DesignCompile/NetlistElaboration.h b/include/Surelog/DesignCompile/NetlistElaboration.h
index d301f04ff0..66c2963e63 100644
--- a/include/Surelog/DesignCompile/NetlistElaboration.h
+++ b/include/Surelog/DesignCompile/NetlistElaboration.h
@@ -29,12 +29,18 @@
 #include <Surelog/Common/PathId.h>
 #include <Surelog/DesignCompile/CompileHelper.h>
 #include <Surelog/DesignCompile/TestbenchElaboration.h>
-#include <uhdm/uhdm_types.h>
 
 #include <cstdint>
 #include <map>
 #include <string_view>
 
+// UHDM
+#include <uhdm/interface_array.h>
+#include <uhdm/interface_inst.h>
+#include <uhdm/modport.h>
+#include <uhdm/typespec.h>
+#include <uhdm/uhdm_types.h>
+
 namespace SURELOG {
 
 class CompileDesign;
diff --git a/include/Surelog/DesignCompile/UhdmWriter.h b/include/Surelog/DesignCompile/UhdmWriter.h
index 1cb08ce865..4f7fc3d68e 100644
--- a/include/Surelog/DesignCompile/UhdmWriter.h
+++ b/include/Surelog/DesignCompile/UhdmWriter.h
@@ -37,6 +37,8 @@
 #include <vector>
 
 // UHDM
+#include <uhdm/Serializer.h>
+#include <uhdm/containers.h>
 #include <uhdm/uhdm_forward_decl.h>
 
 #include <string>
diff --git a/src/DesignCompile/CompileClass.cpp b/src/DesignCompile/CompileClass.cpp
index 1ac15aeba1..753e8396ec 100644
--- a/src/DesignCompile/CompileClass.cpp
+++ b/src/DesignCompile/CompileClass.cpp
@@ -45,7 +45,9 @@
 #include "Surelog/Utils/StringUtils.h"
 
 // UHDM
+#include <uhdm/Serializer.h>
 #include <uhdm/class_defn.h>
+#include <uhdm/containers.h>
 
 #include <cstdint>
 #include <stack>
diff --git a/src/DesignCompile/CompileModule.cpp b/src/DesignCompile/CompileModule.cpp
index f0da0e6c6b..45a436f730 100644
--- a/src/DesignCompile/CompileModule.cpp
+++ b/src/DesignCompile/CompileModule.cpp
@@ -43,15 +43,23 @@
 #include "Surelog/Utils/StringUtils.h"
 
 // UHDM
+#include <uhdm/Serializer.h>
 #include <uhdm/always.h>
 #include <uhdm/assign_stmt.h>
 #include <uhdm/assignment.h>
+#include <uhdm/clocking_block.h>
 #include <uhdm/constant.h>
+#include <uhdm/cont_assign.h>
+#include <uhdm/containers.h>
 #include <uhdm/final_stmt.h>
 #include <uhdm/initial.h>
 #include <uhdm/io_decl.h>
 #include <uhdm/logic_net.h>
+#include <uhdm/module_array.h>
+#include <uhdm/property_decl.h>
+#include <uhdm/ref_module.h>
 #include <uhdm/ref_obj.h>
+#include <uhdm/sequence_decl.h>
 #include <uhdm/table_entry.h>
 #include <uhdm/udp_defn.h>
 #include <uhdm/vpi_user.h>
diff --git a/src/DesignCompile/CompilePackage.cpp b/src/DesignCompile/CompilePackage.cpp
index fe15d00c9d..1ebd292046 100644
--- a/src/DesignCompile/CompilePackage.cpp
+++ b/src/DesignCompile/CompilePackage.cpp
@@ -41,7 +41,11 @@
 #include "Surelog/Utils/StringUtils.h"
 
 // UHDM
+#include <uhdm/Serializer.h>
+#include <uhdm/containers.h>
 #include <uhdm/package.h>
+#include <uhdm/property_decl.h>
+#include <uhdm/sequence_decl.h>
 
 #include <cstdint>
 #include <stack>
diff --git a/src/DesignCompile/CompileProgram.cpp b/src/DesignCompile/CompileProgram.cpp
index 9d28012cfa..5a0a66be4a 100644
--- a/src/DesignCompile/CompileProgram.cpp
+++ b/src/DesignCompile/CompileProgram.cpp
@@ -23,9 +23,6 @@
 
 #include "Surelog/DesignCompile/CompileProgram.h"
 
-#include <uhdm/final_stmt.h>
-#include <uhdm/initial.h>
-
 #include <cstdint>
 #include <stack>
 #include <string>
@@ -47,6 +44,13 @@
 #include "Surelog/Testbench/Program.h"
 #include "Surelog/Utils/StringUtils.h"
 
+// UHDM
+#include <uhdm/containers.h>
+#include <uhdm/final_stmt.h>
+#include <uhdm/initial.h>
+#include <uhdm/property_decl.h>
+#include <uhdm/sequence_decl.h>
+
 namespace SURELOG {
 
 int32_t FunctorCompileProgram::operator()() const {
diff --git a/src/DesignCompile/ResolveSymbols.cpp b/src/DesignCompile/ResolveSymbols.cpp
index d9cca265bd..0b98c52e1f 100644
--- a/src/DesignCompile/ResolveSymbols.cpp
+++ b/src/DesignCompile/ResolveSymbols.cpp
@@ -39,6 +39,7 @@
 #include "Surelog/Utils/StringUtils.h"
 
 // UHDM
+#include <uhdm/Serializer.h>
 #include <uhdm/package.h>
 
 #include <cstdint>
diff --git a/src/DesignCompile/TestbenchElaboration.cpp b/src/DesignCompile/TestbenchElaboration.cpp
index b89aadc687..285ed53c0d 100644
--- a/src/DesignCompile/TestbenchElaboration.cpp
+++ b/src/DesignCompile/TestbenchElaboration.cpp
@@ -45,10 +45,14 @@
 #include "Surelog/Utils/StringUtils.h"
 
 // UHDM
+#include <uhdm/Serializer.h>
 #include <uhdm/class_defn.h>
 #include <uhdm/class_typespec.h>
+#include <uhdm/containers.h>
 #include <uhdm/expr.h>
 #include <uhdm/extends.h>
+#include <uhdm/named_event.h>
+#include <uhdm/range.h>
 #include <uhdm/ref_typespec.h>
 #include <uhdm/uhdm_types.h>
 
diff --git a/src/Testbench/ClassDefinition.cpp b/src/Testbench/ClassDefinition.cpp
index 5c9f64e068..1cd2cabae5 100644
--- a/src/Testbench/ClassDefinition.cpp
+++ b/src/Testbench/ClassDefinition.cpp
@@ -22,6 +22,8 @@
  */
 #include "Surelog/Testbench/ClassDefinition.h"
 
+#include <uhdm/class_defn.h>
+
 #include <cstdint>
 #include <string_view>