diff --git a/meson.build b/meson.build
index d5080b3..1a44195 100644
--- a/meson.build
+++ b/meson.build
@@ -47,22 +47,23 @@
                        'INVENTORY_JSON_SYM_LINK': '"'+get_option('INVENTORY_JSON_SYM_LINK')+'"',
                        'INVENTORY_JSON_2U': '"'+get_option('INVENTORY_JSON_2U')+'"',
                        'INVENTORY_JSON_4U': '"'+get_option('INVENTORY_JSON_4U')+'"',
-                       'INVENTORY_JSON_EVEREST': '"'+get_option('INVENTORY_JSON_EVEREST')+'"'
+                       'INVENTORY_JSON_EVEREST': '"'+get_option('INVENTORY_JSON_EVEREST')+'"',
+                       'DBUS_PROP_JSON': '"'+get_option('DBUS_PROP_JSON')+'"'
                        }
   )
 
+common_SOURCES =[
+'vpd-parser/parser_factory.cpp',
+                 'vpd-parser/memory_vpd_parser.cpp',
+                 'vpd-parser/keyword_vpd_parser.cpp',
+                 'vpd-parser/ipz_parser.cpp', 'impl.cpp', 'utils.cpp',
+                 'vpdecc/vpdecc.c', 'vpdecc/vpdecc_support.c'
+]
+
 if get_option('ibm-parser').enabled()
         libgpiodcxx = dependency('libgpiodcxx')
-        ibm_read_vpd_SOURCES = ['ibm_vpd_app.cpp',
-                                'vpd-parser/ipz_parser.cpp',
-                                'impl.cpp',
-                                'utils.cpp',
-                                'vpd-parser/keyword_vpd_parser.cpp',
-                                'vpdecc/vpdecc.c',
-                                'vpdecc/vpdecc_support.c',
-                                'vpd-parser/memory_vpd_parser.cpp',
-                                'vpd-parser/parser_factory.cpp'
-                               ]
+        ibm_read_vpd_SOURCES = ['ibm_vpd_app.cpp'
+                               ]+common_SOURCES
 
         ibm_vpd_exe = executable(
                                 'ibm-read-vpd',
@@ -78,8 +79,11 @@
                             )
 
         vpd_tool_SOURCES = ['vpd_tool.cpp',
-                            'vpd_tool_impl.cpp'
-                           ]
+                            'vpd_tool_impl.cpp',
+                            'vpd-manager/editor_impl.cpp',
+                           ]+common_SOURCES
+
+        vpd_tool_INCLUDE = include_directories('vpd-parser/', 'vpd-manager')
 
         vpd_tool_exe = executable(
                                  'vpd-tool',
@@ -87,7 +91,8 @@
                                  dependencies: [
                                    sdbusplus
                                    ],
-                                 install: true
+                                 install: true,
+                                 include_directories : vpd_tool_INCLUDE
                                  )
 if get_option('vpd-manager').enabled()
     subdir('vpd-manager')