gbuild: drop uses of removed packages

Change-Id: I400fad08c0ae7b6b34bad63693f54856867e4dac
Reviewed-on: https://gerrit.libreoffice.org/3502
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

135 files changed, 1 insertions, 289 deletions

diff --git a/animations/Library_animcore.mk b/animations/Library_animcore.mk
index 5a50d94dae4e..cbab8334ddec 100644
--- a/animations/Library_animcore.mk
+++ b/animations/Library_animcore.mk
@@ -31,8 +31,6 @@ $(eval $(call gb_Library_Library,animcore))
 $(eval $(call gb_Library_use_external,animcore,boost_headers))
 
 $(eval $(call gb_Library_use_packages,animcore,\
-	animations_inc \
-	comphelper_inc \
 ))
 
 $(eval $(call gb_Library_set_componentfile,animcore,animations/source/animcore/animcore))
diff --git a/apple_remote/Library_AppleRemote.mk b/apple_remote/Library_AppleRemote.mk
index 22a44dbfff66..48fbb09b2ae6 100644
--- a/apple_remote/Library_AppleRemote.mk
+++ b/apple_remote/Library_AppleRemote.mk
@@ -11,8 +11,7 @@
 
 $(eval $(call gb_Library_Library,AppleRemote))
 
-$(eval $(call gb_Library_use_packages,AppleRemote,\
-    apple_remote_inc \
+$(eval $(call gb_Library_use_package,AppleRemote,\
 ))
 
 $(eval $(call gb_Library_use_system_darwin_frameworks,AppleRemote,\
diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk
index d308f3ec449d..04c8c8399019 100644
--- a/avmedia/Library_avmedia.mk
+++ b/avmedia/Library_avmedia.mk
@@ -28,8 +28,6 @@
 
 $(eval $(call gb_Library_Library,avmedia))
 
-$(eval $(call gb_Library_use_package,avmedia,avmedia_inc))
-
 $(eval $(call gb_Library_set_componentfile,avmedia,avmedia/util/avmedia))
 
 $(eval $(call gb_Library_set_include,avmedia,\
diff --git a/basctl/AllLangResTarget_basctl.mk b/basctl/AllLangResTarget_basctl.mk
index 54ba3c3395d2..657c9690acfd 100644
--- a/basctl/AllLangResTarget_basctl.mk
+++ b/basctl/AllLangResTarget_basctl.mk
@@ -35,12 +35,7 @@ $(eval $(call gb_AllLangResTarget_add_srs,basctl,\
 $(eval $(call gb_SrsTarget_SrsTarget,basctl/res))
 
 $(eval $(call gb_SrsTarget_use_packages,basctl/res,\
-	editeng_inc \
-	sfx2_inc \
-	svl_inc \
-	svtools_inc \
 	svx_globlmn_hrc \
-	svx_inc \
 ))
 
 $(eval $(call gb_SrsTarget_set_include,basctl/res,\
diff --git a/basebmp/Library_basebmp.mk b/basebmp/Library_basebmp.mk
index 3587d35c8ce5..3f0caeb7ae72 100644
--- a/basebmp/Library_basebmp.mk
+++ b/basebmp/Library_basebmp.mk
@@ -9,8 +9,6 @@
 
 $(eval $(call gb_Library_Library,basebmp))
 
-$(eval $(call gb_Library_use_package,basebmp,basebmp_inc))
-
 $(eval $(call gb_Library_use_sdk_api,basebmp))
 
 $(eval $(call gb_Library_use_externals,basebmp,\
diff --git a/basebmp/StaticLibrary_basebmp.mk b/basebmp/StaticLibrary_basebmp.mk
index f4d7b08ecb46..721bee05ba52 100644
--- a/basebmp/StaticLibrary_basebmp.mk
+++ b/basebmp/StaticLibrary_basebmp.mk
@@ -9,8 +9,6 @@
 
 $(eval $(call gb_StaticLibrary_StaticLibrary,basebmp))
 
-$(eval $(call gb_StaticLibrary_use_package,basebmp,basebmp_inc))
-
 $(eval $(call gb_StaticLibrary_use_sdk_api,basebmp))
 
 $(eval $(call gb_StaticLibrary_use_externals,basebmp,\
diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk
index 303d4376f434..8605b1cc6608 100644
--- a/basegfx/Library_basegfx.mk
+++ b/basegfx/Library_basegfx.mk
@@ -12,9 +12,6 @@ $(eval $(call gb_Library_Library,basegfx))
 $(eval $(call gb_Library_use_external,basegfx,boost_headers))
 
 $(eval $(call gb_Library_use_packages,basegfx,\
-    basegfx_inc \
-    comphelper_inc \
-    o3tl_inc \
 ))
 
 $(eval $(call gb_Library_use_sdk_api,basegfx))
diff --git a/basic/AllLangResTarget_sb.mk b/basic/AllLangResTarget_sb.mk
index ab66b6f7068e..fffe07bdb4f1 100644
--- a/basic/AllLangResTarget_sb.mk
+++ b/basic/AllLangResTarget_sb.mk
@@ -27,10 +27,6 @@ $(eval $(call gb_AllLangResTarget_add_srs,sb,\
 $(eval $(call gb_SrsTarget_SrsTarget,sb/res))
 
 $(eval $(call gb_SrsTarget_use_packages,sb/res,\
-	basic_inc \
-	svl_inc \
-	svtools_inc \
-	tools_inc \
 ))
 
 $(eval $(call gb_SrsTarget_set_include,sb/res,\
diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk
index 35680567f8b7..98eea5c81dac 100644
--- a/basic/Library_sb.mk
+++ b/basic/Library_sb.mk
@@ -19,8 +19,6 @@
 
 $(eval $(call gb_Library_Library,sb))
 
-$(eval $(call gb_Library_use_package,sb,basic_inc))
-
 $(eval $(call gb_Library_set_componentfile,sb,basic/util/sb))
 
 $(eval $(call gb_Library_set_include,sb,\
diff --git a/canvas/Library_canvasfactory.mk b/canvas/Library_canvasfactory.mk
index def28e256b5a..74d5c7645869 100644
--- a/canvas/Library_canvasfactory.mk
+++ b/canvas/Library_canvasfactory.mk
@@ -29,7 +29,6 @@
 $(eval $(call gb_Library_Library,canvasfactory))
 
 $(eval $(call gb_Library_use_package,canvasfactory,\
-	o3tl_inc \
 ))
 
 $(eval $(call gb_Library_set_componentfile,canvasfactory,canvas/source/factory/canvasfactory))
diff --git a/canvas/Library_canvastools.mk b/canvas/Library_canvastools.mk
index 825a3f62aae4..9e1309a1ced9 100644
--- a/canvas/Library_canvastools.mk
+++ b/canvas/Library_canvastools.mk
@@ -28,8 +28,6 @@
 
 $(eval $(call gb_Library_Library,canvastools))
 
-$(eval $(call gb_Library_use_package,canvastools,canvas_inc))
-
 $(eval $(call gb_Library_set_include,canvastools,\
 	$$(INCLUDE) \
 	-I$(SRCDIR)/canvas/inc \
diff --git a/chart2/AllLangResTarget_chartcontroller.mk b/chart2/AllLangResTarget_chartcontroller.mk
index 3109d4429b22..4e69f81fb31e 100644
--- a/chart2/AllLangResTarget_chartcontroller.mk
+++ b/chart2/AllLangResTarget_chartcontroller.mk
@@ -18,11 +18,6 @@ $(eval $(call gb_AllLangResTarget_add_srs,chartcontroller,\
 $(eval $(call gb_SrsTarget_SrsTarget,chart2/res))
 
 $(eval $(call gb_SrsTarget_use_packages,chart2/res,\
-	editeng_inc \
-	sfx2_inc \
-	svl_inc \
-	svtools_inc \
-	svx_inc \
 ))
 
 $(eval $(call gb_SrsTarget_set_include,chart2/res,\
diff --git a/codemaker/StaticLibrary_codemaker.mk b/codemaker/StaticLibrary_codemaker.mk
index 36fbd962c0ea..7eae7d484ae9 100644
--- a/codemaker/StaticLibrary_codemaker.mk
+++ b/codemaker/StaticLibrary_codemaker.mk
@@ -30,9 +30,6 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,codemaker))
 $(eval $(call gb_StaticLibrary_use_external,codemaker,boost_headers))
 
 $(eval $(call gb_StaticLibrary_use_packages,codemaker,\
-	codemaker_inc \
-	registry_inc \
-	unoidl_inc \
 ))
 
 $(eval $(call gb_StaticLibrary_add_exception_objects,codemaker,\
diff --git a/codemaker/StaticLibrary_codemaker_cpp.mk b/codemaker/StaticLibrary_codemaker_cpp.mk
index 61750aa040e4..a69d26c3feb8 100644
--- a/codemaker/StaticLibrary_codemaker_cpp.mk
+++ b/codemaker/StaticLibrary_codemaker_cpp.mk
@@ -30,8 +30,6 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,codemaker_cpp))
 $(eval $(call gb_StaticLibrary_use_external,codemaker_cpp,boost_headers))
 
 $(eval $(call gb_StaticLibrary_use_packages,codemaker_cpp,\
-	codemaker_inc \
-	registry_inc \
 ))
 
 $(eval $(call gb_StaticLibrary_add_exception_objects,codemaker_cpp,\
diff --git a/codemaker/StaticLibrary_codemaker_java.mk b/codemaker/StaticLibrary_codemaker_java.mk
index 9bce1322d69f..5f5ce51034bc 100644
--- a/codemaker/StaticLibrary_codemaker_java.mk
+++ b/codemaker/StaticLibrary_codemaker_java.mk
@@ -30,8 +30,6 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,codemaker_java))
 $(eval $(call gb_StaticLibrary_use_external,codemaker_java,boost_headers))
 
 $(eval $(call gb_StaticLibrary_use_packages,codemaker_java,\
-	codemaker_inc \
-	registry_inc \
 ))
 
 $(eval $(call gb_StaticLibrary_add_exception_objects,codemaker_java,\
diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk
index b9448580c5f7..aa3ff0085464 100644
--- a/comphelper/Library_comphelper.mk
+++ b/comphelper/Library_comphelper.mk
@@ -20,7 +20,6 @@
 $(eval $(call gb_Library_Library,comphelper))
 
 $(eval $(call gb_Library_use_packages,comphelper,\
-	comphelper_inc \
 	officecfg_cppheader \
 ))
 
diff --git a/connectivity/CppunitTest_connectivity_commontools.mk b/connectivity/CppunitTest_connectivity_commontools.mk
index c18952c5381b..6cf8f26dca47 100644
--- a/connectivity/CppunitTest_connectivity_commontools.mk
+++ b/connectivity/CppunitTest_connectivity_commontools.mk
@@ -10,7 +10,6 @@
 $(eval $(call gb_CppunitTest_CppunitTest,connectivity_commontools))
 
 $(eval $(call gb_CppunitTest_use_packages,connectivity_commontools,\
-	connectivity_inc \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,connectivity_commontools,\
diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk
index 7678f2ec1d94..fac3f2a4f355 100644
--- a/connectivity/Library_dbtools.mk
+++ b/connectivity/Library_dbtools.mk
@@ -28,7 +28,6 @@
 $(eval $(call gb_Library_Library,dbtools))
 
 $(eval $(call gb_Library_use_packages,dbtools,\
-	connectivity_inc \
 ))
 
 $(eval $(call gb_Library_add_defs,dbtools,\
diff --git a/connectivity/Library_kabdrv1.mk b/connectivity/Library_kabdrv1.mk
index 9050c711acde..d2dd565f6dac 100644
--- a/connectivity/Library_kabdrv1.mk
+++ b/connectivity/Library_kabdrv1.mk
@@ -28,7 +28,6 @@
 $(eval $(call gb_Library_Library,kabdrv1))
 
 $(eval $(call gb_Library_use_packages,kabdrv1,\
-	shell_inc \
 ))
 
 $(eval $(call gb_Library_use_sdk_api,kabdrv1))
diff --git a/connectivity/Library_tdeab1.mk b/connectivity/Library_tdeab1.mk
index 94bafe5ab516..363e1abb4aac 100644
--- a/connectivity/Library_tdeab1.mk
+++ b/connectivity/Library_tdeab1.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_Library_use_externals,tdeab1,\
 $(eval $(call gb_Library_set_componentfile,tdeab1,connectivity/source/drivers/kab/tdeab1))
 
 $(eval $(call gb_Library_use_packages,tdeab1,\
-        shell_inc \
 ))
 
 $(eval $(call gb_Library_set_include,tdeab1,\
diff --git a/connectivity/Library_tdeabdrv1.mk b/connectivity/Library_tdeabdrv1.mk
index 5e091fe661c1..26a0541ba913 100644
--- a/connectivity/Library_tdeabdrv1.mk
+++ b/connectivity/Library_tdeabdrv1.mk
@@ -28,7 +28,6 @@
 $(eval $(call gb_Library_Library,tdeabdrv1))
 
 $(eval $(call gb_Library_use_packages,tdeabdrv1,\
-	shell_inc \
 ))
 
 $(eval $(call gb_Library_set_include,tdeabdrv1,\
diff --git a/cosv/StaticLibrary_cosv.mk b/cosv/StaticLibrary_cosv.mk
index d6f3229ee3e3..78481760ebf1 100644
--- a/cosv/StaticLibrary_cosv.mk
+++ b/cosv/StaticLibrary_cosv.mk
@@ -10,7 +10,6 @@
 $(eval $(call gb_StaticLibrary_StaticLibrary,cosv))
 
 $(eval $(call gb_StaticLibrary_use_packages,cosv,\
-	cosv_inc \
 ))
 
 $(eval $(call gb_StaticLibrary_add_exception_objects,cosv,\
diff --git a/cppcanvas/Library_cppcanvas.mk b/cppcanvas/Library_cppcanvas.mk
index 51a5861d01d4..dc4e6b361c94 100644
--- a/cppcanvas/Library_cppcanvas.mk
+++ b/cppcanvas/Library_cppcanvas.mk
@@ -19,8 +19,6 @@
 
 $(eval $(call gb_Library_Library,cppcanvas))
 
-$(eval $(call gb_Library_use_package,cppcanvas,cppcanvas_inc))
-
 $(eval $(call gb_Library_set_include,cppcanvas,\
 	-I$(SRCDIR)/cppcanvas/inc \
 	-I$(SRCDIR)/cppcanvas/source/inc \
diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index e275ca5d277f..fa64d0330f07 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -18,11 +18,6 @@ $(eval $(call gb_AllLangResTarget_add_srs,cui,\
 $(eval $(call gb_SrsTarget_SrsTarget,cui/res))
 
 $(eval $(call gb_SrsTarget_use_packages,cui/res,\
-	editeng_inc \
-	sfx2_inc \
-	svl_inc \
-	svtools_inc \
-	svx_inc \
 ))
 
 $(eval $(call gb_SrsTarget_set_include,cui/res,\
diff --git a/dbaccess/AllLangResTarget_dba.mk b/dbaccess/AllLangResTarget_dba.mk
index 27f9edde5454..5b81d9ed1afb 100644
--- a/dbaccess/AllLangResTarget_dba.mk
+++ b/dbaccess/AllLangResTarget_dba.mk
@@ -18,7 +18,6 @@ $(eval $(call gb_AllLangResTarget_add_srs,dba,\
 $(eval $(call gb_SrsTarget_SrsTarget,dbaccess/dba))
 
 $(eval $(call gb_SrsTarget_use_packages,dbaccess/dba,\
-	svl_inc \
 ))
 
 $(eval $(call gb_SrsTarget_set_include,dbaccess/dba,\
diff --git a/dbaccess/AllLangResTarget_dbmm.mk b/dbaccess/AllLangResTarget_dbmm.mk
index 2d25254ca534..0505ad7cbd6b 100644
--- a/dbaccess/AllLangResTarget_dbmm.mk
+++ b/dbaccess/AllLangResTarget_dbmm.mk
@@ -18,7 +18,6 @@ $(eval $(call gb_AllLangResTarget_add_srs,dbmm,\
 $(eval $(call gb_SrsTarget_SrsTarget,dbaccess/dbmm))
 
 $(eval $(call gb_SrsTarget_use_packages,dbaccess/dbmm,\
-	svl_inc \
 ))
 
 $(eval $(call gb_SrsTarget_add_files,dbaccess/dbmm,\
diff --git a/dbaccess/AllLangResTarget_dbu.mk b/dbaccess/AllLangResTarget_dbu.mk
index bb4cbb696b50..646282ca9495 100644
--- a/dbaccess/AllLangResTarget_dbu.mk
+++ b/dbaccess/AllLangResTarget_dbu.mk
@@ -18,11 +18,7 @@ $(eval $(call gb_AllLangResTarget_add_srs,dbu,\
 $(eval $(call gb_SrsTarget_SrsTarget,dbaccess/dbu))
 
 $(eval $(call gb_SrsTarget_use_packages,dbaccess/dbu,\
-	editeng_inc \
-	sfx2_inc \
-	svl_inc \
 	svx_globlmn_hrc \
-	svx_inc \
 ))
 
 $(eval $(call gb_SrsTarget_set_include,dbaccess/dbu,\
diff --git a/dbaccess/AllLangResTarget_sdbt.mk b/dbaccess/AllLangResTarget_sdbt.mk
index 7dac4169cbf3..82093f8a00af 100644
--- a/dbaccess/AllLangResTarget_sdbt.mk
+++ b/dbaccess/AllLangResTarget_sdbt.mk
@@ -18,7 +18,6 @@ $(eval $(call gb_AllLangResTarget_add_srs,sdbt,\
 $(eval $(call gb_SrsTarget_SrsTarget,dbaccess/sdbt))
 
 $(eval $(call gb_SrsTarget_use_packages,dbaccess/sdbt,\
-	svl_inc \
 ))
 
 $(eval $(call gb_SrsTarget_set_include,dbaccess/sdbt,\
diff --git a/dbaccess/Library_sdbt.mk b/dbaccess/Library_sdbt.mk
index a7dd26ec194d..5e4d74872497 100644
--- a/dbaccess/Library_sdbt.mk
+++ b/dbaccess/Library_sdbt.mk
@@ -11,7 +11,6 @@ $(eval $(call gb_Library_Library,sdbt))
 
 $(eval $(call gb_Library_use_packages,sdbt,\
 	dbaccess_inc \
-	svl_inc \
 ))
 
 $(eval $(call gb_Library_set_include,sdbt,\
diff --git a/desktop/AllLangResTarget_deploymentgui.mk b/desktop/AllLangResTarget_deploymentgui.mk
index 75466872bfac..162758f16b6f 100644
--- a/desktop/AllLangResTarget_deploymentgui.mk
+++ b/desktop/AllLangResTarget_deploymentgui.mk
@@ -18,7 +18,6 @@ $(eval $(call gb_AllLangResTarget_add_srs,deploymentgui,\
 $(eval $(call gb_SrsTarget_SrsTarget,deploymentgui/res))
 
 $(eval $(call gb_SrsTarget_use_packages,deploymentgui/res,\
-    svtools_inc \
 ))
 
 $(eval $(call gb_SrsTarget_set_include,deploymentgui/res,\
diff --git a/desktop/AllLangResTarget_dkt.mk b/desktop/AllLangResTarget_dkt.mk
index b0cf2e92c376..faaab5d43c3c 100644
--- a/desktop/AllLangResTarget_dkt.mk
+++ b/desktop/AllLangResTarget_dkt.mk
@@ -18,7 +18,6 @@ $(eval $(call gb_AllLangResTarget_add_srs,dkt,\
 $(eval $(call gb_SrsTarget_SrsTarget,dkt/res))
 
 $(eval $(call gb_SrsTarget_use_packages,dkt/res,\
-    svl_inc \
 ))
 
 $(eval $(call gb_SrsTarget_add_files,dkt/res,\
diff --git a/desktop/Executable_unopkg.com.mk b/desktop/Executable_unopkg.com.mk
index f8a17fd5a2f3..632592443b62 100644
--- a/desktop/Executable_unopkg.com.mk
+++ b/desktop/Executable_unopkg.com.mk
@@ -10,7 +10,6 @@
 $(eval $(call gb_Executable_Executable,unopkg_com))
 
 $(eval $(call gb_Executable_use_packages,unopkg_com,\
-    sal_inc \
 ))
 
 $(eval $(call gb_Executable_set_targettype_gui,unopkg_com,NO))
diff --git a/desktop/Executable_unopkg.mk b/desktop/Executable_unopkg.mk
index b5dd1e3d4b22..0c62932856bc 100644
--- a/desktop/Executable_unopkg.mk
+++ b/desktop/Executable_unopkg.mk
@@ -10,7 +10,6 @@
 $(eval $(call gb_Executable_Executable,unopkg))
 
 $(eval $(call gb_Executable_use_packages,unopkg,\
-    sal_inc \
 ))
 
 $(eval $(call gb_Executable_set_targettype_gui,unopkg,YES))
diff --git a/desktop/StaticLibrary_winextendloaderenv.mk b/desktop/StaticLibrary_winextendloaderenv.mk
index f2a2b955ddc1..d06ff6201dd8 100644
--- a/desktop/StaticLibrary_winextendloaderenv.mk
+++ b/desktop/StaticLibrary_winextendloaderenv.mk
@@ -11,7 +11,6 @@
 $(eval $(call gb_StaticLibrary_StaticLibrary,winextendloaderenv))
 
 $(eval $(call gb_StaticLibrary_use_packages,winextendloaderenv,\
-	tools_inc \
 ))
 
 $(eval $(call gb_StaticLibrary_add_noexception_objects,winextendloaderenv,\
diff --git a/drawinglayer/Library_drawinglayer.mk b/drawinglayer/Library_drawinglayer.mk
index edd1ce8c8fc4..0690231fff83 100644
--- a/drawinglayer/Library_drawinglayer.mk
+++ b/drawinglayer/Library_drawinglayer.mk
@@ -9,8 +9,6 @@
 
 $(eval $(call gb_Library_Library,drawinglayer))
 
-$(eval $(call gb_Library_use_package,drawinglayer,drawinglayer_inc))
-
 $(eval $(call gb_Library_set_include,drawinglayer,\
     $$(INCLUDE) \
     -I$(SRCDIR)/drawinglayer/inc \
diff --git a/dtrans/StaticLibrary_dtobj.mk b/dtrans/StaticLibrary_dtobj.mk
index 70a9aec87734..f8453620436b 100644
--- a/dtrans/StaticLibrary_dtobj.mk
+++ b/dtrans/StaticLibrary_dtobj.mk
@@ -29,8 +29,6 @@
 $(eval $(call gb_StaticLibrary_StaticLibrary,dtobj))
 
 $(eval $(call gb_StaticLibrary_use_packages,dtobj,\
-	comphelper_inc \
-	sal_inc \
 ))
 
 $(eval $(call gb_StaticLibrary_use_sdk_api,dtobj))
diff --git a/editeng/AllLangResTarget_editeng.mk b/editeng/AllLangResTarget_editeng.mk
index 896415846e12..c1850b03cfdc 100644
--- a/editeng/AllLangResTarget_editeng.mk
+++ b/editeng/AllLangResTarget_editeng.mk
@@ -25,7 +25,6 @@ $(eval $(call gb_AllLangResTarget_add_srs,editeng, editeng/res))
 $(eval $(call gb_SrsTarget_SrsTarget,editeng/res))
 
 $(eval $(call gb_SrsTarget_use_packages,editeng/res,\
-	svl_inc \
 ))
 
 $(eval $(call gb_SrsTarget_set_include,editeng/res,\
diff --git a/editeng/Library_editeng.mk b/editeng/Library_editeng.mk
index bab7ffec4c86..f352113c96ef 100644
--- a/editeng/Library_editeng.mk
+++ b/editeng/Library_editeng.mk
@@ -19,8 +19,6 @@
 
 $(eval $(call gb_Library_Library,editeng))
 
-$(eval $(call gb_Library_use_package,editeng,editeng_inc))
-
 $(eval $(call gb_Library_set_include,editeng,\
     $$(INCLUDE) \
     -I$(SRCDIR)/editeng/inc \
diff --git a/embeddedobj/Library_embobj.mk b/embeddedobj/Library_embobj.mk
index bfe7176f0fa8..c0af8b19d2ae 100644
--- a/embeddedobj/Library_embobj.mk
+++ b/embeddedobj/Library_embobj.mk
@@ -28,7 +28,6 @@
 $(eval $(call gb_Library_Library,embobj))
 
 $(eval $(call gb_Library_use_packages,embobj,\
-	tools_inc \
 ))
 
 $(eval $(call gb_Library_set_componentfile,embobj,embeddedobj/util/embobj))
diff --git a/embedserv/Library_inprocserv.mk b/embedserv/Library_inprocserv.mk
index 417c22f00b6b..a042994eb8d2 100644
--- a/embedserv/Library_inprocserv.mk
+++ b/embedserv/Library_inprocserv.mk
@@ -43,7 +43,6 @@ $(eval $(call gb_Library_use_libraries,inprocserv,\
 ))
 
 $(eval $(call gb_Library_use_packages,inprocserv,\
-	comphelper_inc \
 ))
 
 ifeq ($(COM),MSC)
diff --git a/extensions/AllLangResTarget_abp.mk b/extensions/AllLangResTarget_abp.mk
index 1a0d660c51e5..541764f9c2d5 100644
--- a/extensions/AllLangResTarget_abp.mk
+++ b/extensions/AllLangResTarget_abp.mk
@@ -37,7 +37,6 @@ $(eval $(call gb_AllLangResTarget_add_srs,abp,abp/res))
 $(eval $(call gb_SrsTarget_SrsTarget,abp/res))
 
 $(eval $(call gb_SrsTarget_use_packages,abp/res,\
-    svl_inc \
 ))
 
 $(eval $(call gb_SrsTarget_set_include,abp/res,\
diff --git a/extensions/AllLangResTarget_bib.mk b/extensions/AllLangResTarget_bib.mk
index d75cd05316f6..1c1aa1850475 100644
--- a/extensions/AllLangResTarget_bib.mk
+++ b/extensions/AllLangResTarget_bib.mk
@@ -35,10 +35,6 @@ $(eval $(call gb_AllLangResTarget_add_srs,bib,bib/res))
 $(eval $(call gb_SrsTarget_SrsTarget,bib/res))
 
 $(eval $(call gb_SrsTarget_use_packages,bib/res,\
-    editeng_inc \
-    sfx2_inc \
-    svl_inc \
-    svx_inc \
 ))
 
 $(eval $(call gb_SrsTarget_set_include,bib/res,\
diff --git a/extensions/AllLangResTarget_dbp.mk b/extensions/AllLangResTarget_dbp.mk
index a1f74059473a..5de43a2455da 100644
--- a/extensions/AllLangResTarget_dbp.mk
+++ b/extensions/AllLangResTarget_dbp.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_AllLangResTarget_add_srs,dbp,dbp/res))
 $(eval $(call gb_SrsTarget_SrsTarget,dbp/res))
 
 $(eval $(call gb_SrsTarget_use_packages,dbp/res,\
-    svl_inc \
 ))
 
 $(eval $(call gb_SrsTarget_set_include,dbp/res,\
diff --git a/extensions/Executable_nsplugin.mk b/extensions/Executable_nsplugin.mk
index 82e49fc33d5d..5d5b7f258b05 100644
--- a/extensions/Executable_nsplugin.mk
+++ b/extensions/Executable_nsplugin.mk
@@ -31,9 +31,6 @@
 $(eval $(call gb_Executable_Executable,nsplugin))
 
 $(eval $(call gb_Executable_use_packages,nsplugin,\
-    basegfx_inc \
-    comphelper_inc \
-    tools_inc \
 ))
 
 $(eval $(call gb_Executable_use_external,nsplugin,boost_headers))
diff --git a/extensions/Library_bib.mk b/extensions/Library_bib.mk
index 01664557dc8e..979d14cbcf3a 100644
--- a/extensions/Library_bib.mk
+++ b/extensions/Library_bib.mk
@@ -31,9 +31,6 @@
 $(eval $(call gb_Library_Library,bib))
 
 $(eval $(call gb_Library_use_packages,bib,\
-    editeng_inc \
-    sfx2_inc \
-    svx_inc \
 ))
 
 $(eval $(call gb_Library_set_componentfile,bib,extensions/source/bibliography/bib))
diff --git a/extensions/Library_log.mk b/extensions/Library_log.mk
index 7c4c149f6d24..77ed1dd5ae36 100644
--- a/extensions/Library_log.mk
+++ b/extensions/Library_log.mk
@@ -31,7 +31,6 @@
 $(eval $(call gb_Library_Library,log))
 
 $(eval $(call gb_Library_use_packages,log,\
-    tools_inc \
 ))
 
 $(eval $(call gb_Library_set_componentfile,log,extensions/source/logging/log))
diff --git a/extensions/Library_npsoplugin.mk b/extensions/Library_npsoplugin.mk
index 63ee754454ea..4ea79472d648 100644
--- a/extensions/Library_npsoplugin.mk
+++ b/extensions/Library_npsoplugin.mk
@@ -31,7 +31,6 @@
 $(eval $(call gb_Library_Library,npsoplugin))
 
 $(eval $(call gb_Library_use_packages,npsoplugin,\
-	comphelper_inc \
 	np_sdk_inc \
 ))
 
diff --git a/extensions/Library_updatecheckui.mk b/extensions/Library_updatecheckui.mk
index 054f568c4d90..a3787b9fe64e 100644
--- a/extensions/Library_updatecheckui.mk
+++ b/extensions/Library_updatecheckui.mk
@@ -14,7 +14,6 @@ $(eval $(call gb_Library_Library,updatecheckui))
 $(eval $(call gb_Library_set_componentfile,updatecheckui,extensions/source/update/ui/updchk))
 
 $(eval $(call gb_Library_use_packages,updatecheckui,\
-    sfx2_inc \
 ))
 
 $(eval $(call gb_Library_use_external,updatecheckui,boost_headers))
diff --git a/extensions/Library_updchk.mk b/extensions/Library_updchk.mk
index 1cd3b4959b83..3d8a013604d8 100644
--- a/extensions/Library_updchk.mk
+++ b/extensions/Library_updchk.mk
@@ -37,7 +37,6 @@ $(eval $(call gb_Library_set_include,updchk,\
 ))
 
 $(eval $(call gb_Library_use_packages,updchk,\
-    tools_inc \
 ))
 
 $(eval $(call gb_Library_use_sdk_api,updchk))
diff --git a/extensions/StaticLibrary_plugcon.mk b/extensions/StaticLibrary_plugcon.mk
index bfe1ea36d019..3cc8ba15cc33 100644
--- a/extensions/StaticLibrary_plugcon.mk
+++ b/extensions/StaticLibrary_plugcon.mk
@@ -15,15 +15,7 @@ endif
 $(eval $(call gb_StaticLibrary_StaticLibrary,plugcon))
 
 $(eval $(call gb_StaticLibrary_use_packages,plugcon,\
-    basegfx_inc \
-    comphelper_inc \
-    i18nlangtag_inc \
     np_sdk_inc \
-	o3tl_inc \
-	rsc_inc \
-    tools_inc \
-    unotools_inc \
-    vcl_inc \
 ))
 
 $(eval $(call gb_StaticLibrary_use_externals,plugcon,\
diff --git a/filter/AllLangResTarget_pdffilter.mk b/filter/AllLangResTarget_pdffilter.mk
index 67775c36ccb1..c92b9a944801 100644
--- a/filter/AllLangResTarget_pdffilter.mk
+++ b/filter/AllLangResTarget_pdffilter.mk
@@ -28,7 +28,6 @@ $(eval $(call gb_AllLangResTarget_add_srs,pdffilter,\
 $(eval $(call gb_SrsTarget_SrsTarget,filter/pdffilter))
 
 $(eval $(call gb_SrsTarget_use_packages,filter/pdffilter,\
-	svl_inc \
 ))
 
 $(eval $(call gb_SrsTarget_set_include,filter/pdffilter,\
diff --git a/filter/AllLangResTarget_xsltdlg.mk b/filter/AllLangResTarget_xsltdlg.mk
index e348909de7f3..e4f5440d37be 100644
--- a/filter/AllLangResTarget_xsltdlg.mk
+++ b/filter/AllLangResTarget_xsltdlg.mk
@@ -25,7 +25,6 @@ $(eval $(call gb_AllLangResTarget_add_srs,xsltdlg,\
 $(eval $(call gb_SrsTarget_SrsTarget,filter/xsltdlg))
 
 $(eval $(call gb_SrsTarget_use_packages,filter/xsltdlg,\
-	svl_inc \
 ))
 
 $(eval $(call gb_SrsTarget_set_include,filter/xsltdlg,\
diff --git a/filter/Library_msfilter.mk b/filter/Library_msfilter.mk
index 90b6c3a2d716..5a5ea9f16cd3 100644
--- a/filter/Library_msfilter.mk
+++ b/filter/Library_msfilter.mk
@@ -19,8 +19,6 @@
 
 $(eval $(call gb_Library_Library,msfilter))
 
-$(eval $(call gb_Library_use_package,msfilter,filter_inc))
-
 $(eval $(call gb_Library_set_componentfile,msfilter,filter/source/msfilter/msfilter))
 
 $(eval $(call gb_Library_use_external,msfilter,boost_headers))
diff --git a/forms/AllLangResTarget_frm.mk b/forms/AllLangResTarget_frm.mk
index 33d464a6114e..ed7465c48974 100644
--- a/forms/AllLangResTarget_frm.mk
+++ b/forms/AllLangResTarget_frm.mk
@@ -18,7 +18,6 @@ $(eval $(call gb_AllLangResTarget_add_srs,frm,\
 $(eval $(call gb_SrsTarget_SrsTarget,frm/res))
 
 $(eval $(call gb_SrsTarget_use_packages,frm/res,\
-	svl_inc \
 ))
 
 $(eval $(call gb_SrsTarget_set_include,frm/res,\
diff --git a/formula/AllLangResTarget_for.mk b/formula/AllLangResTarget_for.mk
index 27afdaf3ec73..0ee51f4794b1 100644
--- a/formula/AllLangResTarget_for.mk
+++ b/formula/AllLangResTarget_for.mk
@@ -18,8 +18,6 @@ $(eval $(call gb_AllLangResTarget_add_srs,for,\
 $(eval $(call gb_SrsTarget_SrsTarget,formula/res))
 
 $(eval $(call gb_SrsTarget_use_packages,formula/res,\
-	formula_inc \
-	svl_inc \
 ))
 
 $(eval $(call gb_SrsTarget_set_include,formula/res,\
diff --git a/formula/AllLangResTarget_forui.mk b/formula/AllLangResTarget_forui.mk
index fefb9674b2e3..2a8570445744 100644
--- a/formula/AllLangResTarget_forui.mk
+++ b/formula/AllLangResTarget_forui.mk
@@ -18,7 +18,6 @@ $(eval $(call gb_AllLangResTarget_add_srs,forui,\
 $(eval $(call gb_SrsTarget_SrsTarget,formula/ui))
 
 $(eval $(call gb_SrsTarget_use_packages,formula/ui,\
-	svl_inc \
 ))
 
 $(eval $(call gb_SrsTarget_set_include,formula/ui,\
diff --git a/formula/Library_for.mk b/formula/Library_for.mk
index 2ca5fecf885c..efdd24b51258 100644
--- a/formula/Library_for.mk
+++ b/formula/Library_for.mk
@@ -10,7 +10,6 @@
 $(eval $(call gb_Library_Library,for))
 
 $(eval $(call gb_Library_use_package,for,\
-	formula_inc \
 ))
 
 $(eval $(call gb_Library_set_include,for,\
diff --git a/fpicker/AllLangResTarget_fps_office.mk b/fpicker/AllLangResTarget_fps_office.mk
index d16fb10a0070..5df641114f72 100644
--- a/fpicker/AllLangResTarget_fps_office.mk
+++ b/fpicker/AllLangResTarget_fps_office.mk
@@ -36,9 +36,6 @@ $(eval $(call gb_AllLangResTarget_add_srs,fps_office,\
 $(eval $(call gb_SrsTarget_SrsTarget,fps_office/res))
 
 $(eval $(call gb_SrsTarget_use_packages,fps_office/res,\
-    svl_inc \
-	svtools_inc \
-	vcl_inc \
 ))
 
 $(eval $(call gb_SrsTarget_add_files,fps_office/res,\
diff --git a/fpicker/Library_fps.mk b/fpicker/Library_fps.mk
index ed9cac4b236b..de256497a66f 100644
--- a/fpicker/Library_fps.mk
+++ b/fpicker/Library_fps.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Library_add_nativeres,fps,fps/src))
 $(eval $(call gb_Library_set_componentfile,fps,fpicker/source/win32/fps))
 
 $(eval $(call gb_Library_use_packages,fps,\
-	vcl_inc \
 ))
 
 $(eval $(call gb_Library_use_external,fps,boost_headers))
diff --git a/fpicker/Library_fps_aqua.mk b/fpicker/Library_fps_aqua.mk
index bd1f0bbe6efe..b8b98e2690d0 100644
--- a/fpicker/Library_fps_aqua.mk
+++ b/fpicker/Library_fps_aqua.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Library_Library,fps_aqua))
 $(eval $(call gb_Library_set_componentfile,fps_aqua,fpicker/source/aqua/fps_aqua))
 
 $(eval $(call gb_Library_use_packages,fps_aqua,\
-	vcl_inc \
 ))
 
 $(eval $(call gb_Library_use_external,fps_aqua,boost_headers))
diff --git a/framework/AllLangResTarget_fwe.mk b/framework/AllLangResTarget_fwe.mk
index 5ae4e9c8b4b7..4e6105ed0459 100644
--- a/framework/AllLangResTarget_fwe.mk
+++ b/framework/AllLangResTarget_fwe.mk
@@ -42,7 +42,6 @@ $(eval $(call gb_SrsTarget_add_files,fwe/fwk_classes,\
 $(eval $(call gb_SrsTarget_SrsTarget,fwe/fwk_services))
 
 $(eval $(call gb_SrsTarget_use_packages,fwe/fwk_services,\
-	svl_inc \
 ))
 
 $(eval $(call gb_SrsTarget_set_include,fwe/fwk_services,\
diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk
index 6fcd6d2023a3..4c56b77e1869 100644
--- a/framework/Library_fwi.mk
+++ b/framework/Library_fwi.mk
@@ -19,8 +19,6 @@
 
 $(eval $(call gb_Library_Library,fwi))
 
-$(eval $(call gb_Library_use_package,fwi,framework_inc))
-
 $(eval $(call gb_Library_add_defs,fwi,\
     -DFWI_DLLIMPLEMENTATION \
 ))
diff --git a/i18nlangtag/Library_i18nlangtag.mk b/i18nlangtag/Library_i18nlangtag.mk
index 2953e764d6cc..43f2696aa210 100644
--- a/i18nlangtag/Library_i18nlangtag.mk
+++ b/i18nlangtag/Library_i18nlangtag.mk
@@ -29,7 +29,6 @@
 $(eval $(call gb_Library_Library,i18nlangtag))
 
 $(eval $(call gb_Library_use_packages,i18nlangtag,\
-	i18nlangtag_inc \
 ))
 
 $(eval $(call gb_Library_set_include,i18nlangtag,\
diff --git a/i18npool/Library_i18nsearch.mk b/i18npool/Library_i18nsearch.mk
index bad0d7afa0b7..c0f94926d4ec 100644
--- a/i18npool/Library_i18nsearch.mk
+++ b/i18npool/Library_i18nsearch.mk
@@ -28,8 +28,6 @@
 
 $(eval $(call gb_Library_Library,i18nsearch))
 
-$(eval $(call gb_Library_use_package,i18nsearch,i18nlangtag_inc))
-
 $(eval $(call gb_Library_set_componentfile,i18nsearch,i18npool/source/search/i18nsearch))
 
 $(eval $(call gb_Library_use_sdk_api,i18nsearch))
diff --git a/i18nutil/Library_i18nutil.mk b/i18nutil/Library_i18nutil.mk
index 07c5de212c43..2b79b79344a0 100644
--- a/i18nutil/Library_i18nutil.mk
+++ b/i18nutil/Library_i18nutil.mk
@@ -18,8 +18,6 @@
 
 $(eval $(call gb_Library_Library,i18nutil))
 
-$(eval $(call gb_Library_use_package,i18nutil,i18nutil_inc))
-
 $(eval $(call gb_Library_use_externals,i18nutil,\
 	boost_headers \
 	icu_headers \
diff --git a/ios/Executable_LibreOffice.mk b/ios/Executable_LibreOffice.mk
index 69745ad42e71..7689ea965402 100644
--- a/ios/Executable_LibreOffice.mk
+++ b/ios/Executable_LibreOffice.mk
@@ -32,8 +32,6 @@ $(eval $(call gb_Executable_add_objcobjects,LibreOffice,\
     ios/experimental/LibreOffice/LibreOffice/ViewController \
 ))
 
-$(call gb_Executable_use_package,LibreOffice,touch_inc)
-
 # Mark the executable as depending on all libraries so that it gets
 # rebuilt if any library has been rebuilt. Avoids need for "make
 # ios.clean".
diff --git a/jvmaccess/Library_jvmaccess.mk b/jvmaccess/Library_jvmaccess.mk
index 88af70716980..d3628b8379e4 100644
--- a/jvmaccess/Library_jvmaccess.mk
+++ b/jvmaccess/Library_jvmaccess.mk
@@ -10,7 +10,6 @@
 $(eval $(call gb_Library_Library,jvmaccess))
 
 $(eval $(call gb_Library_use_package,jvmaccess,\
-    jvmaccess_inc \
 ))
 
 $(eval $(call gb_Library_add_defs,jvmaccess,\
diff --git a/jvmfwk/Library_jvmfwk.mk b/jvmfwk/Library_jvmfwk.mk
index 74a6ae4de4fe..71e24c96d031 100644
--- a/jvmfwk/Library_jvmfwk.mk
+++ b/jvmfwk/Library_jvmfwk.mk
@@ -10,7 +10,6 @@
 $(eval $(call gb_Library_Library,jvmfwk))
 
 $(eval $(call gb_Library_use_package,jvmfwk,\
-    jvmfwk_inc \
 ))
 
 $(eval $(call gb_Library_add_defs,jvmfwk,\
diff --git a/jvmfwk/Library_sunjavaplugin.mk b/jvmfwk/Library_sunjavaplugin.mk
index 5625f97a247a..1b3eabf5015f 100644
--- a/jvmfwk/Library_sunjavaplugin.mk
+++ b/jvmfwk/Library_sunjavaplugin.mk
@@ -24,7 +24,6 @@ $(eval $(call gb_Library_use_api,sunjavaplugin,\
 ))
 
 $(eval $(call gb_Library_use_package,sunjavaplugin,\
-    jvmfwk_inc \
 ))
 
 $(eval $(call gb_Library_use_libraries,sunjavaplugin,\
diff --git a/lingucomponent/StaticLibrary_ulingu.mk b/lingucomponent/StaticLibrary_ulingu.mk
index a9e0a3843525..2e17b6aaf34a 100644
--- a/lingucomponent/StaticLibrary_ulingu.mk
+++ b/lingucomponent/StaticLibrary_ulingu.mk
@@ -28,11 +28,6 @@
 $(eval $(call gb_StaticLibrary_StaticLibrary,ulingu))
 
 $(eval $(call gb_StaticLibrary_use_packages,ulingu,\
-	comphelper_inc \
-	i18nlangtag_inc \
-	linguistic_inc \
-	tools_inc \
-	unotools_inc \
 ))
 
 $(eval $(call gb_StaticLibrary_use_api,ulingu,\
diff --git a/linguistic/Library_lng.mk b/linguistic/Library_lng.mk
index 2be2af17d5af..537d1c854296 100644
--- a/linguistic/Library_lng.mk
+++ b/linguistic/Library_lng.mk
@@ -28,8 +28,6 @@
 
 $(eval $(call gb_Library_Library,lng))
 
-$(eval $(call gb_Library_use_package,lng,linguistic_inc))
-
 $(eval $(call gb_Library_set_componentfile,lng,linguistic/source/lng))
 
 $(eval $(call gb_Library_set_include,lng,\
diff --git a/o3tl/CppunitTest_o3tl_tests.mk b/o3tl/CppunitTest_o3tl_tests.mk
index 02fcaf938926..02b0ed33e662 100644
--- a/o3tl/CppunitTest_o3tl_tests.mk
+++ b/o3tl/CppunitTest_o3tl_tests.mk
@@ -28,8 +28,6 @@
 
 $(eval $(call gb_CppunitTest_CppunitTest,o3tl_tests))
 
-$(eval $(call gb_CppunitTest_use_package,o3tl_tests,o3tl_inc))
-
 $(eval $(call gb_CppunitTest_use_external,o3tl_tests,boost_headers))
 
 $(eval $(call gb_CppunitTest_use_libraries,o3tl_tests,\
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index cbd4e674109c..a8c95ee980f1 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -10,7 +10,6 @@
 $(eval $(call gb_Library_Library,oox))
 
 $(eval $(call gb_Library_use_packages,oox,\
-    oox_inc \
     oox_generated \
     oox_tokens \
 ))
diff --git a/package/Library_package2.mk b/package/Library_package2.mk
index 407150be1ccf..c282a31c7137 100644
--- a/package/Library_package2.mk
+++ b/package/Library_package2.mk
@@ -28,8 +28,6 @@
 
 $(eval $(call gb_Library_Library,package2))
 
-$(eval $(call gb_Library_use_package,package2,package_inc))
-
 $(eval $(call gb_Library_set_componentfile,package2,package/util/package2))
 
 $(eval $(call gb_Library_set_include,package2,\
diff --git a/registry/Library_reg.mk b/registry/Library_reg.mk
index 78753c5aea7c..52a77bc4cb68 100644
--- a/registry/Library_reg.mk
+++ b/registry/Library_reg.mk
@@ -27,7 +27,6 @@
 $(eval $(call gb_Library_Library,reg))
 
 $(eval $(call gb_Library_use_packages,reg,\
-	registry_inc \
 ))
 
 $(eval $(call gb_Library_add_defs,reg,\
diff --git a/reportdesign/AllLangResTarget_rpt.mk b/reportdesign/AllLangResTarget_rpt.mk
index 5d0ab3234d1f..43b91b71c9be 100644
--- a/reportdesign/AllLangResTarget_rpt.mk
+++ b/reportdesign/AllLangResTarget_rpt.mk
@@ -18,7 +18,6 @@ $(eval $(call gb_AllLangResTarget_add_srs,rpt,\
 $(eval $(call gb_SrsTarget_SrsTarget,reportdesign/res))
 
 $(eval $(call gb_SrsTarget_use_packages,reportdesign/res,\
-	svl_inc \
 	svx_globlmn_hrc \
 ))
 
diff --git a/reportdesign/AllLangResTarget_rptui.mk b/reportdesign/AllLangResTarget_rptui.mk
index 0235e7f31811..a496a54718c3 100644
--- a/reportdesign/AllLangResTarget_rptui.mk
+++ b/reportdesign/AllLangResTarget_rptui.mk
@@ -35,11 +35,7 @@ $(eval $(call gb_AllLangResTarget_add_srs,rptui,reportdesign/rptui))
 $(eval $(call gb_SrsTarget_SrsTarget,reportdesign/rptui))
 
 $(eval $(call gb_SrsTarget_use_packages,reportdesign/rptui,\
-	editeng_inc \
-	sfx2_inc \
-	svl_inc \
 	svx_globlmn_hrc \
-	svx_inc \
 ))
 
 $(eval $(call gb_SrsTarget_set_include,reportdesign/rptui,\
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index 46ca29073dbf..100fa786b431 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Library_set_soversion_script,sal,3,$(SRCDIR)/sal/util/sal.map))
 $(eval $(call gb_Library_set_precompiled_header,sal,$(SRCDIR)/sal/inc/pch/precompiled_sal))
 
 $(eval $(call gb_Library_use_packages,sal,\
-	sal_inc \
 ))
 
 $(eval $(call gb_Library_set_include,sal,\
diff --git a/sal/Library_uwinapi.mk b/sal/Library_uwinapi.mk
index dbb91a2a4787..1d6f2aceec36 100644
--- a/sal/Library_uwinapi.mk
+++ b/sal/Library_uwinapi.mk
@@ -28,7 +28,6 @@
 $(eval $(call gb_Library_Library,uwinapi))
 
 $(eval $(call gb_Library_use_packages,uwinapi,\
-	sal_inc \
 ))
 
 $(eval $(call gb_Library_use_system_win32_libs,uwinapi,\
diff --git a/sax/Library_sax.mk b/sax/Library_sax.mk
index af8a75c223b6..07c3b729bc07 100644
--- a/sax/Library_sax.mk
+++ b/sax/Library_sax.mk
@@ -10,7 +10,6 @@
 $(eval $(call gb_Library_Library,sax))
 
 $(eval $(call gb_Library_use_package,sax,\
-    sax_inc \
 ))
 
 $(eval $(call gb_Library_set_include,sax,\
diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk
index d89decce2bbf..9d487f643a62 100644
--- a/sc/AllLangResTarget_sc.mk
+++ b/sc/AllLangResTarget_sc.mk
@@ -17,13 +17,7 @@ $(eval $(call gb_AllLangResTarget_add_srs,sc,\
 $(eval $(call gb_SrsTarget_SrsTarget,sc/res))
 
 $(eval $(call gb_SrsTarget_use_packages,sc/res,\
-	editeng_inc \
-	formula_inc \
-	sfx2_inc \
-	svl_inc \
 	svx_globlmn_hrc \
-	svx_inc \
-	tools_inc \
 ))
 
 $(eval $(call gb_SrsTarget_set_include,sc/res,\
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index c896d055286b..99d723e3f177 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -30,8 +30,6 @@ $(eval $(call gb_Library_add_defs,sc,\
 ))
 
 $(eval $(call gb_Library_use_packages,sc,\
-	oox_inc \
-	vbahelper_inc \
 ))
 
 $(eval $(call gb_Library_use_sdk_api,sc))
diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk
index 744324810496..a5838b8f938b 100644
--- a/sd/AllLangResTarget_sd.mk
+++ b/sd/AllLangResTarget_sd.mk
@@ -18,13 +18,7 @@ $(eval $(call gb_AllLangResTarget_add_srs,sd,\
 $(eval $(call gb_SrsTarget_SrsTarget,sd/res))
 
 $(eval $(call gb_SrsTarget_use_packages,sd/res,\
-	editeng_inc \
-	sfx2_inc \
-	svl_inc \
-	svtools_inc \
 	svx_globlmn_hrc \
-	svx_inc \
-	tools_inc \
 ))
 
 $(eval $(call gb_SrsTarget_set_include,sd/res,\
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index e23bbb7cfd1f..c18535345d91 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -33,7 +33,6 @@ $(eval $(call gb_Library_add_sdi_headers,sd,\
 ))
 
 $(eval $(call gb_Library_use_packages,sd,\
-	animations_inc \
 	bluez_bluetooth_inc \
 ))
 
diff --git a/sdext/StaticLibrary_pdfimport_s.mk b/sdext/StaticLibrary_pdfimport_s.mk
index 8a889dd986f5..6b026fd5e6e5 100644
--- a/sdext/StaticLibrary_pdfimport_s.mk
+++ b/sdext/StaticLibrary_pdfimport_s.mk
@@ -10,14 +10,6 @@
 $(eval $(call gb_StaticLibrary_StaticLibrary,pdfimport_s))
 
 $(eval $(call gb_StaticLibrary_use_packages,pdfimport_s,\
-    basegfx_inc \
-    comphelper_inc \
-	i18nlangtag_inc \
-    o3tl_inc \
-	rsc_inc \
-    tools_inc \
-	unotools_inc \
-	vcl_inc \
 ))
 
 $(eval $(call gb_StaticLibrary_use_api,pdfimport_s,\
diff --git a/sfx2/AllLangResTarget_sfx2.mk b/sfx2/AllLangResTarget_sfx2.mk
index a62306574c69..d8fdfe65be2d 100644
--- a/sfx2/AllLangResTarget_sfx2.mk
+++ b/sfx2/AllLangResTarget_sfx2.mk
@@ -28,10 +28,6 @@ $(eval $(call gb_AllLangResTarget_add_srs,sfx,\
 $(eval $(call gb_SrsTarget_SrsTarget,sfx/res))
 
 $(eval $(call gb_SrsTarget_use_packages,sfx/res,\
-    sfx2_inc \
-    svl_inc \
-    svtools_inc \
-    tools_inc \
 ))
 
 $(eval $(call gb_SrsTarget_set_include,sfx/res,\
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index b530767e7948..ef81f31c3482 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -20,7 +20,6 @@
 $(eval $(call gb_Library_Library,sfx))
 
 $(eval $(call gb_Library_use_packages,sfx,\
-    sfx2_inc \
     sfx2_sdi \
 ))
 
diff --git a/shell/Library_kdebe.mk b/shell/Library_kdebe.mk
index 835e9d7f0638..ffc5e39ba0b7 100644
--- a/shell/Library_kdebe.mk
+++ b/shell/Library_kdebe.mk
@@ -10,7 +10,6 @@
 $(eval $(call gb_Library_Library,kdebe1))
 
 $(eval $(call gb_Library_use_packages,kdebe1,\
-	shell_inc \
 ))
 
 $(eval $(call gb_Library_add_libs,kdebe1,\
diff --git a/shell/Library_tdebe.mk b/shell/Library_tdebe.mk
index f892016060a8..ca63f918c098 100644
--- a/shell/Library_tdebe.mk
+++ b/shell/Library_tdebe.mk
@@ -10,7 +10,6 @@
 $(eval $(call gb_Library_Library,tdebe1))
 
 $(eval $(call gb_Library_use_packages,tdebe1,\
-	shell_inc \
 ))
 
 $(eval $(call gb_Library_use_sdk_api,tdebe1))
diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk
index e7dc340df84d..8d2dfb4ab1c4 100644
--- a/slideshow/Library_slideshow.mk
+++ b/slideshow/Library_slideshow.mk
@@ -10,7 +10,6 @@
 $(eval $(call gb_Library_Library,slideshow))
 
 $(eval $(call gb_Library_use_packages,slideshow,\
-	animations_inc \
 ))
 
 $(eval $(call gb_Library_set_include,slideshow,\
diff --git a/sot/Library_sot.mk b/sot/Library_sot.mk
index f50af4a1db01..515757e203e3 100644
--- a/sot/Library_sot.mk
+++ b/sot/Library_sot.mk
@@ -28,8 +28,6 @@
 
 $(eval $(call gb_Library_Library,sot))
 
-$(eval $(call gb_Library_use_package,sot,sot_inc))
-
 $(eval $(call gb_Library_set_componentfile,sot,sot/util/sot))
 
 $(eval $(call gb_Library_use_external,sot,boost_headers))
diff --git a/starmath/AllLangResTarget_sm.mk b/starmath/AllLangResTarget_sm.mk
index 3188cb4695fe..90c684d15f26 100644
--- a/starmath/AllLangResTarget_sm.mk
+++ b/starmath/AllLangResTarget_sm.mk
@@ -24,9 +24,6 @@ $(eval $(call gb_SrsTarget_set_include,sm/res,\
 ))
 
 $(eval $(call gb_SrsTarget_use_packages,sm/res,\
-	editeng_inc \
-	sfx2_inc \
-	svl_inc \
 	svx_globlmn_hrc \
 ))
 
diff --git a/starmath/Library_smd.mk b/starmath/Library_smd.mk
index 59adb7b1660e..b836cf748473 100644
--- a/starmath/Library_smd.mk
+++ b/starmath/Library_smd.mk
@@ -10,8 +10,6 @@
 $(eval $(call gb_Library_Library,smd))
 
 $(eval $(call gb_Library_use_packages,smd,\
-	editeng_inc \
-	oox_inc \
 ))
 
 $(eval $(call gb_Library_set_componentfile,smd,starmath/util/smd))
diff --git a/store/Library_store.mk b/store/Library_store.mk
index 983f811e065f..301721601c0d 100644
--- a/store/Library_store.mk
+++ b/store/Library_store.mk
@@ -29,7 +29,6 @@ $(eval $(call gb_Library_Library,store))
 $(eval $(call gb_Library_use_external,store,boost_headers))
 
 $(eval $(call gb_Library_use_packages,store,\
-	store_inc \
 ))
 
 $(eval $(call gb_Library_add_defs,store,\
diff --git a/svl/AllLangResTarget_svl.mk b/svl/AllLangResTarget_svl.mk
index a4a72cf5bd66..c76ed01f031f 100644
--- a/svl/AllLangResTarget_svl.mk
+++ b/svl/AllLangResTarget_svl.mk
@@ -26,7 +26,6 @@ $(eval $(call gb_AllLangResTarget_add_srs,svl,\
 $(eval $(call gb_SrsTarget_SrsTarget,svl/res))
 
 $(eval $(call gb_SrsTarget_use_packages,svl/res,\
-	svl_inc \
 ))
 
 $(eval $(call gb_SrsTarget_add_files,svl/res,\
diff --git a/svl/Library_fsstorage.mk b/svl/Library_fsstorage.mk
index 6ccd8bd81c09..468fbfe49608 100644
--- a/svl/Library_fsstorage.mk
+++ b/svl/Library_fsstorage.mk
@@ -28,8 +28,6 @@
 
 $(eval $(call gb_Library_Library,fsstorage))
 
-$(eval $(call gb_Library_use_package,fsstorage,svl_inc))
-
 $(eval $(call gb_Library_set_componentfile,fsstorage,svl/source/fsstor/fsstorage))
 
 $(eval $(call gb_Library_set_include,fsstorage,\
diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk
index 5cde5678563a..f4291e03f58f 100644
--- a/svl/Library_passwordcontainer.mk
+++ b/svl/Library_passwordcontainer.mk
@@ -28,8 +28,6 @@
 
 $(eval $(call gb_Library_Library,passwordcontainer))
 
-$(eval $(call gb_Library_use_package,passwordcontainer,svl_inc))
-
 $(eval $(call gb_Library_set_componentfile,passwordcontainer,svl/source/passwordcontainer/passwordcontainer))
 
 $(eval $(call gb_Library_set_include,passwordcontainer,\
diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk
index fcd83ad8f7aa..ce4aa9793442 100644
--- a/svl/Library_svl.mk
+++ b/svl/Library_svl.mk
@@ -31,8 +31,6 @@ $(eval $(call gb_Library_Library,svl))
 $(eval $(call gb_Library_use_external,svl,boost_headers))
 
 $(eval $(call gb_Library_use_packages,svl,\
-	rsc_inc \
-	svl_inc \
 ))
 
 $(eval $(call gb_Library_set_componentfile,svl,svl/util/svl))
diff --git a/svtools/AllLangResTarget_svt.mk b/svtools/AllLangResTarget_svt.mk
index c9e33f94dbcc..edaeef649053 100644
--- a/svtools/AllLangResTarget_svt.mk
+++ b/svtools/AllLangResTarget_svt.mk
@@ -28,11 +28,6 @@ $(eval $(call gb_AllLangResTarget_add_srs,svt,\
 $(eval $(call gb_SrsTarget_SrsTarget,svt/res))
 
 $(eval $(call gb_SrsTarget_use_packages,svt/res,\
-    i18nlangtag_inc \
-    svl_inc \
-    svtools_inc \
-    vcl_inc \
-    tools_inc \
 ))
 
 $(eval $(call gb_SrsTarget_set_include,svt/res,\
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index 3ede10bdc0f1..4b339e9958e8 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -19,8 +19,6 @@
 
 $(eval $(call gb_Library_Library,svt))
 
-$(eval $(call gb_Library_use_package,svt,svtools_inc))
-
 $(eval $(call gb_Library_set_precompiled_header,svt,$(SRCDIR)/svtools/inc/pch/precompiled_svt))
 
 $(eval $(call gb_Library_set_componentfile,svt,svtools/util/svt))
diff --git a/svx/AllLangResTarget_gal.mk b/svx/AllLangResTarget_gal.mk
index 48e841a3fcec..58515818923b 100644
--- a/svx/AllLangResTarget_gal.mk
+++ b/svx/AllLangResTarget_gal.mk
@@ -26,10 +26,6 @@ $(eval $(call gb_AllLangResTarget_add_srs,gal,svx/gal))
 $(eval $(call gb_SrsTarget_SrsTarget,svx/gal))
 
 $(eval $(call gb_SrsTarget_use_packages,svx/gal,\
-	editeng_inc \
-	sfx2_inc \
-	svl_inc \
-	svx_inc \
 ))
 
 $(eval $(call gb_SrsTarget_set_include,svx/gal,\
diff --git a/svx/AllLangResTarget_ofa.mk b/svx/AllLangResTarget_ofa.mk
index ee7f2017b1d3..4003a67aac65 100644
--- a/svx/AllLangResTarget_ofa.mk
+++ b/svx/AllLangResTarget_ofa.mk
@@ -26,12 +26,6 @@ $(eval $(call gb_AllLangResTarget_add_srs,ofa,svx/ofa))
 $(eval $(call gb_SrsTarget_SrsTarget,svx/ofa))
 
 $(eval $(call gb_SrsTarget_use_packages,svx/ofa,\
-	editeng_inc \
-	sfx2_inc \
-	svl_inc \
-	svtools_inc \
-	svx_inc \
-	tools_inc \
 ))
 
 $(eval $(call gb_SrsTarget_add_files,svx/ofa,\
diff --git a/svx/AllLangResTarget_svx.mk b/svx/AllLangResTarget_svx.mk
index c973b5da0a54..1c1cadc66ae8 100644
--- a/svx/AllLangResTarget_svx.mk
+++ b/svx/AllLangResTarget_svx.mk
@@ -28,12 +28,6 @@ $(eval $(call gb_AllLangResTarget_add_srs,svx,\
 $(eval $(call gb_SrsTarget_SrsTarget,svx/res))
 
 $(eval $(call gb_SrsTarget_use_packages,svx/res,\
-	editeng_inc \
-	sfx2_inc \
-	svl_inc \
-	svtools_inc \
-	svx_inc \
-	tools_inc \
 ))
 
 $(eval $(call gb_SrsTarget_set_include,svx/res,\
diff --git a/svx/AllLangResTarget_textconversiondlgs.mk b/svx/AllLangResTarget_textconversiondlgs.mk
index e40c8f483c30..d3b8ad86c867 100644
--- a/svx/AllLangResTarget_textconversiondlgs.mk
+++ b/svx/AllLangResTarget_textconversiondlgs.mk
@@ -28,7 +28,6 @@ $(eval $(call gb_AllLangResTarget_add_srs,textconversiondlgs,\
 $(eval $(call gb_SrsTarget_SrsTarget,svx/textconversiondlgs))
 
 $(eval $(call gb_SrsTarget_use_packages,svx/textconversiondlgs,\
-	svtools_inc \
 ))
 
 $(eval $(call gb_SrsTarget_add_files,svx/textconversiondlgs,\
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index c868a5874c01..c28e0f8c730f 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -24,7 +24,6 @@ $(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_use_packages,svxcore,\
-    svx_inc \
     svx_sdi \
 ))
 
@@ -378,7 +377,6 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\
 
 ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
 $(eval $(call gb_Library_use_packages,svxcore,\
-	connectivity_inc \
 	connectivity_generated \
 ))
 
diff --git a/svx/Library_textconversiondlgs.mk b/svx/Library_textconversiondlgs.mk
index ead619daf964..5fd91aa8da6a 100644
--- a/svx/Library_textconversiondlgs.mk
+++ b/svx/Library_textconversiondlgs.mk
@@ -20,7 +20,6 @@
 $(eval $(call gb_Library_Library,textconversiondlgs))
 
 $(eval $(call gb_Library_use_packages,textconversiondlgs,\
-	sfx2_inc \
 ))
 
 $(eval $(call gb_Library_set_componentfile,textconversiondlgs,svx/util/textconversiondlgs))
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index 735751a1761f..69a6aaaed084 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -26,13 +26,7 @@ $(eval $(call gb_AllLangResTarget_add_srs,sw,\
 $(eval $(call gb_SrsTarget_SrsTarget,sw/res))
 
 $(eval $(call gb_SrsTarget_use_packages,sw/res,\
-	editeng_inc \
-	sfx2_inc \
-	svl_inc \
-	svtools_inc \
 	svx_globlmn_hrc \
-	svx_inc \
-	tools_inc \
 ))
 
 $(eval $(call gb_SrsTarget_set_include,sw/res,\
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index 4d35d693b28c..f9fd27bb55b4 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -75,7 +75,6 @@ $(eval $(call gb_Library_use_libraries,sw,\
 ))
 
 $(eval $(call gb_Library_use_packages,sw,\
-	vbahelper_inc \
 ))
 
 $(eval $(call gb_Library_use_externals,sw,\
diff --git a/test/Library_test.mk b/test/Library_test.mk
index 1027dc5a2859..ba304a56bf53 100644
--- a/test/Library_test.mk
+++ b/test/Library_test.mk
@@ -9,8 +9,6 @@
 
 $(eval $(call gb_Library_Library,test))
 
-$(eval $(call gb_Library_use_package,test,test_inc))
-
 $(eval $(call gb_Library_add_defs,test,\
     -DOOO_DLLIMPLEMENTATION_TEST \
 ))
diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk
index 2bdc643793fa..f06c11dacce7 100644
--- a/toolkit/Library_tk.mk
+++ b/toolkit/Library_tk.mk
@@ -32,8 +32,6 @@ $(eval $(call gb_Library_set_componentfile,tk,toolkit/util/tk))
 
 $(eval $(call gb_Library_use_external,tk,boost_headers))
 
-$(eval $(call gb_Library_use_package,tk,toolkit_inc))
-
 $(eval $(call gb_Library_set_include,tk,\
     $$(INCLUDE) \
     -I$(SRCDIR)/toolkit/inc \
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index 5491b8c90e91..e0d19b84e358 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -19,8 +19,6 @@
 
 $(eval $(call gb_Library_Library,tl))
 
-$(eval $(call gb_Library_use_package,tl,tools_inc))
-
 $(eval $(call gb_Library_use_custom_headers,tl,tools/reversemap))
 
 $(eval $(call gb_Library_set_include,tl,\
diff --git a/tools/StaticLibrary_ooopathutils.mk b/tools/StaticLibrary_ooopathutils.mk
index 3942e688f801..4a14ddf31740 100644
--- a/tools/StaticLibrary_ooopathutils.mk
+++ b/tools/StaticLibrary_ooopathutils.mk
@@ -20,7 +20,6 @@
 $(eval $(call gb_StaticLibrary_StaticLibrary,ooopathutils))
 
 $(eval $(call gb_StaticLibrary_use_packages,ooopathutils,\
-	tools_inc \
 ))
 
 $(eval $(call gb_StaticLibrary_add_exception_objects,ooopathutils,\
diff --git a/tubes/Library_tubes.mk b/tubes/Library_tubes.mk
index ae7f3a4c86a6..f294e1aa1675 100644
--- a/tubes/Library_tubes.mk
+++ b/tubes/Library_tubes.mk
@@ -10,8 +10,6 @@
 
 $(eval $(call gb_Library_Library,tubes))
 
-$(eval $(call gb_Library_use_packages,tubes,tubes_inc))
-
 $(eval $(call gb_Library_set_include,tubes,\
 	-I$(SRCDIR)/tubes/inc \
 	$$(INCLUDE) \
diff --git a/ucb/Library_srtrs1.mk b/ucb/Library_srtrs1.mk
index 5dfb160ba03b..b073620ff1cf 100644
--- a/ucb/Library_srtrs1.mk
+++ b/ucb/Library_srtrs1.mk
@@ -28,7 +28,6 @@
 $(eval $(call gb_Library_Library,srtrs1))
 
 $(eval $(call gb_Library_use_packages,srtrs1,\
-	ucbhelper_inc \
 ))
 
 $(eval $(call gb_Library_set_componentfile,srtrs1,ucb/source/sorter/srtrs1))
diff --git a/ucb/Library_ucpext.mk b/ucb/Library_ucpext.mk
index 5e1b19523881..71fe40f9daf9 100644
--- a/ucb/Library_ucpext.mk
+++ b/ucb/Library_ucpext.mk
@@ -28,7 +28,6 @@
 $(eval $(call gb_Library_Library,ucpext))
 
 $(eval $(call gb_Library_use_packages,ucpext,\
-	tools_inc \
 ))
 
 $(eval $(call gb_Library_set_componentfile,ucpext,ucb/source/ucp/ext/ucpext))
diff --git a/ucbhelper/Library_ucbhelper.mk b/ucbhelper/Library_ucbhelper.mk
index 49a1b2a8df0e..8d1d80523c10 100644
--- a/ucbhelper/Library_ucbhelper.mk
+++ b/ucbhelper/Library_ucbhelper.mk
@@ -9,8 +9,6 @@
 
 $(eval $(call gb_Library_Library,ucbhelper))
 
-$(eval $(call gb_Library_use_package,ucbhelper,ucbhelper_inc))
-
 $(eval $(call gb_Library_use_sdk_api,ucbhelper))
 
 $(eval $(call gb_Library_use_external,ucbhelper,boost_headers))
diff --git a/udm/StaticLibrary_udm.mk b/udm/StaticLibrary_udm.mk
index 3901a45bd727..d8eac688f280 100644
--- a/udm/StaticLibrary_udm.mk
+++ b/udm/StaticLibrary_udm.mk
@@ -10,8 +10,6 @@
 $(eval $(call gb_StaticLibrary_StaticLibrary,udm))
 
 $(eval $(call gb_StaticLibrary_use_packages,udm,\
-	cosv_inc \
-	udm_inc \
 ))
 
 $(eval $(call gb_StaticLibrary_set_include,udm,\
diff --git a/unoidl/Library_unoidl.mk b/unoidl/Library_unoidl.mk
index 5de3cf163ac0..46534c7ec6aa 100644
--- a/unoidl/Library_unoidl.mk
+++ b/unoidl/Library_unoidl.mk
@@ -23,6 +23,4 @@ $(eval $(call gb_Library_use_libraries,unoidl, \
     salhelper \
 ))
 
-$(eval $(call gb_Library_use_package,unoidl,unoidl_inc))
-
 # vim: set noet sw=4 ts=4:
diff --git a/unotest/Library_unobootstrapprotector.mk b/unotest/Library_unobootstrapprotector.mk
index 0ba1e9352907..8a29d9490121 100644
--- a/unotest/Library_unobootstrapprotector.mk
+++ b/unotest/Library_unobootstrapprotector.mk
@@ -27,8 +27,6 @@
 
 $(eval $(call gb_Library_Library,unobootstrapprotector))
 
-$(eval $(call gb_Library_use_package,unobootstrapprotector,unotest_inc))
-
 $(eval $(call gb_Library_use_sdk_api,unobootstrapprotector))
 
 $(eval $(call gb_Library_use_libraries,unobootstrapprotector,\
diff --git a/unotest/Library_unoexceptionprotector.mk b/unotest/Library_unoexceptionprotector.mk
index 40534d28e1a8..3d6bf0f8de01 100644
--- a/unotest/Library_unoexceptionprotector.mk
+++ b/unotest/Library_unoexceptionprotector.mk
@@ -27,8 +27,6 @@
 
 $(eval $(call gb_Library_Library,unoexceptionprotector))
 
-$(eval $(call gb_Library_use_package,unoexceptionprotector,unotest_inc))
-
 $(eval $(call gb_Library_use_sdk_api,unoexceptionprotector))
 
 $(eval $(call gb_Library_use_libraries,unoexceptionprotector,\
diff --git a/unotest/Library_unotest.mk b/unotest/Library_unotest.mk
index d86ec273c538..0b59ca0b31ac 100644
--- a/unotest/Library_unotest.mk
+++ b/unotest/Library_unotest.mk
@@ -27,8 +27,6 @@
 
 $(eval $(call gb_Library_Library,unotest))
 
-$(eval $(call gb_Library_use_package,unotest,unotest_inc))
-
 $(eval $(call gb_Library_add_defs,unotest,\
 	-DOOO_DLLIMPLEMENTATION_UNOTEST \
 ))
diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk
index fbebf37a78ad..f840fa2d7b3d 100644
--- a/unotools/Library_utl.mk
+++ b/unotools/Library_utl.mk
@@ -13,10 +13,6 @@ $(eval $(call gb_Library_Library,utl))
 
 $(eval $(call gb_Library_use_external,utl,boost_headers))
 
-# declare packages that will be delivered before compilation of utl
-# learn more about TYPE in the Package.mk template
-$(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))
 
diff --git a/uui/AllLangResTarget_uui.mk b/uui/AllLangResTarget_uui.mk
index 66694b00930e..d1189bbdccc7 100644
--- a/uui/AllLangResTarget_uui.mk
+++ b/uui/AllLangResTarget_uui.mk
@@ -35,9 +35,6 @@ $(eval $(call gb_AllLangResTarget_add_srs,uui,\
 $(eval $(call gb_SrsTarget_SrsTarget,uui/res))
 
 $(eval $(call gb_SrsTarget_use_packages,uui/res,\
-	svl_inc \
-	svtools_inc \
-	tools_inc \
 ))
 
 $(eval $(call gb_SrsTarget_set_include,uui/res,\
diff --git a/vbahelper/Library_vbahelper.mk b/vbahelper/Library_vbahelper.mk
index 1233c5bef536..1ff7fa55af7a 100644
--- a/vbahelper/Library_vbahelper.mk
+++ b/vbahelper/Library_vbahelper.mk
@@ -28,8 +28,6 @@
 
 $(eval $(call gb_Library_Library,vbahelper))
 
-$(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))
 
diff --git a/vcl/AllLangResTarget_vcl.mk b/vcl/AllLangResTarget_vcl.mk
index 39efb7f762a3..40411cc2190e 100644
--- a/vcl/AllLangResTarget_vcl.mk
+++ b/vcl/AllLangResTarget_vcl.mk
@@ -28,7 +28,6 @@ $(eval $(call gb_AllLangResTarget_add_srs,vcl,\
 $(eval $(call gb_SrsTarget_SrsTarget,vcl/source/src))
 
 $(eval $(call gb_SrsTarget_use_packages,vcl/source/src,\
-	svl_inc \
 ))
 
 $(eval $(call gb_SrsTarget_set_include,vcl/source/src,\
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index f1de72b9b79d..2ef627e41374 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -42,8 +42,6 @@ else
 $(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.unx))
 endif
 
-$(eval $(call gb_Library_use_package,vcl,vcl_inc))
-
 $(eval $(call gb_Library_set_precompiled_header,vcl,$(SRCDIR)/vcl/inc/pch/precompiled_vcl))
 
 $(eval $(call gb_Library_use_custom_headers,vcl,vcl/generic/fontmanager))
@@ -347,7 +345,6 @@ $(eval $(call gb_Library_use_external,vcl,graphite))
 endif
 
 $(eval $(call gb_Library_use_packages,vcl,\
-	basebmp_inc \
 ))
 
 vcl_quartz_code= \
diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk
index 1eedaa515516..844129ff55c7 100644
--- a/vcl/Library_vclplug_kde.mk
+++ b/vcl/Library_vclplug_kde.mk
@@ -20,7 +20,6 @@
 $(eval $(call gb_Library_Library,vclplug_kde))
 
 $(eval $(call gb_Library_use_packages,vclplug_kde,\
-	shell_inc \
 ))
 
 $(eval $(call gb_Library_set_include,vclplug_kde,\
diff --git a/vcl/Library_vclplug_tde.mk b/vcl/Library_vclplug_tde.mk
index 2abfce081bb9..e2a3d28bf663 100644
--- a/vcl/Library_vclplug_tde.mk
+++ b/vcl/Library_vclplug_tde.mk
@@ -27,7 +27,6 @@
 $(eval $(call gb_Library_Library,vclplug_tde))
 
 $(eval $(call gb_Library_use_packages,vclplug_tde,\
-	shell_inc \
 ))
 
 $(eval $(call gb_Library_set_include,vclplug_tde,\
diff --git a/vcl/StaticLibrary_headless.mk b/vcl/StaticLibrary_headless.mk
index 2b003a8da011..b8cdcd0cca08 100644
--- a/vcl/StaticLibrary_headless.mk
+++ b/vcl/StaticLibrary_headless.mk
@@ -29,15 +29,6 @@
 $(eval $(call gb_StaticLibrary_StaticLibrary,headless))
 
 $(eval $(call gb_StaticLibrary_use_packages,headless,\
-	basebmp_inc \
-	basegfx_inc \
-	comphelper_inc \
-	i18nlangtag_inc \
-	i18nutil_inc \
-	o3tl_inc \
-	rsc_inc \
-	tools_inc \
-	unotools_inc \
 ))
 
 $(eval $(call gb_StaticLibrary_use_external,headless,boost_headers))
diff --git a/vcl/StaticLibrary_vclmain.mk b/vcl/StaticLibrary_vclmain.mk
index 0f437a60b7ee..1c7791ddf235 100644
--- a/vcl/StaticLibrary_vclmain.mk
+++ b/vcl/StaticLibrary_vclmain.mk
@@ -20,8 +20,6 @@
 $(eval $(call gb_StaticLibrary_StaticLibrary,vclmain))
 
 $(eval $(call gb_StaticLibrary_use_packages,vclmain,\
-	comphelper_inc \
-	tools_inc \
 ))
 
 ifeq ($(OS),IOS)
diff --git a/writerperfect/StaticLibrary_writerperfect.mk b/writerperfect/StaticLibrary_writerperfect.mk
index 9e80119aaa9f..50b83b135990 100644
--- a/writerperfect/StaticLibrary_writerperfect.mk
+++ b/writerperfect/StaticLibrary_writerperfect.mk
@@ -20,11 +20,6 @@
 $(eval $(call gb_StaticLibrary_StaticLibrary,writerperfect))
 
 $(eval $(call gb_StaticLibrary_use_packages,writerperfect,\
-	comphelper_inc \
-	sot_inc \
-	tools_inc \
-	unotools_inc \
-	xmloff_inc \
 ))
 
 $(eval $(call gb_StaticLibrary_set_include,writerperfect,\
diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk
index 8994ff3d76d2..ef8a54c6d5ba 100644
--- a/xmloff/Library_xo.mk
+++ b/xmloff/Library_xo.mk
@@ -21,8 +21,6 @@ $(eval $(call gb_Library_Library,xo))
 
 $(eval $(call gb_Library_set_componentfile,xo,xmloff/util/xo))
 
-$(eval $(call gb_Library_use_package,xo,xmloff_inc))
-
 $(eval $(call gb_Library_set_precompiled_header,xo,$(SRCDIR)/xmloff/inc/pch/precompiled_xo))
 
 $(eval $(call gb_Library_set_include,xo,\
diff --git a/xmlreader/Library_xmlreader.mk b/xmlreader/Library_xmlreader.mk
index d7356fbff2bc..ee0666e0ba87 100644
--- a/xmlreader/Library_xmlreader.mk
+++ b/xmlreader/Library_xmlreader.mk
@@ -28,8 +28,6 @@
 
 $(eval $(call gb_Library_Library,xmlreader))
 
-$(eval $(call gb_Library_use_package,xmlreader,xmlreader_inc))
-
 $(eval $(call gb_Library_add_defs,xmlreader,\
 	-DOOO_DLLIMPLEMENTATION_XMLREADER \
 ))
diff --git a/xmlscript/Library_xmlscript.mk b/xmlscript/Library_xmlscript.mk
index b27fdf58fafc..c625594d421d 100644
--- a/xmlscript/Library_xmlscript.mk
+++ b/xmlscript/Library_xmlscript.mk
@@ -12,8 +12,6 @@ $(eval $(call gb_Library_Library,xmlscript))
 $(eval $(call gb_Library_use_external,xmlscript,boost_headers))
 
 $(eval $(call gb_Library_use_packages,xmlscript,\
-	tools_inc \
-	xmlscript_inc \
 ))
 
 $(eval $(call gb_Library_set_componentfile,xmlscript,xmlscript/util/xmlscript))
diff --git a/xmlsecurity/AllLangResTarget_xsec.mk b/xmlsecurity/AllLangResTarget_xsec.mk
index 74d8d109b57f..4ce15957d3d1 100644
--- a/xmlsecurity/AllLangResTarget_xsec.mk
+++ b/xmlsecurity/AllLangResTarget_xsec.mk
@@ -37,8 +37,6 @@ $(eval $(call gb_AllLangResTarget_add_srs,xmlsec,\
 $(eval $(call gb_SrsTarget_SrsTarget,xmlsec/res))
 
 $(eval $(call gb_SrsTarget_use_packages,xmlsec/res,\
-	svl_inc \
-	svtools_inc \
 ))
 
 $(eval $(call gb_SrsTarget_set_include,xmlsec/res,\