From fc81393c7f11ffb854fe024b64146b50cf462921 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Sat, 26 Jan 2013 22:15:04 +0100
Subject: gbuild: remove various pointless calls that don't add anything

Change-Id: I7eccac4fa8890c2873c6bbd7f8f5bf5b0dd006d2
---
 basctl/Library_basctl.mk                  | 4 ----
 desktop/Executable_crashrep.com.mk        | 4 ----
 desktop/Executable_officeloader.mk        | 4 ----
 desktop/Executable_oosplash.mk            | 4 ----
 desktop/Executable_quickstart.mk          | 4 ----
 desktop/Executable_unoinfo.mk             | 4 ----
 desktop/Executable_unopkg.com.mk          | 4 ----
 desktop/Library_migrationoo2.mk           | 4 ----
 desktop/Library_migrationoo3.mk           | 4 ----
 desktop/Library_offacc.mk                 | 4 ----
 dtrans/Library_dnd.mk                     | 4 ----
 dtrans/Library_dtrans.mk                  | 4 ----
 dtrans/Library_ftransl.mk                 | 4 ----
 dtrans/Library_mcnttype.mk                | 4 ----
 dtrans/Library_sysdtrans.mk               | 4 ----
 editeng/CppunitTest_editeng_borderline.mk | 4 ----
 editeng/CppunitTest_editeng_lookuptree.mk | 4 ----
 fileaccess/Library_fileacc.mk             | 4 ----
 filter/Library_egi.mk                     | 4 ----
 filter/Library_eme.mk                     | 4 ----
 filter/Library_epb.mk                     | 4 ----
 filter/Library_epg.mk                     | 4 ----
 filter/Library_epp.mk                     | 4 ----
 filter/Library_eps.mk                     | 4 ----
 filter/Library_ept.mk                     | 4 ----
 filter/Library_era.mk                     | 4 ----
 filter/Library_eti.mk                     | 4 ----
 filter/Library_exp.mk                     | 4 ----
 filter/Library_flash.mk                   | 4 ----
 filter/Library_icd.mk                     | 4 ----
 filter/Library_icg.mk                     | 4 ----
 filter/Library_idx.mk                     | 4 ----
 filter/Library_ime.mk                     | 4 ----
 filter/Library_ipb.mk                     | 4 ----
 filter/Library_ipd.mk                     | 4 ----
 filter/Library_ips.mk                     | 4 ----
 filter/Library_ipt.mk                     | 4 ----
 filter/Library_ipx.mk                     | 4 ----
 filter/Library_ira.mk                     | 4 ----
 filter/Library_itg.mk                     | 4 ----
 filter/Library_iti.mk                     | 4 ----
 filter/Library_msfilter.mk                | 4 ----
 filter/Library_placeware.mk               | 4 ----
 filter/Library_t602filter.mk              | 4 ----
 filter/Library_textfd.mk                  | 4 ----
 filter/Library_xmlfa.mk                   | 4 ----
 filter/Library_xmlfd.mk                   | 4 ----
 filter/Library_xsltfilter.mk              | 4 ----
 hwpfilter/Library_hwp.mk                  | 4 ----
 i18npool/Executable_genconv_dict.mk       | 4 ----
 i18npool/Executable_gendict.mk            | 4 ----
 i18npool/Executable_genindex_data.mk      | 4 ----
 i18npool/Executable_saxparser.mk          | 4 ----
 i18npool/Library_i18nsearch.mk            | 4 ----
 ios/Executable_Viewer.mk                  | 4 ----
 lotuswordpro/Library_lwpft.mk             | 4 ----
 padmin/Executable_spadmin.bin.mk          | 4 ----
 slideshow/Library_OGLTrans.mk             | 4 ----
 svx/Executable_gengal.bin.mk              | 4 ----
 unoxml/Library_unordf.mk                  | 4 ----
 unoxml/Library_unoxml.mk                  | 4 ----
 vbahelper/Library_msforms.mk              | 5 -----
 vbahelper/Library_vbahelper.mk            | 5 -----
 vcl/Executable_ui-previewer.mk            | 4 ----
 xmlsecurity/CppunitTest_qa_certext.mk     | 4 ----
 65 files changed, 262 deletions(-)

diff --git a/basctl/Library_basctl.mk b/basctl/Library_basctl.mk
index 14154cc0e54a..1025df8669eb 100644
--- a/basctl/Library_basctl.mk
+++ b/basctl/Library_basctl.mk
@@ -120,10 +120,6 @@ $(eval $(call gb_Library_add_sdi_headers,basctl,basctl/sdi/basslots))
 
 $(eval $(call gb_SdiTarget_SdiTarget,basctl/sdi/basslots,basctl/sdi/baside))
 
