diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6a9074062fd796baef2c4e4dbec23787713b19cb..94e956e20d123934f1b566ea28e41c1b51194e55 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -131,13 +131,15 @@ install(FILES
     DESTINATION "${FGGL_CONFIG_PATH}"
 )
 # generate the export targets for the build tree
+install(TARGETS ${PROJECT_NAME}
+		EXPORT fgglTargets
+		DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+		PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}
+		INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+)
+
 export(EXPORT "${PROJECT_NAME}Targets"
     FILE "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Targets.cmake"
     NAMESPACE ${namespace}::
 )
 
-install(TARGETS ${PROJECT_NAME}
-  DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-  PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}
-  INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-)
diff --git a/vendor/imgui/CMakeLists.txt b/vendor/imgui/CMakeLists.txt
index ce27d619ada859d3a43088f2c7de00a5f39e844f..a52e4d754e12f6fffe6054c719f6ba0a7c6a3243 100644
--- a/vendor/imgui/CMakeLists.txt
+++ b/vendor/imgui/CMakeLists.txt
@@ -11,6 +11,7 @@ set( IMGUI_SOURCES
 
 add_library(imgui STATIC ${IMGUI_SOURCES} )
 set_property(TARGET imgui PROPERTY POSITION_INDEPENDENT_CODE ON)
+set_target_properties(imgui PROPERTIES PUBLIC_HEADER include/* )
 
 target_include_directories( imgui
 	PUBLIC
@@ -19,14 +20,9 @@ target_include_directories( imgui
 )
 
 install(
-		FILES
-			include/imconfig.h
-			include/imgui.h
-			include/imgui_internal.h
-			include/imstb_rectpack.h
-			include/imstb_textedit.h
-			include/imstb_truetype.h
+		TARGETS imgui
+		EXPORT fgglTargets
+		PUBLIC_HEADER
 		DESTINATION
 			${CMAKE_INSTALL_INCLUDEDIR}/fggl/imgui
-)
-install( TARGETS imgui EXPORT fgglTargets )
\ No newline at end of file
+)
\ No newline at end of file