clean up

27 files changed, 20 insertions, 93 deletions

diff --git a/filter/CppunitTest_filter_tga_test.mk b/filter/CppunitTest_filter_tga_test.mk
index 51edf537bf98..126f60593ac7 100644
--- a/filter/CppunitTest_filter_tga_test.mk
+++ b/filter/CppunitTest_filter_tga_test.mk
@@ -41,10 +41,6 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_tga_test, \
     $(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_CppunitTest_set_include,filter_tga_test,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_CppunitTest_use_api,filter_tga_test,\
     udkapi \
     offapi \
diff --git a/filter/CppunitTest_filter_tiff_test.mk b/filter/CppunitTest_filter_tiff_test.mk
index a647a32b434d..035712b8f1d0 100644
--- a/filter/CppunitTest_filter_tiff_test.mk
+++ b/filter/CppunitTest_filter_tiff_test.mk
@@ -41,10 +41,6 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_tiff_test, \
     $(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_CppunitTest_set_include,filter_tiff_test,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_CppunitTest_use_api,filter_tiff_test,\
     udkapi \
     offapi \
diff --git a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
index a0b01705f1cc..1d3fcd716835 100644
--- a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
+++ b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
@@ -45,10 +45,6 @@ $(eval $(call gb_CppunitTest_use_libraries,hwpfilter_test_hwpfilter, \
     $(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_CppunitTest_set_include,hwpfilter_test_hwpfilter,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_CppunitTest_use_api,hwpfilter_test_hwpfilter,\
     offapi \
     udkapi \
@@ -63,9 +59,4 @@ $(eval $(call gb_CppunitTest_use_components,hwpfilter_test_hwpfilter,\
 
 $(eval $(call gb_CppunitTest_use_configuration,hwpfilter_test_hwpfilter))
 
-# we need to explicitly depend on library hwp because it is not implied
-# by a link relation
-$(call gb_CppunitTest_get_target,hwpfilter_test_hwpfilter) : \
-	$(call gb_Library_get_target,hwp)
-
 # vim: set noet sw=4 ts=4:
diff --git a/i18npool/CppunitTest_i18npool_test_breakiterator.mk b/i18npool/CppunitTest_i18npool_test_breakiterator.mk
index 19808fffcc96..de7bb0a833e4 100644
--- a/i18npool/CppunitTest_i18npool_test_breakiterator.mk
+++ b/i18npool/CppunitTest_i18npool_test_breakiterator.mk
@@ -28,10 +28,6 @@
 
 $(eval $(call gb_CppunitTest_CppunitTest,i18npool_test_breakiterator))
 
-$(eval $(call gb_CppunitTest_set_include,i18npool_test_breakiterator,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_CppunitTest_use_api,i18npool_test_breakiterator,\
 	udkapi \
 	offapi \
@@ -52,6 +48,4 @@ $(eval $(call gb_CppunitTest_use_components,i18npool_test_breakiterator,\
 	i18npool/util/i18npool \
 ))
 
-$(call gb_CppunitTest_get_target,i18npool_test_breakiterator) : $(call gb_Module_get_target,i18npool)
-
 # vim: set noet sw=4 ts=4:
diff --git a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
index a9b1bcd681cc..85e60f6ece89 100644
--- a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
+++ b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
@@ -45,10 +45,6 @@ $(eval $(call gb_CppunitTest_use_libraries,lotuswordpro_test_lotuswordpro, \
     $(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_CppunitTest_set_include,lotuswordpro_test_lotuswordpro,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_CppunitTest_use_api,lotuswordpro_test_lotuswordpro,\
     offapi \
     udkapi \
@@ -63,8 +59,4 @@ $(eval $(call gb_CppunitTest_use_components,lotuswordpro_test_lotuswordpro,\
 
 $(eval $(call gb_CppunitTest_use_configuration,lotuswordpro_test_lotuswordpro))
 
-# we need to explicitly depend on library lwpft because it is not implied
-# by a link relation
-$(call gb_CppunitTest_get_target,lotuswordpro_test_lotuswordpro) : $(call gb_Library_get_target,lwpft)
-
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_cellrangeobj.mk b/sc/CppunitTest_sc_cellrangeobj.mk
index a4ee45a10ff9..0935d900fa9b 100644
--- a/sc/CppunitTest_sc_cellrangeobj.mk
+++ b/sc/CppunitTest_sc_cellrangeobj.mk
@@ -76,7 +76,6 @@ $(eval $(call gb_CppunitTest_set_include,sc_cellrangesbase,\
     -I$(SRCDIR)/sc/source/ui/inc \
     -I$(SRCDIR)/sc/inc \
     $$(INCLUDE) \
-    -I$(OUTDIR)/inc \
 ))
 
 $(eval $(call gb_CppunitTest_use_api,sc_cellrangesbase,\
@@ -127,12 +126,11 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sc_cellrangesbase,\
 ))
 
 # we need to
-# a) explicitly depend on library msword because it is not implied by a link
+# a) explicitly depend on library localedata_en because it is not implied by a link
 #    relation
 # b) explicitly depend on the sc resource files needed at unit-test runtime
 $(call gb_CppunitTest_get_target,sc_cellrangesbase) : \
     $(WORKDIR)/AllLangRes/sc \
     $(call gb_Library_get_target,localedata_en) \
-    $(call gb_Library_get_target,scfilt) \
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_chart_regression_test.mk b/sc/CppunitTest_sc_chart_regression_test.mk
index 4d4da30e004b..0c746c2debb3 100644
--- a/sc/CppunitTest_sc_chart_regression_test.mk
+++ b/sc/CppunitTest_sc_chart_regression_test.mk
@@ -133,12 +133,11 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sc_chart_regression_test,\
 ))
 
 # we need to
-# a) explicitly depend on library msword because it is not implied by a link
+# a) explicitly depend on library localedata_en because it is not implied by a link
 #    relation
 # b) explicitly depend on the sc resource files needed at unit-test runtime
 $(call gb_CppunitTest_get_target,sc_chart_regression_test) : \
     $(WORKDIR)/AllLangRes/sc \
     $(call gb_Library_get_target,localedata_en) \
-    $(call gb_Library_get_target,scfilt) \
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_databaserangeobj.mk b/sc/CppunitTest_sc_databaserangeobj.mk
index ff2f4e8cc3ee..eb0e87b58fbe 100644
--- a/sc/CppunitTest_sc_databaserangeobj.mk
+++ b/sc/CppunitTest_sc_databaserangeobj.mk
@@ -125,12 +125,11 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sc_databaserangeobj,\
 ))
 
 # we need to
-# a) explicitly depend on library msword because it is not implied by a link
+# a) explicitly depend on library localedata_en because it is not implied by a link
 #    relation
 # b) explicitly depend on the sc resource files needed at unit-test runtime
 $(call gb_CppunitTest_get_target,sc_databaserangeobj) : \
     $(WORKDIR)/AllLangRes/sc \
     $(call gb_Library_get_target,localedata_en) \
-    $(call gb_Library_get_target,scfilt) \
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk
index 096b37f4bc02..945be2b97278 100644
--- a/sc/CppunitTest_sc_datapilotfieldobj.mk
+++ b/sc/CppunitTest_sc_datapilotfieldobj.mk
@@ -125,12 +125,11 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sc_datapilotfieldobj,\
 ))
 
 # we need to
-# a) explicitly depend on library msword because it is not implied by a link
+# a) explicitly depend on library localedata_en because it is not implied by a link
 #    relation
 # b) explicitly depend on the sc resource files needed at unit-test runtime
 $(call gb_CppunitTest_get_target,sc_datapilotfieldobj) : \
     $(WORKDIR)/AllLangRes/sc \
     $(call gb_Library_get_target,localedata_en) \
-    $(call gb_Library_get_target,scfilt) \
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_datapilottableobj.mk b/sc/CppunitTest_sc_datapilottableobj.mk
index 921b576864ef..a08d5557d24b 100644
--- a/sc/CppunitTest_sc_datapilottableobj.mk
+++ b/sc/CppunitTest_sc_datapilottableobj.mk
@@ -125,12 +125,11 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sc_datapilottableobj,\
 ))
 
 # we need to
-# a) explicitly depend on library msword because it is not implied by a link
+# a) explicitly depend on library localedata_en because it is not implied by a link
 #    relation
 # b) explicitly depend on the sc resource files needed at unit-test runtime
 $(call gb_CppunitTest_get_target,sc_datapilottableobj) : \
     $(WORKDIR)/AllLangRes/sc \
     $(call gb_Library_get_target,localedata_en) \
-    $(call gb_Library_get_target,scfilt) \
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk
index a200570abe5c..c0ead8a1dd33 100644
--- a/sc/CppunitTest_sc_filters_test.mk
+++ b/sc/CppunitTest_sc_filters_test.mk
@@ -121,12 +121,11 @@ $(eval $(call gb_CppunitTest_use_configuration,sc_filters_test))
 $(eval $(call gb_CppunitTest_use_filter_configuration,sc_filters_test))
 
 # we need to
-# a) explicitly depend on library msword because it is not implied by a link
+# a) explicitly depend on library localedata_en because it is not implied by a link
 #    relation
 # b) explicitly depend on the sc resource files needed at unit-test runtime
 $(call gb_CppunitTest_get_target,sc_filters_test) : \
     $(WORKDIR)/AllLangRes/sc \
     $(call gb_Library_get_target,localedata_en) \
-    $(call gb_Library_get_target,scfilt) \
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk
index bdfd820a350b..af5ad014159d 100644
--- a/sc/CppunitTest_sc_macros_test.mk
+++ b/sc/CppunitTest_sc_macros_test.mk
@@ -122,12 +122,11 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sc_macros_test,\
 ))
 
 # we need to
-# a) explicitly depend on library msword because it is not implied by a link
+# a) explicitly depend on library localedata_en because it is not implied by a link
 #    relation
 # b) explicitly depend on the sc resource files needed at unit-test runtime
 $(call gb_CppunitTest_get_target,sc_macros_test) : \
     $(WORKDIR)/AllLangRes/sc \
     $(call gb_Library_get_target,localedata_en) \
-    $(call gb_Library_get_target,scfilt) \
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_namedrangeobj.mk b/sc/CppunitTest_sc_namedrangeobj.mk
index 33cd57d050fa..11d23d2132a5 100644
--- a/sc/CppunitTest_sc_namedrangeobj.mk
+++ b/sc/CppunitTest_sc_namedrangeobj.mk
@@ -125,12 +125,11 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sc_namedrangeobj,\
 ))
 
 # we need to
-# a) explicitly depend on library msword because it is not implied by a link
+# a) explicitly depend on library localedata_en because it is not implied by a link
 #    relation
 # b) explicitly depend on the sc resource files needed at unit-test runtime
 $(call gb_CppunitTest_get_target,sc_namedrangeobj) : \
     $(WORKDIR)/AllLangRes/sc \
     $(call gb_Library_get_target,localedata_en) \
-    $(call gb_Library_get_target,scfilt) \
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_namedrangesobj.mk b/sc/CppunitTest_sc_namedrangesobj.mk
index 1e6024090521..807e8a14a5fc 100644
--- a/sc/CppunitTest_sc_namedrangesobj.mk
+++ b/sc/CppunitTest_sc_namedrangesobj.mk
@@ -125,12 +125,11 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sc_namedrangesobj,\
 ))
 
 # we need to
