diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 0be205470fea..1e16b2af6014 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1384,6 +1384,10 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
 ))
 
 define gb_LinkTarget__use_cdr
+$(call gb_LinkTarget_set_include,$(1),\
+	-I$(call gb_UnpackedTarball_get_dir,libcdr)/inc \
+	$$(INCLUDE) \
+)
 $(call gb_LinkTarget_use_package,$(1),\
 	libcdr \
 )
diff --git a/libcdr/ExternalPackage_libcdr.mk b/libcdr/ExternalPackage_libcdr.mk
index d612a7766a0d..908ce60522c5 100644
--- a/libcdr/ExternalPackage_libcdr.mk
+++ b/libcdr/ExternalPackage_libcdr.mk
@@ -9,13 +9,6 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,libcdr,libcdr))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,libcdr,inc/external/libcdr,\
-	inc/libcdr/libcdr.h \
-	inc/libcdr/CDRDocument.h \
-	inc/libcdr/CDRStringVector.h \
-	inc/libcdr/CMXDocument.h \
-))
-
 $(eval $(call gb_ExternalPackage_use_external_project,libcdr,libcdr))
 
 ifeq ($(COM),MSC)