diff --git a/CMakeLists.txt b/CMakeLists.txt
index e275491b5..16c470478 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -144,11 +144,11 @@ if(USE_CAIRO)
     list(APPEND MAPNIK_OPTIONAL_LIBS Cairo::Cairo)
 endif()
 
-add_library(mapnik-headers INTERFACE)
-add_library(mapnik::headers ALIAS mapnik-headers)
+add_library(headers INTERFACE)
+add_library(mapnik::headers ALIAS headers)
 
 # todo: mapbox includes need to included private.
-target_include_directories(mapnik-headers INTERFACE  
+target_include_directories(headers INTERFACE  
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>  
     $<INSTALL_INTERFACE:include>
     ${MAPBOX_GEOMETRY_INCLUDE_DIRS}
@@ -158,7 +158,7 @@ target_include_directories(mapnik-headers INTERFACE
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/deps>  
     $<INSTALL_INTERFACE:deps>
 )
-target_link_libraries(mapnik-headers INTERFACE 
+target_link_libraries(headers INTERFACE 
     Boost::boost
     Boost::regex
     Boost::filesystem
@@ -167,9 +167,9 @@ target_link_libraries(mapnik-headers INTERFACE
     harfbuzz::harfbuzz
     ${MAPNIK_OPTIONAL_LIBS}
 )
-target_compile_definitions(mapnik-headers INTERFACE ${MAPNIK_COMPILE_DEFS})
+target_compile_definitions(headers INTERFACE ${MAPNIK_COMPILE_DEFS})
 
-install(TARGETS mapnik-headers 
+install(TARGETS headers 
     EXPORT MapnikTargets
     LIBRARY DESTINATION lib
     ARCHIVE DESTINATION lib
@@ -208,3 +208,6 @@ install(EXPORT MapnikTargets
         NAMESPACE mapnik::
         DESTINATION lib/cmake/mapnik
 )
+
+install(DIRECTORY include/ DESTINATION include)
+install(DIRECTORY deps/agg/include/ DESTINATION include)
\ No newline at end of file
diff --git a/plugins/input/csv/CMakeLists.txt b/plugins/input/csv/CMakeLists.txt
index 6d3ffe272..4597cee15 100644
--- a/plugins/input/csv/CMakeLists.txt
+++ b/plugins/input/csv/CMakeLists.txt
@@ -22,10 +22,7 @@ set_target_properties(input-csv PROPERTIES SUFFIX ".input")
 #install(TARGETS input-csv DESTINATION bin/plugins/input)
 
 install(TARGETS input-csv 
-    EXPORT MapnikTargets
     LIBRARY DESTINATION lib/plugins/input
     ARCHIVE DESTINATION lib/plugins/input
     RUNTIME DESTINATION bin/plugins/input
-    INCLUDES DESTINATION .
-    PUBLIC_HEADER DESTINATION .
 )
\ No newline at end of file
diff --git a/plugins/input/gdal/CMakeLists.txt b/plugins/input/gdal/CMakeLists.txt
index 90758ec4e..4c2919cc1 100644
--- a/plugins/input/gdal/CMakeLists.txt
+++ b/plugins/input/gdal/CMakeLists.txt
@@ -20,10 +20,7 @@ set_target_properties(input-gdal PROPERTIES OUTPUT_NAME "gdal")
 set_target_properties(input-gdal PROPERTIES SUFFIX ".input")
 
 install(TARGETS input-gdal 
-    EXPORT MapnikTargets
     LIBRARY DESTINATION lib/plugins/input
     ARCHIVE DESTINATION lib/plugins/input
     RUNTIME DESTINATION bin/plugins/input
-    INCLUDES DESTINATION .
-    PUBLIC_HEADER DESTINATION .
 )
diff --git a/plugins/input/geobuf/CMakeLists.txt b/plugins/input/geobuf/CMakeLists.txt
index c325e6109..75bd7af2a 100644
--- a/plugins/input/geobuf/CMakeLists.txt
+++ b/plugins/input/geobuf/CMakeLists.txt
@@ -16,10 +16,7 @@ set_target_properties(input-geobuf PROPERTIES OUTPUT_NAME "geobuf")
 set_target_properties(input-geobuf PROPERTIES SUFFIX ".input")
 
 install(TARGETS input-geobuf 
-    EXPORT MapnikTargets
     LIBRARY DESTINATION lib/plugins/input
     ARCHIVE DESTINATION lib/plugins/input
     RUNTIME DESTINATION bin/plugins/input
-    INCLUDES DESTINATION .
-    PUBLIC_HEADER DESTINATION .
 )
diff --git a/plugins/input/geojson/CMakeLists.txt b/plugins/input/geojson/CMakeLists.txt
index 7243eb723..d8f945e0c 100644
--- a/plugins/input/geojson/CMakeLists.txt
+++ b/plugins/input/geojson/CMakeLists.txt
@@ -20,10 +20,7 @@ set_target_properties(input-geojson PROPERTIES OUTPUT_NAME "geojson")
 set_target_properties(input-geojson PROPERTIES SUFFIX ".input")
 
 install(TARGETS input-geojson 
-    EXPORT MapnikTargets
     LIBRARY DESTINATION lib/plugins/input
     ARCHIVE DESTINATION lib/plugins/input
     RUNTIME DESTINATION bin/plugins/input
-    INCLUDES DESTINATION .
-    PUBLIC_HEADER DESTINATION .
 )
diff --git a/plugins/input/ogr/CMakeLists.txt b/plugins/input/ogr/CMakeLists.txt
index 8311175fa..034311c7e 100644
--- a/plugins/input/ogr/CMakeLists.txt
+++ b/plugins/input/ogr/CMakeLists.txt
@@ -22,10 +22,7 @@ set_target_properties(input-ogr PROPERTIES OUTPUT_NAME "ogr")
 set_target_properties(input-ogr PROPERTIES SUFFIX ".input")
 
 install(TARGETS input-ogr 
-    EXPORT MapnikTargets
     LIBRARY DESTINATION lib/plugins/input
     ARCHIVE DESTINATION lib/plugins/input
     RUNTIME DESTINATION bin/plugins/input
-    INCLUDES DESTINATION .
-    PUBLIC_HEADER DESTINATION .
 )
diff --git a/plugins/input/pgraster/CMakeLists.txt b/plugins/input/pgraster/CMakeLists.txt
index 40b35fd6f..20ae20760 100644
--- a/plugins/input/pgraster/CMakeLists.txt
+++ b/plugins/input/pgraster/CMakeLists.txt
@@ -21,10 +21,7 @@ set_target_properties(input-pgraster PROPERTIES OUTPUT_NAME "pgraster")
 set_target_properties(input-pgraster PROPERTIES SUFFIX ".input")
 
 install(TARGETS input-pgraster 
-    EXPORT MapnikTargets
     LIBRARY DESTINATION lib/plugins/input
     ARCHIVE DESTINATION lib/plugins/input
     RUNTIME DESTINATION bin/plugins/input
-    INCLUDES DESTINATION .
-    PUBLIC_HEADER DESTINATION .
 )
diff --git a/plugins/input/postgis/CMakeLists.txt b/plugins/input/postgis/CMakeLists.txt
index 2c4cc37d7..3085e6246 100644
--- a/plugins/input/postgis/CMakeLists.txt
+++ b/plugins/input/postgis/CMakeLists.txt
@@ -20,10 +20,7 @@ set_target_properties(input-postgis PROPERTIES OUTPUT_NAME "postgis")
 set_target_properties(input-postgis PROPERTIES SUFFIX ".input")
 
 install(TARGETS input-postgis 
-    EXPORT MapnikTargets
     LIBRARY DESTINATION lib/plugins/input
     ARCHIVE DESTINATION lib/plugins/input
     RUNTIME DESTINATION bin/plugins/input
-    INCLUDES DESTINATION .
-    PUBLIC_HEADER DESTINATION .
 )
diff --git a/plugins/input/raster/CMakeLists.txt b/plugins/input/raster/CMakeLists.txt
index 22c5d203d..557668536 100644
--- a/plugins/input/raster/CMakeLists.txt
+++ b/plugins/input/raster/CMakeLists.txt
@@ -18,10 +18,7 @@ set_target_properties(input-raster PROPERTIES OUTPUT_NAME "raster")
 set_target_properties(input-raster PROPERTIES SUFFIX ".input")
 
 install(TARGETS input-raster 
-    EXPORT MapnikTargets
     LIBRARY DESTINATION lib/plugins/input
     ARCHIVE DESTINATION lib/plugins/input
     RUNTIME DESTINATION bin/plugins/input
-    INCLUDES DESTINATION .
-    PUBLIC_HEADER DESTINATION .
 )
diff --git a/plugins/input/shape/CMakeLists.txt b/plugins/input/shape/CMakeLists.txt
index 8b73af6c8..64beadd57 100644
--- a/plugins/input/shape/CMakeLists.txt
+++ b/plugins/input/shape/CMakeLists.txt
@@ -21,10 +21,7 @@ set_target_properties(input-shape PROPERTIES OUTPUT_NAME "shape")
 set_target_properties(input-shape PROPERTIES SUFFIX ".input")
 
 install(TARGETS input-shape 
-    EXPORT MapnikTargets
     LIBRARY DESTINATION lib/plugins/input
     ARCHIVE DESTINATION lib/plugins/input
     RUNTIME DESTINATION bin/plugins/input
-    INCLUDES DESTINATION .
-    PUBLIC_HEADER DESTINATION .
 )
diff --git a/plugins/input/sqlite/CMakeLists.txt b/plugins/input/sqlite/CMakeLists.txt
index a4913fc7c..8b4a57cff 100644
--- a/plugins/input/sqlite/CMakeLists.txt
+++ b/plugins/input/sqlite/CMakeLists.txt
@@ -19,11 +19,8 @@ set_target_properties(input-sqlite PROPERTIES PREFIX "")
 set_target_properties(input-sqlite PROPERTIES OUTPUT_NAME "sqlite")
 set_target_properties(input-sqlite PROPERTIES SUFFIX ".input")
 
-install(TARGETS input-sqlite 
-    EXPORT MapnikTargets
+install(TARGETS input-sqlite
     LIBRARY DESTINATION lib/plugins/input
     ARCHIVE DESTINATION lib/plugins/input
     RUNTIME DESTINATION bin/plugins/input
-    INCLUDES DESTINATION .
-    PUBLIC_HEADER DESTINATION .
 )
diff --git a/plugins/input/topojson/CMakeLists.txt b/plugins/input/topojson/CMakeLists.txt
index 93dc4968e..f727a5e19 100644
--- a/plugins/input/topojson/CMakeLists.txt
+++ b/plugins/input/topojson/CMakeLists.txt
@@ -18,10 +18,7 @@ set_target_properties(input-topojson PROPERTIES OUTPUT_NAME "topojson")
 set_target_properties(input-topojson PROPERTIES SUFFIX ".input")
 
 install(TARGETS input-topojson 
-    EXPORT MapnikTargets
     LIBRARY DESTINATION lib/plugins/input
     ARCHIVE DESTINATION lib/plugins/input
     RUNTIME DESTINATION bin/plugins/input
-    INCLUDES DESTINATION .
-    PUBLIC_HEADER DESTINATION .
 )