diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1b002b1b2..05bd33688 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -435,8 +435,6 @@ endforeach()
 ### include directories
 
 include_directories(
-    "accessor"
-    "geo_iterator"
     ${ECCODES_INCLUDE_DIRS}
     ${ECCODES_EXTRA_INCLUDE_DIRS}
     )
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a012d66e7..aa38b6ad3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,6 +8,12 @@
 # granted to it by virtue of its status as an intergovernmental organisation
 # nor does it submit to any jurisdiction.
 #
+
+include_directories(
+    "${CMAKE_CURRENT_SOURCE_DIR}/accessor"
+    "${CMAKE_CURRENT_SOURCE_DIR}/geo_iterator"
+    )
+
 list( APPEND eccodes_src_files
     accessor/grib_accessor.cc
     accessor/grib_accessors_list.cc