diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6f5ea25..cec7b85 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,12 +54,14 @@ target_compile_options(${PROJECT_NAME} PRIVATE ${COMPILE_OPTIONS})
 
 set_property(TARGET ${PROJECT_NAME} PROPERTY VERSION ${version})
 set_property(TARGET ${PROJECT_NAME} PROPERTY SOVERSION 1)
+set_property(TARGET ${PROJECT_NAME} PROPERTY EXPORT_NAME ${PROJECT_NAME})
 set_property(TARGET ${PROJECT_NAME} PROPERTY
   INTERFACE_${PROJECT_NAME}_MAJOR_VERSION 1)
 set_property(TARGET ${PROJECT_NAME} APPEND PROPERTY
   COMPATIBLE_INTERFACE_STRING ${PROJECT_NAME}_MAJOR_VERSION
 )
 
+
 add_subdirectory(src)
 if (BUILD_DOC)
   find_package(Doxygen)
@@ -74,13 +76,20 @@ if (BUILD_TESTS)
   add_subdirectory(test)
 endif ()
 
-target_include_directories(${PROJECT_NAME} PUBLIC "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_LOW}>")
+target_include_directories(
+  ${PROJECT_NAME}
+  PUBLIC
+  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_LOW}>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
+)
 target_include_directories(${PROJECT_NAME} PRIVATE ${Qt${QT_VERSION_MAJOR}_INCLUDE_DIRS})
 target_include_directories(${PROJECT_NAME} PRIVATE ${Qt${QT_VERSION_MAJOR}Core_INCLUDE_DIRS})
 
-target_link_libraries(${PROJECT_NAME} PRIVATE
-                      Qt${QT_VERSION_MAJOR}::Core
-                      lmdb
+target_link_libraries(
+  ${PROJECT_NAME}
+  PRIVATE
+  Qt${QT_VERSION_MAJOR}::Core
+  lmdb
 )
 
 configure_package_config_file(
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2da5cd8..956e6b0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -19,7 +19,6 @@ set(HEADERS
 )
 
 target_sources(${PROJECT_NAME} PRIVATE ${SOURCES})
-target_include_directories(${PROJECT_NAME} PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>")
 
 add_subdirectory(serializer)
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index e9c7476..93d54e3 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -14,7 +14,6 @@ add_executable(runUnitTests
 
 target_compile_options(runUnitTests PRIVATE -fPIC -Wall -Wextra -O0)
 
-target_include_directories(runUnitTests PRIVATE ${CMAKE_SOURCE_DIR}/src)
 target_include_directories(runUnitTests PRIVATE ${Qt${QT_VERSION_MAJOR}_INCLUDE_DIRS})
 target_include_directories(runUnitTests PRIVATE ${Qt${QT_VERSION_MAJOR}Core_INCLUDE_DIRS})