LinkTarget.mk: remove gb_LinkTarget_add_package_headers

animations/Library_animcore.mk

@@ -28,7 +28,7 @@
 
 $(eval $(call gb_Library_Library,animcore))
 
-$(eval $(call gb_Library_add_package_headers,animcore,animations_inc))
+$(eval $(call gb_Library_use_package,animcore,animations_inc))
 
 $(eval $(call gb_Library_set_componentfile,animcore,animations/source/animcore/animcore))
 

apple_remote/Library_AppleRemote.mk

@@ -29,7 +29,7 @@
 
 $(eval $(call gb_Library_Library,AppleRemote))
 
-$(eval $(call gb_Library_add_package_headers,AppleRemote,\
+$(eval $(call gb_Library_use_package,AppleRemote,\
     apple_remote_inc \
 ))
 

avmedia/Library_avmedia.mk

@@ -28,7 +28,7 @@
 
 $(eval $(call gb_Library_Library,avmedia))
 
-$(eval $(call gb_Library_add_package_headers,avmedia,avmedia_inc))
+$(eval $(call gb_Library_use_package,avmedia,avmedia_inc))
 
 $(eval $(call gb_Library_set_componentfile,avmedia,avmedia/util/avmedia))
 

basebmp/Library_basebmp.mk

@@ -28,7 +28,7 @@
 
 $(eval $(call gb_Library_Library,basebmp))
 
-$(eval $(call gb_Library_add_package_headers,basebmp,basebmp_inc))
+$(eval $(call gb_Library_use_package,basebmp,basebmp_inc))
 
 $(eval $(call gb_Library_set_include,basebmp,\
 	-I$(SRCDIR)/basebmp/inc/ \

basegfx/Library_basegfx.mk

@@ -28,7 +28,7 @@
 
 $(eval $(call gb_Library_Library,basegfx))
 
-$(eval $(call gb_Library_add_package_headers,basegfx,basegfx_inc))
+$(eval $(call gb_Library_use_package,basegfx,basegfx_inc))
 
 $(eval $(call gb_Library_set_include,basegfx,\
 	-I$(SRCDIR)/basegfx/inc \

basegfx/StaticLibrary_basegfx_s.mk

@@ -28,7 +28,7 @@
 
 $(eval $(call gb_StaticLibrary_StaticLibrary,basegfx_s))
 
-$(eval $(call gb_StaticLibrary_add_package_headers,basegfx_s,basegfx_inc))
+$(eval $(call gb_StaticLibrary_use_package,basegfx_s,basegfx_inc))
 
 $(eval $(call gb_StaticLibrary_set_include,basegfx_s,\
 	-I$(SRCDIR)/basegfx/inc \

basic/Library_sb.mk

@@ -28,7 +28,7 @@
 
 $(eval $(call gb_Library_Library,sb))
 
-$(eval $(call gb_Library_add_package_headers,sb,basic_inc))
+$(eval $(call gb_Library_use_package,sb,basic_inc))
 
 $(eval $(call gb_Library_set_componentfile,sb,basic/util/sb))
 

canvas/Library_canvastools.mk

@@ -28,7 +28,7 @@
 
 $(eval $(call gb_Library_Library,canvastools))
 
-$(eval $(call gb_Library_add_package_headers,canvastools,canvas_inc))
+$(eval $(call gb_Library_use_package,canvastools,canvas_inc))
 
 $(eval $(call gb_Library_set_include,canvastools,\
 	$$(INCLUDE) \

clucene/Library_clucene.mk

@@ -29,7 +29,7 @@ $(eval $(call gb_Library_Library,clucene))
 
 $(eval $(call gb_Library_use_external,clucene,zlib))
 
-$(eval $(call gb_Library_add_package_headers,clucene,clucene_source))
+$(eval $(call gb_Library_use_package,clucene,clucene_source))
 
 $(eval $(call gb_Library_set_warnings_not_errors,clucene))
 

comphelper/Library_comphelp.mk

@@ -28,7 +28,7 @@
 
 $(eval $(call gb_Library_Library,comphelper))
 
-$(eval $(call gb_Library_add_package_headers,comphelper,comphelper_inc))
+$(eval $(call gb_Library_use_package,comphelper,comphelper_inc))
 
 $(eval $(call gb_Library_set_componentfile,comphelper,comphelper/util/comphelp))
 

cppcanvas/Library_cppcanvas.mk

@@ -28,7 +28,7 @@
 
 $(eval $(call gb_Library_Library,cppcanvas))
 
-$(eval $(call gb_Library_add_package_headers,cppcanvas,cppcanvas_inc))
+$(eval $(call gb_Library_use_package,cppcanvas,cppcanvas_inc))
 
 $(eval $(call gb_Library_set_include,cppcanvas,\
 	-I$(SRCDIR)/cppcanvas/inc \

cppu/Library_cppu.mk

@@ -30,7 +30,7 @@ $(eval $(call gb_Library_Library,cppu))
 $(eval $(call gb_Library_set_soversion_script,cppu,3,$(SRCDIR)/cppu/util/cppu.map))
 
 # Unit tests depend on cppu_generated custom target
-$(eval $(call gb_Library_add_package_headers,cppu,cppu_generated))
+$(eval $(call gb_Library_use_package,cppu,cppu_generated))
 
 $(eval $(call gb_Library_set_include,cppu,\
 	$$(INCLUDE) \

cppuhelper/Library_cppuhelper.mk

@@ -29,8 +29,10 @@ $(eval $(call gb_Library_Library,cppuhelper))
 
 $(eval $(call gb_Library_set_soversion_script,cppuhelper,3,$(SRCDIR)/cppuhelper/source/gcc3.map))
 
-$(eval $(call gb_Library_add_package_headers,cppuhelper,cppuhelper_generated))
-$(eval $(call gb_Library_add_package_headers,cppuhelper,cppuhelper_inc))
+$(eval $(call gb_Library_use_packages,cppuhelper,\
+	cppuhelper_generated \
+	cppuhelper_inc \
+))
 
 $(eval $(call gb_Library_set_include,cppuhelper,\
 	-I$(WORKDIR)/CustomTarget/cppuhelper/unotypes \

dbaccess/Library_dba.mk

@@ -27,7 +27,7 @@
 
 $(eval $(call gb_Library_Library,dba))
 
-$(eval $(call gb_Library_add_package_headers,dba,\
+$(eval $(call gb_Library_use_package,dba,\
 	dbaccess_inc \
 ))
 

dbaccess/Library_dbmm.mk

@@ -27,7 +27,7 @@
 
 $(eval $(call gb_Library_Library,dbmm))
 
-$(eval $(call gb_Library_add_package_headers,dbmm,\
+$(eval $(call gb_Library_use_package,dbmm,\
 	dbaccess_inc \
 ))
 

dbaccess/Library_sdbt.mk

@@ -27,7 +27,7 @@
 
 $(eval $(call gb_Library_Library,sdbt))
 
-$(eval $(call gb_Library_add_package_headers,sdbt,\
+$(eval $(call gb_Library_use_package,sdbt,\
 	dbaccess_inc \
 ))
 

drawinglayer/Library_drawinglayer.mk

@@ -27,7 +27,7 @@
 
 $(eval $(call gb_Library_Library,drawinglayer))
 
-$(eval $(call gb_Library_add_package_headers,drawinglayer,drawinglayer_inc))
+$(eval $(call gb_Library_use_package,drawinglayer,drawinglayer_inc))
 
 $(eval $(call gb_Library_set_include,drawinglayer,\
     $$(INCLUDE) \

editeng/Library_editeng.mk

@@ -28,7 +28,7 @@
 
 $(eval $(call gb_Library_Library,editeng))
 
-$(eval $(call gb_Library_add_package_headers,editeng,editeng_inc))
+$(eval $(call gb_Library_use_package,editeng,editeng_inc))
 
 $(eval $(call gb_Library_set_include,editeng,\
     $$(INCLUDE) \

filter/Library_msfilter.mk

@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Library_Library,msfilter))
 
-$(eval $(call gb_Library_add_package_headers,msfilter,filter_inc))
+$(eval $(call gb_Library_use_package,msfilter,filter_inc))
 
 $(eval $(call gb_Library_set_componentfile,msfilter,filter/source/msfilter/msfilter))
 

formula/Library_for.mk

@@ -27,7 +27,7 @@
 
 $(eval $(call gb_Library_Library,for))
 
-$(eval $(call gb_Library_add_package_headers,for,\
+$(eval $(call gb_Library_use_package,for,\
 	formula_inc \
 ))
 

framework/Library_fwi.mk

@@ -28,7 +28,7 @@
 
 $(eval $(call gb_Library_Library,fwi))
 
-$(eval $(call gb_Library_add_package_headers,fwi,framework_inc))
+$(eval $(call gb_Library_use_package,fwi,framework_inc))
 
 $(eval $(call gb_Library_add_defs,fwi,\
     -DFWI_DLLIMPLEMENTATION \

i18npool/Library_i18nisolang1.mk

@@ -28,7 +28,7 @@
 
 $(eval $(call gb_Library_Library,i18nisolang1))
 
-$(eval $(call gb_Library_add_package_headers,i18nisolang1,i18npool_inc))
+$(eval $(call gb_Library_use_package,i18nisolang1,i18npool_inc))
 
 $(eval $(call gb_Library_set_include,i18nisolang1,\
 	$$(INCLUDE) \

i18npool/Library_i18nsearch.mk

@@ -28,7 +28,7 @@
 
 $(eval $(call gb_Library_Library,i18nsearch))
 
-$(eval $(call gb_Library_add_package_headers,i18nsearch,i18npool_inc))
+$(eval $(call gb_Library_use_package,i18nsearch,i18npool_inc))
 
 $(eval $(call gb_Library_set_componentfile,i18nsearch,i18npool/source/search/i18nsearch))
 

i18nutil/Library_i18nutil.mk

@@ -27,7 +27,7 @@
 
 $(eval $(call gb_Library_Library,i18nutil))
 
-$(eval $(call gb_Library_add_package_headers,i18nutil,i18nutil_inc))
+$(eval $(call gb_Library_use_package,i18nutil,i18nutil_inc))
 
 $(eval $(call gb_Library_use_api,i18nutil,\
 	udkapi \

javaunohelper/Library_juh.mk

@@ -27,7 +27,7 @@
 
 $(eval $(call gb_Library_Library,juh))
 
-$(eval $(call gb_Library_add_package_headers,juh,\
+$(eval $(call gb_Library_use_package,juh,\
     javaunohelper_cppumaker \
 ))
 

javaunohelper/Library_juhx.mk

@@ -27,7 +27,7 @@
 
 $(eval $(call gb_Library_Library,juhx))
 
-$(eval $(call gb_Library_add_package_headers,juhx,\
+$(eval $(call gb_Library_use_package,juhx,\
     javaunohelper_cppumaker \
 ))
 

jvmaccess/Library_jvmaccess.mk

@@ -29,7 +29,7 @@ $(eval $(call gb_Library_Library,jvmaccess))
 
 $(eval $(call gb_Library_set_soversion_script,jvmaccess,3,$(SRCDIR)/jvmaccess/util/gcc3.map))
 
-$(eval $(call gb_Library_add_package_headers,jvmaccess,\
+$(eval $(call gb_Library_use_package,jvmaccess,\
     jvmaccess_inc \
 ))
 

jvmfwk/Library_jvmfwk.mk

@@ -29,7 +29,7 @@ $(eval $(call gb_Library_Library,jvmfwk))
 
 $(eval $(call gb_Library_set_soversion_script,jvmfwk,3,$(SRCDIR)/jvmfwk/source/framework.map))
 
-$(eval $(call gb_Library_add_package_headers,jvmfwk,\
+$(eval $(call gb_Library_use_package,jvmfwk,\
     jvmfwk_inc \
 ))
 

linguistic/Library_lng.mk

@@ -28,7 +28,7 @@
 
 $(eval $(call gb_Library_Library,lng))
 
-$(eval $(call gb_Library_add_package_headers,lng,linguistic_inc))
+$(eval $(call gb_Library_use_package,lng,linguistic_inc))
 
 $(eval $(call gb_Library_set_componentfile,lng,linguistic/source/lng))
 

np_sdk/StaticLibrary_nputils.mk

@@ -27,7 +27,7 @@
 
 $(eval $(call gb_StaticLibrary_StaticLibrary,nputils))
 
-$(eval $(call gb_StaticLibrary_add_package_headers,nputils,np_sdk_inc))
+$(eval $(call gb_StaticLibrary_use_package,nputils,np_sdk_inc))
 
 $(eval $(call gb_StaticLibrary_use_externals,nputils,\
 	mozilla_headers \

o3tl/CppunitTest_o3tl_tests.mk

@@ -28,7 +28,7 @@
 
 $(eval $(call gb_CppunitTest_CppunitTest,o3tl_tests))
 
-$(eval $(call gb_CppunitTest_add_package_headers,o3tl_tests,o3tl_inc))
+$(eval $(call gb_CppunitTest_use_package,o3tl_tests,o3tl_inc))
 
 $(eval $(call gb_CppunitTest_use_libraries,o3tl_tests,\
 	sal \

officecfg/CppunitTest_officecfg_cppheader_test.mk

@@ -41,6 +41,6 @@ $(eval $(call gb_CppunitTest_use_api,officecfg_cppheader_test, \
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_add_package_headers,officecfg_cppheader_test,officecfg_cppheader))
+$(eval $(call gb_CppunitTest_use_package,officecfg_cppheader_test,officecfg_cppheader))
 
 ## vim: set noet sw=4 ts=4:

oox/Library_oox.mk

@@ -27,7 +27,7 @@
 
 $(eval $(call gb_Library_Library,oox))
 
-$(eval $(call gb_Library_add_package_headers,oox,\
+$(eval $(call gb_Library_use_packages,oox,\
     oox_inc \
     oox_generated \
     oox_source \

package/Library_package2.mk

@@ -28,7 +28,7 @@
 
 $(eval $(call gb_Library_Library,package2))
 
-$(eval $(call gb_Library_add_package_headers,package2,package_inc))
+$(eval $(call gb_Library_use_package,package2,package_inc))
 
 $(eval $(call gb_Library_set_componentfile,package2,package/util/package2))
 

regexp/Library_regexp.mk

@@ -28,7 +28,7 @@
 
 $(eval $(call gb_Library_Library,i18nregexp))
 
-$(eval $(call gb_Library_add_package_headers,i18nregexp,regexp_inc))
+$(eval $(call gb_Library_use_package,i18nregexp,regexp_inc))
 
 $(eval $(call gb_Library_use_api,i18nregexp,\
     offapi \

sal/Library_sal.mk

@@ -29,8 +29,10 @@ $(eval $(call gb_Library_Library,sal))
 
 $(eval $(call gb_Library_set_soversion_script,sal,3,$(SRCDIR)/sal/util/sal.map))
 
-$(eval $(call gb_Library_add_package_headers,sal,sal_generated))
-$(eval $(call gb_Library_add_package_headers,sal,sal_inc))
+$(eval $(call gb_Library_use_packages,sal,\
+	sal_generated \
+	sal_inc \
+))
 
 $(eval $(call gb_Library_set_include,sal,\
 	$$(INCLUDE) \

sal/StaticLibrary_salcpprt.mk

@@ -27,7 +27,7 @@
 
 $(eval $(call gb_StaticLibrary_StaticLibrary,salcpprt))
 
-$(eval $(call gb_StaticLibrary_add_package_headers,salcpprt,\
+$(eval $(call gb_StaticLibrary_use_packages,salcpprt,\
 	sal_generated \
 	sal_inc \
 ))

salhelper/Library_salhelper.mk

@@ -27,7 +27,7 @@
 
 $(eval $(call gb_Library_Library,salhelper))
 
-$(eval $(call gb_Library_add_package_headers,salhelper,salhelper_inc))
+$(eval $(call gb_Library_use_package,salhelper,salhelper_inc))
 
 $(eval $(call gb_Library_add_defs,salhelper,\
 	-DSALHELPER_DLLIMPLEMENTATION \

sax/Library_sax.mk

@@ -28,7 +28,7 @@
 
 $(eval $(call gb_Library_Library,sax))
 
-$(eval $(call gb_Library_add_package_headers,sax,\
+$(eval $(call gb_Library_use_package,sax,\
 	sax_inc \
 ))
 

sfx2/Library_sfx.mk

@@ -28,7 +28,7 @@
 
 $(eval $(call gb_Library_Library,sfx))
 
-$(eval $(call gb_Library_add_package_headers,sfx,\
+$(eval $(call gb_Library_use_packages,sfx,\
     sfx2_inc \
     sfx2_sdi \
 ))

slideshow/CppunitTest_slideshow.mk

@@ -27,7 +27,7 @@
 
 $(eval $(call gb_CppunitTest_CppunitTest,slideshow))
 
-$(eval $(call gb_CppunitTest_add_package_headers,slideshow,sd_qa_unit))
+$(eval $(call gb_CppunitTest_use_package,slideshow,sd_qa_unit))
 
 $(eval $(call gb_CppunitTest_set_include,slideshow,\
     $$(INCLUDE) \

slideshow/Executable_demoshow.mk

@@ -27,7 +27,7 @@
 
 $(eval $(call gb_Executable_Executable,demoshow))
 
-$(eval $(call gb_Executable_add_package_headers,demoshow,sd_qa_unit))
+$(eval $(call gb_Executable_use_package,demoshow,sd_qa_unit))
 
 $(eval $(call gb_Executable_set_include,demoshow,\
     $$(INCLUDE) \

solenv/gbuild/CppunitTest.mk

@@ -282,6 +282,8 @@ $(eval $(foreach method,\
 	add_asmobject \
 	add_asmobjects \
 	add_package_headers \
+	use_package \
+	use_packages \
 	add_sdi_headers \
 	add_cflags \
 	set_cflags \

solenv/gbuild/Executable.mk

@@ -121,6 +121,8 @@ $(eval $(foreach method,\
 	add_custom_headers \
 	use_custom_headers \
 	add_package_headers \
+	use_package \
+	use_packages \
 	add_sdi_headers \
 	add_nativeres \
 	set_warnings_not_errors \

solenv/gbuild/Library.mk

@@ -199,6 +199,7 @@ $(eval $(foreach method,\
 	use_custom_headers \
 	add_external_headers \
 	use_package \
+	use_packages \
 	add_package_headers \
 	add_sdi_headers \
 	export_objects_list \

solenv/gbuild/LinkTarget.mk

@@ -1011,9 +1011,8 @@ $(foreach customtarget,$(2),$(call gb_LinkTarget__use_custom_headers,$(1),$(cust
 endef
 
 define gb_LinkTarget_add_package_headers
-$(foreach package,$(2),$(call gb_LinkTarget__add_internal_headers,$(1),$(call gb_Package_get_target,$(package))))
-$(call gb_LinkTarget_get_clean_target,$(1)) : $(foreach package,$(2),$(call gb_Package_get_clean_target,$(package)))
-
+$$(call gb_Output_error,\
+ gb_LinkTarget_add_package_headers: use gb_LinkTarget_use_package instead.)
 endef
 
 # add SDI (svidl) headers
@@ -1029,7 +1028,13 @@ endef
 
 # use a header package, possibly from another module (i.e. via OUTDIR)
 define gb_LinkTarget_use_package
-$(call gb_LinkTarget_get_headers_target,$(1) : |$(call gb_Package_get_target,$(2)))
+$(call gb_LinkTarget_get_headers_target,$(1) : | \
+	$(call gb_Package_get_target,$(strip $(2))))
+
+endef
+
+define gb_LinkTarget_use_packages
+$(foreach package,$(2),$(call gb_LinkTarget_use_package,$(1),$(package)))
 endef
 
 # this forwards to functions that must be defined in RepositoryExternal.mk.

solenv/gbuild/StaticLibrary.mk

@@ -113,6 +113,8 @@ $(eval $(foreach method,\
 	add_custom_headers \
 	use_custom_headers \
 	add_package_headers \
+	use_package \
+	use_packages \
 	add_sdi_headers \
 	set_warnings_not_errors \
 ,\

solenv/gbuild/templates/Library.mk

@@ -33,7 +33,7 @@ $(eval $(call gb_Library_Library,LIB))
 
 # declare packages that will be delivered before compilation of LIB
 # learn more about TYPE in the Package.mk template
-$(eval $(call gb_Library_add_package_headers,LIB,MODULE_TYPE))
+$(eval $(call gb_Library_use_package,LIB,MODULE_TYPE))
 
 # in case UNO services are exported: declare location of component file
 $(eval $(call gb_Library_set_componentfile,LIB,MODULE/COMPONENT_FILE))

solenv/gbuild/templates/StaticLibrary.mk

@@ -27,7 +27,7 @@
 
 $(eval $(call gb_StaticLibrary_StaticLibrary,LIB))
 
-$(eval $(call gb_StaticLibrary_add_package_headers,LIB,MODULE_inc))
+$(eval $(call gb_StaticLibrary_use_package,LIB,MODULE_inc))
 
 $(eval $(call gb_StaticLibrary_add_exception_objects,LIB,\
 ))

sot/Library_sot.mk

@@ -28,7 +28,7 @@
 
 $(eval $(call gb_Library_Library,sot))
 
-$(eval $(call gb_Library_add_package_headers,sot,sot_inc))
+$(eval $(call gb_Library_use_package,sot,sot_inc))
 
 $(eval $(call gb_Library_set_componentfile,sot,sot/util/sot))
 

svl/Library_fsstorage.mk

@@ -28,7 +28,7 @@
 
 $(eval $(call gb_Library_Library,fsstorage))
 
-$(eval $(call gb_Library_add_package_headers,fsstorage,svl_inc))
+$(eval $(call gb_Library_use_package,fsstorage,svl_inc))
 
 $(eval $(call gb_Library_set_componentfile,fsstorage,svl/source/fsstor/fsstorage))
 

svl/Library_passwordcontainer.mk

@@ -28,7 +28,7 @@
 
 $(eval $(call gb_Library_Library,passwordcontainer))
 
-$(eval $(call gb_Library_add_package_headers,passwordcontainer,svl_inc))
+$(eval $(call gb_Library_use_package,passwordcontainer,svl_inc))
 
 $(eval $(call gb_Library_set_componentfile,passwordcontainer,svl/source/passwordcontainer/passwordcontainer))
 

svl/Library_svl.mk

@@ -28,7 +28,7 @@
 
 $(eval $(call gb_Library_Library,svl))
 
-$(eval $(call gb_Library_add_package_headers,svl,svl_inc))
+$(eval $(call gb_Library_use_package,svl,svl_inc))
 
 $(eval $(call gb_Library_set_componentfile,svl,svl/util/svl))
 

svtools/Library_svt.mk

@@ -28,7 +28,7 @@
 
 $(eval $(call gb_Library_Library,svt))
 
-$(eval $(call gb_Library_add_package_headers,svt,svtools_inc))
+$(eval $(call gb_Library_use_package,svt,svtools_inc))
 
 $(eval $(call gb_Library_set_componentfile,svt,svtools/util/svt))
 

svx/Library_svxcore.mk

@@ -32,7 +32,7 @@ $(eval $(call gb_Library_set_componentfile,svxcore,svx/util/svxcore))
 
 $(eval $(call gb_Library_add_sdi_headers,svxcore,svx/sdi/svxslots))
 
-$(eval $(call gb_Library_add_package_headers,svxcore,\
+$(eval $(call gb_Library_use_packages,svxcore,\
     svx_inc \
     svx_sdi \
 ))

test/Library_test.mk

@@ -27,7 +27,7 @@
 
 $(eval $(call gb_Library_Library,test))
 
-$(eval $(call gb_Library_add_package_headers,test,test_inc))
+$(eval $(call gb_Library_use_package,test,test_inc))
 
 $(eval $(call gb_Library_add_defs,test,\
     -DOOO_DLLIMPLEMENTATION_TEST \

toolkit/Library_tk.mk

@@ -30,7 +30,7 @@ $(eval $(call gb_Library_Library,tk))
 
 $(eval $(call gb_Library_set_componentfile,tk,toolkit/util/tk))
 
-$(eval $(call gb_Library_add_package_headers,tk,toolkit_inc))
+$(eval $(call gb_Library_use_package,tk,toolkit_inc))
 
 $(eval $(call gb_Library_set_include,tk,\
     $$(INCLUDE) \

tools/Library_tl.mk

@@ -28,7 +28,7 @@
 
 $(eval $(call gb_Library_Library,tl))
 
-$(eval $(call gb_Library_add_package_headers,tl,tools_inc))
+$(eval $(call gb_Library_use_package,tl,tools_inc))
 
 $(eval $(call gb_Library_use_custom_headers,tl,tools/reversemap))
 

tools/StaticLibrary_ooopathutils.mk

@@ -28,7 +28,7 @@
 
 $(eval $(call gb_StaticLibrary_StaticLibrary,ooopathutils))
 
-$(eval $(call gb_StaticLibrary_add_package_headers,ooopathutils,tools_inc))
+$(eval $(call gb_StaticLibrary_use_package,ooopathutils,tools_inc))
 
 $(eval $(call gb_StaticLibrary_add_exception_objects,ooopathutils,\
     tools/source/misc/pathutils \

ucb/StaticLibrary_odma_lib.mk

@@ -27,7 +27,7 @@
 
 $(eval $(call gb_StaticLibrary_StaticLibrary,odma_lib))
 
-$(eval $(call gb_StaticLibrary_add_package_headers,odma_lib,ucb_odma_inc))
+$(eval $(call gb_StaticLibrary_use_package,odma_lib,ucb_odma_inc))
 
 $(eval $(call gb_StaticLibrary_use_api,odma_lib,\
     offapi \

ucbhelper/Library_ucbhelper.mk

@@ -28,7 +28,7 @@
 
 $(eval $(call gb_Library_Library,ucbhelper))
 
-$(eval $(call gb_Library_add_package_headers,ucbhelper,ucbhelper_inc))
+$(eval $(call gb_Library_use_package,ucbhelper,ucbhelper_inc))
 
 $(eval $(call gb_Library_set_include,ucbhelper,\
 	$$(INCLUDE) \

unotest/Library_unoexceptionprotector.mk

@@ -27,7 +27,7 @@
 
 $(eval $(call gb_Library_Library,unoexceptionprotector))
 
-$(eval $(call gb_Library_add_package_headers,unoexceptionprotector,unotest_inc))
+$(eval $(call gb_Library_use_package,unoexceptionprotector,unotest_inc))
 
 $(eval $(call gb_Library_use_api,unoexceptionprotector,\
 	udkapi \

unotest/Library_unotest.mk

@@ -27,7 +27,7 @@
 
 $(eval $(call gb_Library_Library,unotest))
 
-$(eval $(call gb_Library_add_package_headers,unotest,unotest_inc))
+$(eval $(call gb_Library_use_package,unotest,unotest_inc))
 
 $(eval $(call gb_Library_add_defs,unotest,\
 	-DOOO_DLLIMPLEMENTATION_UNOTEST \

unotools/Library_utl.mk

@@ -31,7 +31,7 @@ $(eval $(call gb_Library_Library,utl))
 
 # declare packages that will be delivered before compilation of utl
 # learn more about TYPE in the Package.mk template
-$(eval $(call gb_Library_add_package_headers,utl,unotools_inc))
+$(eval $(call gb_Library_use_package,utl,unotools_inc))
 
 # in case UNO services are exported: declare location of component file
 $(eval $(call gb_Library_set_componentfile,utl,unotools/util/utl))

vbahelper/Library_vbahelper.mk

@@ -28,7 +28,7 @@
 
 $(eval $(call gb_Library_Library,vbahelper))
 
-$(eval $(call gb_Library_add_package_headers,vbahelper,vbahelper_inc))
+$(eval $(call gb_Library_use_package,vbahelper,vbahelper_inc))
 
 # in case UNO services are exported: declare location of component file
 #$(eval $(call gb_Library_set_componentfile,vbahelper,vbahelper/COMPONENT_FILE))

vcl/Library_desktop_detector.mk

@@ -28,7 +28,7 @@
 
 $(eval $(call gb_Library_Library,desktop_detector))
 
-#$(eval $(call gb_Library_add_package_headers,vcl,vcl_inc))
+#$(eval $(call gb_Library_use_package,vcl,vcl_inc))
 
 $(eval $(call gb_Library_set_include,desktop_detector,\
     $$(INCLUDE) \

vcl/Library_vcl.mk

@@ -42,7 +42,7 @@ else
 $(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.unx))
 endif
 
-$(eval $(call gb_Library_add_package_headers,vcl,vcl_inc))
+$(eval $(call gb_Library_use_package,vcl,vcl_inc))
 
 $(eval $(call gb_Library_use_custom_headers,vcl,vcl/generic/fontmanager))
 

xmloff/Library_xo.mk

@@ -30,7 +30,7 @@ $(eval $(call gb_Library_Library,xo))
 
 $(eval $(call gb_Library_set_componentfile,xo,xmloff/util/xo))
 
-$(eval $(call gb_Library_add_package_headers,xo,xmloff_inc))
+$(eval $(call gb_Library_use_package,xo,xmloff_inc))
 
 $(eval $(call gb_Library_set_include,xo,\
     -I$(SRCDIR)/xmloff/inc \

xmlreader/Library_xmlreader.mk

@@ -28,7 +28,7 @@
 
 $(eval $(call gb_Library_Library,xmlreader))
 
-$(eval $(call gb_Library_add_package_headers,xmlreader,xmlreader_inc))
+$(eval $(call gb_Library_use_package,xmlreader,xmlreader_inc))
 
 $(eval $(call gb_Library_add_defs,xmlreader,\
 	-DOOO_DLLIMPLEMENTATION_XMLREADER \

xmlscript/Library_xcr.mk

@@ -28,7 +28,7 @@
 
 $(eval $(call gb_Library_Library,xcr))
 
-$(eval $(call gb_Library_add_package_headers,xcr,xmlscript_inc))
+$(eval $(call gb_Library_use_package,xcr,xmlscript_inc))
 
 $(eval $(call gb_Library_set_componentfile,xcr,xmlscript/util/xcr))