gbuild: Remove MSVC 2013 legacy code

Uwinapi is discontinued.

Change-Id: I063b4d0d8fab2d60de168e960a63b8181158ac01
Reviewed-on: https://gerrit.libreoffice.org/23198
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
Tested-by: David Ostrovsky <david@ostrovsky.org>

58 files changed, 0 insertions, 58 deletions

diff --git a/sc/CppunitTest_sc_addin_functions_test.mk b/sc/CppunitTest_sc_addin_functions_test.mk
index 245c94b82b04..b1aa766679be 100644
--- a/sc/CppunitTest_sc_addin_functions_test.mk
+++ b/sc/CppunitTest_sc_addin_functions_test.mk
@@ -49,7 +49,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_addin_functions_test, \
     utl \
     vcl \
     xo \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sc_addin_functions_test,\
diff --git a/sc/CppunitTest_sc_anchor_test.mk b/sc/CppunitTest_sc_anchor_test.mk
index 8af40604ed84..2f9719e48fd6 100644
--- a/sc/CppunitTest_sc_anchor_test.mk
+++ b/sc/CppunitTest_sc_anchor_test.mk
@@ -51,7 +51,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_anchor_test, \
 	vbahelper \
 	vcl \
 	xo \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sc_anchor_test,\
diff --git a/sc/CppunitTest_sc_annotationobj.mk b/sc/CppunitTest_sc_annotationobj.mk
index c2b8e7d4beb3..7dbd3c377330 100644
--- a/sc/CppunitTest_sc_annotationobj.mk
+++ b/sc/CppunitTest_sc_annotationobj.mk
@@ -50,7 +50,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_annotationobj, \
     vbahelper \
     vcl \
     xo \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sc_annotationobj,\
diff --git a/sc/CppunitTest_sc_annotationshapeobj.mk b/sc/CppunitTest_sc_annotationshapeobj.mk
index b2bbd9de618c..eb720ce0bcb4 100644
--- a/sc/CppunitTest_sc_annotationshapeobj.mk
+++ b/sc/CppunitTest_sc_annotationshapeobj.mk
@@ -50,7 +50,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_annotationshapeobj, \
     vbahelper \
     vcl \
     xo \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sc_annotationshapeobj,\
diff --git a/sc/CppunitTest_sc_annotationsobj.mk b/sc/CppunitTest_sc_annotationsobj.mk
index 6cca3089ae02..e606242f9fa2 100644
--- a/sc/CppunitTest_sc_annotationsobj.mk
+++ b/sc/CppunitTest_sc_annotationsobj.mk
@@ -50,7 +50,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_annotationsobj, \
     vbahelper \
     vcl \
     xo \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sc_annotationsobj,\
diff --git a/sc/CppunitTest_sc_array_functions_test.mk b/sc/CppunitTest_sc_array_functions_test.mk
index cff986e37fc6..c94b75a7b203 100644
--- a/sc/CppunitTest_sc_array_functions_test.mk
+++ b/sc/CppunitTest_sc_array_functions_test.mk
@@ -49,7 +49,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_array_functions_test, \
     utl \
     vcl \
     xo \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sc_array_functions_test,\
diff --git a/sc/CppunitTest_sc_bugfix_test.mk b/sc/CppunitTest_sc_bugfix_test.mk
index 65896590edc8..d14a9e1154da 100644
--- a/sc/CppunitTest_sc_bugfix_test.mk
+++ b/sc/CppunitTest_sc_bugfix_test.mk
@@ -53,7 +53,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_bugfix_test, \
     vbahelper \
     vcl \
     xo \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sc_bugfix_test,\
diff --git a/sc/CppunitTest_sc_cellrangeobj.mk b/sc/CppunitTest_sc_cellrangeobj.mk
index da6c5773f4be..16fd329ae6fe 100644
--- a/sc/CppunitTest_sc_cellrangeobj.mk
+++ b/sc/CppunitTest_sc_cellrangeobj.mk
@@ -50,7 +50,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_cellrangeobj, \
     vbahelper \
     vcl \
     xo \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sc_cellrangeobj,\
diff --git a/sc/CppunitTest_sc_chart_regression_test.mk b/sc/CppunitTest_sc_chart_regression_test.mk
index 003b7c71846b..1a00137c0a85 100644
--- a/sc/CppunitTest_sc_chart_regression_test.mk
+++ b/sc/CppunitTest_sc_chart_regression_test.mk
@@ -46,7 +46,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_chart_regression_test, \
     vbahelper \
     vcl \
     xo \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sc_chart_regression_test,\