-# a) explicitly depend on library msword because it is not implied by a link
+# a) explicitly depend on library localedata_en because it is not implied by a link
 #    relation
 # b) explicitly depend on the sc resource files needed at unit-test runtime
 $(call gb_CppunitTest_get_target,sc_namedrangesobj) : \
     $(WORKDIR)/AllLangRes/sc \
     $(call gb_Library_get_target,localedata_en) \
-    $(call gb_Library_get_target,scfilt) \
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk
index d814ddab6d7e..941bfeddac81 100644
--- a/sc/CppunitTest_sc_subsequent_filters_test.mk
+++ b/sc/CppunitTest_sc_subsequent_filters_test.mk
@@ -134,12 +134,11 @@ $(eval $(call gb_CppunitTest_use_configuration,sc_subsequent_filters_test))
 $(eval $(call gb_CppunitTest_use_filter_configuration,sc_subsequent_filters_test))
 
 # we need to
-# a) explicitly depend on library msword because it is not implied by a link
+# a) explicitly depend on library localedata_en because it is not implied by a link
 #    relation
 # b) explicitly depend on the sc resource files needed at unit-test runtime
 $(call gb_CppunitTest_get_target,sc_subsequent_filters_test) : \
     $(WORKDIR)/AllLangRes/sc \
     $(call gb_Library_get_target,localedata_en) \