-$(eval $(call gb_SdiTarget_set_include,basctl/sdi/basslots,\
-	$$(INCLUDE) \
-))
-
 ifeq ($(OS),WNT)
 $(eval $(call gb_Library_use_system_win32_libs,basctl,\
 	advapi32 \
diff --git a/desktop/Executable_crashrep.com.mk b/desktop/Executable_crashrep.com.mk
index c42d6301a085..5605cfc492e1 100644
--- a/desktop/Executable_crashrep.com.mk
+++ b/desktop/Executable_crashrep.com.mk
@@ -29,10 +29,6 @@ $(eval $(call gb_Executable_Executable,crashrep_com))
 
 $(eval $(call gb_Executable_set_targettype_gui,crashrep_com,NO))
 
-$(eval $(call gb_Executable_set_include,crashrep_com,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Executable_add_defs,crashrep_com,\
     $(LFS_CFLAGS) \
 ))
diff --git a/desktop/Executable_officeloader.mk b/desktop/Executable_officeloader.mk
index d29e0d31108b..974610ca8f46 100644
--- a/desktop/Executable_officeloader.mk
+++ b/desktop/Executable_officeloader.mk
@@ -27,10 +27,6 @@
 
 $(eval $(call gb_Executable_Executable,officeloader))
 
-$(eval $(call gb_Executable_set_include,officeloader,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Executable_use_libraries,officeloader,\
     sal \
 	$(gb_UWINAPI) \
diff --git a/desktop/Executable_oosplash.mk b/desktop/Executable_oosplash.mk
index b67e08dc67e5..1f5280647202 100644
--- a/desktop/Executable_oosplash.mk
+++ b/desktop/Executable_oosplash.mk
@@ -29,10 +29,6 @@ $(eval $(call gb_Executable_Executable,oosplash))
 
 $(eval $(call gb_Executable_set_targettype_gui,oosplash,YES))
 
-$(eval $(call gb_Executable_set_include,oosplash,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Executable_use_libraries,oosplash,\
     sal \
 ))
diff --git a/desktop/Executable_quickstart.mk b/desktop/Executable_quickstart.mk
index 555917edf714..7d7101335f0b 100644
--- a/desktop/Executable_quickstart.mk
+++ b/desktop/Executable_quickstart.mk
@@ -29,10 +29,6 @@ $(eval $(call gb_Executable_Executable,quickstart))
 
 $(eval $(call gb_Executable_set_targettype_gui,quickstart,YES))
 
-$(eval $(call gb_Executable_set_include,quickstart,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Executable_use_system_win32_libs,quickstart,\
     comdlg32 \
     gdi32 \
diff --git a/desktop/Executable_unoinfo.mk b/desktop/Executable_unoinfo.mk
index 40db3a0bbb6e..841a2b9a7d18 100644
--- a/desktop/Executable_unoinfo.mk
+++ b/desktop/Executable_unoinfo.mk
@@ -27,10 +27,6 @@
 
 $(eval $(call gb_Executable_Executable,unoinfo))
 
-$(eval $(call gb_Executable_set_include,unoinfo,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Executable_use_static_libraries,unoinfo,\
     ooopathutils \
 ))
diff --git a/desktop/Executable_unopkg.com.mk b/desktop/Executable_unopkg.com.mk
index 9eb961b74502..946e5798de1d 100644
--- a/desktop/Executable_unopkg.com.mk
+++ b/desktop/Executable_unopkg.com.mk
@@ -29,10 +29,6 @@ $(eval $(call gb_Executable_Executable,unopkg_com))
 
 $(eval $(call gb_Executable_set_targettype_gui,unopkg_com,NO))
 
-$(eval $(call gb_Executable_set_include,unopkg_com,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Executable_add_defs,unopkg_com,\
     $(LFS_CFLAGS) \
 ))
diff --git a/desktop/Library_migrationoo2.mk b/desktop/Library_migrationoo2.mk
index 769df8b11cd1..f624d18b83f3 100644
--- a/desktop/Library_migrationoo2.mk
+++ b/desktop/Library_migrationoo2.mk
@@ -27,10 +27,6 @@
 
 $(eval $(call gb_Library_Library,migrationoo2))
 
-$(eval $(call gb_Library_set_include,migrationoo2,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_external,migrationoo2,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,migrationoo2))
diff --git a/desktop/Library_migrationoo3.mk b/desktop/Library_migrationoo3.mk
index 7fc3bf92c9e1..f397faf6f552 100644
--- a/desktop/Library_migrationoo3.mk
+++ b/desktop/Library_migrationoo3.mk
@@ -27,10 +27,6 @@
 
 $(eval $(call gb_Library_Library,migrationoo3))
 
-$(eval $(call gb_Library_set_include,migrationoo3,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_sdk_api,migrationoo3))
 
 $(eval $(call gb_Library_use_libraries,migrationoo3,\
diff --git a/desktop/Library_offacc.mk b/desktop/Library_offacc.mk
index 6e3c84589d76..2699ff009077 100644
--- a/desktop/Library_offacc.mk
+++ b/desktop/Library_offacc.mk
@@ -27,10 +27,6 @@
 
 $(eval $(call gb_Library_Library,offacc))
 
-$(eval $(call gb_Library_set_include,offacc,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_sdk_api,offacc))
 
 $(eval $(call gb_Library_use_libraries,offacc,\
diff --git a/dtrans/Library_dnd.mk b/dtrans/Library_dnd.mk
index 952b3cc51115..6314a648a1a2 100644
--- a/dtrans/Library_dnd.mk
+++ b/dtrans/Library_dnd.mk
@@ -30,10 +30,6 @@ $(eval $(call gb_Library_Library,dnd))
 
 $(eval $(call gb_Library_set_componentfile,dnd,dtrans/util/dnd))
 
-$(eval $(call gb_Library_set_include,dnd,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_sdk_api,dnd))
 
 $(eval $(call gb_Library_use_libraries,dnd,\
diff --git a/dtrans/Library_dtrans.mk b/dtrans/Library_dtrans.mk
index 1313b9bff939..43b2d3c1c0c2 100644
--- a/dtrans/Library_dtrans.mk
+++ b/dtrans/Library_dtrans.mk
@@ -30,10 +30,6 @@ $(eval $(call gb_Library_Library,dtrans))
 
 $(eval $(call gb_Library_set_componentfile,dtrans,dtrans/source/generic/dtrans))
 
-$(eval $(call gb_Library_set_include,dtrans,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_sdk_api,dtrans))
 
 $(eval $(call gb_Library_use_libraries,dtrans,\
diff --git a/dtrans/Library_ftransl.mk b/dtrans/Library_ftransl.mk
index f85460203a9d..fcad409984ba 100644
--- a/dtrans/Library_ftransl.mk
+++ b/dtrans/Library_ftransl.mk
@@ -30,10 +30,6 @@ $(eval $(call gb_Library_Library,ftransl))
 
 $(eval $(call gb_Library_set_componentfile,ftransl,dtrans/util/ftransl))
 
-$(eval $(call gb_Library_set_include,ftransl,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_sdk_api,ftransl))
 
 $(eval $(call gb_Library_use_libraries,ftransl,\
diff --git a/dtrans/Library_mcnttype.mk b/dtrans/Library_mcnttype.mk
index b826a42f8db0..efb50113d391 100644
--- a/dtrans/Library_mcnttype.mk
+++ b/dtrans/Library_mcnttype.mk
@@ -30,10 +30,6 @@ $(eval $(call gb_Library_Library,mcnttype))
 
 $(eval $(call gb_Library_set_componentfile,mcnttype,dtrans/util/mcnttype))
 
-$(eval $(call gb_Library_set_include,mcnttype,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_sdk_api,mcnttype))
 
 $(eval $(call gb_Library_use_libraries,mcnttype,\
diff --git a/dtrans/Library_sysdtrans.mk b/dtrans/Library_sysdtrans.mk
index 6be9786b72fa..9ab23961cf7e 100644
--- a/dtrans/Library_sysdtrans.mk
+++ b/dtrans/Library_sysdtrans.mk
@@ -30,10 +30,6 @@ $(eval $(call gb_Library_Library,sysdtrans))
 
 $(eval $(call gb_Library_set_componentfile,sysdtrans,dtrans/util/sysdtrans))
 
-$(eval $(call gb_Library_set_include,sysdtrans,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_sdk_api,sysdtrans))
 
 $(eval $(call gb_Library_add_defs,sysdtrans,\
diff --git a/editeng/CppunitTest_editeng_borderline.mk b/editeng/CppunitTest_editeng_borderline.mk
index 554ac68d811d..c8547109b6fe 100644
--- a/editeng/CppunitTest_editeng_borderline.mk
+++ b/editeng/CppunitTest_editeng_borderline.mk
@@ -51,10 +51,6 @@ $(eval $(call gb_CppunitTest_use_externals,editeng_borderline,\
     icuuc \
 ))
 
-$(eval $(call gb_CppunitTest_set_include,editeng_borderline,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_CppunitTest_use_api,editeng_borderline,\
     offapi \
     udkapi \
diff --git a/editeng/CppunitTest_editeng_lookuptree.mk b/editeng/CppunitTest_editeng_lookuptree.mk
index 1650db995682..1574558e304a 100644
--- a/editeng/CppunitTest_editeng_lookuptree.mk
+++ b/editeng/CppunitTest_editeng_lookuptree.mk
@@ -50,10 +50,6 @@ $(eval $(call gb_CppunitTest_use_externals,editeng_lookuptree,\
     icuuc \
 ))
 
-$(eval $(call gb_CppunitTest_set_include,editeng_lookuptree,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_CppunitTest_use_api,editeng_lookuptree,\
     offapi \
     udkapi \
diff --git a/fileaccess/Library_fileacc.mk b/fileaccess/Library_fileacc.mk
index a5df4474c901..75fae7a0c363 100644
--- a/fileaccess/Library_fileacc.mk
+++ b/fileaccess/Library_fileacc.mk
@@ -27,10 +27,6 @@
 
 $(eval $(call gb_Library_Library,fileacc))
 
-$(eval $(call gb_Library_set_include,fileacc,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_sdk_api,fileacc))
 
 $(eval $(call gb_Library_use_libraries,fileacc,\
diff --git a/filter/Library_egi.mk b/filter/Library_egi.mk
index 59dd7682d152..a51ad82d2091 100644
--- a/filter/Library_egi.mk
+++ b/filter/Library_egi.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,egi,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,egi))
 
-$(eval $(call gb_Library_set_include,egi,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,egi,\
 	svt \
 	vcl \
diff --git a/filter/Library_eme.mk b/filter/Library_eme.mk
index a62f16a0ce1c..1e431e6493de 100644
--- a/filter/Library_eme.mk
+++ b/filter/Library_eme.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,eme,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,eme))
 
-$(eval $(call gb_Library_set_include,eme,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,eme,\
 	svt \
 	vcl \
diff --git a/filter/Library_epb.mk b/filter/Library_epb.mk
index 1e9bd20a716c..eb0a05a78c27 100644
--- a/filter/Library_epb.mk
+++ b/filter/Library_epb.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,epb,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,epb))
 
-$(eval $(call gb_Library_set_include,epb,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,epb,\
 	svt \
 	vcl \
diff --git a/filter/Library_epg.mk b/filter/Library_epg.mk
index 4a97a0000f4b..0f329209c4b9 100644
--- a/filter/Library_epg.mk
+++ b/filter/Library_epg.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,epg,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,epg))
 
-$(eval $(call gb_Library_set_include,epg,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,epg,\
 	svt \
 	vcl \
diff --git a/filter/Library_epp.mk b/filter/Library_epp.mk
index bd9c4d9d4dab..dafdcd835a47 100644
--- a/filter/Library_epp.mk
+++ b/filter/Library_epp.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,epp,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,epp))
 
-$(eval $(call gb_Library_set_include,epp,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,epp,\
 	svt \
 	vcl \
diff --git a/filter/Library_eps.mk b/filter/Library_eps.mk
index 664ccef1766b..ea757b89569e 100644
--- a/filter/Library_eps.mk
+++ b/filter/Library_eps.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,eps,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,eps))
 
-$(eval $(call gb_Library_set_include,eps,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,eps,\
 	svt \
 	vcl \
diff --git a/filter/Library_ept.mk b/filter/Library_ept.mk
index 9f0a442db78e..62e4e950cf79 100644
--- a/filter/Library_ept.mk
+++ b/filter/Library_ept.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,ept,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,ept))
 
-$(eval $(call gb_Library_set_include,ept,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,ept,\
 	svt \
 	vcl \
diff --git a/filter/Library_era.mk b/filter/Library_era.mk
index 3a963a1dd4b0..f12a836ce6be 100644
--- a/filter/Library_era.mk
+++ b/filter/Library_era.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,era,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,era))
 
-$(eval $(call gb_Library_set_include,era,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,era,\
 	svt \
 	vcl \
diff --git a/filter/Library_eti.mk b/filter/Library_eti.mk
index 9f934f68eb33..bbafdc16ed6a 100644
--- a/filter/Library_eti.mk
+++ b/filter/Library_eti.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,eti,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,eti))
 
-$(eval $(call gb_Library_set_include,eti,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,eti,\
 	svt \
 	vcl \
diff --git a/filter/Library_exp.mk b/filter/Library_exp.mk
index 628e636e4618..7ea0be4ce6b6 100644
--- a/filter/Library_exp.mk
+++ b/filter/Library_exp.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,exp,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,exp))
 
-$(eval $(call gb_Library_set_include,exp,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,exp,\
 	svt \
 	vcl \
diff --git a/filter/Library_flash.mk b/filter/Library_flash.mk
index 97dd310905b1..d3fc3309562e 100644
--- a/filter/Library_flash.mk
+++ b/filter/Library_flash.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_set_componentfile,flash,filter/source/flash/flash))
 
 $(eval $(call gb_Library_use_sdk_api,flash))
 
-$(eval $(call gb_Library_set_include,flash,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,flash,\
 	svt \
 	vcl \
diff --git a/filter/Library_icd.mk b/filter/Library_icd.mk
index bc4ec54a3465..02f600eb3d4a 100644
--- a/filter/Library_icd.mk
+++ b/filter/Library_icd.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,icd,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,icd))
 
-$(eval $(call gb_Library_set_include,icd,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,icd,\
 	svt \
 	vcl \
diff --git a/filter/Library_icg.mk b/filter/Library_icg.mk
index 43362ad2865b..51e360cb1b50 100644
--- a/filter/Library_icg.mk
+++ b/filter/Library_icg.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,icg,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,icg))
 
-$(eval $(call gb_Library_set_include,icg,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,icg,\
         comphelper \
 	tk \
diff --git a/filter/Library_idx.mk b/filter/Library_idx.mk
index 69b1cd73cc95..a6369720f14c 100644
--- a/filter/Library_idx.mk
+++ b/filter/Library_idx.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,idx,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,idx))
 
-$(eval $(call gb_Library_set_include,idx,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,idx,\
 	vcl \
 	tl \
diff --git a/filter/Library_ime.mk b/filter/Library_ime.mk
index f7a37cc15f2c..f7889b494545 100644
--- a/filter/Library_ime.mk
+++ b/filter/Library_ime.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,ime,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,ime))
 
-$(eval $(call gb_Library_set_include,ime,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,ime,\
 	vcl \
 	tl \
diff --git a/filter/Library_ipb.mk b/filter/Library_ipb.mk
index a972a53b898a..41755170ea42 100644
--- a/filter/Library_ipb.mk
+++ b/filter/Library_ipb.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,ipb,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,ipb))
 
-$(eval $(call gb_Library_set_include,ipb,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,ipb,\
 	vcl \
 	tl \
diff --git a/filter/Library_ipd.mk b/filter/Library_ipd.mk
index 264cec6db538..34b1df83bae3 100644
--- a/filter/Library_ipd.mk
+++ b/filter/Library_ipd.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,ipd,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,ipd))
 
-$(eval $(call gb_Library_set_include,ipd,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,ipd,\
 	vcl \
 	tl \
diff --git a/filter/Library_ips.mk b/filter/Library_ips.mk
index ba4d5361a956..2a61795fd2b6 100644
--- a/filter/Library_ips.mk
+++ b/filter/Library_ips.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,ips,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,ips))
 
-$(eval $(call gb_Library_set_include,ips,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,ips,\
 	vcl \
 	tl \
diff --git a/filter/Library_ipt.mk b/filter/Library_ipt.mk
index 283cf8a34aef..68e913c3f0ac 100644
--- a/filter/Library_ipt.mk
+++ b/filter/Library_ipt.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,ipt,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,ipt))
 
-$(eval $(call gb_Library_set_include,ipt,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,ipt,\
 	vcl \
 	tl \
diff --git a/filter/Library_ipx.mk b/filter/Library_ipx.mk
index 9eeb5fd4eec5..5ed39ce27529 100644
--- a/filter/Library_ipx.mk
+++ b/filter/Library_ipx.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,ipx,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,ipx))
 
-$(eval $(call gb_Library_set_include,ipx,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,ipx,\
 	vcl \
 	tl \
diff --git a/filter/Library_ira.mk b/filter/Library_ira.mk
index 4df5243e2922..16ac76af12c3 100644
--- a/filter/Library_ira.mk
+++ b/filter/Library_ira.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,ira,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,ira))
 
-$(eval $(call gb_Library_set_include,ira,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,ira,\
 	vcl \
 	tl \
diff --git a/filter/Library_itg.mk b/filter/Library_itg.mk
index 282199691c74..0f6cd3387707 100644
--- a/filter/Library_itg.mk
+++ b/filter/Library_itg.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,itg,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,itg))
 
-$(eval $(call gb_Library_set_include,itg,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,itg,\
 	vcl \
 	tl \
diff --git a/filter/Library_iti.mk b/filter/Library_iti.mk
index 05cdac1fb01d..55224ace19eb 100644
--- a/filter/Library_iti.mk
+++ b/filter/Library_iti.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,iti,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,iti))
 
-$(eval $(call gb_Library_set_include,iti,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,iti,\
 	vcl \
 	tl \
diff --git a/filter/Library_msfilter.mk b/filter/Library_msfilter.mk
index c4dfb2eaf84a..90b6c3a2d716 100644
--- a/filter/Library_msfilter.mk
+++ b/filter/Library_msfilter.mk
@@ -27,10 +27,6 @@ $(eval $(call gb_Library_use_external,msfilter,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,msfilter))
 
-$(eval $(call gb_Library_set_include,msfilter,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_add_defs,msfilter,\
 	-DMSFILTER_DLLIMPLEMENTATION \
 ))
diff --git a/filter/Library_placeware.mk b/filter/Library_placeware.mk
index 8c636439335f..732c31f3bfa1 100644
--- a/filter/Library_placeware.mk
+++ b/filter/Library_placeware.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_set_componentfile,placeware,filter/source/placeware/pla
 
 $(eval $(call gb_Library_use_sdk_api,placeware))
 
-$(eval $(call gb_Library_set_include,placeware,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,placeware,\
 	cppuhelper \
 	cppu \
diff --git a/filter/Library_t602filter.mk b/filter/Library_t602filter.mk
index b9db72109cc9..a0acfe30b668 100644
--- a/filter/Library_t602filter.mk
+++ b/filter/Library_t602filter.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_set_componentfile,t602filter,filter/source/t602/t602fil
 
 $(eval $(call gb_Library_use_sdk_api,t602filter))
 
-$(eval $(call gb_Library_set_include,t602filter,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,t602filter,\
 	xo \
 	tl \
diff --git a/filter/Library_textfd.mk b/filter/Library_textfd.mk
index bcb4d90b55de..f367cef7b004 100644
--- a/filter/Library_textfd.mk
+++ b/filter/Library_textfd.mk
@@ -34,10 +34,6 @@ $(eval $(call gb_Library_set_componentfile,textfd,filter/source/textfilterdetect
 
 $(eval $(call gb_Library_use_sdk_api,textfd))
 
-$(eval $(call gb_Library_set_include,textfd,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,textfd,\
 	ucbhelper \
 	cppuhelper \
diff --git a/filter/Library_xmlfa.mk b/filter/Library_xmlfa.mk
index d8dec8d15f03..fe1dfae81440 100644
--- a/filter/Library_xmlfa.mk
+++ b/filter/Library_xmlfa.mk
@@ -25,10 +25,6 @@ $(eval $(call gb_Library_use_external,xmlfa,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,xmlfa))
 
-$(eval $(call gb_Library_set_include,xmlfa,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,xmlfa,\
 	tl \
 	comphelper \
diff --git a/filter/Library_xmlfd.mk b/filter/Library_xmlfd.mk
index 8972f7bcd633..39f10c2ccded 100644
--- a/filter/Library_xmlfd.mk
+++ b/filter/Library_xmlfd.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_set_componentfile,xmlfd,filter/source/xmlfilterdetect/x
 
 $(eval $(call gb_Library_use_sdk_api,xmlfd))
 
-$(eval $(call gb_Library_set_include,xmlfd,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,xmlfd,\
 	ucbhelper \
 	cppuhelper \
diff --git a/filter/Library_xsltfilter.mk b/filter/Library_xsltfilter.mk
index e3be0d77aa7b..d221bf800d9e 100644
--- a/filter/Library_xsltfilter.mk
+++ b/filter/Library_xsltfilter.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_set_componentfile,xsltfilter,filter/source/xsltfilter/x
 
 $(eval $(call gb_Library_use_sdk_api,xsltfilter))
 
-$(eval $(call gb_Library_set_include,xsltfilter,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,xsltfilter,\
 	xo \
 	tl \
diff --git a/hwpfilter/Library_hwp.mk b/hwpfilter/Library_hwp.mk
index f6b6159dc7c1..97264ca62189 100644
--- a/hwpfilter/Library_hwp.mk
+++ b/hwpfilter/Library_hwp.mk
@@ -27,10 +27,6 @@
 
 $(eval $(call gb_Library_Library,hwp))
 
-$(eval $(call gb_Library_set_include,hwp,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_sdk_api,hwp))
 
 $(eval $(call gb_Library_use_libraries,hwp,\
diff --git a/i18npool/Executable_genconv_dict.mk b/i18npool/Executable_genconv_dict.mk
index 70ec6c97dd2f..119735012736 100644
--- a/i18npool/Executable_genconv_dict.mk
+++ b/i18npool/Executable_genconv_dict.mk
@@ -28,10 +28,6 @@
 
 $(eval $(call gb_Executable_Executable,genconv_dict))
 
-$(eval $(call gb_Executable_set_include,genconv_dict,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Executable_use_libraries,genconv_dict,\
 	sal \
 	$(gb_UWINAPI) \
diff --git a/i18npool/Executable_gendict.mk b/i18npool/Executable_gendict.mk
index 3b63cfc5eea5..7d67e1ed8c4d 100644
--- a/i18npool/Executable_gendict.mk
+++ b/i18npool/Executable_gendict.mk
@@ -28,10 +28,6 @@
 
 $(eval $(call gb_Executable_Executable,gendict))
 
-$(eval $(call gb_Executable_set_include,gendict,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Executable_use_libraries,gendict,\
 	sal \
 	$(gb_UWINAPI) \
diff --git a/i18npool/Executable_genindex_data.mk b/i18npool/Executable_genindex_data.mk
index 0795b7bb2c51..6baf5d119ae1 100644
--- a/i18npool/Executable_genindex_data.mk
+++ b/i18npool/Executable_genindex_data.mk
@@ -28,10 +28,6 @@
 
 $(eval $(call gb_Executable_Executable,genindex_data))
 
-$(eval $(call gb_Executable_set_include,genindex_data,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Executable_use_libraries,genindex_data,\
 	sal \
 	$(gb_UWINAPI) \
diff --git a/i18npool/Executable_saxparser.mk b/i18npool/Executable_saxparser.mk
index ba0be63c5fc9..d006a80d368c 100644
--- a/i18npool/Executable_saxparser.mk
+++ b/i18npool/Executable_saxparser.mk
@@ -28,10 +28,6 @@
 
 $(eval $(call gb_Executable_Executable,saxparser))
 
-$(eval $(call gb_Executable_set_include,saxparser,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Executable_use_sdk_api,saxparser))
 
 $(eval $(call gb_Executable_use_libraries,saxparser,\
diff --git a/i18npool/Library_i18nsearch.mk b/i18npool/Library_i18nsearch.mk
index f7cd5fc4c48f..9a91a504c730 100644
--- a/i18npool/Library_i18nsearch.mk
+++ b/i18npool/Library_i18nsearch.mk
@@ -32,10 +32,6 @@ $(eval $(call gb_Library_use_package,i18nsearch,i18npool_inc))
 
 $(eval $(call gb_Library_set_componentfile,i18nsearch,i18npool/source/search/i18nsearch))
 
-$(eval $(call gb_Library_set_include,i18nsearch,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_sdk_api,i18nsearch))
 
 $(eval $(call gb_Library_use_externals,i18nsearch,\
diff --git a/ios/Executable_Viewer.mk b/ios/Executable_Viewer.mk
index 1931b54015b1..e98253414964 100644
--- a/ios/Executable_Viewer.mk
+++ b/ios/Executable_Viewer.mk
@@ -12,10 +12,6 @@ $(eval $(call gb_Executable_use_externals,Viewer,\
     zlib \
 ))
 
-$(eval $(call gb_Executable_set_include,Viewer,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Executable_use_system_darwin_frameworks,Viewer,\
     Foundation \
     CoreFoundation \
diff --git a/lotuswordpro/Library_lwpft.mk b/lotuswordpro/Library_lwpft.mk
index c6f2a7803939..7966c106e936 100644
--- a/lotuswordpro/Library_lwpft.mk
+++ b/lotuswordpro/Library_lwpft.mk
@@ -27,10 +27,6 @@
 
 $(eval $(call gb_Library_Library,lwpft))
 
-$(eval $(call gb_Library_set_include,lwpft,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_sdk_api,lwpft))
 
 $(eval $(call gb_Library_use_libraries,lwpft,\
diff --git a/padmin/Executable_spadmin.bin.mk b/padmin/Executable_spadmin.bin.mk
index 25fa903a588c..5ea6a3ad87d0 100644
--- a/padmin/Executable_spadmin.bin.mk
+++ b/padmin/Executable_spadmin.bin.mk
@@ -19,10 +19,6 @@
 
 $(eval $(call gb_Executable_Executable,spadmin.bin))
 
-$(eval $(call gb_Executable_set_include,spadmin.bin,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Executable_use_external,spadmin.bin,boost_headers))
 
 $(eval $(call gb_Executable_use_static_libraries,spadmin.bin,\
diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk
index 701b37727411..1b9043ee0210 100644
--- a/slideshow/Library_OGLTrans.mk
+++ b/slideshow/Library_OGLTrans.mk
@@ -27,10 +27,6 @@
 
 $(eval $(call gb_Library_Library,OGLTrans))
 
-$(eval $(call gb_Library_set_include,OGLTrans,\
-    $$(INCLUDE) \
-))
-
 ifeq ($(strip $(VERBOSE)),TRUE)
 $(eval $(call gb_Library_add_defs,OGLTrans,\
     -DVERBOSE \
diff --git a/svx/Executable_gengal.bin.mk b/svx/Executable_gengal.bin.mk
index 10955f9f1bc5..e6613e52b24e 100644
--- a/svx/Executable_gengal.bin.mk
+++ b/svx/Executable_gengal.bin.mk
@@ -35,10 +35,6 @@ $(eval $(call gb_Executable_set_include,$(svx_GENGALBIN),\
     -I$(OUTDIR)/inc/offapi \
 ))
 
-$(eval $(call gb_Executable_add_cxxflags,$(svx_GENGALBIN),\
-    $$(CXXFLAGS) \
-))
-
 $(eval $(call gb_Executable_use_external,$(svx_GENGALBIN),boost_headers))
 
 $(eval $(call gb_Executable_use_libraries,$(svx_GENGALBIN),\
diff --git a/unoxml/Library_unordf.mk b/unoxml/Library_unordf.mk
index 2ef670e1e858..ccbd29287b6a 100644
--- a/unoxml/Library_unordf.mk
+++ b/unoxml/Library_unordf.mk
@@ -21,10 +21,6 @@ $(eval $(call gb_Library_Library,unordf))
 
 $(eval $(call gb_Library_set_componentfile,unordf,unoxml/source/rdf/unordf))
 
-$(eval $(call gb_Library_set_include,unordf,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_sdk_api,unordf))
 
 $(eval $(call gb_Library_use_libraries,unordf,\
diff --git a/unoxml/Library_unoxml.mk b/unoxml/Library_unoxml.mk
index a974c33a9fd4..df7b2b4e827e 100644
--- a/unoxml/Library_unoxml.mk
+++ b/unoxml/Library_unoxml.mk
@@ -21,10 +21,6 @@ $(eval $(call gb_Library_Library,unoxml))
 
 $(eval $(call gb_Library_set_componentfile,unoxml,unoxml/source/service/unoxml))
 
-$(eval $(call gb_Library_set_include,unoxml,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_sdk_api,unoxml))
 
 $(eval $(call gb_Library_use_libraries,unoxml,\
diff --git a/vbahelper/Library_msforms.mk b/vbahelper/Library_msforms.mk
index 40b4c94ccc5f..d4bbc0830bf3 100644
--- a/vbahelper/Library_msforms.mk
+++ b/vbahelper/Library_msforms.mk
@@ -35,11 +35,6 @@ $(eval $(call gb_Library_Library,msforms))
 # in case UNO services are exported: declare location of component file
 $(eval $(call gb_Library_set_componentfile,msforms,vbahelper/util/msforms))
 
-# add any additional include paths for this library here
-$(eval $(call gb_Library_set_include,msforms,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_external,msforms,boost_headers))
 
 $(eval $(call gb_Library_use_api,msforms,\
diff --git a/vbahelper/Library_vbahelper.mk b/vbahelper/Library_vbahelper.mk
index 0537489ec8f0..1233c5bef536 100644
--- a/vbahelper/Library_vbahelper.mk
+++ b/vbahelper/Library_vbahelper.mk
@@ -33,11 +33,6 @@ $(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))
 
-# add any additional include paths for this library here
-$(eval $(call gb_Library_set_include,vbahelper,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_add_defs,vbahelper,\
     -DVBAHELPER_DLLIMPLEMENTATION \
 ))
diff --git a/vcl/Executable_ui-previewer.mk b/vcl/Executable_ui-previewer.mk
index 71ed93c838ea..1629c595df0f 100644
--- a/vcl/Executable_ui-previewer.mk
+++ b/vcl/Executable_ui-previewer.mk
@@ -27,10 +27,6 @@
 
 $(eval $(call gb_Executable_Executable,ui-previewer))
 
-$(eval $(call gb_Executable_set_include,ui-previewer,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Executable_use_external,ui-previewer,boost_headers))
 
 $(eval $(call gb_Executable_use_api,ui-previewer,\
diff --git a/xmlsecurity/CppunitTest_qa_certext.mk b/xmlsecurity/CppunitTest_qa_certext.mk
index c42e02408fd7..48c4b2630d37 100644
--- a/xmlsecurity/CppunitTest_qa_certext.mk
+++ b/xmlsecurity/CppunitTest_qa_certext.mk
@@ -28,10 +28,6 @@
 
 $(eval $(call gb_CppunitTest_CppunitTest,xmlsecurity_qa_certext))
 
-$(eval $(call gb_CppunitTest_set_include,xmlsecurity_qa_certext,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_CppunitTest_use_api,xmlsecurity_qa_certext,\
 	offapi \
 	udkapi \
-- 
cgit