diff --git a/CMakeLists.txt b/CMakeLists.txt
index b506fe7c..641c6fa6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -84,9 +84,6 @@ IF( EXIV2_ENABLE_COMMERCIAL )
     SET (EXIV2_ENABLE_NLS OFF)
 ENDIF()
 
-# binary as first, since it workarounds old VS solution compatibility problems
-INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/src/ ${CMAKE_SOURCE_DIR}/include/  ${CMAKE_SOURCE_DIR}/include/exiv2/)
-
 if( MSVC )
     # cmake_policy(SET CMP0008)
     ADD_DEFINITIONS(-DPSAPI_VERSION=1) # to be compatible with <= WinVista (#905)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bb28979e..aa890a4e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -246,6 +246,8 @@ IF ( UNIX )
 ENDIF()
 
 target_include_directories(exiv2lib PRIVATE ${CMAKE_SOURCE_DIR}/xmpsdk/include)
+# TODO : We should not include include/exiv2 but only include !!!
+target_include_directories(exiv2lib PUBLIC  ${CMAKE_SOURCE_DIR}/include/exiv2)
 
 if ( MSVC )
     if ( EXIV2_ENABLE_STATIC )