-    $(call gb_Library_get_target,scfilt) \
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_tableautoformatfield.mk b/sc/CppunitTest_sc_tableautoformatfield.mk
index 2e5a2c706b19..862617b32c11 100644
--- a/sc/CppunitTest_sc_tableautoformatfield.mk
+++ b/sc/CppunitTest_sc_tableautoformatfield.mk
@@ -125,12 +125,11 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sc_tableautoformatfield,\
 ))
 
 # we need to
-# a) explicitly depend on library msword because it is not implied by a link
+# a) explicitly depend on library localedata_en because it is not implied by a link
 #    relation
 # b) explicitly depend on the sc resource files needed at unit-test runtime
 $(call gb_CppunitTest_get_target,sc_tableautoformatfield) : \
     $(WORKDIR)/AllLangRes/sc \
     $(call gb_Library_get_target,localedata_en) \
-    $(call gb_Library_get_target,scfilt) \
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_tablesheetobj.mk b/sc/CppunitTest_sc_tablesheetobj.mk
index b35754869e98..0d23ae6c2e53 100644
--- a/sc/CppunitTest_sc_tablesheetobj.mk
+++ b/sc/CppunitTest_sc_tablesheetobj.mk
@@ -76,7 +76,6 @@ $(eval $(call gb_CppunitTest_set_include,sc_spreadsheetobj,\
     -I$(SRCDIR)/sc/source/ui/inc \
     -I$(SRCDIR)/sc/inc \
     $$(INCLUDE) \
-    -I$(OUTDIR)/inc \
 ))
 
 $(eval $(call gb_CppunitTest_use_api,sc_spreadsheetobj,\
@@ -126,10 +125,7 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sc_spreadsheetobj,\
 	$(OUTDIR)/unittest/registry \
 ))
 
