5 files changed, 4 insertions, 5 deletions
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
index f9bc5ea..e8b69e7 100644
--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
@@ -46,10 +46,10 @@ endif()
 set(PLUGINS_SOURCES
     sc_plugins.c
     sc_model.c
+    sys_util.c
     ietf/ietf_interface.c
     openconfig/openconfig_interfaces.c
     openconfig/openconfig_local_routing.c
-    openconfig/sys_util.c
 )
 
 # build the source code into shared library
diff --git a/src/plugins/openconfig/openconfig_interfaces.c b/src/plugins/openconfig/openconfig_interfaces.c
index 85339af..c72ad7f 100644
--- a/src/plugins/openconfig/openconfig_interfaces.c
+++ b/src/plugins/openconfig/openconfig_interfaces.c
@@ -18,7 +18,7 @@
 #include <string.h>
 
 #include "openconfig_interfaces.h"
-#include "sys_util.h"
+#include "../sys_util.h"
 
 #include "sc_vpp_comm.h"
 #include "sc_vpp_interface.h"
diff --git a/src/plugins/openconfig/openconfig_local_routing.c b/src/plugins/openconfig/openconfig_local_routing.c
index 39481e1..5c63eaa 100644
--- a/src/plugins/openconfig/openconfig_local_routing.c
+++ b/src/plugins/openconfig/openconfig_local_routing.c
@@ -19,7 +19,7 @@
 
 #include "openconfig_local_routing.h"
 
-#include "sys_util.h"
+#include "../sys_util.h"
 
 #include "sc_vpp_comm.h"
 #include "sc_vpp_interface.h"
diff --git a/src/plugins/openconfig/sys_util.c b/src/plugins/sys_util.c
index 1a0ee9b..7bd0937 100644
--- a/src/plugins/openconfig/sys_util.c
+++ b/src/plugins/sys_util.c
@@ -18,7 +18,7 @@
 #include "sc_vpp_comm.h"
 
 #include <string.h>
-#include <vppinfra/types.h>
+#include <sysrepo/plugins.h>
 
 char* xpath_find_first_key(const char *xpath, char *key, sr_xpath_ctx_t *state)
 {
diff --git a/src/plugins/openconfig/sys_util.h b/src/plugins/sys_util.h
index d525066..6c227c3 100644
--- a/src/plugins/openconfig/sys_util.h
+++ b/src/plugins/sys_util.h
@@ -19,7 +19,6 @@
 
 #include <sysrepo.h>
 #include <sysrepo/xpath.h>
-#include <sysrepo/plugins.h>
 
 #define XPATH_SIZE 2000