diff --git a/meson.build b/meson.build
index 170655d..ae2b8ad 100644
--- a/meson.build
+++ b/meson.build
@@ -117,9 +117,12 @@
 
 if get_option('ibm-parser').enabled()
         libgpiodcxx = dependency('libgpiodcxx')
-        ibm_read_vpd_SOURCES = ['ibm_vpd_app.cpp'
+        ibm_read_vpd_SOURCES = ['ibm_vpd_app.cpp',
+                                'vpd-manager/editor_impl.cpp',
                                ]+common_SOURCES
 
+        vpd_tool_INCLUDE = include_directories('vpd-parser/', 'vpd-manager')
+
         ibm_vpd_exe = executable(
                                 'ibm-read-vpd',
                                 ibm_read_vpd_SOURCES,
@@ -129,7 +132,7 @@
                                         libgpiodcxx,
                                 ],
                                 link_with : libvpdecc,
-                                include_directories : 'vpd-parser/',
+                                include_directories : vpd_tool_INCLUDE,
                                 install: true,
                                 cpp_args : '-DIPZ_PARSER'
                             )
@@ -139,7 +142,6 @@
                             'vpd-manager/editor_impl.cpp',
                            ]+common_SOURCES
 
-        vpd_tool_INCLUDE = include_directories('vpd-parser/', 'vpd-manager')
 
         vpd_tool_exe = executable(
                                  'vpd-tool',