-# we need to
-# a) explicitly depend on library msword because it is not implied by a link
-#    relation
-# b) explicitly depend on the sc resource files needed at unit-test runtime
-$(call gb_CppunitTest_get_target,sc_spreadsheetobj) : $(call gb_Library_get_target,scfilt) $(WORKDIR)/AllLangRes/sc
+# we need to explicitly depend on the sc resource files needed at unit-test runtime
+$(call gb_CppunitTest_get_target,sc_spreadsheetobj) : $(WORKDIR)/AllLangRes/sc
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_tablesheetsobj.mk b/sc/CppunitTest_sc_tablesheetsobj.mk
index 57947934bc1d..79774b4bf1ed 100644
--- a/sc/CppunitTest_sc_tablesheetsobj.mk
+++ b/sc/CppunitTest_sc_tablesheetsobj.mk
@@ -124,10 +124,7 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sc_spreadsheetsobj,\
 	$(OUTDIR)/unittest/registry \
 ))
 
-# we need to
-# a) explicitly depend on library msword because it is not implied by a link
-#    relation
-# b) explicitly depend on the sc resource files needed at unit-test runtime
-$(call gb_CppunitTest_get_target,sc_spreadsheetsobj) : $(call gb_Library_get_target,scfilt) $(WORKDIR)/AllLangRes/sc
+# we need to explicitly depend on the sc resource files needed at unit-test runtime
+$(call gb_CppunitTest_get_target,sc_spreadsheetsobj) : $(WORKDIR)/AllLangRes/sc
 
 # vim: set noet sw=4 ts=4:
diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk
index 9af86e0a1079..afecc5ac00c5 100644
--- a/sd/CppunitTest_sd_filters_test.mk
+++ b/sd/CppunitTest_sd_filters_test.mk
@@ -110,8 +110,4 @@ $(eval $(call gb_CppunitTest_use_configuration,sd_filters_test))
 
 $(eval $(call gb_CppunitTest_use_filter_configuration,sd_filters_test))
 
-# we need to explicitly depend on library sdfilt because it is not implied
-# by a link relation
-$(call gb_CppunitTest_get_target,sd_filters_test) : $(call gb_Library_get_target,sdfilt)
-
 # vim: set noet sw=4 ts=4:
diff --git a/sd/CppunitTest_sd_regression_test.mk b/sd/CppunitTest_sd_regression_test.mk
index b8d157ab43db..1ba820191691 100644
--- a/sd/CppunitTest_sd_regression_test.mk
+++ b/sd/CppunitTest_sd_regression_test.mk
@@ -128,8 +128,4 @@ $(eval $(call gb_CppunitTest_add_arguments,sd_regression_test,\
     "-env:SVG_DISABLE_FONT_EMBEDDING=YEAH" \
 ))
 
-# we need to explicitly depend on library sdfilt because it is not implied
-# by a link relation
-$(call gb_CppunitTest_get_target,sd_regression_test) : $(call gb_Library_get_target,sdfilt)
-
 # vim: set noet sw=4 ts=4:
