diff --git a/CMakeLists.txt b/CMakeLists.txt
index 596b699..52df803 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -141,7 +141,7 @@ IF(DEFINED CMAKE_BUILD_TYPE AND CMAKE_VERSION VERSION_GREATER "2.8")
 ENDIF()
 SET( CMAKE_CXX_FLAGS "" )
 
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} )
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} )
 
 ######################################################################################
 # Configure targets
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index e8d1bb0..ab80be4 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -75,6 +75,12 @@ TARGET_LINK_LIBRARIES( ${PROJECT_LIBRARY}
     ${OpenCV_LIBRARIES}
 )
 
+TARGET_INCLUDE_DIRECTORIES(${PROJECT_LIBRARY}
+    PUBLIC
+        $<INSTALL_INTERFACE:include>
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
+)
+
 SET_TARGET_PROPERTIES( ${PROJECT_LIBRARY}
    PROPERTIES VERSION ${CALYP_VERSION}
    SOVERSION ${CALYP_VERSION_MAJOR}
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 9580596..c95a7c1 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -2,11 +2,10 @@
 ### CMakeLists for calyp tools component
 ###
 
-# This is hard way - please fix
 INCLUDE_DIRECTORIES(
-  ${CMAKE_CURRENT_BINARY_DIR}/../
+  ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_CURRENT_SOURCE_DIR}/../ )
+)
 
 set(Calyp_Tools_SRCS
   main.cpp