diff --git a/cmake/findDependencies.cmake b/cmake/findDependencies.cmake
index 64a22569..53201bc5 100644
--- a/cmake/findDependencies.cmake
+++ b/cmake/findDependencies.cmake
@@ -12,7 +12,6 @@ find_package(Threads REQUIRED)
 
 if( EXIV2_ENABLE_PNG )
     find_package( ZLIB REQUIRED )
-    include_directories( ${ZLIB_INCLUDE_DIR} )
 endif( )
 
 if( EXIV2_ENABLE_WEBREADY )
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 491f2c3c..5cda46a7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -224,6 +224,9 @@ if ( UNIX AND CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" )
     set (FREEBSD 1)
 endif()
 
+target_include_directories(exiv2lib_int PRIVATE ${ZLIB_INCLUDE_DIR})
+target_include_directories(exiv2lib PRIVATE ${ZLIB_INCLUDE_DIR})
+
 if (EXIV2_ENABLE_XMP)
     #target_include_directories(exiv2lib PRIVATE ${CMAKE_SOURCE_DIR}/xmpsdk/include)
     target_link_libraries(exiv2lib PUBLIC xmp)