diff --git a/sot/CppunitTest_sot_test_sot.mk b/sot/CppunitTest_sot_test_sot.mk
index 003a346956cf..72faace86aed 100644
--- a/sot/CppunitTest_sot_test_sot.mk
+++ b/sot/CppunitTest_sot_test_sot.mk
@@ -47,10 +47,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sot_test_sot, \
     $(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_CppunitTest_set_include,sot_test_sot,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_CppunitTest_use_api,sot_test_sot,\
     offapi \
     udkapi \
diff --git a/starmath/CppunitTest_starmath_qa_cppunit.mk b/starmath/CppunitTest_starmath_qa_cppunit.mk
index 1af328685eb7..8d122dacbffa 100644
--- a/starmath/CppunitTest_starmath_qa_cppunit.mk
+++ b/starmath/CppunitTest_starmath_qa_cppunit.mk
@@ -81,10 +81,10 @@ $(eval $(call gb_CppunitTest_use_components,starmath_qa_cppunit,\
     i18npool/util/i18npool \
     toolkit/util/tk \
     sfx2/util/sfx \
+    vcl/vcl \
 ))
 
 $(eval $(call gb_CppunitTest_use_old_components,starmath_qa_cppunit,\
-    component/vcl/vcl \
     mcnttype \
 ))
 
diff --git a/svtools/CppunitTest_svtools_filters_test.mk b/svtools/CppunitTest_svtools_filters_test.mk
index 7d4353fbde13..9cd4a53c9be8 100644
--- a/svtools/CppunitTest_svtools_filters_test.mk
+++ b/svtools/CppunitTest_svtools_filters_test.mk
@@ -44,10 +44,6 @@ $(eval $(call gb_CppunitTest_use_libraries,svtools_filters_test, \
     $(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_CppunitTest_set_include,svtools_filters_test,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_CppunitTest_use_api,svtools_filters_test,\
     udkapi \
     offapi \
diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk
index bf616828e458..ecfc8ce11c0b 100644
--- a/sw/CppunitTest_sw_filters_test.mk
+++ b/sw/CppunitTest_sw_filters_test.mk
@@ -92,10 +92,9 @@ $(eval $(call gb_CppunitTest_use_components,sw_filters_test,\
 
 $(eval $(call gb_CppunitTest_use_configuration,sw_filters_test))
 
-# we need to explicitly depend on library msword because it is not implied
+# we need to explicitly depend on library localedata_en because it is not implied
 # by a link relation
 $(call gb_CppunitTest_get_target,sw_filters_test) : \
     $(call gb_Library_get_target,localedata_en) \
-    $(call gb_Library_get_target,msword) \
 
 # vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_layout_test.mk b/sw/CppunitTest_sw_layout_test.mk
index c3540adf9ca9..819babbae19f 100644
--- a/sw/CppunitTest_sw_layout_test.mk
+++ b/sw/CppunitTest_sw_layout_test.mk
@@ -122,12 +122,10 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sw_layout_test,\
 ))
 
 # we need to
-# a) explicitly depend on library msword because it is not implied by a link
+# a) explicitly depend on library localedata_en because it is not implied by a link
 #    relation
 # b) explicitly depend on the sw resource files needed at unit-test runtime
 $(call gb_CppunitTest_get_target,sw_layout_test) : \
     $(call gb_Library_get_target,localedata_en) \
-    $(call gb_Library_get_target,msword) \
-    $(if $(filter-out $(OS),IOS),$(call gb_Library_get_target,vbaswobj)) \
 
 # vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk
index f7a053b8e9e1..634f8f3d04b0 100644
--- a/sw/CppunitTest_sw_macros_test.mk
+++ b/sw/CppunitTest_sw_macros_test.mk
@@ -124,12 +124,10 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sw_macros_test,\
 ))
 
 # we need to
-# a) explicitly depend on library msword because it is not implied by a link
+# a) explicitly depend on library localedata_en because it is not implied by a link
 #    relation
 # b) explicitly depend on the sw resource files needed at unit-test runtime
 $(call gb_CppunitTest_get_target,sw_macros_test) : \
     $(call gb_Library_get_target,localedata_en) \
-    $(call gb_Library_get_target,msword) \
-    $(if $(filter SCRIPTING,$(BUILD_TYPE)),$(call gb_Library_get_target,vbaswobj)) \
 
 # vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_regression_test.mk b/sw/CppunitTest_sw_regression_test.mk
index e1d35d8999a1..c64a9d30df77 100644
--- a/sw/CppunitTest_sw_regression_test.mk
+++ b/sw/CppunitTest_sw_regression_test.mk
@@ -124,12 +124,10 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sw_regression_test,\
 ))
 
 # we need to
-# a) explicitly depend on library msword because it is not implied by a link
+# a) explicitly depend on library localedata_en because it is not implied by a link
 #    relation
 # b) explicitly depend on the sw resource files needed at unit-test runtime
 $(call gb_CppunitTest_get_target,sw_regression_test) : \
     $(call gb_Library_get_target,localedata_en) \
-    $(call gb_Library_get_target,msword) \
-    $(if $(filter-out $(OS),IOS),$(call gb_Library_get_target,vbaswobj)) \
 
 # vim: set noet sw=4 ts=4: