diff --git a/.github/workflows/cpp-linter.yml b/.github/workflows/cpp-linter.yml
index b31e62592..adad283a6 100644
--- a/.github/workflows/cpp-linter.yml
+++ b/.github/workflows/cpp-linter.yml
@@ -53,6 +53,7 @@ jobs:
           thread-comments: true
           ignore: 'build|cmake_modules|ci'
           database: build
+          extra-args: '-I$PWD/src -I$PWD/build/src'
       - name: Fail fast?!
         if: steps.linter.outputs.checks-failed != 0
         run: |
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9b52e30d9..dd983a807 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,7 +47,6 @@ set(ICEBERG_INSTALL_BINDIR "${CMAKE_INSTALL_BINDIR}")
 set(ICEBERG_INSTALL_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}")
 set(ICEBERG_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake")
 set(ICEBERG_INSTALL_DOCDIR "share/doc/${PROJECT_NAME}")
-set(ICEBERG_INCLUDES "${PROJECT_BINARY_DIR}/src" "${PROJECT_SOURCE_DIR}/src")
 
 if(WIN32 AND NOT MINGW)
   set(MSVC_TOOLCHAIN TRUE)
diff --git a/src/iceberg/CMakeLists.txt b/src/iceberg/CMakeLists.txt
index 0c1475bbb..6ecea2116 100644
--- a/src/iceberg/CMakeLists.txt
+++ b/src/iceberg/CMakeLists.txt
@@ -15,6 +15,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
+set(ICEBERG_INCLUDES "$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/src>"
+                     "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>")
 set(ICEBERG_SOURCES
     arrow_c_data_internal.cc
     demo_table.cc
@@ -35,7 +37,7 @@ list(APPEND ICEBERG_SHARED_INSTALL_INTERFACE_LIBS "Iceberg::nanoarrow")
 add_iceberg_lib(iceberg
                 SOURCES
                 ${ICEBERG_SOURCES}
-                PRIVATE_INCLUDES
+                EXTRA_INCLUDES
                 ${ICEBERG_INCLUDES}
                 SHARED_LINK_LIBS
                 ${ICEBERG_SHARED_BUILD_INTERFACE_LIBS}
diff --git a/src/iceberg/arrow/CMakeLists.txt b/src/iceberg/arrow/CMakeLists.txt
index 792631d14..51d1811ba 100644
--- a/src/iceberg/arrow/CMakeLists.txt
+++ b/src/iceberg/arrow/CMakeLists.txt
@@ -20,7 +20,6 @@ if(NOT ICEBERG_ARROW)
 endif()
 
 set(ICEBERG_ARROW_SOURCES demo_arrow.cc)
-set(ICEBERG_ARROW_INCLUDES "${ICEBERG_INCLUDES}")
 
 # Libraries to link with exported libiceberg_arrow.{so,a}.
 set(ICEBERG_ARROW_STATIC_BUILD_INTERFACE_LIBS)
@@ -61,8 +60,6 @@ list(APPEND
 add_iceberg_lib(iceberg_arrow
                 SOURCES
                 ${ICEBERG_ARROW_SOURCES}
-                PRIVATE_INCLUDES
-                ${ICEBERG_ARROW_INCLUDES}
                 SHARED_LINK_LIBS
                 ${ICEBERG_ARROW_SHARED_BUILD_INTERFACE_LIBS}
                 STATIC_LINK_LIBS
diff --git a/src/iceberg/avro/CMakeLists.txt b/src/iceberg/avro/CMakeLists.txt
index 6a17eb500..315d39c2d 100644
--- a/src/iceberg/avro/CMakeLists.txt
+++ b/src/iceberg/avro/CMakeLists.txt
@@ -20,7 +20,6 @@ if(NOT ICEBERG_AVRO)
 endif()
 
 set(ICEBERG_AVRO_SOURCES demo_avro.cc)
-set(ICEBERG_AVRO_INCLUDES "${ICEBERG_INCLUDES}")
 
 # Libraries to link with exported libiceberg_avro.{so,a}.
 set(ICEBERG_AVRO_STATIC_BUILD_INTERFACE_LIBS)
@@ -65,8 +64,6 @@ list(APPEND
 add_iceberg_lib(iceberg_avro
                 SOURCES
                 ${ICEBERG_AVRO_SOURCES}
-                PRIVATE_INCLUDES
-                ${ICEBERG_AVRO_INCLUDES}
                 SHARED_LINK_LIBS
                 ${ICEBERG_AVRO_SHARED_BUILD_INTERFACE_LIBS}
                 STATIC_LINK_LIBS
diff --git a/src/iceberg/puffin/CMakeLists.txt b/src/iceberg/puffin/CMakeLists.txt
index 5acd6bef1..440ff8442 100644
--- a/src/iceberg/puffin/CMakeLists.txt
+++ b/src/iceberg/puffin/CMakeLists.txt
@@ -16,7 +16,6 @@
 # under the License.
 
 set(ICEBERG_PUFFIN_SOURCES demo_puffin.cc)
-set(ICEBERG_PUFFIN_INCLUDES "${ICEBERG_INCLUDES}")
 
 set(ICEBERG_PUFFIN_STATIC_BUILD_INTERFACE_LIBS)
 set(ICEBERG_PUFFIN_SHARED_BUILD_INTERFACE_LIBS)
@@ -39,8 +38,6 @@ list(APPEND
 add_iceberg_lib(iceberg_puffin
                 SOURCES
                 ${ICEBERG_PUFFIN_SOURCES}
-                PRIVATE_INCLUDES
-                ${ICEBERG_PUFFIN_INCLUDES}
                 SHARED_LINK_LIBS
                 ${ICEBERG_PUFFIN_SHARED_BUILD_INTERFACE_LIBS}
                 STATIC_LINK_LIBS
diff --git a/test/arrow/CMakeLists.txt b/test/arrow/CMakeLists.txt
index 0ef658643..043ecf4be 100644
--- a/test/arrow/CMakeLists.txt
+++ b/test/arrow/CMakeLists.txt
@@ -20,6 +20,5 @@ if(ICEBERG_ARROW)
   target_sources(arrow_unittest PRIVATE arrow_test.cc)
   target_link_libraries(arrow_unittest PRIVATE iceberg_arrow_static Arrow::arrow_static
                                                GTest::gtest_main)
-  target_include_directories(arrow_unittest PRIVATE "${ICEBERG_INCLUDES}")
   add_test(NAME arrow_unittest COMMAND arrow_unittest)
 endif()
diff --git a/test/avro/CMakeLists.txt b/test/avro/CMakeLists.txt
index 9cd1c0b8a..c32fbf8be 100644
--- a/test/avro/CMakeLists.txt
+++ b/test/avro/CMakeLists.txt
@@ -19,6 +19,5 @@ if(ICEBERG_AVRO)
   add_executable(avro_unittest)
   target_sources(avro_unittest PRIVATE avro_test.cc)
   target_link_libraries(avro_unittest PRIVATE iceberg_avro_static GTest::gtest_main)
-  target_include_directories(avro_unittest PRIVATE "${ICEBERG_INCLUDES}")
   add_test(NAME avro_unittest COMMAND avro_unittest)
 endif()
diff --git a/test/core/CMakeLists.txt b/test/core/CMakeLists.txt
index 6e82b9b40..3bed59baa 100644
--- a/test/core/CMakeLists.txt
+++ b/test/core/CMakeLists.txt
@@ -19,11 +19,9 @@ add_executable(core_unittest)
 target_sources(core_unittest PRIVATE core_unittest.cc schema_test.cc schema_field_test.cc
                                      type_test.cc)
 target_link_libraries(core_unittest PRIVATE iceberg_static GTest::gtest_main GTest::gmock)
-target_include_directories(core_unittest PRIVATE "${ICEBERG_INCLUDES}")
 add_test(NAME core_unittest COMMAND core_unittest)
 
 add_executable(expected_test)
 target_sources(expected_test PRIVATE expected_test.cc)
 target_link_libraries(expected_test PRIVATE iceberg_static GTest::gtest_main)
-target_include_directories(expected_test PRIVATE "${ICEBERG_INCLUDES}")
 add_test(NAME expected_test COMMAND expected_test)