diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6e73895551e..91c31f629b8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -363,7 +363,6 @@ if(WITH_PNG)
   find_package(PNG)
   if(PNG_FOUND)
     set(HAVE_PNG ON)
-    include_directories(SYSTEM "${PNG_INCLUDE_DIR}")
   endif()
 endif()
 
diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
index 670f2d8fac1..219d64c8bf8 100644
--- a/apps/CMakeLists.txt
+++ b/apps/CMakeLists.txt
@@ -117,8 +117,8 @@ if(VTK_FOUND)
     target_link_libraries(pcl_openni_octree_compression pcl_common pcl_io pcl_filters pcl_visualization pcl_octree)
 
     if(HAVE_PNG)
-    PCL_ADD_EXECUTABLE(pcl_openni_organized_compression COMPONENT ${SUBSYS_NAME} SOURCES src/openni_organized_compression.cpp BUNDLE)
-    target_link_libraries(pcl_openni_organized_compression pcl_common pcl_io pcl_filters pcl_visualization pcl_octree)
+      PCL_ADD_EXECUTABLE(pcl_openni_organized_compression COMPONENT ${SUBSYS_NAME} SOURCES src/openni_organized_compression.cpp BUNDLE)
+      target_link_libraries(pcl_openni_organized_compression pcl_common pcl_io pcl_filters pcl_visualization pcl_octree)
     endif()
 
     PCL_ADD_EXECUTABLE(pcl_openni_shift_to_depth_conversion COMPONENT ${SUBSYS_NAME} SOURCES src/openni_shift_to_depth_conversion.cpp BUNDLE)
diff --git a/io/CMakeLists.txt b/io/CMakeLists.txt
index be9e2f4bb74..1b978a9484b 100644
--- a/io/CMakeLists.txt
+++ b/io/CMakeLists.txt
@@ -374,6 +374,7 @@ if(VTK_FOUND)
 endif()
 
 if(PNG_FOUND)
+  target_include_directories("${LIB_NAME}" SYSTEM PRIVATE ${PNG_INCLUDE_DIRS})
   target_link_libraries("${LIB_NAME}" ${PNG_LIBRARIES})
 endif()