diff --git a/sc/CppunitTest_sc_check_data_pilot_field.mk b/sc/CppunitTest_sc_check_data_pilot_field.mk
index 6f1e631a81cf..59825d028bd9 100644
--- a/sc/CppunitTest_sc_check_data_pilot_field.mk
+++ b/sc/CppunitTest_sc_check_data_pilot_field.mk
@@ -48,7 +48,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_check_data_pilot_field, \
         vbahelper \
         vcl \
         xo \
-        $(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sc_check_data_pilot_field,\
diff --git a/sc/CppunitTest_sc_check_data_pilot_table.mk b/sc/CppunitTest_sc_check_data_pilot_table.mk
index e536dfeb92fd..9f3f4209604d 100644
--- a/sc/CppunitTest_sc_check_data_pilot_table.mk
+++ b/sc/CppunitTest_sc_check_data_pilot_table.mk
@@ -48,7 +48,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_check_data_pilot_table, \
         vbahelper \
         vcl \
         xo \
-        $(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sc_check_data_pilot_table,\
diff --git a/sc/CppunitTest_sc_check_xcell_ranges_query.mk b/sc/CppunitTest_sc_check_xcell_ranges_query.mk
index afbd184ac240..33c448dbebf1 100644
--- a/sc/CppunitTest_sc_check_xcell_ranges_query.mk
+++ b/sc/CppunitTest_sc_check_xcell_ranges_query.mk
@@ -48,7 +48,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_check_xcell_ranges_query, \
 	vbahelper \
 	vcl \
 	xo \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sc_check_xcell_ranges_query,\
diff --git a/sc/CppunitTest_sc_condformats.mk b/sc/CppunitTest_sc_condformats.mk
index a31478fe985e..f88d6b264674 100644
--- a/sc/CppunitTest_sc_condformats.mk
+++ b/sc/CppunitTest_sc_condformats.mk
@@ -51,7 +51,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_condformats, \
 	vbahelper \
 	vcl \
 	xo \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sc_condformats,\
diff --git a/sc/CppunitTest_sc_copypaste.mk b/sc/CppunitTest_sc_copypaste.mk
index 4920c80ae77d..8d71cf6004cf 100644
--- a/sc/CppunitTest_sc_copypaste.mk
+++ b/sc/CppunitTest_sc_copypaste.mk
@@ -53,7 +53,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_copypaste, \
     vbahelper \
     vcl \
     xo \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sc_copypaste,\
diff --git a/sc/CppunitTest_sc_database_functions_test.mk b/sc/CppunitTest_sc_database_functions_test.mk
index 4596080dfe31..8b9b9ac83625 100644
--- a/sc/CppunitTest_sc_database_functions_test.mk
+++ b/sc/CppunitTest_sc_database_functions_test.mk
@@ -49,7 +49,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_database_functions_test, \
     utl \
     vcl \
     xo \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sc_database_functions_test,\
diff --git a/sc/CppunitTest_sc_databaserangeobj.mk b/sc/CppunitTest_sc_databaserangeobj.mk
index 71e12b6c064b..528829687311 100644
--- a/sc/CppunitTest_sc_databaserangeobj.mk
+++ b/sc/CppunitTest_sc_databaserangeobj.mk
@@ -50,7 +50,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_databaserangeobj, \
     vbahelper \
     vcl \
     xo \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sc_databaserangeobj,\
diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk
index 736cd5458578..1377f6615f5a 100644
--- a/sc/CppunitTest_sc_datapilotfieldobj.mk
+++ b/sc/CppunitTest_sc_datapilotfieldobj.mk
@@ -50,7 +50,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_datapilotfieldobj, \
     vbahelper \
     vcl \
     xo \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sc_datapilotfieldobj,\
diff --git a/sc/CppunitTest_sc_datapilottableobj.mk b/sc/CppunitTest_sc_datapilottableobj.mk
index 4f5026609836..ea953602add4 100644
--- a/sc/CppunitTest_sc_datapilottableobj.mk
+++ b/sc/CppunitTest_sc_datapilottableobj.mk
@@ -50,7 +50,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_datapilottableobj, \
     vbahelper \
     vcl \
     xo \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sc_datapilottableobj,\
diff --git a/sc/CppunitTest_sc_datetime_functions_test.mk b/sc/CppunitTest_sc_datetime_functions_test.mk
index 138ff3a1eaa0..560ae910f684 100644
--- a/sc/CppunitTest_sc_datetime_functions_test.mk
+++ b/sc/CppunitTest_sc_datetime_functions_test.mk
@@ -49,7 +49,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_datetime_functions_test, \
     utl \
     vcl \
     xo \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sc_datetime_functions_test,\
diff --git a/sc/CppunitTest_sc_editfieldobj_cell.mk b/sc/CppunitTest_sc_editfieldobj_cell.mk
index c7395eea6691..04914a43fac1 100644
--- a/sc/CppunitTest_sc_editfieldobj_cell.mk
+++ b/sc/CppunitTest_sc_editfieldobj_cell.mk
@@ -50,7 +50,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_editfieldobj_cell, \
     vbahelper \
     vcl \
     xo \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sc_editfieldobj_cell,\
diff --git a/sc/CppunitTest_sc_editfieldobj_header.mk b/sc/CppunitTest_sc_editfieldobj_header.mk
index 5097f4f8f74f..ce1e529bc285 100644
--- a/sc/CppunitTest_sc_editfieldobj_header.mk
+++ b/sc/CppunitTest_sc_editfieldobj_header.mk
@@ -50,7 +50,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_editfieldobj_header, \
     vbahelper \
     vcl \
     xo \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sc_editfieldobj_header,\
diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk
index ed575a0bc32e..0821f2753a42 100644
--- a/sc/CppunitTest_sc_filters_test.mk
+++ b/sc/CppunitTest_sc_filters_test.mk
@@ -55,7 +55,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_filters_test, \
     utl \
     vcl \
     xo \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sc_filters_test,\
diff --git a/sc/CppunitTest_sc_financial_functions_test.mk b/sc/CppunitTest_sc_financial_functions_test.mk
index 5bf97a751baf..748c44b879b8 100644
--- a/sc/CppunitTest_sc_financial_functions_test.mk
+++ b/sc/CppunitTest_sc_financial_functions_test.mk
@@ -49,7 +49,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_financial_functions_test, \
     utl \
     vcl \
     xo \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sc_financial_functions_test,\
diff --git a/sc/CppunitTest_sc_functions_test_old.mk b/sc/CppunitTest_sc_functions_test_old.mk
index 2981bf87b8fb..cad0a6acf1bc 100644
--- a/sc/CppunitTest_sc_functions_test_old.mk
+++ b/sc/CppunitTest_sc_functions_test_old.mk
@@ -49,7 +49,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_functions_test_old, \
     utl \
     vcl \
     xo \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sc_functions_test_old,\
diff --git a/sc/CppunitTest_sc_html_export_test.mk b/sc/CppunitTest_sc_html_export_test.mk
index c3fa3abe8c5e..08e7d04d4bf1 100644
--- a/sc/CppunitTest_sc_html_export_test.mk
+++ b/sc/CppunitTest_sc_html_export_test.mk
@@ -49,7 +49,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_html_export_test, \
     utl \
     vcl \
     xo \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sc_html_export_test,\
diff --git a/sc/CppunitTest_sc_information_functions_test.mk b/sc/CppunitTest_sc_information_functions_test.mk
index 4741322e51af..1c476bd6ac3b 100644
--- a/sc/CppunitTest_sc_information_functions_test.mk
+++ b/sc/CppunitTest_sc_information_functions_test.mk
@@ -49,7 +49,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_information_functions_test, \
     utl \
     vcl \
     xo \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sc_information_functions_test,\
diff --git a/sc/CppunitTest_sc_logical_functions_test.mk b/sc/CppunitTest_sc_logical_functions_test.mk
index af9a5a3bf5c6..ec2d07ea5f80 100644
--- a/sc/CppunitTest_sc_logical_functions_test.mk
+++ b/sc/CppunitTest_sc_logical_functions_test.mk
@@ -49,7 +49,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_logical_functions_test, \
     utl \
     vcl \
     xo \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sc_logical_functions_test,\
diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk
index 8e241681ce57..dd979d6b8486 100644
--- a/sc/CppunitTest_sc_macros_test.mk
+++ b/sc/CppunitTest_sc_macros_test.mk
@@ -51,7 +51,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_macros_test, \
     vbahelper \
     vcl \
     xo \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sc_macros_test,\
diff --git a/sc/CppunitTest_sc_mark_test.mk b/sc/CppunitTest_sc_mark_test.mk
index bd4bf3dfab13..a37367b1d092 100644
--- a/sc/CppunitTest_sc_mark_test.mk
+++ b/sc/CppunitTest_sc_mark_test.mk
@@ -55,7 +55,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_mark_test, \
     vbahelper \
     vcl \
     xo \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sc_mark_test,\
diff --git a/sc/CppunitTest_sc_mathematical_functions_test.mk b/sc/CppunitTest_sc_mathematical_functions_test.mk
index 672bf5cb4226..94e84e759edb 100644
--- a/sc/CppunitTest_sc_mathematical_functions_test.mk
+++ b/sc/CppunitTest_sc_mathematical_functions_test.mk
@@ -49,7 +49,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_mathematical_functions_test, \
     utl \
     vcl \
     xo \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sc_mathematical_functions_test,\
diff --git a/sc/CppunitTest_sc_modelobj.mk b/sc/CppunitTest_sc_modelobj.mk
index 6f045f48ea14..d8ce3c528ad8 100644
--- a/sc/CppunitTest_sc_modelobj.mk
+++ b/sc/CppunitTest_sc_modelobj.mk
@@ -50,7 +50,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_modelobj, \
     vbahelper \
     vcl \
     xo \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sc_modelobj,\
diff --git a/sc/CppunitTest_sc_namedrangeobj.mk b/sc/CppunitTest_sc_namedrangeobj.mk
index 8fa8de50a96c..3b68504ac429 100644
--- a/sc/CppunitTest_sc_namedrangeobj.mk
+++ b/sc/CppunitTest_sc_namedrangeobj.mk
@@ -50,7 +50,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_namedrangeobj, \
     vbahelper \
     vcl \
     xo \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sc_namedrangeobj,\
diff --git a/sc/CppunitTest_sc_namedrangesobj.mk b/sc/CppunitTest_sc_namedrangesobj.mk
index c6ad37158e7b..49d5f43f9f54 100644
--- a/sc/CppunitTest_sc_namedrangesobj.mk
+++ b/sc/CppunitTest_sc_namedrangesobj.mk
@@ -50,7 +50,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_namedrangesobj, \
     vbahelper \
     vcl \
     xo \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sc_namedrangesobj,\
diff --git a/sc/CppunitTest_sc_new_cond_format_api.mk b/sc/CppunitTest_sc_new_cond_format_api.mk
index 2ffdd2681a32..8997b907e0f6 100644
--- a/sc/CppunitTest_sc_new_cond_format_api.mk
+++ b/sc/CppunitTest_sc_new_cond_format_api.mk
@@ -49,7 +49,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_new_cond_format_api, \
 	vbahelper \
 	vcl \
 	xo \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sc_new_cond_format_api,\
diff --git a/sc/CppunitTest_sc_opencl_test.mk b/sc/CppunitTest_sc_opencl_test.mk
index ff0532e73ce6..6abc275ec991 100644
--- a/sc/CppunitTest_sc_opencl_test.mk
+++ b/sc/CppunitTest_sc_opencl_test.mk
@@ -50,7 +50,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_opencl_test, \
     utl \
     vcl \
     xo \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sc_opencl_test,\
diff --git a/sc/CppunitTest_sc_outlineobj.mk b/sc/CppunitTest_sc_outlineobj.mk
index 0a256f63695b..6822d9f2b0ba 100644
--- a/sc/CppunitTest_sc_outlineobj.mk
+++ b/sc/CppunitTest_sc_outlineobj.mk
@@ -50,7 +50,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_outlineobj, \
     vbahelper \
     vcl \
     xo \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sc_outlineobj,\
diff --git a/sc/CppunitTest_sc_perfobj.mk b/sc/CppunitTest_sc_perfobj.mk
index c3e02686d16b..a59ac83bf02e 100644
--- a/sc/CppunitTest_sc_perfobj.mk
+++ b/sc/CppunitTest_sc_perfobj.mk
@@ -50,7 +50,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_perfobj, \
     vbahelper \
     vcl \
     xo \
-    $(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sc_perfobj,\
diff --git a/sc/CppunitTest_sc_range_test.mk b/sc/CppunitTest_sc_range_test.mk
index 0fdbd3c08fb5..9405142caa13 100644
--- a/sc/CppunitTest_sc_range_test.mk
+++ b/sc/CppunitTest_sc_range_test.mk
@@ -55,7 +55,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_range_test, \
     vbahelper \
     vcl \
     xo \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sc_range_test,\
diff --git a/sc/CppunitTest_sc_rangelst_test.mk b/sc/CppunitTest_sc_rangelst_test.mk
index fa6f690e425c..b348105af8be 100644
--- a/sc/CppunitTest_sc_rangelst_test.mk
+++ b/sc/CppunitTest_sc_rangelst_test.mk
@@ -55,7 +55,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_rangelst_test, \
     vbahelper \
     vcl \
     xo \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sc_rangelst_test,\
diff --git a/sc/CppunitTest_sc_recordchanges.mk b/sc/CppunitTest_sc_recordchanges.mk
index 9fddf38c1f9b..e64f39a70afe 100644
--- a/sc/CppunitTest_sc_recordchanges.mk
+++ b/sc/CppunitTest_sc_recordchanges.mk
@@ -50,7 +50,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_recordchanges, \
     vbahelper \
     vcl \
     xo \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sc_recordchanges,\
diff --git a/sc/CppunitTest_sc_screenshots.mk b/sc/CppunitTest_sc_screenshots.mk
index 0c0123a1824c..fde5d149cdb3 100644
--- a/sc/CppunitTest_sc_screenshots.mk
+++ b/sc/CppunitTest_sc_screenshots.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_screenshots, \
     vcl \
     tl \
     utl \
-    $(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_use_externals,sc_screenshots,\
diff --git a/sc/CppunitTest_sc_spreadsheet_functions_test.mk b/sc/CppunitTest_sc_spreadsheet_functions_test.mk
index dee36b2afea8..6049862d5782 100644
--- a/sc/CppunitTest_sc_spreadsheet_functions_test.mk
+++ b/sc/CppunitTest_sc_spreadsheet_functions_test.mk
@@ -49,7 +49,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_spreadsheet_functions_test, \
     utl \
     vcl \
     xo \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sc_spreadsheet_functions_test,\
diff --git a/sc/CppunitTest_sc_statistical_functions_test.mk b/sc/CppunitTest_sc_statistical_functions_test.mk
index 4ec0561da657..931c0b22ad86 100644
--- a/sc/CppunitTest_sc_statistical_functions_test.mk
+++ b/sc/CppunitTest_sc_statistical_functions_test.mk
@@ -49,7 +49,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_statistical_functions_test, \
     utl \
     vcl \
     xo \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sc_statistical_functions_test,\
diff --git a/sc/CppunitTest_sc_styleloaderobj.mk b/sc/CppunitTest_sc_styleloaderobj.mk
index 9b3daa503b08..3a644acc5607 100644
--- a/sc/CppunitTest_sc_styleloaderobj.mk
+++ b/sc/CppunitTest_sc_styleloaderobj.mk
@@ -50,7 +50,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_styleloaderobj, \
     vbahelper \
     vcl \
     xo \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sc_styleloaderobj,\
diff --git a/sc/CppunitTest_sc_subsequent_export_test.mk b/sc/CppunitTest_sc_subsequent_export_test.mk
index 453314cb04bc..b97423e27f89 100644
--- a/sc/CppunitTest_sc_subsequent_export_test.mk
+++ b/sc/CppunitTest_sc_subsequent_export_test.mk
@@ -50,7 +50,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_subsequent_export_test, \
     utl \
     vcl \
     xo \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sc_subsequent_export_test,\
diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk
index b1537df1d0e5..ea835c8aea02 100644
--- a/sc/CppunitTest_sc_subsequent_filters_test.mk
+++ b/sc/CppunitTest_sc_subsequent_filters_test.mk
@@ -53,7 +53,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_subsequent_filters_test, \
     vbahelper \
     vcl \
     xo \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sc_subsequent_filters_test,\
diff --git a/sc/CppunitTest_sc_tablesheetobj.mk b/sc/CppunitTest_sc_tablesheetobj.mk
index 707cc87f167c..ef212c33574f 100644
--- a/sc/CppunitTest_sc_tablesheetobj.mk
+++ b/sc/CppunitTest_sc_tablesheetobj.mk
@@ -50,7 +50,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_tablesheetobj, \
     vbahelper \
     vcl \
     xo \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sc_tablesheetobj,\
diff --git a/sc/CppunitTest_sc_tablesheetsobj.mk b/sc/CppunitTest_sc_tablesheetsobj.mk
index 0dce9d43105b..334058881200 100644
--- a/sc/CppunitTest_sc_tablesheetsobj.mk
+++ b/sc/CppunitTest_sc_tablesheetsobj.mk
@@ -50,7 +50,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_tablesheetsobj, \
     vbahelper \
     vcl \
     xo \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sc_tablesheetsobj,\
diff --git a/sc/CppunitTest_sc_text_functions_test.mk b/sc/CppunitTest_sc_text_functions_test.mk
index 6f4131ce04fc..956b2b9d5aa1 100644
--- a/sc/CppunitTest_sc_text_functions_test.mk
+++ b/sc/CppunitTest_sc_text_functions_test.mk
@@ -49,7 +49,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_text_functions_test, \
     utl \
     vcl \
     xo \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sc_text_functions_test,\
diff --git a/sc/CppunitTest_sc_tiledrendering.mk b/sc/CppunitTest_sc_tiledrendering.mk
index fb86e258ba6e..3926e5fdcd23 100644
--- a/sc/CppunitTest_sc_tiledrendering.mk
+++ b/sc/CppunitTest_sc_tiledrendering.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_tiledrendering, \
     vcl \
     tl \
     utl \
-    $(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_use_externals,sc_tiledrendering,\
diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk
index 247279bf46ce..5e91862f416c 100644
--- a/sc/CppunitTest_sc_ucalc.mk
+++ b/sc/CppunitTest_sc_ucalc.mk
@@ -72,7 +72,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_ucalc, \
     vbahelper \
     vcl \
     xo \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sc_ucalc,\
diff --git a/sc/CppunitTest_sc_viewpaneobj.mk b/sc/CppunitTest_sc_viewpaneobj.mk
index cde890cdd15f..e1a7a2c21ffb 100644
--- a/sc/CppunitTest_sc_viewpaneobj.mk
+++ b/sc/CppunitTest_sc_viewpaneobj.mk
@@ -50,7 +50,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_viewpaneobj, \
     vbahelper \
     vcl \
     xo \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sc_viewpaneobj,\
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index c9e1d0a13f11..99c66b78af47 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -84,7 +84,6 @@ $(eval $(call gb_Library_use_libraries,sc,\
         vbahelper) \
     vcl \
     xo \
-    $(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,sc,\
diff --git a/sc/Library_scd.mk b/sc/Library_scd.mk
index efd1be364b90..1b491afc5cd8 100644
--- a/sc/Library_scd.mk
+++ b/sc/Library_scd.mk
@@ -29,7 +29,6 @@ $(eval $(call gb_Library_use_libraries,scd,\
 	sot \
 	tl \
 	utl \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,scd,\
diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk
index 8abfd870c4de..e7d91bff580c 100644
--- a/sc/Library_scfilt.mk
+++ b/sc/Library_scfilt.mk
@@ -61,7 +61,6 @@ $(eval $(call gb_Library_use_libraries,scfilt,\
 	utl \
 	vcl \
 	i18nlangtag \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,scfilt,\
diff --git a/sc/Library_scqahelper.mk b/sc/Library_scqahelper.mk
index 767ef7a9e714..0e209024b398 100644
--- a/sc/Library_scqahelper.mk
+++ b/sc/Library_scqahelper.mk
@@ -55,7 +55,6 @@ $(eval $(call gb_Library_use_libraries,scqahelper,\
 	ucbhelper \
 	unotest \
 	vcl \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,scqahelper,\
diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk
index 4b911d6846b1..2f2a5d6ac6d1 100644
--- a/sc/Library_scui.mk
+++ b/sc/Library_scui.mk
@@ -54,7 +54,6 @@ $(eval $(call gb_Library_use_libraries,scui,\
 	tl \
 	utl \
 	vcl \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,scui,\
diff --git a/sc/Library_vbaobj.mk b/sc/Library_vbaobj.mk
index 92d3e06d024f..36b4d7e39d91 100644
--- a/sc/Library_vbaobj.mk
+++ b/sc/Library_vbaobj.mk
@@ -52,7 +52,6 @@ $(eval $(call gb_Library_use_libraries,vbaobj,\
 	utl \
 	vbahelper \
 	vcl \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,vbaobj,\