diff --git a/CMakeLists.txt b/CMakeLists.txt
index 17185468..d7637b31 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,6 +29,8 @@ option(
   "Enable substrait-cpp tests. This will enable all other build options automatically."
   ON)
 
+set(SUBSTRAIT_CPP_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)
+
 # Local files come first.
 include_directories(include)
 include_directories(src)
diff --git a/src/substrait/common/CMakeLists.txt b/src/substrait/common/CMakeLists.txt
index 70a1fc6a..8a10f222 100644
--- a/src/substrait/common/CMakeLists.txt
+++ b/src/substrait/common/CMakeLists.txt
@@ -19,10 +19,8 @@ add_dependencies(
   absl::status
   absl::statusor)
 target_include_directories(
-  substrait_io
-  INTERFACE
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../../include/substrait/common>
-    $<INSTALL_INTERFACE:include/substrait/common>)
+  substrait_io INTERFACE $<BUILD_INTERFACE:${SUBSTRAIT_CPP_INCLUDE_DIR}>
+                         $<INSTALL_INTERFACE:include>)
 target_link_libraries(substrait_io substrait_proto substrait_textplan_converter
                       substrait_textplan_loader absl::status absl::statusor)