diff --git a/CMakeLists.txt b/CMakeLists.txt
index f0f1d21..8db81b1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -342,11 +342,3 @@ INSTALL(
     DESTINATION CMake
     COMPONENT dev
 )
-
-# Install all headers in include/
-INSTALL(
-    DIRECTORY ${CMAKE_SOURCE_DIR}/include/
-    DESTINATION include
-    COMPONENT Headers
-    FILES_MATCHING PATTERN "*.h*"
-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bc892a0..da877f8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -223,3 +223,14 @@ INSTALL(
     ARCHIVE DESTINATION lib
     COMPONENT dev
 )
+
+MACRO(INSTALL_HEADERS_WITH_DIRECTORY HEADER_LIST)
+    FOREACH(HEADER ${HEADERS})
+        # Extract directory name and remove leading '../'
+        get_filename_component(DIR ${HEADER} PATH)
+        STRING(REGEX REPLACE "^\\.\\.\\/" "" DIR ${DIR})
+        INSTALL(FILES ${HEADER} DESTINATION ${DIR})
+    ENDFOREACH(HEADER)
+ENDMACRO()
+
+INSTALL_HEADERS_WITH_DIRECTORY(${HEADERS})
\ No newline at end of file