diff --git a/common/i2c/meson.build b/common/i2c/meson.build
index fd8a702..eb92b88 100644
--- a/common/i2c/meson.build
+++ b/common/i2c/meson.build
@@ -1,7 +1,11 @@
-libi2c_dev = static_library('i2c_dev', 'i2c.cpp', link_args: '-li2c')
-libi2c_inc = include_directories('.')
+libi2c_inc = include_directories('../include/i2c/')
+libi2c_dev = static_library(
+    'i2c_dev',
+    'i2c.cpp',
+    include_directories: libi2c_inc,
+    link_args: '-li2c',
+)
 libi2c_dep = declare_dependency(
-    common_include,
     link_with: libi2c_dev,
     include_directories: libi2c_inc,
     link_args: '-li2c',
diff --git a/common/meson.build b/common/meson.build
index 6887c38..1e29ae8 100644
--- a/common/meson.build
+++ b/common/meson.build
@@ -9,7 +9,6 @@
     'src/software.cpp',
     'src/software_update.cpp',
     'src/host_power.cpp',
-    'i2c/i2c.cpp',
-    include_directories: ['.', 'include/', 'include/i2c/', common_include],
+    include_directories: ['.', 'include/', common_include],
     dependencies: [pdi_dep, phosphor_logging_dep, sdbusplus_dep, libpldm_dep],
 )
diff --git a/i2c-vr/meson.build b/i2c-vr/meson.build
index 9a6a812..58ff477 100644
--- a/i2c-vr/meson.build
+++ b/i2c-vr/meson.build
@@ -9,17 +9,19 @@
     'i2cvr_software_manager.cpp',
     i2cvr_src,
     regulators_src,
-    include_directories: [common_include, i2cvr_include],
+    include_directories: [common_include, i2cvr_include, libi2c_inc],
     dependencies: [
         sdbusplus_dep,
         phosphor_logging_dep,
         pdi_dep,
         boost_dep,
         libpldm_dep,
+        libi2c_dep,
     ],
-    link_with: [software_common_lib, libpldmutil],
+    link_with: [software_common_lib, libpldmutil, libi2c_dev],
     install: true,
     install_dir: get_option('libexecdir') / 'phosphor-code-mgmt',
+    link_args: '-li2c',
 )
 
 systemd_system_unit_dir = dependency('systemd').get_variable(
diff --git a/meson.build b/meson.build
index 9c7c919..d785bb4 100644
--- a/meson.build
+++ b/meson.build
@@ -89,6 +89,7 @@
 endif
 
 if get_option('i2cvr-software-update').enabled()
+    subdir('common/i2c/')
     subdir('i2c-vr')
 endif