diff --git a/src/DesignCompile/CompileExpression.cpp b/src/DesignCompile/CompileExpression.cpp
index e248b453c3..7102ebda6f 100644
--- a/src/DesignCompile/CompileExpression.cpp
+++ b/src/DesignCompile/CompileExpression.cpp
@@ -64,7 +64,9 @@
 #include <uhdm/ElaboratorListener.h>
 #include <uhdm/ExprEval.h>
 #include <uhdm/clone_tree.h>
+#include <uhdm/sv_vpi_user.h>
 #include <uhdm/uhdm.h>
+#include <uhdm/vpi_user.h>
 #include <uhdm/vpi_visitor.h>
 
 namespace SURELOG {
diff --git a/src/DesignCompile/CompileHelper.cpp b/src/DesignCompile/CompileHelper.cpp
index 74dff35a25..27032617a3 100644
--- a/src/DesignCompile/CompileHelper.cpp
+++ b/src/DesignCompile/CompileHelper.cpp
@@ -63,7 +63,9 @@
 #include <uhdm/ExprEval.h>
 #include <uhdm/VpiListener.h>
 #include <uhdm/clone_tree.h>
+#include <uhdm/sv_vpi_user.h>
 #include <uhdm/uhdm.h>
+#include <uhdm/vpi_user.h>
 
 #include <climits>
 #include <cstdint>
diff --git a/src/DesignCompile/CompileHelper_test.cpp b/src/DesignCompile/CompileHelper_test.cpp
index a5f900a626..9908b5c861 100644
--- a/src/DesignCompile/CompileHelper_test.cpp
+++ b/src/DesignCompile/CompileHelper_test.cpp
@@ -19,6 +19,7 @@
 #include <gtest/gtest.h>
 #include <uhdm/Serializer.h>
 #include <uhdm/constant.h>
+#include <uhdm/vpi_user.h>
 
 #include <cstdint>
 #include <limits>
diff --git a/src/DesignCompile/CompileModule.cpp b/src/DesignCompile/CompileModule.cpp
index 0fd87a6a8e..858a597941 100644
--- a/src/DesignCompile/CompileModule.cpp
+++ b/src/DesignCompile/CompileModule.cpp
@@ -53,6 +53,7 @@
 #include <uhdm/ref_obj.h>
 #include <uhdm/table_entry.h>
 #include <uhdm/udp_defn.h>
+#include <uhdm/vpi_user.h>
 
 #include <cstdint>
 #include <stack>
diff --git a/src/DesignCompile/CompileStmt.cpp b/src/DesignCompile/CompileStmt.cpp
index 856c4c7142..6d6ee01239 100644
--- a/src/DesignCompile/CompileStmt.cpp
+++ b/src/DesignCompile/CompileStmt.cpp
@@ -54,7 +54,9 @@
 
 // UHDM
 #include <uhdm/ElaboratorListener.h>
+#include <uhdm/sv_vpi_user.h>
 #include <uhdm/uhdm.h>
+#include <uhdm/vpi_user.h>
 
 #include <cstdint>
 #include <functional>
diff --git a/src/DesignCompile/CompileType.cpp b/src/DesignCompile/CompileType.cpp
index a918a3330b..b7eefa2b59 100644
--- a/src/DesignCompile/CompileType.cpp
+++ b/src/DesignCompile/CompileType.cpp
@@ -57,6 +57,7 @@
 #include <uhdm/ExprEval.h>
 #include <uhdm/clone_tree.h>
 #include <uhdm/uhdm.h>
+#include <uhdm/vpi_user.h>
 
 #include <cstdint>
 #include <stack>
diff --git a/src/DesignCompile/DesignElaboration.cpp b/src/DesignCompile/DesignElaboration.cpp
index df3d2667fb..5ae14fcd58 100644
--- a/src/DesignCompile/DesignElaboration.cpp
+++ b/src/DesignCompile/DesignElaboration.cpp
@@ -53,7 +53,9 @@
 #include <uhdm/ElaboratorListener.h>
 #include <uhdm/ExprEval.h>
 #include <uhdm/clone_tree.h>
+#include <uhdm/sv_vpi_user.h>
 #include <uhdm/uhdm.h>
+#include <uhdm/vpi_user.h>
 
 #include <cstdint>
 #include <cstring>
diff --git a/src/DesignCompile/ElaborationStep.cpp b/src/DesignCompile/ElaborationStep.cpp
index 5e03651c5b..0636b64a1e 100644
--- a/src/DesignCompile/ElaborationStep.cpp
+++ b/src/DesignCompile/ElaborationStep.cpp
@@ -68,6 +68,7 @@
 #include <uhdm/ElaboratorListener.h>
 #include <uhdm/ExprEval.h>
 #include <uhdm/clone_tree.h>
+#include <uhdm/sv_vpi_user.h>
 #include <uhdm/uhdm.h>
 #include <uhdm/vpi_visitor.h>
 
diff --git a/src/DesignCompile/NetlistElaboration.cpp b/src/DesignCompile/NetlistElaboration.cpp
index f32ef7473d..d2621d85e1 100644
--- a/src/DesignCompile/NetlistElaboration.cpp
+++ b/src/DesignCompile/NetlistElaboration.cpp
@@ -64,7 +64,9 @@
 #include <uhdm/ElaboratorListener.h>
 #include <uhdm/ExprEval.h>
 #include <uhdm/clone_tree.h>
+#include <uhdm/sv_vpi_user.h>
 #include <uhdm/uhdm.h>
+#include <uhdm/vpi_user.h>
 
 namespace SURELOG {
 
diff --git a/src/DesignCompile/UhdmWriter.cpp b/src/DesignCompile/UhdmWriter.cpp
index 1091224ac1..b2d2c4290a 100644
--- a/src/DesignCompile/UhdmWriter.cpp
+++ b/src/DesignCompile/UhdmWriter.cpp
@@ -70,7 +70,10 @@
 #include <uhdm/UhdmLint.h>
 #include <uhdm/VpiListener.h>
 #include <uhdm/clone_tree.h>
+#include <uhdm/sv_vpi_user.h>
 #include <uhdm/uhdm.h>
+#include <uhdm/vpi_uhdm.h>
+#include <uhdm/vpi_user.h>
 #include <uhdm/vpi_visitor.h>
 
 namespace SURELOG {
diff --git a/src/DesignCompile/Uhdm_test.cpp b/src/DesignCompile/Uhdm_test.cpp
index ddedaff1ef..adb3b08282 100644
--- a/src/DesignCompile/Uhdm_test.cpp
+++ b/src/DesignCompile/Uhdm_test.cpp
@@ -26,6 +26,7 @@
 // UHDM
 #include <uhdm/design.h>
 #include <uhdm/uhdm.h>
+#include <uhdm/vpi_user.h>
 
 namespace SURELOG {
 
diff --git a/src/hellodesign.cpp b/src/hellodesign.cpp
index b16f9dd21f..5a0158b75a 100644
--- a/src/hellodesign.cpp
+++ b/src/hellodesign.cpp
@@ -39,6 +39,7 @@
 #include <uhdm/ElaboratorListener.h>
 #include <uhdm/VpiListener.h>
 #include <uhdm/uhdm.h>
+#include <uhdm/vpi_user.h>
 
 class DesignListener final : public UHDM::VpiListener {
   void enterModule_inst(const UHDM::module_inst *object,
diff --git a/src/hellouhdm.cpp b/src/hellouhdm.cpp
index 7fa61fa655..c4e89ec4db 100644
--- a/src/hellouhdm.cpp
+++ b/src/hellouhdm.cpp
@@ -38,6 +38,7 @@
 #include <uhdm/ElaboratorListener.h>
 #include <uhdm/VpiListener.h>
 #include <uhdm/uhdm.h>
+#include <uhdm/vpi_user.h>
 
 int main(int argc, const char** argv) {
   // Read command line, compile a design, use -parse argument
diff --git a/src/roundtrip.cpp b/src/roundtrip.cpp
index b13033d685..fc8c636568 100644
--- a/src/roundtrip.cpp
+++ b/src/roundtrip.cpp
@@ -27,7 +27,9 @@
 #include <uhdm/ElaboratorListener.h>
 #include <uhdm/UhdmListener.h>
 #include <uhdm/VpiListener.h>
+#include <uhdm/sv_vpi_user.h>
 #include <uhdm/uhdm.h>
+#include <uhdm/vpi_user.h>
 
 #include <algorithm>
 #include <cstdint>