diff --git a/vpd-manager/editor_impl.cpp b/vpd-manager/editor_impl.cpp
index 9ca68fc..23079f2 100644
--- a/vpd-manager/editor_impl.cpp
+++ b/vpd-manager/editor_impl.cpp
@@ -2,9 +2,9 @@
 
 #include "editor_impl.hpp"
 
+#include "ibm_vpd_utils.hpp"
 #include "ipz_parser.hpp"
 #include "parser_factory.hpp"
-#include "utils.hpp"
 
 #include "vpdecc/vpdecc.h"
 
diff --git a/vpd-manager/manager.cpp b/vpd-manager/manager.cpp
index 5344664..feb6115 100644
--- a/vpd-manager/manager.cpp
+++ b/vpd-manager/manager.cpp
@@ -3,9 +3,9 @@
 #include "manager.hpp"
 
 #include "editor_impl.hpp"
+#include "ibm_vpd_utils.hpp"
 #include "ipz_parser.hpp"
 #include "reader_impl.hpp"
-#include "utils.hpp"
 
 using namespace openpower::vpd::constants;
 using namespace openpower::vpd::inventory;
diff --git a/vpd-manager/meson.build b/vpd-manager/meson.build
index 56b139e..66e283f 100644
--- a/vpd-manager/meson.build
+++ b/vpd-manager/meson.build
@@ -11,7 +11,8 @@
                       'reader_impl.cpp',
                       '../impl.cpp',
                       '../vpd-parser/ipz_parser.cpp',
-                      '../utils.cpp',
+                      '../ibm_vpd_utils.cpp',
+                      '../common_utility.cpp',
                       '../vpdecc/vpdecc.c',
                       '../vpdecc/vpdecc_support.c',
                       '../vpd-parser//keyword_vpd_parser.cpp',
diff --git a/vpd-manager/reader_impl.cpp b/vpd-manager/reader_impl.cpp
index 4da02be..08eb32b 100644
--- a/vpd-manager/reader_impl.cpp
+++ b/vpd-manager/reader_impl.cpp
@@ -2,7 +2,7 @@
 
 #include "reader_impl.hpp"
 
-#include "utils.hpp"
+#include "ibm_vpd_utils.hpp"
 
 #include <algorithm>
 #include <com/ibm/VPD/error.hpp>