[Libreoffice-commits] core.git: accessibility/Library_acc.mk animations/Library_animcore.mk avmedia/Library_avmediagst_0_10.mk avmedia/Library_avmediagst.mk avmedia/Library_avmediaMacAVF.mk avmedia/Library_avmedia.mk avmedia/Library_avmediaogl.mk avmedia/Library_avmediaQuickTime.mk avmedia/Library_avmediavlc.mk avmedia/Library_avmediawin.mk basctl/CppunitTest_basctl_dialogs_test.mk basctl/Library_basctl.mk basegfx/CppunitTest_basegfx.mk basegfx/Library_basegfx.mk basic/CppunitTest_basic_macros.mk basic/CppunitTest_basic_scanner.mk basic/Library_sb.mk bean/com bean/Library_officebean.mk binaryurp/CppunitTest_binaryurp_test-cache.mk binaryurp/CppunitTest_binaryurp_test-unmarshal.mk binaryurp/Library_binaryurp.mk bridges/Library_java_uno.mk canvas/Library_cairocanvas.mk canvas/Library_canvasfactory.mk canvas/Library_canvastools.mk canvas/Library_directx9canvas.mk canvas/Library_gdipluscanvas.mk canvas/Library_oglcanvas.mk canvas/Library_simplecanvas.mk canvas/Library_vclcanvas.mk chart2/CppunitTest_ chart2_common_functors.mk chart2/CppunitTest_chart2_dialogs_test.mk chart2/CppunitTest_chart2_dump.mk chart2/CppunitTest_chart2_export.mk chart2/CppunitTest_chart2_import.mk chart2/CppunitTest_chart2_pivot_chart_test.mk chart2/CppunitTest_chart2_trendcalculators.mk chart2/CppunitTest_chart2_xshape.mk chart2/Library_chartcontroller.mk chart2/Library_chartcore.mk chart2/Library_chartopengl.mk cli_ure/Executable_climaker.mk comphelper/CppunitTest_comphelper_ifcontainer.mk comphelper/CppunitTest_comphelper_syntaxhighlight_test.mk comphelper/CppunitTest_comphelper_test.mk comphelper/CppunitTest_comphelper_threadpool_test.mk comphelper/CppunitTest_comphelper_variadictemplates_test.mk comphelper/Library_comphelper.mk configmgr/CppunitTest_configmgr_unit.mk configmgr/Library_configmgr.mk connectivity/com connectivity/CppunitTest_connectivity_ado.mk connectivity/CppunitTest_connectivity_commontools.mk connectivity/CppunitTest_connectivity_mork.mk connectivity/Library_ado.mk connectivity/Libr ary_calc.mk connectivity/Library_dbase.mk connectivity/Library_dbpool2.mk connectivity/Library_dbtools.mk connectivity/Library_evoab.mk connectivity/Library_file.mk connectivity/Library_firebird_sdbc.mk connectivity/Library_flat.mk connectivity/Library_hsqldb.mk connectivity/Library_jdbc.mk connectivity/Library_mork.mk connectivity/Library_mozbootstrap.mk connectivity/Library_mysql.mk connectivity/Library_odbc.mk connectivity/Library_postgresql-sdbc-impl.mk connectivity/Library_postgresql-sdbc.mk connectivity/Library_sdbc2.mk cppcanvas/CppunitTest_cppcanvas_test.mk cppcanvas/Library_cppcanvas.mk cppcanvas/Library_mtfrenderer.mk cppu/CppunitTest_cppu_any-external.mk cppu/CppunitTest_cppu_qa_any.mk cppu/CppunitTest_cppu_qa_recursion.mk cppu/CppunitTest_cppu_qa_reference.mk cppu/CppunitTest_cppu_qa_unotype.mk cppu/CppunitTest_cppu_test_cppumaker.mk cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk cppuhelper/CppunitTest_cppuhelper_qa _weak.mk cppuhelper/Library_cppuhelper.mk cppu/Library_affine_uno_uno.mk cppu/Library_cppu.mk cppu/Library_log_uno_uno.mk cppu/Library_purpenvhelper.mk cppu/Library_unsafe_uno_uno.mk cpputools/Executable_uno.mk cui/CppunitTest_cui_dialogs_test_2.mk cui/CppunitTest_cui_dialogs_test_3.mk cui/CppunitTest_cui_dialogs_test_4.mk cui/CppunitTest_cui_dialogs_test.mk cui/Library_cui.mk dbaccess/CppunitTest_dbaccess_dialog_save.mk dbaccess/CppunitTest_dbaccess_dialogs_test.mk dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk dbaccess/CppunitTest_dbaccess_firebird_test.mk dbaccess/CppunitTest_dbaccess_hsqldb_test.mk dbaccess/CppunitTest_dbaccess_macros_test.mk dbaccess/CppunitTest_dbaccess_nolib_save.mk dbaccess/CppunitTest_dbaccess_RowSetClones.mk dbaccess/Executable_odbcconfig.mk dbaccess/Library_dba.mk dbaccess/Library_dbaxml.mk dbaccess/Library_dbmm.mk dbaccess/Library_dbu.mk dbaccess/Library_sdbt.mk desktop/CppunitTest_desktop_d ialogs_test.mk desktop/CppunitTest_desktop_lib.mk desktop/Executable_quickstart.mk desktop/Executable_sbase.mk desktop/Executable_scalc.mk desktop/Executable_sdraw.mk desktop/Executable_simpress.mk desktop/Executable_smath.mk desktop/Executable_soffice_bin.mk desktop/Executable_soffice.mk desktop/Executable_sweb.mk desktop/Executable_swriter.mk desktop/Executable_unopkg_bin.mk desktop/Library_crashreport.mk desktop/Library_deploymentgui.mk desktop/Library_deploymentmisc.mk desktop/Library_deployment.mk desktop/Library_migrationoo2.mk desktop/Library_migrationoo3.mk desktop/Library_offacc.mk desktop/Library_sofficeapp.mk desktop/Library_spl.mk desktop/Library_unopkgapp.mk drawinglayer/CppunitTest_drawinglayer_border.mk drawinglayer/Library_drawinglayer.mk dtrans/Library_dnd.mk dtrans/Library_dtrans.mk dtrans/Library_ftransl.mk dtrans/Library_mcnttype.mk dtrans/Library_sysdtrans.mk dtrans/source editeng/CppunitTest_editeng_borderline.mk editeng/CppunitTest_editeng_core.mk editeng/Cppu nitTest_editeng_lookuptree.mk editeng/Library_editeng.mk embeddedobj/Library_embobj.mk embeddedobj/Library_emboleobj.mk embedserv/Library_emser.mk embedserv/Library_inprocserv.mk eventattacher/Library_evtatt.mk extensions/CppunitTest_extensions_test_update.mk extensions/Library_abp.mk extensions/Library_bib.mk extensions/Library_dbp.mk extensions/Library_log.mk extensions/Library_pcr.mk extensions/Library_res.mk extensions/Library_scn.mk external/coinmp external/poppler filter/CppunitTest_filter_dialogs_test.mk filter/CppunitTest_filter_dxf_test.mk filter/CppunitTest_filter_eps_test.mk filter/CppunitTest_filter_met_test.mk filter/CppunitTest_filter_msfilter.mk filter/CppunitTest_filter_pcd_test.mk filter/CppunitTest_filter_pcx_test.mk filter/CppunitTest_filter_pict_test.mk filter/CppunitTest_filter_ppm_test.mk filter/CppunitTest_filter_priority.mk filter/CppunitTest_filter_psd_test.mk filter/CppunitTest_filter_ras_test.mk filter/CppunitTest_filter_tga_test.mk filter/CppunitTest_filt er_tiff_test.mk filter/CppunitTest_filter_xslt.mk filter/Executable_svg2odf.mk filter/Library_filterconfig.mk filter/Library_flash.mk filter/Library_gie.mk filter/Library_graphicfilter.mk filter/Library_icg.mk filter/Library_msfilter.mk filter/Library_odfflatxml.mk filter/Library_pdffilter.mk filter/Library_storagefd.mk filter/Library_svgfilter.mk filter/Library_t602filter.mk filter/Library_textfd.mk filter/Library_xmlfa.mk filter/Library_xmlfd.mk filter/Library_xsltdlg.mk filter/Library_xsltfilter.mk forms/Library_frm.mk formula/CppunitTest_formula_dialogs_test.mk formula/Library_for.mk formula/Library_forui.mk fpicker/CppunitTest_fpicker_dialogs_test.mk fpicker/Library_fps.mk fpicker/Library_fps_office.mk framework/CppunitTest_framework_dispatch.mk framework/Library_fwe.mk framework/Library_fwi.mk framework/Library_fwk.mk framework/Library_fwl.mk framework/Library_fwm.mk hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk hwpfilter/Library_hwp.mk i18nlangtag/CppunitTest_i18nlangtag_ test_languagetag.mk i18nlangtag/Library_i18nlangtag.mk i18npool/CppunitTest_i18npool_test_breakiterator.mk i18npool/CppunitTest_i18npool_test_characterclassification.mk i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk i18npool/CppunitTest_i18npool_test_textsearch.mk i18npool/Executable_gencoll_rule.mk i18npool/Executable_genconv_dict.mk i18npool/Executable_gendict.mk i18npool/Executable_genindex_data.mk i18npool/Executable_saxparser.mk i18npool/Library_collator_data.mk i18npool/Library_dict_ja.mk i18npool/Library_dict_zh.mk i18npool/Library_i18npool.mk i18npool/Library_i18nsearch.mk i18npool/Library_index_data.mk i18npool/Library_localedata_en.mk i18npool/Library_localedata_es.mk i18npool/Library_localedata_euro.mk i18npool/Library_localedata_others.mk i18npool/Library_textconv_dict.mk i18nutil/Library_i18nutil.mk idl/Executable_svidl.mk include/sal include/systools io/Library_io.mk javaunohelper/Library_juh.mk javaunohelper/Library_juhx.mk jurt/Library_jpipe.mk jurt/Library_jpip x.mk jvmaccess/Library_jvmaccess.mk jvmfwk/Executable_javaldx.mk jvmfwk/Library_jvmfwk.mk Library_merged.mk libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk lingucomponent/Library_guesslang.mk lingucomponent/Library_hyphen.mk lingucomponent/Library_lnth.mk lingucomponent/Library_spell.mk linguistic/Library_lng.mk lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk lotuswordpro/Library_lwpft.mk o3tl/CppunitTest_o3tl_tests.mk odk/CppunitTest_odk_checkapi.mk odk/CustomTarget_doxygen.mk odk/Package_odk_headers.mk officecfg/CppunitTest_officecfg_cppheader_test.mk oox/CppunitTest_oox_tokenmap.mk oox/CppunitTest_oox_vba_compression.mk oox/CppunitTest_oox_vba_encryption.mk oox/Library_oox.mk package/CppunitTest_package2_test.mk package/Library_package2.mk package/Library_xstor.mk postprocess/CppunitTest_services.mk registry/Library_reg.mk remotebridges/Library_uuresolver.mk reportdesign/CppunitTest_reportdesign_dialogs_test.mk reportdesign/Library_rpt.mk reportdesign/Libra ry_rptui.mk reportdesign/Library_rptxml.mk RepositoryExternal.mk Repository.mk rsc/Executable_rsc.mk sal/CppunitTest_Module_DLL.mk sal/CppunitTest_sal_osl.mk sal/CppunitTest_sal_osl_security.mk sal/CppunitTest_sal_rtl.mk sal/CppunitTest_sal_types.mk sal/Executable_cppunittester.mk sal/Executable_osl_process_child.mk salhelper/CppunitTest_salhelper_testapi.mk salhelper/Library_salhelper.mk sal/Library_sal.mk sal/Library_sal_textenc.mk sal/Library_uwinapi.mk sal/Module_sal.mk sal/systools sax/CppunitTest_sax_attributes.mk sax/CppunitTest_sax.mk sax/CppunitTest_sax_parser.mk sax/CppunitTest_sax_xmlimport.mk sax/Library_expwrap.mk sax/Library_sax.mk scaddins/Library_analysis.mk scaddins/Library_date.mk scaddins/Library_pricing.mk sccomp/CppunitTest_sccomp_lpsolver.mk sccomp/Library_solver.mk sc/CppunitTest_sc_addin_functions_test.mk sc/CppunitTest_sc_anchor_test.mk sc/CppunitTest_sc_annotationobj.mk sc/CppunitTest_sc_annotationshapeobj.mk sc/CppunitTest_sc_annotationsobj.mk sc/CppunitTe st_sc_array_functions_test.mk sc/CppunitTest_sc_bugfix_test.mk sc/CppunitTest_sc_cellrangeobj.mk sc/CppunitTest_sc_chart_regression_test.mk sc/CppunitTest_sc_check_data_pilot_field.mk sc/CppunitTest_sc_check_data_pilot_table.mk sc/CppunitTest_sc_check_xcell_ranges_query.mk sc/CppunitTest_sc_condformats.mk sc/CppunitTest_sc_copypaste.mk sc/CppunitTest_sc_database_functions_test.mk sc/CppunitTest_sc_databaserangeobj.mk sc/CppunitTest_sc_datapilotfieldobj.mk sc/CppunitTest_sc_datapilottableobj.mk sc/CppunitTest_sc_datetime_functions_test.mk sc/CppunitTest_sc_editfieldobj_cell.mk sc/CppunitTest_sc_editfieldobj_header.mk sc/CppunitTest_sc_filters_test.mk sc/CppunitTest_sc_financial_functions_test.mk sc/CppunitTest_sc_functions_test_old.mk sc/CppunitTest_sc_html_export_test.mk sc/CppunitTest_sc_information_functions_test.mk sc/CppunitTest_sc_logical_functions_test.mk sc/CppunitTest_sc_macros_test.mk sc/CppunitTest_sc_mark_test.mk sc/CppunitTest_sc_mathematical_functions_test.mk sc/Cppunit Test_sc_modelobj.mk sc/CppunitTest_sc_namedrangeobj.mk sc/CppunitTest_sc_namedrangesobj.mk sc/CppunitTest_sc_new_cond_format_api.mk sc/CppunitTest_sc_opencl_test.mk sc/CppunitTest_sc_outlineobj.mk sc/CppunitTest_sc_perfobj.mk sc/CppunitTest_sc_rangelst_test.mk sc/CppunitTest_sc_range_test.mk sc/CppunitTest_sc_recordchanges.mk sc/CppunitTest_sc_screenshots.mk sc/CppunitTest_sc_spreadsheet_functions_test.mk sc/CppunitTest_sc_statistical_functions_test.mk sc/CppunitTest_sc_styleloaderobj.mk sc/CppunitTest_sc_subsequent_export_test.mk sc/CppunitTest_sc_subsequent_filters_test.mk sc/CppunitTest_sc_tablesheetobj.mk sc/CppunitTest_sc_tablesheetsobj.mk sc/CppunitTest_sc_text_functions_test.mk sc/CppunitTest_sc_tiledrendering.mk sc/CppunitTest_sc_ucalc.mk sc/CppunitTest_sc_viewpaneobj.mk sc/Library_scd.mk sc/Library_scfilt.mk sc/Library_sc.mk sc/Library_scqahelper.mk sc/Library_scui.mk sc/Library_vbaobj.mk scp2/source scripting/Library_basprov.mk scripting/Library_dlgprov.mk scripting/Librar y_protocolhandler.mk scripting/Library_scriptframe.mk scripting/Library_stringresource.mk scripting/Library_vbaevents.mk sd/CppunitTest_sd_dialogs_test.mk sd/CppunitTest_sd_export_ooxml1.mk sd/CppunitTest_sd_export_ooxml2.mk sd/CppunitTest_sd_export_tests.mk sd/CppunitTest_sd_filters_test.mk sd/CppunitTest_sd_html_export_tests.mk sd/CppunitTest_sd_import_tests.mk sd/CppunitTest_sd_misc_tests.mk sd/CppunitTest_sd_svg_export_tests.mk sd/CppunitTest_sd_tiledrendering.mk sd/CppunitTest_sd_uimpress.mk sdext/CppunitTest_sdext_pdfimport.mk sdext/Executable_xpdfimport.mk sd/Library_sdd.mk sd/Library_sdfilt.mk sd/Library_sd.mk sd/Library_sdui.mk setup_native/Library_instooofiltmsi.mk setup_native/Library_qslnkmsi.mk setup_native/Library_reg4allmsdoc.mk setup_native/Library_regactivex.mk setup_native/Library_sdqsmsi.mk setup_native/Library_sellangmsi.mk setup_native/Library_shlxtmsi.mk setup_native/Library_sn_tools.mk sfx2/CppunitTest_sfx2_classification.mk sfx2/CppunitTest_sfx2_controllerite m.mk sfx2/CppunitTest_sfx2_dialogs_test.mk sfx2/CppunitTest_sfx2_metadatable.mk sfx2/Library_qstart_gtk.mk sfx2/Library_sfx.mk shell/Executable_lngconvex.mk shell/Library_cmdmail.mk shell/Library_desktopbe.mk shell/Library_localebe.mk shell/Library_recentfile.mk shell/Library_syssh.mk shell/Library_wininetbe.mk slideshow/CppunitTest_slideshow.mk slideshow/Executable_demoshow.mk slideshow/Library_OGLTrans.mk slideshow/Library_slideshow.mk smoketest/Executable_libtest.mk solenv/gbuild sot/CppunitTest_sot_test_sot.mk sot/Library_sot.mk starmath/CppunitTest_starmath_dialogs_test.mk starmath/CppunitTest_starmath_export.mk starmath/CppunitTest_starmath_import.mk starmath/CppunitTest_starmath_qa_cppunit.mk starmath/Library_smd.mk starmath/Library_sm.mk stoc/Library_bootstrap.mk stoc/Library_introspection.mk stoc/Library_invocadapt.mk stoc/Library_invocation.mk stoc/Library_javaloader.mk stoc/Library_javavm.mk stoc/Library_namingservice.mk stoc/Library_proxyfac.mk stoc/Library_reflection.mk stoc/Library_stocservices.mk store/Library_store.mk svgio/CppunitTest_svgio.mk svl/CppunitTest_svl_lngmisc.mk svl/CppunitTest_svl_urihelper.mk svl/Library_fsstorage.mk svl/Library_passwordcontainer.mk svl/Library_svl.mk svtools/CppunitTest_svtools_dialogs_test.mk svtools/CppunitTest_svtools_graphic.mk svtools/CppunitTest_svtools_html.mk svtools/Executable_langsupport.mk svtools/Library_svt.mk svx/CppunitTest_svx_dialogs_test.mk svx/Executable_gengal.mk svx/Library_svxcore.mk svx/Library_svx.mk svx/Library_textconversiondlgs.mk sw/CppunitTest_sw_dialogs_test_2.mk sw/CppunitTest_sw_dialogs_test.mk sw/CppunitTest_sw_docbookexport.mk sw/CppunitTest_sw_filters_test.mk sw/CppunitTest_sw_globalfilter.mk sw/CppunitTest_sw_htmlexport.mk sw/CppunitTest_sw_htmlimport.mk sw/CppunitTest_sw_layout_test.mk sw/CppunitTest_sw_macros_test.mk sw/CppunitTest_sw_odfexport.mk sw/CppunitTest_sw_odfimport.mk sw/CppunitTest_sw_ooxmlexport8.mk sw/CppunitTest_sw_ooxmlimport.mk sw/CppunitTest_sw_rtfexport.mk sw/CppunitTest_sw_rtfimport.mk sw/CppunitTest_sw_tiledrendering.mk sw/CppunitTest_sw_uiwriter.mk sw/CppunitTest_sw_uwriter.mk sw/CppunitTest_sw_ww8export2.mk sw/CppunitTest_sw_ww8export.mk sw/CppunitTest_sw_ww8import.mk sw/Library_msword.mk sw/Library_swd.mk sw/Library_sw.mk sw/Library_swui.mk sw/Library_vbaswobj.mk sw/ooxmlexport_setup.mk test/Library_subsequenttest.mk test/Library_test.mk test/Library_test_setupvcl.mk test/Library_vclbootstrapprotector.mk toolkit/Library_tk.mk tools/CppunitTest_tools_test.mk tools/Executable_bestreversemap.mk tools/Library_tl.mk ucbhelper/Library_ucbhelper.mk ucb/Library_cached1.mk ucb/Library_srtrs1.mk ucb/Library_ucb1.mk ucb/Library_ucpcmis1.mk ucb/Library_ucpdav1.mk ucb/Library_ucpexpand1.mk ucb/Library_ucpext.mk ucb/Library_ucpfile1.mk ucb/Library_ucpftp1.mk ucb/Library_ucphier1.mk ucb/Library_ucpimage.mk ucb/Library_ucppkg1.mk ucb/Library_ucptdoc1.mk UnoControls/Library_ctl.mk unotest/Library_unobootstrapprotector.mk unotest/Library_unoexcept ionprotector.mk unotest/Library_unotest.mk unotools/CppunitTest_unotools_fontdefs.mk unotools/Library_utl.mk unoxml/Library_unordf.mk unoxml/Library_unoxml.mk uui/CppunitTest_uui_dialogs_test.mk uui/Library_uui.mk vbahelper/Library_msforms.mk vbahelper/Library_vbahelper.mk vcl/CppunitTest_vcl_bitmapprocessor_test.mk vcl/CppunitTest_vcl_bitmap_test.mk vcl/CppunitTest_vcl_blocklistparser_test.mk vcl/CppunitTest_vcl_complextext.mk vcl/CppunitTest_vcl_dialogs_test.mk vcl/CppunitTest_vcl_filters_test.mk vcl/CppunitTest_vcl_fontcharmap.mk vcl/CppunitTest_vcl_fontmetric.mk vcl/CppunitTest_vcl_font.mk vcl/CppunitTest_vcl_jpeg_read_write_test.mk vcl/CppunitTest_vcl_lifecycle.mk vcl/CppunitTest_vcl_mapmode.mk vcl/CppunitTest_vcl_outdev.mk vcl/CppunitTest_vcl_pdfexport.mk vcl/CppunitTest_vcl_svm_test.mk vcl/CppunitTest_vcl_timer.mk vcl/CppunitTest_vcl_wmf_test.mk vcl/Library_vcl.mk winaccessibility/Library_winaccessibility.mk writerfilter/CppunitTest_writerfilter_misc.mk writerfilter/CppunitTe st_writerfilter_rtftok.mk writerfilter/Library_writerfilter.mk writerperfect/CppunitTest_writerperfect_calc.mk writerperfect/CppunitTest_writerperfect_draw.mk writerperfect/CppunitTest_writerperfect_import.mk writerperfect/CppunitTest_writerperfect_impress.mk writerperfect/CppunitTest_writerperfect_wpftimport.mk writerperfect/CppunitTest_writerperfect_writer.mk writerperfect/Library_wpftcalc.mk writerperfect/Library_wpftdraw.mk writerperfect/Library_wpftimpress.mk writerperfect/Library_wpftwriter.mk writerperfect/Library_writerperfect.mk xmloff/CppunitTest_xmloff_uxmloff.mk xmloff/Library_xof.mk xmloff/Library_xo.mk xmlreader/Library_xmlreader.mk xmlscript/Library_xmlscript.mk xmlsecurity/CppunitTest_qa_certext.mk xmlsecurity/CppunitTest_xmlsecurity_dialogs_test.mk xmlsecurity/CppunitTest_xmlsecurity_pdfsigning.mk xmlsecurity/CppunitTest_xmlsecurity_signing.mk xmlsecurity/Library_xmlsecurity.mk xmlsecurity/Library_xsec_fw.mk xmlsecurity/Library_xsec_gpg.mk xmlsecurity/Library_xsec_x mlsec.mk

David Ostrovsky david at ostrovsky.org
Fri Apr 21 16:19:11 UTC 2017


 Library_merged.mk                                                |    1 
 Repository.mk                                                    |    3 
 RepositoryExternal.mk                                            |    2 
 UnoControls/Library_ctl.mk                                       |    1 
 accessibility/Library_acc.mk                                     |    1 
 animations/Library_animcore.mk                                   |    1 
 avmedia/Library_avmedia.mk                                       |    1 
 avmedia/Library_avmediaMacAVF.mk                                 |    1 
 avmedia/Library_avmediaQuickTime.mk                              |    1 
 avmedia/Library_avmediagst.mk                                    |    1 
 avmedia/Library_avmediagst_0_10.mk                               |    1 
 avmedia/Library_avmediaogl.mk                                    |    1 
 avmedia/Library_avmediavlc.mk                                    |    1 
 avmedia/Library_avmediawin.mk                                    |    1 
 basctl/CppunitTest_basctl_dialogs_test.mk                        |    1 
 basctl/Library_basctl.mk                                         |    1 
 basegfx/CppunitTest_basegfx.mk                                   |    1 
 basegfx/Library_basegfx.mk                                       |    1 
 basic/CppunitTest_basic_macros.mk                                |    1 
 basic/CppunitTest_basic_scanner.mk                               |    1 
 basic/Library_sb.mk                                              |    1 
 bean/Library_officebean.mk                                       |    4 
 bean/com/sun/star/comp/beans/LocalOfficeConnection.java          |   11 
 binaryurp/CppunitTest_binaryurp_test-cache.mk                    |    1 
 binaryurp/CppunitTest_binaryurp_test-unmarshal.mk                |    1 
 binaryurp/Library_binaryurp.mk                                   |    1 
 bridges/Library_java_uno.mk                                      |    1 
 canvas/Library_cairocanvas.mk                                    |    1 
 canvas/Library_canvasfactory.mk                                  |    1 
 canvas/Library_canvastools.mk                                    |    1 
 canvas/Library_directx9canvas.mk                                 |    1 
 canvas/Library_gdipluscanvas.mk                                  |    1 
 canvas/Library_oglcanvas.mk                                      |    1 
 canvas/Library_simplecanvas.mk                                   |    1 
 canvas/Library_vclcanvas.mk                                      |    1 
 chart2/CppunitTest_chart2_common_functors.mk                     |    1 
 chart2/CppunitTest_chart2_dialogs_test.mk                        |    1 
 chart2/CppunitTest_chart2_dump.mk                                |    1 
 chart2/CppunitTest_chart2_export.mk                              |    1 
 chart2/CppunitTest_chart2_import.mk                              |    1 
 chart2/CppunitTest_chart2_pivot_chart_test.mk                    |    1 
 chart2/CppunitTest_chart2_trendcalculators.mk                    |    1 
 chart2/CppunitTest_chart2_xshape.mk                              |    1 
 chart2/Library_chartcontroller.mk                                |    1 
 chart2/Library_chartcore.mk                                      |    1 
 chart2/Library_chartopengl.mk                                    |    1 
 cli_ure/Executable_climaker.mk                                   |    1 
 comphelper/CppunitTest_comphelper_ifcontainer.mk                 |    1 
 comphelper/CppunitTest_comphelper_syntaxhighlight_test.mk        |    1 
 comphelper/CppunitTest_comphelper_test.mk                        |    1 
 comphelper/CppunitTest_comphelper_threadpool_test.mk             |    1 
 comphelper/CppunitTest_comphelper_variadictemplates_test.mk      |    1 
 comphelper/Library_comphelper.mk                                 |    1 
 configmgr/CppunitTest_configmgr_unit.mk                          |    1 
 configmgr/Library_configmgr.mk                                   |    1 
 connectivity/CppunitTest_connectivity_ado.mk                     |    1 
 connectivity/CppunitTest_connectivity_commontools.mk             |    1 
 connectivity/CppunitTest_connectivity_mork.mk                    |    1 
 connectivity/Library_ado.mk                                      |    1 
 connectivity/Library_calc.mk                                     |    1 
 connectivity/Library_dbase.mk                                    |    1 
 connectivity/Library_dbpool2.mk                                  |    1 
 connectivity/Library_dbtools.mk                                  |    1 
 connectivity/Library_evoab.mk                                    |    1 
 connectivity/Library_file.mk                                     |    1 
 connectivity/Library_firebird_sdbc.mk                            |    1 
 connectivity/Library_flat.mk                                     |    1 
 connectivity/Library_hsqldb.mk                                   |    1 
 connectivity/Library_jdbc.mk                                     |    1 
 connectivity/Library_mork.mk                                     |    1 
 connectivity/Library_mozbootstrap.mk                             |    1 
 connectivity/Library_mysql.mk                                    |    1 
 connectivity/Library_odbc.mk                                     |    1 
 connectivity/Library_postgresql-sdbc-impl.mk                     |    1 
 connectivity/Library_postgresql-sdbc.mk                          |    1 
 connectivity/Library_sdbc2.mk                                    |    1 
 connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java |    1 
 cppcanvas/CppunitTest_cppcanvas_test.mk                          |    1 
 cppcanvas/Library_cppcanvas.mk                                   |    1 
 cppcanvas/Library_mtfrenderer.mk                                 |    1 
 cppu/CppunitTest_cppu_any-external.mk                            |    1 
 cppu/CppunitTest_cppu_qa_any.mk                                  |    1 
 cppu/CppunitTest_cppu_qa_recursion.mk                            |    1 
 cppu/CppunitTest_cppu_qa_reference.mk                            |    1 
 cppu/CppunitTest_cppu_qa_unotype.mk                              |    1 
 cppu/CppunitTest_cppu_test_cppumaker.mk                          |    1 
 cppu/Library_affine_uno_uno.mk                                   |    1 
 cppu/Library_cppu.mk                                             |    1 
 cppu/Library_log_uno_uno.mk                                      |    1 
 cppu/Library_purpenvhelper.mk                                    |    1 
 cppu/Library_unsafe_uno_uno.mk                                   |    1 
 cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk            |    1 
 cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk                 |    1 
 cppuhelper/CppunitTest_cppuhelper_qa_weak.mk                     |    1 
 cppuhelper/Library_cppuhelper.mk                                 |    1 
 cpputools/Executable_uno.mk                                      |    1 
 cui/CppunitTest_cui_dialogs_test.mk                              |    1 
 cui/CppunitTest_cui_dialogs_test_2.mk                            |    1 
 cui/CppunitTest_cui_dialogs_test_3.mk                            |    1 
 cui/CppunitTest_cui_dialogs_test_4.mk                            |    1 
 cui/Library_cui.mk                                               |    1 
 dbaccess/CppunitTest_dbaccess_RowSetClones.mk                    |    1 
 dbaccess/CppunitTest_dbaccess_dialog_save.mk                     |    1 
 dbaccess/CppunitTest_dbaccess_dialogs_test.mk                    |    1 
 dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk      |    1 
 dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk               |    1 
 dbaccess/CppunitTest_dbaccess_firebird_test.mk                   |    1 
 dbaccess/CppunitTest_dbaccess_hsqldb_test.mk                     |    1 
 dbaccess/CppunitTest_dbaccess_macros_test.mk                     |    1 
 dbaccess/CppunitTest_dbaccess_nolib_save.mk                      |    1 
 dbaccess/Executable_odbcconfig.mk                                |    4 
 dbaccess/Library_dba.mk                                          |    1 
 dbaccess/Library_dbaxml.mk                                       |    1 
 dbaccess/Library_dbmm.mk                                         |    1 
 dbaccess/Library_dbu.mk                                          |    1 
 dbaccess/Library_sdbt.mk                                         |    1 
 desktop/CppunitTest_desktop_dialogs_test.mk                      |    1 
 desktop/CppunitTest_desktop_lib.mk                               |    1 
 desktop/Executable_quickstart.mk                                 |    4 
 desktop/Executable_sbase.mk                                      |    4 
 desktop/Executable_scalc.mk                                      |    4 
 desktop/Executable_sdraw.mk                                      |    4 
 desktop/Executable_simpress.mk                                   |    4 
 desktop/Executable_smath.mk                                      |    4 
 desktop/Executable_soffice.mk                                    |    4 
 desktop/Executable_soffice_bin.mk                                |    1 
 desktop/Executable_sweb.mk                                       |    4 
 desktop/Executable_swriter.mk                                    |    4 
 desktop/Executable_unopkg_bin.mk                                 |    1 
 desktop/Library_crashreport.mk                                   |    1 
 desktop/Library_deployment.mk                                    |    1 
 desktop/Library_deploymentgui.mk                                 |    1 
 desktop/Library_deploymentmisc.mk                                |    1 
 desktop/Library_migrationoo2.mk                                  |    1 
 desktop/Library_migrationoo3.mk                                  |    1 
 desktop/Library_offacc.mk                                        |    1 
 desktop/Library_sofficeapp.mk                                    |    1 
 desktop/Library_spl.mk                                           |    1 
 desktop/Library_unopkgapp.mk                                     |    1 
 drawinglayer/CppunitTest_drawinglayer_border.mk                  |    1 
 drawinglayer/Library_drawinglayer.mk                             |    1 
 dtrans/Library_dnd.mk                                            |    1 
 dtrans/Library_dtrans.mk                                         |    1 
 dtrans/Library_ftransl.mk                                        |    1 
 dtrans/Library_mcnttype.mk                                       |    1 
 dtrans/Library_sysdtrans.mk                                      |    1 
 dtrans/source/win32/workbench/makefile.mk                        |    1 
 editeng/CppunitTest_editeng_borderline.mk                        |    1 
 editeng/CppunitTest_editeng_core.mk                              |    1 
 editeng/CppunitTest_editeng_lookuptree.mk                        |    1 
 editeng/Library_editeng.mk                                       |    1 
 embeddedobj/Library_embobj.mk                                    |    1 
 embeddedobj/Library_emboleobj.mk                                 |    1 
 embedserv/Library_emser.mk                                       |    1 
 embedserv/Library_inprocserv.mk                                  |    4 
 eventattacher/Library_evtatt.mk                                  |    1 
 extensions/CppunitTest_extensions_test_update.mk                 |    1 
 extensions/Library_abp.mk                                        |    1 
 extensions/Library_bib.mk                                        |    1 
 extensions/Library_dbp.mk                                        |    1 
 extensions/Library_log.mk                                        |    1 
 extensions/Library_pcr.mk                                        |    1 
 extensions/Library_res.mk                                        |    1 
 extensions/Library_scn.mk                                        |    1 
 external/coinmp/UnpackedTarball_coinmp.mk                        |    4 
 external/coinmp/coinmp-vs2013.patch.1                            |  352 ----------
 external/poppler/UnpackedTarball_poppler.mk                      |    1 
 external/poppler/poppler-snprintf.patch.1                        |   34 
 filter/CppunitTest_filter_dialogs_test.mk                        |    1 
 filter/CppunitTest_filter_dxf_test.mk                            |    1 
 filter/CppunitTest_filter_eps_test.mk                            |    1 
 filter/CppunitTest_filter_met_test.mk                            |    1 
 filter/CppunitTest_filter_msfilter.mk                            |    1 
 filter/CppunitTest_filter_pcd_test.mk                            |    1 
 filter/CppunitTest_filter_pcx_test.mk                            |    1 
 filter/CppunitTest_filter_pict_test.mk                           |    1 
 filter/CppunitTest_filter_ppm_test.mk                            |    1 
 filter/CppunitTest_filter_priority.mk                            |    1 
 filter/CppunitTest_filter_psd_test.mk                            |    1 
 filter/CppunitTest_filter_ras_test.mk                            |    1 
 filter/CppunitTest_filter_tga_test.mk                            |    1 
 filter/CppunitTest_filter_tiff_test.mk                           |    1 
 filter/CppunitTest_filter_xslt.mk                                |    1 
 filter/Executable_svg2odf.mk                                     |    1 
 filter/Library_filterconfig.mk                                   |    1 
 filter/Library_flash.mk                                          |    1 
 filter/Library_gie.mk                                            |    1 
 filter/Library_graphicfilter.mk                                  |    1 
 filter/Library_icg.mk                                            |    1 
 filter/Library_msfilter.mk                                       |    1 
 filter/Library_odfflatxml.mk                                     |    1 
 filter/Library_pdffilter.mk                                      |    1 
 filter/Library_storagefd.mk                                      |    1 
 filter/Library_svgfilter.mk                                      |    1 
 filter/Library_t602filter.mk                                     |    1 
 filter/Library_textfd.mk                                         |    1 
 filter/Library_xmlfa.mk                                          |    1 
 filter/Library_xmlfd.mk                                          |    1 
 filter/Library_xsltdlg.mk                                        |    1 
 filter/Library_xsltfilter.mk                                     |    1 
 forms/Library_frm.mk                                             |    1 
 formula/CppunitTest_formula_dialogs_test.mk                      |    1 
 formula/Library_for.mk                                           |    1 
 formula/Library_forui.mk                                         |    1 
 fpicker/CppunitTest_fpicker_dialogs_test.mk                      |    1 
 fpicker/Library_fps.mk                                           |    1 
 fpicker/Library_fps_office.mk                                    |    1 
 framework/CppunitTest_framework_dispatch.mk                      |    1 
 framework/Library_fwe.mk                                         |    1 
 framework/Library_fwi.mk                                         |    1 
 framework/Library_fwk.mk                                         |    1 
 framework/Library_fwl.mk                                         |    1 
 framework/Library_fwm.mk                                         |    1 
 hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk                |    1 
 hwpfilter/Library_hwp.mk                                         |    1 
 i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk          |    1 
 i18nlangtag/Library_i18nlangtag.mk                               |    1 
 i18npool/CppunitTest_i18npool_test_breakiterator.mk              |    1 
 i18npool/CppunitTest_i18npool_test_characterclassification.mk    |    1 
 i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk              |    1 
 i18npool/CppunitTest_i18npool_test_textsearch.mk                 |    1 
 i18npool/Executable_gencoll_rule.mk                              |    1 
 i18npool/Executable_genconv_dict.mk                              |    1 
 i18npool/Executable_gendict.mk                                   |    1 
 i18npool/Executable_genindex_data.mk                             |    1 
 i18npool/Executable_saxparser.mk                                 |    1 
 i18npool/Library_collator_data.mk                                |    4 
 i18npool/Library_dict_ja.mk                                      |    4 
 i18npool/Library_dict_zh.mk                                      |    4 
 i18npool/Library_i18npool.mk                                     |    1 
 i18npool/Library_i18nsearch.mk                                   |    1 
 i18npool/Library_index_data.mk                                   |    4 
 i18npool/Library_localedata_en.mk                                |    4 
 i18npool/Library_localedata_es.mk                                |    1 
 i18npool/Library_localedata_euro.mk                              |    1 
 i18npool/Library_localedata_others.mk                            |    1 
 i18npool/Library_textconv_dict.mk                                |    1 
 i18nutil/Library_i18nutil.mk                                     |    1 
 idl/Executable_svidl.mk                                          |    1 
 include/sal/config.h                                             |    5 
 include/systools/win32/snprintf.h                                |   88 --
 io/Library_io.mk                                                 |    1 
 javaunohelper/Library_juh.mk                                     |    1 
 javaunohelper/Library_juhx.mk                                    |    1 
 jurt/Library_jpipe.mk                                            |    4 
 jurt/Library_jpipx.mk                                            |    1 
 jvmaccess/Library_jvmaccess.mk                                   |    1 
 jvmfwk/Executable_javaldx.mk                                     |    1 
 jvmfwk/Library_jvmfwk.mk                                         |    1 
 libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk      |    1 
 lingucomponent/Library_guesslang.mk                              |    1 
 lingucomponent/Library_hyphen.mk                                 |    1 
 lingucomponent/Library_lnth.mk                                   |    1 
 lingucomponent/Library_spell.mk                                  |    1 
 linguistic/Library_lng.mk                                        |    1 
 lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk       |    1 
 lotuswordpro/Library_lwpft.mk                                    |    1 
 o3tl/CppunitTest_o3tl_tests.mk                                   |    1 
 odk/CppunitTest_odk_checkapi.mk                                  |    1 
 odk/CustomTarget_doxygen.mk                                      |    4 
 odk/Package_odk_headers.mk                                       |    1 
 officecfg/CppunitTest_officecfg_cppheader_test.mk                |    4 
 oox/CppunitTest_oox_tokenmap.mk                                  |    1 
 oox/CppunitTest_oox_vba_compression.mk                           |    1 
 oox/CppunitTest_oox_vba_encryption.mk                            |    1 
 oox/Library_oox.mk                                               |    1 
 package/CppunitTest_package2_test.mk                             |    1 
 package/Library_package2.mk                                      |    1 
 package/Library_xstor.mk                                         |    1 
 postprocess/CppunitTest_services.mk                              |    1 
 registry/Library_reg.mk                                          |    1 
 remotebridges/Library_uuresolver.mk                              |    1 
 reportdesign/CppunitTest_reportdesign_dialogs_test.mk            |    1 
 reportdesign/Library_rpt.mk                                      |    1 
 reportdesign/Library_rptui.mk                                    |    1 
 reportdesign/Library_rptxml.mk                                   |    1 
 rsc/Executable_rsc.mk                                            |    1 
 sal/CppunitTest_Module_DLL.mk                                    |    1 
 sal/CppunitTest_sal_osl.mk                                       |    1 
 sal/CppunitTest_sal_osl_security.mk                              |    1 
 sal/CppunitTest_sal_rtl.mk                                       |    1 
 sal/CppunitTest_sal_types.mk                                     |    1 
 sal/Executable_cppunittester.mk                                  |    1 
 sal/Executable_osl_process_child.mk                              |    1 
 sal/Library_sal.mk                                               |    1 
 sal/Library_sal_textenc.mk                                       |    1 
 sal/Library_uwinapi.mk                                           |   48 -
 sal/Module_sal.mk                                                |    2 
 sal/systools/win32/uwinapi/legacy.c                              |   35 
 sal/systools/win32/uwinapi/snprintf.c                            |   31 
 sal/systools/win32/uwinapi/sntprintf.c                           |  120 ---
 sal/systools/win32/uwinapi/snwprintf.c                           |   26 
 sal/systools/win32/uwinapi/uwinapi.def                           |    8 
 salhelper/CppunitTest_salhelper_testapi.mk                       |    1 
 salhelper/Library_salhelper.mk                                   |    1 
 sax/CppunitTest_sax.mk                                           |    1 
 sax/CppunitTest_sax_attributes.mk                                |    1 
 sax/CppunitTest_sax_parser.mk                                    |    1 
 sax/CppunitTest_sax_xmlimport.mk                                 |    1 
 sax/Library_expwrap.mk                                           |    1 
 sax/Library_sax.mk                                               |    1 
 sc/CppunitTest_sc_addin_functions_test.mk                        |    1 
 sc/CppunitTest_sc_anchor_test.mk                                 |    1 
 sc/CppunitTest_sc_annotationobj.mk                               |    1 
 sc/CppunitTest_sc_annotationshapeobj.mk                          |    1 
 sc/CppunitTest_sc_annotationsobj.mk                              |    1 
 sc/CppunitTest_sc_array_functions_test.mk                        |    1 
 sc/CppunitTest_sc_bugfix_test.mk                                 |    1 
 sc/CppunitTest_sc_cellrangeobj.mk                                |    1 
 sc/CppunitTest_sc_chart_regression_test.mk                       |    1 
 sc/CppunitTest_sc_check_data_pilot_field.mk                      |    1 
 sc/CppunitTest_sc_check_data_pilot_table.mk                      |    1 
 sc/CppunitTest_sc_check_xcell_ranges_query.mk                    |    1 
 sc/CppunitTest_sc_condformats.mk                                 |    1 
 sc/CppunitTest_sc_copypaste.mk                                   |    1 
 sc/CppunitTest_sc_database_functions_test.mk                     |    1 
 sc/CppunitTest_sc_databaserangeobj.mk                            |    1 
 sc/CppunitTest_sc_datapilotfieldobj.mk                           |    1 
 sc/CppunitTest_sc_datapilottableobj.mk                           |    1 
 sc/CppunitTest_sc_datetime_functions_test.mk                     |    1 
 sc/CppunitTest_sc_editfieldobj_cell.mk                           |    1 
 sc/CppunitTest_sc_editfieldobj_header.mk                         |    1 
 sc/CppunitTest_sc_filters_test.mk                                |    1 
 sc/CppunitTest_sc_financial_functions_test.mk                    |    1 
 sc/CppunitTest_sc_functions_test_old.mk                          |    1 
 sc/CppunitTest_sc_html_export_test.mk                            |    1 
 sc/CppunitTest_sc_information_functions_test.mk                  |    1 
 sc/CppunitTest_sc_logical_functions_test.mk                      |    1 
 sc/CppunitTest_sc_macros_test.mk                                 |    1 
 sc/CppunitTest_sc_mark_test.mk                                   |    1 
 sc/CppunitTest_sc_mathematical_functions_test.mk                 |    1 
 sc/CppunitTest_sc_modelobj.mk                                    |    1 
 sc/CppunitTest_sc_namedrangeobj.mk                               |    1 
 sc/CppunitTest_sc_namedrangesobj.mk                              |    1 
 sc/CppunitTest_sc_new_cond_format_api.mk                         |    1 
 sc/CppunitTest_sc_opencl_test.mk                                 |    1 
 sc/CppunitTest_sc_outlineobj.mk                                  |    1 
 sc/CppunitTest_sc_perfobj.mk                                     |    1 
 sc/CppunitTest_sc_range_test.mk                                  |    1 
 sc/CppunitTest_sc_rangelst_test.mk                               |    1 
 sc/CppunitTest_sc_recordchanges.mk                               |    1 
 sc/CppunitTest_sc_screenshots.mk                                 |    1 
 sc/CppunitTest_sc_spreadsheet_functions_test.mk                  |    1 
 sc/CppunitTest_sc_statistical_functions_test.mk                  |    1 
 sc/CppunitTest_sc_styleloaderobj.mk                              |    1 
 sc/CppunitTest_sc_subsequent_export_test.mk                      |    1 
 sc/CppunitTest_sc_subsequent_filters_test.mk                     |    1 
 sc/CppunitTest_sc_tablesheetobj.mk                               |    1 
 sc/CppunitTest_sc_tablesheetsobj.mk                              |    1 
 sc/CppunitTest_sc_text_functions_test.mk                         |    1 
 sc/CppunitTest_sc_tiledrendering.mk                              |    1 
 sc/CppunitTest_sc_ucalc.mk                                       |    1 
 sc/CppunitTest_sc_viewpaneobj.mk                                 |    1 
 sc/Library_sc.mk                                                 |    1 
 sc/Library_scd.mk                                                |    1 
 sc/Library_scfilt.mk                                             |    1 
 sc/Library_scqahelper.mk                                         |    1 
 sc/Library_scui.mk                                               |    1 
 sc/Library_vbaobj.mk                                             |    1 
 scaddins/Library_analysis.mk                                     |    1 
 scaddins/Library_date.mk                                         |    1 
 scaddins/Library_pricing.mk                                      |    1 
 sccomp/CppunitTest_sccomp_lpsolver.mk                            |    1 
 sccomp/Library_solver.mk                                         |    1 
 scp2/source/ooo/vc_redist.scp                                    |   19 
 scp2/source/winexplorerext/file_winexplorerext.scp               |   60 -
 scripting/Library_basprov.mk                                     |    1 
 scripting/Library_dlgprov.mk                                     |    1 
 scripting/Library_protocolhandler.mk                             |    1 
 scripting/Library_scriptframe.mk                                 |    1 
 scripting/Library_stringresource.mk                              |    1 
 scripting/Library_vbaevents.mk                                   |    1 
 sd/CppunitTest_sd_dialogs_test.mk                                |    1 
 sd/CppunitTest_sd_export_ooxml1.mk                               |    1 
 sd/CppunitTest_sd_export_ooxml2.mk                               |    1 
 sd/CppunitTest_sd_export_tests.mk                                |    1 
 sd/CppunitTest_sd_filters_test.mk                                |    1 
 sd/CppunitTest_sd_html_export_tests.mk                           |    1 
 sd/CppunitTest_sd_import_tests.mk                                |    1 
 sd/CppunitTest_sd_misc_tests.mk                                  |    1 
 sd/CppunitTest_sd_svg_export_tests.mk                            |    1 
 sd/CppunitTest_sd_tiledrendering.mk                              |    1 
 sd/CppunitTest_sd_uimpress.mk                                    |    1 
 sd/Library_sd.mk                                                 |    1 
 sd/Library_sdd.mk                                                |    1 
 sd/Library_sdfilt.mk                                             |    1 
 sd/Library_sdui.mk                                               |    1 
 sdext/CppunitTest_sdext_pdfimport.mk                             |    1 
 sdext/Executable_xpdfimport.mk                                   |    4 
 setup_native/Library_instooofiltmsi.mk                           |    4 
 setup_native/Library_qslnkmsi.mk                                 |    4 
 setup_native/Library_reg4allmsdoc.mk                             |    4 
 setup_native/Library_regactivex.mk                               |    4 
 setup_native/Library_sdqsmsi.mk                                  |    4 
 setup_native/Library_sellangmsi.mk                               |    4 
 setup_native/Library_shlxtmsi.mk                                 |    4 
 setup_native/Library_sn_tools.mk                                 |    4 
 sfx2/CppunitTest_sfx2_classification.mk                          |    1 
 sfx2/CppunitTest_sfx2_controlleritem.mk                          |    1 
 sfx2/CppunitTest_sfx2_dialogs_test.mk                            |    1 
 sfx2/CppunitTest_sfx2_metadatable.mk                             |    1 
 sfx2/Library_qstart_gtk.mk                                       |    1 
 sfx2/Library_sfx.mk                                              |    1 
 shell/Executable_lngconvex.mk                                    |    1 
 shell/Library_cmdmail.mk                                         |    1 
 shell/Library_desktopbe.mk                                       |    1 
 shell/Library_localebe.mk                                        |    1 
 shell/Library_recentfile.mk                                      |    1 
 shell/Library_syssh.mk                                           |    1 
 shell/Library_wininetbe.mk                                       |    1 
 slideshow/CppunitTest_slideshow.mk                               |    1 
 slideshow/Executable_demoshow.mk                                 |    1 
 slideshow/Library_OGLTrans.mk                                    |    1 
 slideshow/Library_slideshow.mk                                   |    1 
 smoketest/Executable_libtest.mk                                  |    4 
 solenv/gbuild/platform/com_MSC_class.mk                          |    4 
 solenv/gbuild/platform/com_MSC_defs.mk                           |   17 
 solenv/gbuild/platform/windows.mk                                |    9 
 sot/CppunitTest_sot_test_sot.mk                                  |    1 
 sot/Library_sot.mk                                               |    1 
 starmath/CppunitTest_starmath_dialogs_test.mk                    |    1 
 starmath/CppunitTest_starmath_export.mk                          |    1 
 starmath/CppunitTest_starmath_import.mk                          |    1 
 starmath/CppunitTest_starmath_qa_cppunit.mk                      |    1 
 starmath/Library_sm.mk                                           |    1 
 starmath/Library_smd.mk                                          |    1 
 stoc/Library_bootstrap.mk                                        |    1 
 stoc/Library_introspection.mk                                    |    1 
 stoc/Library_invocadapt.mk                                       |    1 
 stoc/Library_invocation.mk                                       |    1 
 stoc/Library_javaloader.mk                                       |    1 
 stoc/Library_javavm.mk                                           |    1 
 stoc/Library_namingservice.mk                                    |    1 
 stoc/Library_proxyfac.mk                                         |    1 
 stoc/Library_reflection.mk                                       |    1 
 stoc/Library_stocservices.mk                                     |    1 
 store/Library_store.mk                                           |    1 
 svgio/CppunitTest_svgio.mk                                       |    1 
 svl/CppunitTest_svl_lngmisc.mk                                   |    1 
 svl/CppunitTest_svl_urihelper.mk                                 |    1 
 svl/Library_fsstorage.mk                                         |    1 
 svl/Library_passwordcontainer.mk                                 |    1 
 svl/Library_svl.mk                                               |    1 
 svtools/CppunitTest_svtools_dialogs_test.mk                      |    1 
 svtools/CppunitTest_svtools_graphic.mk                           |    1 
 svtools/CppunitTest_svtools_html.mk                              |    1 
 svtools/Executable_langsupport.mk                                |    1 
 svtools/Library_svt.mk                                           |    1 
 svx/CppunitTest_svx_dialogs_test.mk                              |    1 
 svx/Executable_gengal.mk                                         |    1 
 svx/Library_svx.mk                                               |    1 
 svx/Library_svxcore.mk                                           |    1 
 svx/Library_textconversiondlgs.mk                                |    1 
 sw/CppunitTest_sw_dialogs_test.mk                                |    1 
 sw/CppunitTest_sw_dialogs_test_2.mk                              |    1 
 sw/CppunitTest_sw_docbookexport.mk                               |    1 
 sw/CppunitTest_sw_filters_test.mk                                |    1 
 sw/CppunitTest_sw_globalfilter.mk                                |    1 
 sw/CppunitTest_sw_htmlexport.mk                                  |    1 
 sw/CppunitTest_sw_htmlimport.mk                                  |    1 
 sw/CppunitTest_sw_layout_test.mk                                 |    1 
 sw/CppunitTest_sw_macros_test.mk                                 |    1 
 sw/CppunitTest_sw_odfexport.mk                                   |    1 
 sw/CppunitTest_sw_odfimport.mk                                   |    1 
 sw/CppunitTest_sw_ooxmlexport8.mk                                |    1 
 sw/CppunitTest_sw_ooxmlimport.mk                                 |    1 
 sw/CppunitTest_sw_rtfexport.mk                                   |    1 
 sw/CppunitTest_sw_rtfimport.mk                                   |    1 
 sw/CppunitTest_sw_tiledrendering.mk                              |    1 
 sw/CppunitTest_sw_uiwriter.mk                                    |    1 
 sw/CppunitTest_sw_uwriter.mk                                     |    1 
 sw/CppunitTest_sw_ww8export.mk                                   |    1 
 sw/CppunitTest_sw_ww8export2.mk                                  |    1 
 sw/CppunitTest_sw_ww8import.mk                                   |    1 
 sw/Library_msword.mk                                             |    1 
 sw/Library_sw.mk                                                 |    1 
 sw/Library_swd.mk                                                |    1 
 sw/Library_swui.mk                                               |    1 
 sw/Library_vbaswobj.mk                                           |    1 
 sw/ooxmlexport_setup.mk                                          |    3 
 test/Library_subsequenttest.mk                                   |    1 
 test/Library_test.mk                                             |    1 
 test/Library_test_setupvcl.mk                                    |    1 
 test/Library_vclbootstrapprotector.mk                            |    1 
 toolkit/Library_tk.mk                                            |    1 
 tools/CppunitTest_tools_test.mk                                  |    1 
 tools/Executable_bestreversemap.mk                               |    1 
 tools/Library_tl.mk                                              |    1 
 ucb/Library_cached1.mk                                           |    1 
 ucb/Library_srtrs1.mk                                            |    1 
 ucb/Library_ucb1.mk                                              |    1 
 ucb/Library_ucpcmis1.mk                                          |    1 
 ucb/Library_ucpdav1.mk                                           |    1 
 ucb/Library_ucpexpand1.mk                                        |    1 
 ucb/Library_ucpext.mk                                            |    1 
 ucb/Library_ucpfile1.mk                                          |    1 
 ucb/Library_ucpftp1.mk                                           |    1 
 ucb/Library_ucphier1.mk                                          |    1 
 ucb/Library_ucpimage.mk                                          |    1 
 ucb/Library_ucppkg1.mk                                           |    1 
 ucb/Library_ucptdoc1.mk                                          |    1 
 ucbhelper/Library_ucbhelper.mk                                   |    1 
 unotest/Library_unobootstrapprotector.mk                         |    1 
 unotest/Library_unoexceptionprotector.mk                         |    1 
 unotest/Library_unotest.mk                                       |    1 
 unotools/CppunitTest_unotools_fontdefs.mk                        |    1 
 unotools/Library_utl.mk                                          |    1 
 unoxml/Library_unordf.mk                                         |    1 
 unoxml/Library_unoxml.mk                                         |    1 
 uui/CppunitTest_uui_dialogs_test.mk                              |    1 
 uui/Library_uui.mk                                               |    1 
 vbahelper/Library_msforms.mk                                     |    1 
 vbahelper/Library_vbahelper.mk                                   |    1 
 vcl/CppunitTest_vcl_bitmap_test.mk                               |    1 
 vcl/CppunitTest_vcl_bitmapprocessor_test.mk                      |    1 
 vcl/CppunitTest_vcl_blocklistparser_test.mk                      |    1 
 vcl/CppunitTest_vcl_complextext.mk                               |    1 
 vcl/CppunitTest_vcl_dialogs_test.mk                              |    1 
 vcl/CppunitTest_vcl_filters_test.mk                              |    1 
 vcl/CppunitTest_vcl_font.mk                                      |    1 
 vcl/CppunitTest_vcl_fontcharmap.mk                               |    1 
 vcl/CppunitTest_vcl_fontmetric.mk                                |    1 
 vcl/CppunitTest_vcl_jpeg_read_write_test.mk                      |    1 
 vcl/CppunitTest_vcl_lifecycle.mk                                 |    1 
 vcl/CppunitTest_vcl_mapmode.mk                                   |    1 
 vcl/CppunitTest_vcl_outdev.mk                                    |    1 
 vcl/CppunitTest_vcl_pdfexport.mk                                 |    2 
 vcl/CppunitTest_vcl_svm_test.mk                                  |    1 
 vcl/CppunitTest_vcl_timer.mk                                     |    1 
 vcl/CppunitTest_vcl_wmf_test.mk                                  |    1 
 vcl/Library_vcl.mk                                               |    1 
 winaccessibility/Library_winaccessibility.mk                     |    1 
 writerfilter/CppunitTest_writerfilter_misc.mk                    |    1 
 writerfilter/CppunitTest_writerfilter_rtftok.mk                  |    1 
 writerfilter/Library_writerfilter.mk                             |    1 
 writerperfect/CppunitTest_writerperfect_calc.mk                  |    1 
 writerperfect/CppunitTest_writerperfect_draw.mk                  |    1 
 writerperfect/CppunitTest_writerperfect_import.mk                |    1 
 writerperfect/CppunitTest_writerperfect_impress.mk               |    1 
 writerperfect/CppunitTest_writerperfect_wpftimport.mk            |    1 
 writerperfect/CppunitTest_writerperfect_writer.mk                |    1 
 writerperfect/Library_wpftcalc.mk                                |    1 
 writerperfect/Library_wpftdraw.mk                                |    1 
 writerperfect/Library_wpftimpress.mk                             |    1 
 writerperfect/Library_wpftwriter.mk                              |    1 
 writerperfect/Library_writerperfect.mk                           |    1 
 xmloff/CppunitTest_xmloff_uxmloff.mk                             |    1 
 xmloff/Library_xo.mk                                             |    1 
 xmloff/Library_xof.mk                                            |    1 
 xmlreader/Library_xmlreader.mk                                   |    1 
 xmlscript/Library_xmlscript.mk                                   |    1 
 xmlsecurity/CppunitTest_qa_certext.mk                            |    1 
 xmlsecurity/CppunitTest_xmlsecurity_dialogs_test.mk              |    1 
 xmlsecurity/CppunitTest_xmlsecurity_pdfsigning.mk                |    1 
 xmlsecurity/CppunitTest_xmlsecurity_signing.mk                   |    1 
 xmlsecurity/Library_xmlsecurity.mk                               |    1 
 xmlsecurity/Library_xsec_fw.mk                                   |    1 
 xmlsecurity/Library_xsec_gpg.mk                                  |    1 
 xmlsecurity/Library_xsec_xmlsec.mk                               |    1 
 559 files changed, 38 insertions(+), 1472 deletions(-)

New commits:
commit de030cd7a234fd9191364647deb1a4836ca992cb
Author: David Ostrovsky <david at ostrovsky.org>
Date:   Sat Mar 4 14:36:08 2017 +0100

    gbuild: Remove MSVC 2013 legacy code
    
    Uwinapi is discontinued.
    
    Change-Id: I063b4d0d8fab2d60de168e960a63b8181158ac01
    Reviewed-on: https://gerrit.libreoffice.org/23198
    Reviewed-by: David Ostrovsky <david at ostrovsky.org>
    Tested-by: David Ostrovsky <david at ostrovsky.org>

diff --git a/Library_merged.mk b/Library_merged.mk
index a225b8112715..843dcb058245 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -25,7 +25,6 @@ $(eval $(call gb_Library_use_libraries,merged,\
 	sal \
 	salhelper \
 	xmlreader \
-	$(gb_UWINAPI) \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/Repository.mk b/Repository.mk
index fb86c1b5c5af..057c9b1fb7ad 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -550,9 +550,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,ure, \
 	log_uno_uno \
 	unsafe_uno_uno \
 	$(if $(filter MSC,$(COM)),$(if $(filter INTEL,$(CPUNAME)),msci,mscx),gcc3)_uno \
-	$(if $(filter $(OS),WNT), \
-		uwinapi \
-	) \
 ))
 
 $(eval $(call gb_Helper_register_libraries_for_install,PRIVATELIBS_URE,ure, \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 6641d2b63a1b..7a6db951ef94 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3036,7 +3036,7 @@ endif
 
 ifeq ($(OS),WNT)
 $(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,python3)/PCbuild$(if $(filter X86_64,$(CPUNAME)),/amd64)$(if $(filter INTEL,$(CPUNAME)),/win32)/python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if $(MSVC_USE_DEBUG_RUNTIME),_d).lib \
+	$(call gb_UnpackedTarball_get_dir,python3)/PCbuild/$(if $(filter X86_64,$(CPUNAME)),amd64,win32)/python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if $(MSVC_USE_DEBUG_RUNTIME),_d).lib \
 )
 else ifeq ($(OS),MACOSX)
 $(call gb_LinkTarget_add_libs,$(1),\
diff --git a/UnoControls/Library_ctl.mk b/UnoControls/Library_ctl.mk
index 8c5df40d0ab8..f7953e80e5a2 100644
--- a/UnoControls/Library_ctl.mk
+++ b/UnoControls/Library_ctl.mk
@@ -23,7 +23,6 @@ $(eval $(call gb_Library_use_libraries,ctl,\
     cppuhelper \
     sal \
     tl \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_set_componentfile,ctl,UnoControls/util/ctl))
diff --git a/accessibility/Library_acc.mk b/accessibility/Library_acc.mk
index 3d12cb250ade..bbec944079df 100644
--- a/accessibility/Library_acc.mk
+++ b/accessibility/Library_acc.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_Library_use_libraries,acc,\
     tl \
     utl \
     vcl \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,acc,\
diff --git a/animations/Library_animcore.mk b/animations/Library_animcore.mk
index 6246d571f38c..359688cd7812 100644
--- a/animations/Library_animcore.mk
+++ b/animations/Library_animcore.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Library_use_libraries,animcore,\
     cppu \
 	cppuhelper \
     sal \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,animcore,\
diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk
index e662fc379382..72f46a38b5c6 100644
--- a/avmedia/Library_avmedia.mk
+++ b/avmedia/Library_avmedia.mk
@@ -47,7 +47,6 @@ $(eval $(call gb_Library_use_libraries,avmedia,\
 	tl \
 	utl \
 	vcl \
-	$(gb_UWINAPI) \
 ))
 
 ifeq ($(ENABLE_GLTF),TRUE)
diff --git a/avmedia/Library_avmediaMacAVF.mk b/avmedia/Library_avmediaMacAVF.mk
index b123130c4d53..877efd97ac36 100644
--- a/avmedia/Library_avmediaMacAVF.mk
+++ b/avmedia/Library_avmediaMacAVF.mk
@@ -27,7 +27,6 @@ $(eval $(call gb_Library_use_libraries,avmediaMacAVF,\
 	sal \
 	tl \
 	vcl \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_use_system_darwin_frameworks,avmediaMacAVF,\
diff --git a/avmedia/Library_avmediaQuickTime.mk b/avmedia/Library_avmediaQuickTime.mk
index 20bf9c30356b..85eca192eb9a 100644
--- a/avmedia/Library_avmediaQuickTime.mk
+++ b/avmedia/Library_avmediaQuickTime.mk
@@ -27,7 +27,6 @@ $(eval $(call gb_Library_use_libraries,avmediaQuickTime,\
 	sal \
 	tl \
 	vcl \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_use_system_darwin_frameworks,avmediaQuickTime,\
diff --git a/avmedia/Library_avmediagst.mk b/avmedia/Library_avmediagst.mk
index 35a56ac4751b..9b9622b7edc5 100644
--- a/avmedia/Library_avmediagst.mk
+++ b/avmedia/Library_avmediagst.mk
@@ -44,7 +44,6 @@ $(eval $(call gb_Library_use_libraries,avmediagst,\
 	salhelper \
 	tl \
 	vcl \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,avmediagst,\
diff --git a/avmedia/Library_avmediagst_0_10.mk b/avmedia/Library_avmediagst_0_10.mk
index 10c10a001296..16f2d5db1440 100644
--- a/avmedia/Library_avmediagst_0_10.mk
+++ b/avmedia/Library_avmediagst_0_10.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Library_use_libraries,avmediagst_0_10,\
 	salhelper \
 	tl \
 	vcl \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_libs,avmediagst_0_10,\
diff --git a/avmedia/Library_avmediaogl.mk b/avmedia/Library_avmediaogl.mk
index 64925bf1a44f..eae3efab1e64 100644
--- a/avmedia/Library_avmediaogl.mk
+++ b/avmedia/Library_avmediaogl.mk
@@ -28,7 +28,6 @@ $(eval $(call gb_Library_use_libraries,avmediaogl,\
     salhelper \
     tl \
     vcl \
-    $(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_set_include,avmediaogl,\
diff --git a/avmedia/Library_avmediavlc.mk b/avmedia/Library_avmediavlc.mk
index b8318eb0b916..0ee5cd2d0d46 100644
--- a/avmedia/Library_avmediavlc.mk
+++ b/avmedia/Library_avmediavlc.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_Library_use_libraries,avmediavlc,\
     vcl \
     utl \
     salhelper \
-    $(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,avmediavlc,\
diff --git a/avmedia/Library_avmediawin.mk b/avmedia/Library_avmediawin.mk
index 015eb40eac91..09453d6c77ba 100644
--- a/avmedia/Library_avmediawin.mk
+++ b/avmedia/Library_avmediawin.mk
@@ -28,7 +28,6 @@ $(eval $(call gb_Library_use_libraries,avmediawin,\
 	tl \
 	utl \
 	vcl \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_use_system_win32_libs,avmediawin,\
diff --git a/basctl/CppunitTest_basctl_dialogs_test.mk b/basctl/CppunitTest_basctl_dialogs_test.mk
index d45c8ab97d8b..0e28c5a748a3 100644
--- a/basctl/CppunitTest_basctl_dialogs_test.mk
+++ b/basctl/CppunitTest_basctl_dialogs_test.mk
@@ -49,7 +49,6 @@ $(eval $(call gb_CppunitTest_use_libraries,basctl_dialogs_test, \
     utl \
     vcl \
     xo \
-    $(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_use_external,basctl_dialogs_test,boost_headers))
diff --git a/basctl/Library_basctl.mk b/basctl/Library_basctl.mk
index ab3a9a67c20a..317056822d92 100644
--- a/basctl/Library_basctl.mk
+++ b/basctl/Library_basctl.mk
@@ -60,7 +60,6 @@ $(eval $(call gb_Library_use_libraries,basctl,\
 	ucbhelper \
 	vcl \
 	xmlscript \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,basctl,\
diff --git a/basegfx/CppunitTest_basegfx.mk b/basegfx/CppunitTest_basegfx.mk
index 3941a3e1ce52..1710423b5e50 100644
--- a/basegfx/CppunitTest_basegfx.mk
+++ b/basegfx/CppunitTest_basegfx.mk
@@ -19,7 +19,6 @@ $(eval $(call gb_CppunitTest_use_libraries,basegfx,\
     cppu \
     cppuhelper \
     sal \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_add_exception_objects,basegfx,\
diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk
index 68cfe1cfae05..087e4a081419 100644
--- a/basegfx/Library_basegfx.mk
+++ b/basegfx/Library_basegfx.mk
@@ -19,7 +19,6 @@ $(eval $(call gb_Library_use_libraries,basegfx,\
     cppu \
     cppuhelper \
     sal \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_set_include,basegfx,\
diff --git a/basic/CppunitTest_basic_macros.mk b/basic/CppunitTest_basic_macros.mk
index 343522418cd5..8b0dccece557 100644
--- a/basic/CppunitTest_basic_macros.mk
+++ b/basic/CppunitTest_basic_macros.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_macros, \
 	utl \
 	vcl \
 	xmlscript \
-	$(gb_UWINAPI) \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/basic/CppunitTest_basic_scanner.mk b/basic/CppunitTest_basic_scanner.mk
index aa03f41ce757..55a6e0faf311 100644
--- a/basic/CppunitTest_basic_scanner.mk
+++ b/basic/CppunitTest_basic_scanner.mk
@@ -31,7 +31,6 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_scanner, \
     utl \
     vcl \
     xmlscript \
-	$(gb_UWINAPI) \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk
index 20892a3b7826..e2ed084131f0 100644
--- a/basic/Library_sb.mk
+++ b/basic/Library_sb.mk
@@ -56,7 +56,6 @@ $(eval $(call gb_Library_use_libraries,sb,\
 	utl \
 	vcl \
 	xmlscript \
-	$(gb_UWINAPI) \
 ))
 
 ifneq ($(filter SCRIPTING,$(BUILD_TYPE)),)
diff --git a/bean/Library_officebean.mk b/bean/Library_officebean.mk
index 9d916b3e8e0f..06ad262b5e4f 100644
--- a/bean/Library_officebean.mk
+++ b/bean/Library_officebean.mk
@@ -27,8 +27,4 @@ $(eval $(call gb_Library_add_cobjects,officebean,\
 ))
 endif
 
-$(eval $(call gb_Library_use_libraries,officebean,\
-	$(gb_UWINAPI) \
-))
-
 # vim: set noet sw=4 ts=4:
diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
index 00672a608575..5f03fcaa795d 100644
--- a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
+++ b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
@@ -94,17 +94,6 @@ public class LocalOfficeConnection
 
             try
             {
-                NativeLibraryLoader.loadLibrary(LocalOfficeConnection.class.getClassLoader(), "uwinapi");
-            }
-            catch (Throwable e)
-            {
-                // loading twice would fail
-                System.err.println("cannot find uwinapi:");
-                e.printStackTrace();
-            }
-
-            try
-            {
                 NativeLibraryLoader.loadLibrary(LocalOfficeConnection.class.getClassLoader(), "jawt");
             }
             catch (Throwable e)
diff --git a/binaryurp/CppunitTest_binaryurp_test-cache.mk b/binaryurp/CppunitTest_binaryurp_test-cache.mk
index 59191f3bfd0c..97f5b78f081d 100644
--- a/binaryurp/CppunitTest_binaryurp_test-cache.mk
+++ b/binaryurp/CppunitTest_binaryurp_test-cache.mk
@@ -13,7 +13,6 @@ $(eval $(call gb_CppunitTest_use_external,binaryurp_test-cache,boost_headers))
 
 $(eval $(call gb_CppunitTest_use_libraries,binaryurp_test-cache,\
 	sal \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_add_exception_objects,binaryurp_test-cache,\
diff --git a/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk b/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk
index b4da09abf523..11c70f5b9db0 100644
--- a/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk
+++ b/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk
@@ -16,7 +16,6 @@ $(eval $(call gb_CppunitTest_use_libraries,binaryurp_test-unmarshal,\
 	cppuhelper \
 	sal \
 	salhelper \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_use_library_objects,binaryurp_test-unmarshal,\
diff --git a/binaryurp/Library_binaryurp.mk b/binaryurp/Library_binaryurp.mk
index 05f5470847a7..51efc35a5375 100644
--- a/binaryurp/Library_binaryurp.mk
+++ b/binaryurp/Library_binaryurp.mk
@@ -20,7 +20,6 @@ $(eval $(call gb_Library_use_libraries,binaryurp,\
 	cppuhelper \
 	sal \
 	salhelper \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,binaryurp,\
diff --git a/bridges/Library_java_uno.mk b/bridges/Library_java_uno.mk
index 8d70e2195ca6..cdf8308a9636 100644
--- a/bridges/Library_java_uno.mk
+++ b/bridges/Library_java_uno.mk
@@ -23,7 +23,6 @@ $(eval $(call gb_Library_use_libraries,java_uno,\
 	jvmaccess \
 	sal \
 	salhelper \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,java_uno,\
diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk
index f786fe17ce59..782638018b29 100644
--- a/canvas/Library_cairocanvas.mk
+++ b/canvas/Library_cairocanvas.mk
@@ -42,7 +42,6 @@ $(eval $(call gb_Library_use_libraries,cairocanvas,\
 	tl \
 	i18nlangtag \
 	canvastools \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,cairocanvas,\
diff --git a/canvas/Library_canvasfactory.mk b/canvas/Library_canvasfactory.mk
index 8f7f606a04d2..17e3565bfe65 100644
--- a/canvas/Library_canvasfactory.mk
+++ b/canvas/Library_canvasfactory.mk
@@ -31,7 +31,6 @@ $(eval $(call gb_Library_use_libraries,canvasfactory,\
 	sal \
 	utl \
 	vcl \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,canvasfactory,\
diff --git a/canvas/Library_canvastools.mk b/canvas/Library_canvastools.mk
index 4437e3b9ab85..50658b362f6b 100644
--- a/canvas/Library_canvastools.mk
+++ b/canvas/Library_canvastools.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_Library_use_libraries,canvastools,\
 	tk \
 	tl \
 	vcl \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,canvastools,\
diff --git a/canvas/Library_directx9canvas.mk b/canvas/Library_directx9canvas.mk
index 64ff6467be82..2503c139fd2d 100644
--- a/canvas/Library_directx9canvas.mk
+++ b/canvas/Library_directx9canvas.mk
@@ -42,7 +42,6 @@ $(eval $(call gb_Library_use_libraries,directx9canvas,\
 	tl \
 	utl \
 	i18nlangtag \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_use_system_win32_libs,directx9canvas,\
diff --git a/canvas/Library_gdipluscanvas.mk b/canvas/Library_gdipluscanvas.mk
index 94efa63f2bdc..4a23f6b060f6 100644
--- a/canvas/Library_gdipluscanvas.mk
+++ b/canvas/Library_gdipluscanvas.mk
@@ -42,7 +42,6 @@ $(eval $(call gb_Library_use_libraries,gdipluscanvas,\
 	tl \
 	utl \
 	i18nlangtag \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_use_system_win32_libs,gdipluscanvas,\
diff --git a/canvas/Library_oglcanvas.mk b/canvas/Library_oglcanvas.mk
index 2303a8840cb4..979ff6b5d1ea 100644
--- a/canvas/Library_oglcanvas.mk
+++ b/canvas/Library_oglcanvas.mk
@@ -24,7 +24,6 @@ $(eval $(call gb_Library_use_libraries,oglcanvas,\
 	tl \
 	i18nlangtag \
 	canvastools \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,oglcanvas,\
diff --git a/canvas/Library_simplecanvas.mk b/canvas/Library_simplecanvas.mk
index 9de468832868..db4898c72070 100644
--- a/canvas/Library_simplecanvas.mk
+++ b/canvas/Library_simplecanvas.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Library_use_libraries,simplecanvas,\
 	cppu \
 	cppuhelper \
 	sal \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,simplecanvas,\
diff --git a/canvas/Library_vclcanvas.mk b/canvas/Library_vclcanvas.mk
index 7789b7586495..805cefc43c77 100644
--- a/canvas/Library_vclcanvas.mk
+++ b/canvas/Library_vclcanvas.mk
@@ -37,7 +37,6 @@ $(eval $(call gb_Library_use_libraries,vclcanvas,\
 	tk \
 	tl \
 	vcl \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,vclcanvas,\
diff --git a/chart2/CppunitTest_chart2_common_functors.mk b/chart2/CppunitTest_chart2_common_functors.mk
index 55a64b257643..947ae6b4e96f 100644
--- a/chart2/CppunitTest_chart2_common_functors.mk
+++ b/chart2/CppunitTest_chart2_common_functors.mk
@@ -28,7 +28,6 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_common_functors, \
     cppuhelper \
     sal \
     salhelper \
-    $(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,chart2_common_functors,\
diff --git a/chart2/CppunitTest_chart2_dialogs_test.mk b/chart2/CppunitTest_chart2_dialogs_test.mk
index edc36d1188d2..bfbd0d3d3702 100644
--- a/chart2/CppunitTest_chart2_dialogs_test.mk
+++ b/chart2/CppunitTest_chart2_dialogs_test.mk
@@ -51,7 +51,6 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_dialogs_test, \
     utl \
     vcl \
     xo \
-    $(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_use_external,chart2_dialogs_test,boost_headers))
diff --git a/chart2/CppunitTest_chart2_dump.mk b/chart2/CppunitTest_chart2_dump.mk
index d181f168d133..a5d7ce8fdaa1 100755
--- a/chart2/CppunitTest_chart2_dump.mk
+++ b/chart2/CppunitTest_chart2_dump.mk
@@ -55,7 +55,6 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_dump, \
     vbahelper \
     xo \
     sw \
-    $(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,chart2_dump,\
diff --git a/chart2/CppunitTest_chart2_export.mk b/chart2/CppunitTest_chart2_export.mk
index 931edeb21d05..b9ac9b1c9199 100644
--- a/chart2/CppunitTest_chart2_export.mk
+++ b/chart2/CppunitTest_chart2_export.mk
@@ -56,7 +56,6 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_export, \
     vbahelper \
     xo \
     sw \
-    $(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,chart2_export,\
diff --git a/chart2/CppunitTest_chart2_import.mk b/chart2/CppunitTest_chart2_import.mk
index 0816949a3fd6..71dce87a20df 100644
--- a/chart2/CppunitTest_chart2_import.mk
+++ b/chart2/CppunitTest_chart2_import.mk
@@ -55,7 +55,6 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_import, \
     vbahelper \
     xo \
     sw \
-    $(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,chart2_import,\
diff --git a/chart2/CppunitTest_chart2_pivot_chart_test.mk b/chart2/CppunitTest_chart2_pivot_chart_test.mk
index 418db1af9cc9..4ca93e2be0ec 100644
--- a/chart2/CppunitTest_chart2_pivot_chart_test.mk
+++ b/chart2/CppunitTest_chart2_pivot_chart_test.mk
@@ -55,7 +55,6 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_pivot_chart_test, \
     vbahelper \
     xo \
     sw \
-    $(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,chart2_pivot_chart_test,\
diff --git a/chart2/CppunitTest_chart2_trendcalculators.mk b/chart2/CppunitTest_chart2_trendcalculators.mk
index cc271d8051bf..de8b20e1ec42 100644
--- a/chart2/CppunitTest_chart2_trendcalculators.mk
+++ b/chart2/CppunitTest_chart2_trendcalculators.mk
@@ -55,7 +55,6 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_trendcalculators, \
     vbahelper \
     xo \
     sw \
-    $(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,chart2_trendcalculators,\
diff --git a/chart2/CppunitTest_chart2_xshape.mk b/chart2/CppunitTest_chart2_xshape.mk
index 0f9f51235f95..2efd810d932a 100644
--- a/chart2/CppunitTest_chart2_xshape.mk
+++ b/chart2/CppunitTest_chart2_xshape.mk
@@ -55,7 +55,6 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_xshape, \
     vbahelper \
     xo \
     sw \
-    $(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,chart2_xshape,\
diff --git a/chart2/Library_chartcontroller.mk b/chart2/Library_chartcontroller.mk
index 1f95bc022c29..ee4dc2ea5328 100644
--- a/chart2/Library_chartcontroller.mk
+++ b/chart2/Library_chartcontroller.mk
@@ -44,7 +44,6 @@ $(eval $(call gb_Library_use_libraries,chartcontroller,\
     ucbhelper \
     utl \
     vcl \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_set_componentfile,chartcontroller,chart2/source/controller/chartcontroller))
diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk
index 6d1a7215ac63..f785d097ae54 100644
--- a/chart2/Library_chartcore.mk
+++ b/chart2/Library_chartcore.mk
@@ -61,7 +61,6 @@ $(eval $(call gb_Library_use_libraries,chartcore,\
     ucbhelper \
     utl \
     vcl \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_set_componentfile,chartcore,chart2/source/chartcore))
diff --git a/chart2/Library_chartopengl.mk b/chart2/Library_chartopengl.mk
index cc668e441ae5..f999f947bea8 100644
--- a/chart2/Library_chartopengl.mk
+++ b/chart2/Library_chartopengl.mk
@@ -47,7 +47,6 @@ $(eval $(call gb_Library_use_libraries,chartopengl,\
     ucbhelper \
     utl \
     vcl \
-    $(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,chartopengl,\
diff --git a/cli_ure/Executable_climaker.mk b/cli_ure/Executable_climaker.mk
index 6f1a37b8ce10..f0769b627cb2 100644
--- a/cli_ure/Executable_climaker.mk
+++ b/cli_ure/Executable_climaker.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Executable_use_libraries,climaker,\
 	sal \
 	salhelper \
 	unoidl \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Executable_use_system_win32_libs,climaker,\
diff --git a/comphelper/CppunitTest_comphelper_ifcontainer.mk b/comphelper/CppunitTest_comphelper_ifcontainer.mk
index d336c5546ab2..b9f7b4049256 100644
--- a/comphelper/CppunitTest_comphelper_ifcontainer.mk
+++ b/comphelper/CppunitTest_comphelper_ifcontainer.mk
@@ -23,7 +23,6 @@ $(eval $(call gb_CppunitTest_use_libraries,comphelper_ifcontainer,\
 	cppu \
     cppuhelper \
 	sal \
-	$(gb_UWINAPI) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/comphelper/CppunitTest_comphelper_syntaxhighlight_test.mk b/comphelper/CppunitTest_comphelper_syntaxhighlight_test.mk
index 9dade8b53877..0ca808051a80 100644
--- a/comphelper/CppunitTest_comphelper_syntaxhighlight_test.mk
+++ b/comphelper/CppunitTest_comphelper_syntaxhighlight_test.mk
@@ -24,7 +24,6 @@ $(eval $(call gb_CppunitTest_use_libraries,comphelper_syntaxhighlight_test, \
     cppuhelper \
     cppu \
     sal \
-	$(gb_UWINAPI) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/comphelper/CppunitTest_comphelper_test.mk b/comphelper/CppunitTest_comphelper_test.mk
index f67601e6a6de..1d16366d6bc6 100644
--- a/comphelper/CppunitTest_comphelper_test.mk
+++ b/comphelper/CppunitTest_comphelper_test.mk
@@ -21,7 +21,6 @@ $(eval $(call gb_CppunitTest_use_libraries,comphelper_test, \
     cppuhelper \
     cppu \
     sal \
-	$(gb_UWINAPI) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/comphelper/CppunitTest_comphelper_threadpool_test.mk b/comphelper/CppunitTest_comphelper_threadpool_test.mk
index aa4e0f020a6a..16bbd6fff69b 100644
--- a/comphelper/CppunitTest_comphelper_threadpool_test.mk
+++ b/comphelper/CppunitTest_comphelper_threadpool_test.mk
@@ -24,7 +24,6 @@ $(eval $(call gb_CppunitTest_use_libraries,comphelper_threadpool_test, \
     cppuhelper \
     cppu \
     sal \
-	$(gb_UWINAPI) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/comphelper/CppunitTest_comphelper_variadictemplates_test.mk b/comphelper/CppunitTest_comphelper_variadictemplates_test.mk
index 58d490a5d64a..03ded85270fc 100644
--- a/comphelper/CppunitTest_comphelper_variadictemplates_test.mk
+++ b/comphelper/CppunitTest_comphelper_variadictemplates_test.mk
@@ -24,7 +24,6 @@ $(eval $(call gb_CppunitTest_use_libraries,comphelper_variadictemplates_test, \
     cppuhelper \
     cppu \
     sal \
-    $(gb_UWINAPI) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk
index 49347b336756..0cdd3f935e78 100644
--- a/comphelper/Library_comphelper.mk
+++ b/comphelper/Library_comphelper.mk
@@ -50,7 +50,6 @@ $(eval $(call gb_Library_use_libraries,comphelper,\
     salhelper \
     ucbhelper \
 	i18nlangtag \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_use_sdk_api,comphelper))
diff --git a/configmgr/CppunitTest_configmgr_unit.mk b/configmgr/CppunitTest_configmgr_unit.mk
index ca9653fd126e..0e227edba37c 100644
--- a/configmgr/CppunitTest_configmgr_unit.mk
+++ b/configmgr/CppunitTest_configmgr_unit.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_CppunitTest_use_libraries,configmgr_unit, \
 	    unotest \
 	    xmlreader \
 		i18nlangtag \
-		$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,configmgr_unit))
diff --git a/configmgr/Library_configmgr.mk b/configmgr/Library_configmgr.mk
index 81367ca9e21d..4fc2909ad600 100644
--- a/configmgr/Library_configmgr.mk
+++ b/configmgr/Library_configmgr.mk
@@ -62,7 +62,6 @@ $(eval $(call gb_Library_use_libraries,configmgr, \
     salhelper \
     xmlreader \
     i18nlangtag \
-    $(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_set_componentfile,configmgr,configmgr/source/configmgr))
diff --git a/connectivity/CppunitTest_connectivity_ado.mk b/connectivity/CppunitTest_connectivity_ado.mk
index ce2e2c2c5032..fcdaf2da8ebb 100644
--- a/connectivity/CppunitTest_connectivity_ado.mk
+++ b/connectivity/CppunitTest_connectivity_ado.mk
@@ -48,7 +48,6 @@ $(eval $(call gb_CppunitTest_use_libraries,connectivity_ado, \
     unotest \
     ucbhelper \
     utl \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_use_components,connectivity_ado,\
diff --git a/connectivity/CppunitTest_connectivity_commontools.mk b/connectivity/CppunitTest_connectivity_commontools.mk
index a8f4976310df..d197c94b237c 100644
--- a/connectivity/CppunitTest_connectivity_commontools.mk
+++ b/connectivity/CppunitTest_connectivity_commontools.mk
@@ -59,7 +59,6 @@ $(eval $(call gb_CppunitTest_use_libraries,connectivity_commontools, \
     utl \
     tl \
     svt \
-    $(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_use_components,connectivity_commontools,\
diff --git a/connectivity/CppunitTest_connectivity_mork.mk b/connectivity/CppunitTest_connectivity_mork.mk
index be3b0413b8d1..6504adef8d99 100644
--- a/connectivity/CppunitTest_connectivity_mork.mk
+++ b/connectivity/CppunitTest_connectivity_mork.mk
@@ -41,7 +41,6 @@ $(eval $(call gb_CppunitTest_use_libraries,connectivity_mork, \
     unotest \
     ucbhelper \
     utl \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_use_components,connectivity_mork,\
diff --git a/connectivity/Library_ado.mk b/connectivity/Library_ado.mk
index d765660c2294..4289a7fe6dc3 100644
--- a/connectivity/Library_ado.mk
+++ b/connectivity/Library_ado.mk
@@ -43,7 +43,6 @@ $(eval $(call gb_Library_use_libraries,ado,\
 	salhelper \
 	dbtools \
 	comphelper \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,ado,\
diff --git a/connectivity/Library_calc.mk b/connectivity/Library_calc.mk
index a2b355813412..440306b563ca 100644
--- a/connectivity/Library_calc.mk
+++ b/connectivity/Library_calc.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_Library_use_libraries,calc,\
 	dbtools \
 	file \
 	comphelper \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,calc,\
diff --git a/connectivity/Library_dbase.mk b/connectivity/Library_dbase.mk
index e383de8b1ea1..8dcc9c43c50c 100644
--- a/connectivity/Library_dbase.mk
+++ b/connectivity/Library_dbase.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_Library_use_libraries,dbase,\
 	utl \
 	comphelper \
 	svt \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,dbase,\
diff --git a/connectivity/Library_dbpool2.mk b/connectivity/Library_dbpool2.mk
index 214cd55ab8d5..0e1d1fc19a3f 100644
--- a/connectivity/Library_dbpool2.mk
+++ b/connectivity/Library_dbpool2.mk
@@ -29,7 +29,6 @@ $(eval $(call gb_Library_use_libraries,dbpool2,\
 	dbtools \
 	sal \
 	salhelper \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,dbpool2,\
diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk
index 8fc596bd30d3..eb6dda8cb157 100644
--- a/connectivity/Library_dbtools.mk
+++ b/connectivity/Library_dbtools.mk
@@ -40,7 +40,6 @@ $(eval $(call gb_Library_use_libraries,dbtools,\
 	tl \
 	comphelper \
 	i18nlangtag \
-	$(gb_UWINAPI) \
 	svt \
 ))
 
diff --git a/connectivity/Library_evoab.mk b/connectivity/Library_evoab.mk
index ea207538b183..504eee47f45a 100644
--- a/connectivity/Library_evoab.mk
+++ b/connectivity/Library_evoab.mk
@@ -37,7 +37,6 @@ $(eval $(call gb_Library_use_libraries,evoab,\
 	salhelper \
 	dbtools \
 	file \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,evoab,\
diff --git a/connectivity/Library_file.mk b/connectivity/Library_file.mk
index 765b13bf9998..daacb41838bb 100644
--- a/connectivity/Library_file.mk
+++ b/connectivity/Library_file.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_Library_use_libraries,file,\
 	dbtools \
 	utl \
 	comphelper \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,file,\
diff --git a/connectivity/Library_firebird_sdbc.mk b/connectivity/Library_firebird_sdbc.mk
index 0247f08f3de9..3f3ddc7fce10 100644
--- a/connectivity/Library_firebird_sdbc.mk
+++ b/connectivity/Library_firebird_sdbc.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_Library_use_libraries,firebird_sdbc, \
     utl \
     svt \
     vcl \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_set_componentfile,firebird_sdbc,connectivity/source/drivers/firebird/firebird_sdbc))
diff --git a/connectivity/Library_flat.mk b/connectivity/Library_flat.mk
index 3916d1665ffc..dd986cd6e6d8 100644
--- a/connectivity/Library_flat.mk
+++ b/connectivity/Library_flat.mk
@@ -37,7 +37,6 @@ $(eval $(call gb_Library_use_libraries,flat,\
 	dbtools \
 	file \
 	comphelper \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,flat,\
diff --git a/connectivity/Library_hsqldb.mk b/connectivity/Library_hsqldb.mk
index 5fd647c75ece..d1c2bed9e1f8 100644
--- a/connectivity/Library_hsqldb.mk
+++ b/connectivity/Library_hsqldb.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Library_use_libraries,hsqldb,\
 	tl \
 	utl \
 	i18nlangtag \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_set_componentfile,hsqldb,connectivity/source/drivers/hsqldb/hsqldb))
diff --git a/connectivity/Library_jdbc.mk b/connectivity/Library_jdbc.mk
index c626aad0dff1..2fb57a29cca9 100644
--- a/connectivity/Library_jdbc.mk
+++ b/connectivity/Library_jdbc.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_Library_use_libraries,jdbc,\
 	utl \
 	jvmfwk \
 	comphelper \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,jdbc,\
diff --git a/connectivity/Library_mork.mk b/connectivity/Library_mork.mk
index 44f5ad794130..227d8438c43c 100644
--- a/connectivity/Library_mork.mk
+++ b/connectivity/Library_mork.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_Library_use_libraries,mork, \
     salhelper \
     tl \
     utl \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_use_sdk_api,mork))
diff --git a/connectivity/Library_mozbootstrap.mk b/connectivity/Library_mozbootstrap.mk
index ad8041369f17..237726caf8a8 100644
--- a/connectivity/Library_mozbootstrap.mk
+++ b/connectivity/Library_mozbootstrap.mk
@@ -23,7 +23,6 @@ $(eval $(call gb_Library_use_libraries,mozbootstrap,\
 	cppu \
 	cppuhelper \
 	sal \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,mozbootstrap,\
diff --git a/connectivity/Library_mysql.mk b/connectivity/Library_mysql.mk
index 1803b45827c3..4cb33107ce3b 100644
--- a/connectivity/Library_mysql.mk
+++ b/connectivity/Library_mysql.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Library_use_libraries,mysql,\
 	salhelper \
 	dbtools \
 	comphelper \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,mysql,\
diff --git a/connectivity/Library_odbc.mk b/connectivity/Library_odbc.mk
index 181114ad3be5..179b6443939c 100644
--- a/connectivity/Library_odbc.mk
+++ b/connectivity/Library_odbc.mk
@@ -41,7 +41,6 @@ $(eval $(call gb_Library_use_libraries,odbc,\
 	dbtools \
 	sal \
 	salhelper \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,odbc,\
diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk
index 930eaf4d0e09..2ff0b635b890 100644
--- a/connectivity/Library_postgresql-sdbc-impl.mk
+++ b/connectivity/Library_postgresql-sdbc-impl.mk
@@ -25,7 +25,6 @@ $(eval $(call gb_Library_use_libraries,postgresql-sdbc-impl,\
 	dbtools \
 	sal \
 	salhelper \
-	$(gb_UWINAPI) \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/connectivity/Library_postgresql-sdbc.mk b/connectivity/Library_postgresql-sdbc.mk
index c63737231985..8f7efcd02995 100644
--- a/connectivity/Library_postgresql-sdbc.mk
+++ b/connectivity/Library_postgresql-sdbc.mk
@@ -22,7 +22,6 @@ $(eval $(call gb_Library_use_libraries,postgresql-sdbc,\
 	cppu \
 	cppuhelper \
 	sal \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_set_componentfile,postgresql-sdbc,connectivity/source/drivers/postgresql/postgresql-sdbc))
diff --git a/connectivity/Library_sdbc2.mk b/connectivity/Library_sdbc2.mk
index 146b9668088b..494dc4208a09 100644
--- a/connectivity/Library_sdbc2.mk
+++ b/connectivity/Library_sdbc2.mk
@@ -29,7 +29,6 @@ $(eval $(call gb_Library_use_libraries,sdbc2,\
 	utl \
 	sal \
 	tl \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,sdbc2,\
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java
index c1d22a8f6633..59541556b185 100644
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java
@@ -26,7 +26,6 @@ final class NativeLibraries {
     public static void load() {
         if (System.getProperty( "os.name" ).startsWith("Windows")) {
             loadLibrary("msvcr71");
-            loadLibrary("uwinapi");
             loadLibrary("sal3");
             loadLibrary("dbtoolsmi");
         }
diff --git a/cppcanvas/CppunitTest_cppcanvas_test.mk b/cppcanvas/CppunitTest_cppcanvas_test.mk
index ffb22675e36f..e6e7a39d3bae 100644
--- a/cppcanvas/CppunitTest_cppcanvas_test.mk
+++ b/cppcanvas/CppunitTest_cppcanvas_test.mk
@@ -31,7 +31,6 @@ $(eval $(call gb_CppunitTest_use_libraries,cppcanvas_test, \
 	tl \
 	unotest \
 	vcl \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_use_sdk_api,cppcanvas_test))
diff --git a/cppcanvas/Library_cppcanvas.mk b/cppcanvas/Library_cppcanvas.mk
index 13841d227880..5b184296f2f7 100644
--- a/cppcanvas/Library_cppcanvas.mk
+++ b/cppcanvas/Library_cppcanvas.mk
@@ -44,7 +44,6 @@ $(eval $(call gb_Library_use_libraries,cppcanvas,\
 	svt \
 	tl \
 	vcl \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,cppcanvas,\
diff --git a/cppcanvas/Library_mtfrenderer.mk b/cppcanvas/Library_mtfrenderer.mk
index 4a33ac0c6eda..e94f12bccdde 100644
--- a/cppcanvas/Library_mtfrenderer.mk
+++ b/cppcanvas/Library_mtfrenderer.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Library_use_libraries,mtfrenderer,\
 	comphelper \
 	cppcanvas \
 	basegfx \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_use_sdk_api,mtfrenderer))
diff --git a/cppu/CppunitTest_cppu_any-external.mk b/cppu/CppunitTest_cppu_any-external.mk
index 6119e048ba99..e56b957ea8ee 100644
--- a/cppu/CppunitTest_cppu_any-external.mk
+++ b/cppu/CppunitTest_cppu_any-external.mk
@@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_set_external_code,cppu_any-external))
 $(eval $(call gb_CppunitTest_use_libraries,cppu_any-external, \
     cppu \
     sal \
-    $(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_use_udk_api,cppu_any-external))
diff --git a/cppu/CppunitTest_cppu_qa_any.mk b/cppu/CppunitTest_cppu_qa_any.mk
index da0fa37dcb0a..d565b0fd369c 100644
--- a/cppu/CppunitTest_cppu_qa_any.mk
+++ b/cppu/CppunitTest_cppu_qa_any.mk
@@ -19,7 +19,6 @@ $(eval $(call gb_CppunitTest_use_external,cppu_qa_any,boost_headers))
 $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_any, \
 	cppu \
 	sal \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_qa_any, \
diff --git a/cppu/CppunitTest_cppu_qa_recursion.mk b/cppu/CppunitTest_cppu_qa_recursion.mk
index 36c4886ce8eb..9a238fba4551 100644
--- a/cppu/CppunitTest_cppu_qa_recursion.mk
+++ b/cppu/CppunitTest_cppu_qa_recursion.mk
@@ -17,7 +17,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppu_qa_recursion, \
 $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_recursion, \
 	cppu \
 	sal \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_qa_recursion, \
diff --git a/cppu/CppunitTest_cppu_qa_reference.mk b/cppu/CppunitTest_cppu_qa_reference.mk
index de9b2813b853..426902b5a8de 100644
--- a/cppu/CppunitTest_cppu_qa_reference.mk
+++ b/cppu/CppunitTest_cppu_qa_reference.mk
@@ -19,7 +19,6 @@ $(eval $(call gb_CppunitTest_use_external,cppu_qa_reference,boost_headers))
 $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_reference, \
 	cppu \
 	sal \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_qa_reference, \
diff --git a/cppu/CppunitTest_cppu_qa_unotype.mk b/cppu/CppunitTest_cppu_qa_unotype.mk
index 45aba8f1d635..a8eb53aa8ca7 100644
--- a/cppu/CppunitTest_cppu_qa_unotype.mk
+++ b/cppu/CppunitTest_cppu_qa_unotype.mk
@@ -17,7 +17,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppu_qa_unotype, \
 $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_unotype, \
 	cppu \
 	sal \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_qa_unotype, \
diff --git a/cppu/CppunitTest_cppu_test_cppumaker.mk b/cppu/CppunitTest_cppu_test_cppumaker.mk
index 188d05c71975..c812d94de8ac 100644
--- a/cppu/CppunitTest_cppu_test_cppumaker.mk
+++ b/cppu/CppunitTest_cppu_test_cppumaker.mk
@@ -19,7 +19,6 @@ $(eval $(call gb_CppunitTest_use_external,cppu_test_cppumaker,boost_headers))
 $(eval $(call gb_CppunitTest_use_libraries,cppu_test_cppumaker, \
 	cppu \
 	sal \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_test_cppumaker, \
diff --git a/cppu/Library_affine_uno_uno.mk b/cppu/Library_affine_uno_uno.mk
index aeae6ed7f2c2..10b5389b51d6 100644
--- a/cppu/Library_affine_uno_uno.mk
+++ b/cppu/Library_affine_uno_uno.mk
@@ -15,7 +15,6 @@ $(eval $(call gb_Library_use_udk_api,affine_uno_uno))
 $(eval $(call gb_Library_use_libraries,affine_uno_uno,\
 	purpenvhelper \
 	sal \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,affine_uno_uno,\
diff --git a/cppu/Library_cppu.mk b/cppu/Library_cppu.mk
index 69e75cd61354..8031487af373 100644
--- a/cppu/Library_cppu.mk
+++ b/cppu/Library_cppu.mk
@@ -23,7 +23,6 @@ $(eval $(call gb_Library_use_external,cppu,boost_headers))
 $(eval $(call gb_Library_use_libraries,cppu,\
 	sal \
 	salhelper \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,cppu,\
diff --git a/cppu/Library_log_uno_uno.mk b/cppu/Library_log_uno_uno.mk
index 410f12ccd5e4..92d287ea7192 100644
--- a/cppu/Library_log_uno_uno.mk
+++ b/cppu/Library_log_uno_uno.mk
@@ -18,7 +18,6 @@ $(eval $(call gb_Library_use_libraries,log_uno_uno,\
 	cppu \
 	purpenvhelper \
 	sal \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,log_uno_uno,\
diff --git a/cppu/Library_purpenvhelper.mk b/cppu/Library_purpenvhelper.mk
index 7264311a1b2f..42c03749a4b7 100644
--- a/cppu/Library_purpenvhelper.mk
+++ b/cppu/Library_purpenvhelper.mk
@@ -21,7 +21,6 @@ $(eval $(call gb_Library_use_udk_api,purpenvhelper))
 $(eval $(call gb_Library_use_libraries,purpenvhelper,\
 	cppu \
 	sal \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,purpenvhelper,\
diff --git a/cppu/Library_unsafe_uno_uno.mk b/cppu/Library_unsafe_uno_uno.mk
index 59867bac237e..9733f7216f6b 100644
--- a/cppu/Library_unsafe_uno_uno.mk
+++ b/cppu/Library_unsafe_uno_uno.mk
@@ -15,7 +15,6 @@ $(eval $(call gb_Library_use_udk_api,unsafe_uno_uno))
 $(eval $(call gb_Library_use_libraries,unsafe_uno_uno,\
 	purpenvhelper \
 	sal \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,unsafe_uno_uno,\
diff --git a/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk b/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk
index b3988242675e..1d745b6410bf 100644
--- a/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk
+++ b/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk
@@ -22,7 +22,6 @@ $(eval $(call gb_CppunitTest_use_libraries,cppuhelper_cppu_ifcontainer,\
 	cppu \
     cppuhelper \
 	sal \
-	$(gb_UWINAPI) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk b/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk
index b59b36a1af04..d973e748d89b 100644
--- a/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk
+++ b/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk
@@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_use_libraries,cppuhelper_cppu_unourl,\
 	cppu \
     cppuhelper \
 	sal \
-	$(gb_UWINAPI) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk b/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk
index d5792d70c807..9a6322caf9d6 100644
--- a/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk
+++ b/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk
@@ -22,7 +22,6 @@ $(eval $(call gb_CppunitTest_use_libraries,cppuhelper_qa_weak,\
 	cppu \
     cppuhelper \
 	sal \
-	$(gb_UWINAPI) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/cppuhelper/Library_cppuhelper.mk b/cppuhelper/Library_cppuhelper.mk
index 580a70f41ad9..9d05bf8c5529 100644
--- a/cppuhelper/Library_cppuhelper.mk
+++ b/cppuhelper/Library_cppuhelper.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Library_use_libraries,cppuhelper,\
 	salhelper \
 	unoidl \
 	xmlreader \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_use_static_libraries,cppuhelper,\
diff --git a/cpputools/Executable_uno.mk b/cpputools/Executable_uno.mk
index ff6aeb81754d..4a766c57d5cf 100644
--- a/cpputools/Executable_uno.mk
+++ b/cpputools/Executable_uno.mk
@@ -18,7 +18,6 @@ $(eval $(call gb_Executable_use_libraries,uno,\
     cppuhelper \
     sal \
     salhelper \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Executable_use_externals,uno,\
diff --git a/cui/CppunitTest_cui_dialogs_test.mk b/cui/CppunitTest_cui_dialogs_test.mk
index cb6ae8dbf2c6..353abb8a3a25 100644
--- a/cui/CppunitTest_cui_dialogs_test.mk
+++ b/cui/CppunitTest_cui_dialogs_test.mk
@@ -50,7 +50,6 @@ $(eval $(call gb_CppunitTest_use_libraries,cui_dialogs_test, \
     utl \
     vcl \
     xo \
-    $(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_use_external,cui_dialogs_test,boost_headers))
diff --git a/cui/CppunitTest_cui_dialogs_test_2.mk b/cui/CppunitTest_cui_dialogs_test_2.mk
index 24bf50e26e7b..afdc4f9a8b5a 100644
--- a/cui/CppunitTest_cui_dialogs_test_2.mk
+++ b/cui/CppunitTest_cui_dialogs_test_2.mk
@@ -50,7 +50,6 @@ $(eval $(call gb_CppunitTest_use_libraries,cui_dialogs_test2, \
     utl \
     vcl \
     xo \
-    $(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_use_external,cui_dialogs_test2,boost_headers))
diff --git a/cui/CppunitTest_cui_dialogs_test_3.mk b/cui/CppunitTest_cui_dialogs_test_3.mk
index 80511e4c6bb8..69263dafeb79 100644
--- a/cui/CppunitTest_cui_dialogs_test_3.mk
+++ b/cui/CppunitTest_cui_dialogs_test_3.mk
@@ -50,7 +50,6 @@ $(eval $(call gb_CppunitTest_use_libraries,cui_dialogs_test3, \
     utl \
     vcl \
     xo \
-    $(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_use_external,cui_dialogs_test3,boost_headers))
diff --git a/cui/CppunitTest_cui_dialogs_test_4.mk b/cui/CppunitTest_cui_dialogs_test_4.mk
index c5716b3de50d..79779b461ab6 100644
--- a/cui/CppunitTest_cui_dialogs_test_4.mk
+++ b/cui/CppunitTest_cui_dialogs_test_4.mk
@@ -50,7 +50,6 @@ $(eval $(call gb_CppunitTest_use_libraries,cui_dialogs_test4, \
     utl \
     vcl \
     xo \
-    $(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_use_external,cui_dialogs_test4,boost_headers))
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index 64f7844e8ecd..74fbc31f0c24 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -60,7 +60,6 @@ $(eval $(call gb_Library_use_libraries,cui,\
     ucbhelper \
     utl \
     vcl \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_use_externals,cui,\
diff --git a/dbaccess/CppunitTest_dbaccess_RowSetClones.mk b/dbaccess/CppunitTest_dbaccess_RowSetClones.mk
index 31dfae515f7b..de5b2a8ff0ab 100644
--- a/dbaccess/CppunitTest_dbaccess_RowSetClones.mk
+++ b/dbaccess/CppunitTest_dbaccess_RowSetClones.mk
@@ -56,7 +56,6 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_RowSetClones, \
     vbahelper \
     vcl \
     xo \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_use_api,dbaccess_RowSetClones,\
diff --git a/dbaccess/CppunitTest_dbaccess_dialog_save.mk b/dbaccess/CppunitTest_dbaccess_dialog_save.mk
index 0285625d0e9a..68cfeb6eb808 100644
--- a/dbaccess/CppunitTest_dbaccess_dialog_save.mk
+++ b/dbaccess/CppunitTest_dbaccess_dialog_save.mk
@@ -52,7 +52,6 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_dialog_save, \
     vbahelper \
     vcl \
     xo \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_use_api,dbaccess_dialog_save,\
diff --git a/dbaccess/CppunitTest_dbaccess_dialogs_test.mk b/dbaccess/CppunitTest_dbaccess_dialogs_test.mk
index a4c653dc0c3e..3ed9a0649fb7 100644
--- a/dbaccess/CppunitTest_dbaccess_dialogs_test.mk
+++ b/dbaccess/CppunitTest_dbaccess_dialogs_test.mk
@@ -49,7 +49,6 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_dialogs_test, \
     utl \
     vcl \
     xo \
-    $(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_use_external,dbaccess_dialogs_test,boost_headers))
diff --git a/dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk b/dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk
index 5ee18d16541b..a7122b537a3b 100644
--- a/dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk
+++ b/dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk
@@ -31,7 +31,6 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_embeddeddb_performancetest,
     tl \
     unotest \
     xo \
-    $(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_use_api,dbaccess_embeddeddb_performancetest,\
diff --git a/dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk b/dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk
index 3c01fe0728cb..268ebf8439ac 100644
--- a/dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk
+++ b/dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk
@@ -52,7 +52,6 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_empty_stdlib_save, \
     vbahelper \
     vcl \
     xo \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_use_api,dbaccess_empty_stdlib_save,\
diff --git a/dbaccess/CppunitTest_dbaccess_firebird_test.mk b/dbaccess/CppunitTest_dbaccess_firebird_test.mk
index 491f853be252..5652e6622d76 100644
--- a/dbaccess/CppunitTest_dbaccess_firebird_test.mk
+++ b/dbaccess/CppunitTest_dbaccess_firebird_test.mk
@@ -26,7 +26,6 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_firebird_test, \
     test \
     unotest \
     xo \
-    $(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_use_api,dbaccess_firebird_test,\
diff --git a/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk b/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk
index 5a83a4bbe5d3..41c54b05d85a 100644
--- a/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk
+++ b/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_hsqldb_test, \
     tk \
     unotest \
     xo \
-    $(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_use_api,dbaccess_hsqldb_test,\
diff --git a/dbaccess/CppunitTest_dbaccess_macros_test.mk b/dbaccess/CppunitTest_dbaccess_macros_test.mk
index 115bbfb22d4e..82829acd1ec7 100644
--- a/dbaccess/CppunitTest_dbaccess_macros_test.mk
+++ b/dbaccess/CppunitTest_dbaccess_macros_test.mk
@@ -52,7 +52,6 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_macros_test, \
     vbahelper \
     vcl \
     xo \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_use_api,dbaccess_macros_test,\
diff --git a/dbaccess/CppunitTest_dbaccess_nolib_save.mk b/dbaccess/CppunitTest_dbaccess_nolib_save.mk
index 258eeb5e1a30..71e517c2e31a 100644
--- a/dbaccess/CppunitTest_dbaccess_nolib_save.mk
+++ b/dbaccess/CppunitTest_dbaccess_nolib_save.mk
@@ -52,7 +52,6 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_nolib_save, \
     vbahelper \
     vcl \
     xo \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_use_api,dbaccess_nolib_save,\
diff --git a/dbaccess/Executable_odbcconfig.mk b/dbaccess/Executable_odbcconfig.mk
index 66364c91b61c..ea37824924cd 100644
--- a/dbaccess/Executable_odbcconfig.mk
+++ b/dbaccess/Executable_odbcconfig.mk
@@ -13,10 +13,6 @@ $(eval $(call gb_Executable_set_targettype_gui,odbcconfig,YES))
 
 $(eval $(call gb_Library_use_sdk_api,odbcconfig))
 
-$(eval $(call gb_Executable_use_libraries,odbcconfig,\
-	$(gb_UWINAPI) \
-))
-
 $(eval $(call gb_Executable_add_exception_objects,odbcconfig,\
     dbaccess/win32/source/odbcconfig/odbcconfig \
 ))
diff --git a/dbaccess/Library_dba.mk b/dbaccess/Library_dba.mk
index beeddad744c4..ed92df704917 100644
--- a/dbaccess/Library_dba.mk
+++ b/dbaccess/Library_dba.mk
@@ -46,7 +46,6 @@ $(eval $(call gb_Library_use_libraries,dba,\
     utl \
     vcl \
     xo \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_set_componentfile,dba,dbaccess/util/dba))
diff --git a/dbaccess/Library_dbaxml.mk b/dbaccess/Library_dbaxml.mk
index aa009092b9b9..ae92553677af 100644
--- a/dbaccess/Library_dbaxml.mk
+++ b/dbaccess/Library_dbaxml.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_Library_use_libraries,dbaxml,\
     utl \
     vcl \
     xo \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_set_componentfile,dbaxml,dbaccess/source/filter/xml/dbaxml))
diff --git a/dbaccess/Library_dbmm.mk b/dbaccess/Library_dbmm.mk
index 05a0788cdf2b..3fb6dde2c7b5 100644
--- a/dbaccess/Library_dbmm.mk
+++ b/dbaccess/Library_dbmm.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_Library_use_libraries,dbmm,\
     utl \
     vcl \
     xmlscript \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_set_componentfile,dbmm,dbaccess/source/ext/macromigration/dbmm))
diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk
index b29a3d41b114..2192c77e4ebe 100644
--- a/dbaccess/Library_dbu.mk
+++ b/dbaccess/Library_dbu.mk
@@ -56,7 +56,6 @@ $(eval $(call gb_Library_use_libraries,dbu,\
     ucbhelper \
     utl \
     vcl \
-	$(gb_UWINAPI) \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/dbaccess/Library_sdbt.mk b/dbaccess/Library_sdbt.mk
index 08d483a8eb32..50c67d364dc2 100644
--- a/dbaccess/Library_sdbt.mk
+++ b/dbaccess/Library_sdbt.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Library_use_libraries,sdbt,\
     salhelper \
     tl \
     utl \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_set_componentfile,sdbt,dbaccess/util/sdbt))
diff --git a/desktop/CppunitTest_desktop_dialogs_test.mk b/desktop/CppunitTest_desktop_dialogs_test.mk
index d51f7c70089f..ce26857ab8ff 100644
--- a/desktop/CppunitTest_desktop_dialogs_test.mk
+++ b/desktop/CppunitTest_desktop_dialogs_test.mk
@@ -49,7 +49,6 @@ $(eval $(call gb_CppunitTest_use_libraries,desktop_dialogs_test, \
     utl \
     vcl \
     xo \
-    $(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_use_external,desktop_dialogs_test,boost_headers))
diff --git a/desktop/CppunitTest_desktop_lib.mk b/desktop/CppunitTest_desktop_lib.mk
index bfcbf56294fb..7f7a7c77c88b 100644
--- a/desktop/CppunitTest_desktop_lib.mk
+++ b/desktop/CppunitTest_desktop_lib.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_CppunitTest_use_libraries,desktop_lib, \
 	unotest \
 	utl \
 	vcl \
-    $(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_use_externals,desktop_lib, \
diff --git a/desktop/Executable_quickstart.mk b/desktop/Executable_quickstart.mk
index a4b18c55a5db..02b31fef736c 100644
--- a/desktop/Executable_quickstart.mk
+++ b/desktop/Executable_quickstart.mk
@@ -19,10 +19,6 @@ $(eval $(call gb_Executable_use_system_win32_libs,quickstart,\
     shell32 \
 ))
 
-$(eval $(call gb_Executable_use_libraries,quickstart,\
-	$(gb_UWINAPI) \
-))
-
 ifeq ($(COM),GCC)
 
 $(eval $(call gb_Executable_use_system_win32_libs,quickstart,\
diff --git a/desktop/Executable_sbase.mk b/desktop/Executable_sbase.mk
index 9d35f56554da..4dd6be02a9ee 100644
--- a/desktop/Executable_sbase.mk
+++ b/desktop/Executable_sbase.mk
@@ -19,10 +19,6 @@ $(eval $(call gb_Executable_add_ldflags,sbase,\
     /ENTRY:wWinMainCRTStartup \
 ))
 
-$(eval $(call gb_Executable_use_libraries,sbase,\
-	$(gb_UWINAPI) \
-))
-
 $(eval $(call gb_Executable_use_static_libraries,sbase,\
     winlauncher \
 ))
diff --git a/desktop/Executable_scalc.mk b/desktop/Executable_scalc.mk
index 0a0084979a64..fc066770b945 100644
--- a/desktop/Executable_scalc.mk
+++ b/desktop/Executable_scalc.mk
@@ -19,10 +19,6 @@ $(eval $(call gb_Executable_add_ldflags,scalc,\
     /ENTRY:wWinMainCRTStartup \
 ))
 
-$(eval $(call gb_Executable_use_libraries,scalc,\
-	$(gb_UWINAPI) \
-))
-
 $(eval $(call gb_Executable_use_static_libraries,scalc,\
     winlauncher \
 ))
diff --git a/desktop/Executable_sdraw.mk b/desktop/Executable_sdraw.mk
index 17f65ec6b770..1b12bb0f2467 100644
--- a/desktop/Executable_sdraw.mk
+++ b/desktop/Executable_sdraw.mk
@@ -19,10 +19,6 @@ $(eval $(call gb_Executable_add_ldflags,sdraw,\
     /ENTRY:wWinMainCRTStartup \
 ))
 
-$(eval $(call gb_Executable_use_libraries,sdraw,\
-	$(gb_UWINAPI) \
-))
-
 $(eval $(call gb_Executable_use_static_libraries,sdraw,\
     winlauncher \
 ))
diff --git a/desktop/Executable_simpress.mk b/desktop/Executable_simpress.mk
index d486f5716aff..7376b7bd3883 100644
--- a/desktop/Executable_simpress.mk
+++ b/desktop/Executable_simpress.mk
@@ -19,10 +19,6 @@ $(eval $(call gb_Executable_add_ldflags,simpress,\
     /ENTRY:wWinMainCRTStartup \
 ))
 
-$(eval $(call gb_Executable_use_libraries,simpress,\
-	$(gb_UWINAPI) \
-))
-
 $(eval $(call gb_Executable_use_static_libraries,simpress,\
     winlauncher \
 ))
diff --git a/desktop/Executable_smath.mk b/desktop/Executable_smath.mk
index 980cc544edcd..249f62223bfe 100644
--- a/desktop/Executable_smath.mk
+++ b/desktop/Executable_smath.mk
@@ -19,10 +19,6 @@ $(eval $(call gb_Executable_add_ldflags,smath,\
     /ENTRY:wWinMainCRTStartup \
 ))
 
-$(eval $(call gb_Executable_use_libraries,smath,\
-	$(gb_UWINAPI) \
-))
-
 $(eval $(call gb_Executable_use_static_libraries,smath,\
     winlauncher \
 ))
diff --git a/desktop/Executable_soffice.mk b/desktop/Executable_soffice.mk
index 0a6a0ccc5a4a..d1847d7bf76a 100644
--- a/desktop/Executable_soffice.mk
+++ b/desktop/Executable_soffice.mk
@@ -11,10 +11,6 @@ $(eval $(call gb_Executable_Executable,soffice))
 
 $(eval $(call gb_Executable_set_targettype_gui,soffice,YES))
 
-$(eval $(call gb_Executable_use_libraries,soffice,\
-	$(gb_UWINAPI) \
-))
-
 $(eval $(call gb_Executable_use_system_win32_libs,soffice,\
     advapi32 \
     shell32 \
diff --git a/desktop/Executable_soffice_bin.mk b/desktop/Executable_soffice_bin.mk
index f18e9dcd1fd8..6db3c110cc1f 100644
--- a/desktop/Executable_soffice_bin.mk
+++ b/desktop/Executable_soffice_bin.mk
@@ -19,7 +19,6 @@ $(eval $(call gb_Executable_set_include,soffice_bin,\
 $(eval $(call gb_Executable_use_libraries,soffice_bin,\
     sal \
     sofficeapp \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Executable_add_cobjects,soffice_bin,\
diff --git a/desktop/Executable_sweb.mk b/desktop/Executable_sweb.mk
index 25efba659ec8..0bbc83877742 100644
--- a/desktop/Executable_sweb.mk
+++ b/desktop/Executable_sweb.mk
@@ -19,10 +19,6 @@ $(eval $(call gb_Executable_add_ldflags,sweb,\
     /ENTRY:wWinMainCRTStartup \
 ))
 
-$(eval $(call gb_Executable_use_libraries,sweb,\
-	$(gb_UWINAPI) \
-))
-
 $(eval $(call gb_Executable_use_static_libraries,sweb,\
     winlauncher \
 ))
diff --git a/desktop/Executable_swriter.mk b/desktop/Executable_swriter.mk
index f7b522800177..6fbf9bd5057c 100644
--- a/desktop/Executable_swriter.mk
+++ b/desktop/Executable_swriter.mk
@@ -19,10 +19,6 @@ $(eval $(call gb_Executable_add_ldflags,swriter,\
     /ENTRY:wWinMainCRTStartup \
 ))
 
-$(eval $(call gb_Executable_use_libraries,swriter,\
-	$(gb_UWINAPI) \
-))
-
 $(eval $(call gb_Executable_use_static_libraries,swriter,\
     winlauncher \
 ))
diff --git a/desktop/Executable_unopkg_bin.mk b/desktop/Executable_unopkg_bin.mk
index 2ee1985e9742..27ebc5db1eca 100644
--- a/desktop/Executable_unopkg_bin.mk
+++ b/desktop/Executable_unopkg_bin.mk
@@ -21,7 +21,6 @@ $(eval $(call gb_Executable_use_libraries,unopkg_bin,\
     sal \
     tl \
     unopkgapp \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Executable_add_cobjects,unopkg_bin,\
diff --git a/desktop/Library_crashreport.mk b/desktop/Library_crashreport.mk
index d6d9b8b91cc5..e61e837d96d4 100644
--- a/desktop/Library_crashreport.mk
+++ b/desktop/Library_crashreport.mk
@@ -37,7 +37,6 @@ $(eval $(call gb_Library_use_libraries,crashreport,\
     sal \
     salhelper \
     utl \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,crashreport,\
diff --git a/desktop/Library_deployment.mk b/desktop/Library_deployment.mk
index ac32cebc1734..dbc55a700e04 100644
--- a/desktop/Library_deployment.mk
+++ b/desktop/Library_deployment.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_Library_use_libraries,deployment,\
     utl \
     xmlscript \
     i18nlangtag \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_set_componentfile,deployment,desktop/source/deployment/deployment))
diff --git a/desktop/Library_deploymentgui.mk b/desktop/Library_deploymentgui.mk
index cca6211b3a10..a16b567ea5d4 100644
--- a/desktop/Library_deploymentgui.mk
+++ b/desktop/Library_deploymentgui.mk
@@ -39,7 +39,6 @@ $(eval $(call gb_Library_use_libraries,deploymentgui,\
     ucbhelper \
     utl \
     vcl \
-	$(gb_UWINAPI) \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/desktop/Library_deploymentmisc.mk b/desktop/Library_deploymentmisc.mk
index 632b7b67e993..b3754912f54c 100644
--- a/desktop/Library_deploymentmisc.mk
+++ b/desktop/Library_deploymentmisc.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_Library_use_libraries,deploymentmisc,\
     utl \
     xmlscript \
     i18nlangtag \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,deploymentmisc,\
diff --git a/desktop/Library_migrationoo2.mk b/desktop/Library_migrationoo2.mk
index e6ea8cf597d0..21f5c1db175d 100644
--- a/desktop/Library_migrationoo2.mk
+++ b/desktop/Library_migrationoo2.mk
@@ -22,7 +22,6 @@ $(eval $(call gb_Library_use_libraries,migrationoo2,\
     sal \
     tl \
     utl \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_set_componentfile,migrationoo2,desktop/source/migration/services/migrationoo2))
diff --git a/desktop/Library_migrationoo3.mk b/desktop/Library_migrationoo3.mk
index e1540ea15d51..73c38bb291f7 100644
--- a/desktop/Library_migrationoo3.mk
+++ b/desktop/Library_migrationoo3.mk
@@ -17,7 +17,6 @@ $(eval $(call gb_Library_use_libraries,migrationoo3,\
     sal \
     tl \
     utl \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_set_componentfile,migrationoo3,desktop/source/migration/services/migrationoo3))
diff --git a/desktop/Library_offacc.mk b/desktop/Library_offacc.mk
index 7ca5d2ce4586..e02946b76692 100644
--- a/desktop/Library_offacc.mk
+++ b/desktop/Library_offacc.mk
@@ -16,7 +16,6 @@ $(eval $(call gb_Library_use_libraries,offacc,\
     cppu \
     cppuhelper \
     sal \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_set_componentfile,offacc,desktop/source/offacc/offacc))
diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
index 29185e08f707..64b8bb3841d4 100644
--- a/desktop/Library_sofficeapp.mk
+++ b/desktop/Library_sofficeapp.mk
@@ -72,7 +72,6 @@ $(eval $(call gb_Library_use_libraries,sofficeapp,\
     ucbhelper \
     utl \
     vcl \
-	$(gb_UWINAPI) \
 ))
 
 ifeq ($(OS),MACOSX)
diff --git a/desktop/Library_spl.mk b/desktop/Library_spl.mk
index d2bb2a15fb38..89c8e53b9e8a 100644
--- a/desktop/Library_spl.mk
+++ b/desktop/Library_spl.mk
@@ -27,7 +27,6 @@ $(eval $(call gb_Library_use_libraries,spl,\
     ucbhelper \
     utl \
     vcl \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_set_componentfile,spl,desktop/source/splash/spl))
diff --git a/desktop/Library_unopkgapp.mk b/desktop/Library_unopkgapp.mk
index 8c41170773d5..b8978625c3f7 100644
--- a/desktop/Library_unopkgapp.mk
+++ b/desktop/Library_unopkgapp.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_Library_use_libraries,unopkgapp,\
     utl \
     vcl \
     i18nlangtag \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,unopkgapp,\
diff --git a/drawinglayer/CppunitTest_drawinglayer_border.mk b/drawinglayer/CppunitTest_drawinglayer_border.mk
index db8703292861..194c86a6e8ca 100644
--- a/drawinglayer/CppunitTest_drawinglayer_border.mk
+++ b/drawinglayer/CppunitTest_drawinglayer_border.mk
@@ -25,7 +25,6 @@ $(eval $(call gb_CppunitTest_use_libraries,drawinglayer_border, \
 	test \
 	tl \
 	unotest \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_use_externals,drawinglayer_border,\
diff --git a/drawinglayer/Library_drawinglayer.mk b/drawinglayer/Library_drawinglayer.mk
index 690c73aaccd9..8c431c8ec08f 100644
--- a/drawinglayer/Library_drawinglayer.mk
+++ b/drawinglayer/Library_drawinglayer.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_Library_use_libraries,drawinglayer,\
     tk \
     tl \
     vcl \
-    $(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,drawinglayer,\
diff --git a/dtrans/Library_dnd.mk b/dtrans/Library_dnd.mk
index 9ce6c4439e05..8eecd53db50c 100644
--- a/dtrans/Library_dnd.mk
+++ b/dtrans/Library_dnd.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Library_use_libraries,dnd,\
 	cppu \
 	cppuhelper \
 	sal \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_use_system_win32_libs,dnd,\
diff --git a/dtrans/Library_dtrans.mk b/dtrans/Library_dtrans.mk
index 03620e52c273..a4f3413fc4f6 100644
--- a/dtrans/Library_dtrans.mk
+++ b/dtrans/Library_dtrans.mk
@@ -27,7 +27,6 @@ $(eval $(call gb_Library_use_libraries,dtrans,\
 	cppu \
 	cppuhelper \
 	sal \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,dtrans,\
diff --git a/dtrans/Library_ftransl.mk b/dtrans/Library_ftransl.mk
index 7d4a5a260a17..5a16ee83c419 100644
--- a/dtrans/Library_ftransl.mk
+++ b/dtrans/Library_ftransl.mk
@@ -28,7 +28,6 @@ $(eval $(call gb_Library_use_libraries,ftransl,\
 	cppu \
 	cppuhelper \
 	sal \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_use_system_win32_libs,ftransl,\
diff --git a/dtrans/Library_mcnttype.mk b/dtrans/Library_mcnttype.mk
index 2470f1bffca8..c139e88fed27 100644
--- a/dtrans/Library_mcnttype.mk
+++ b/dtrans/Library_mcnttype.mk
@@ -27,7 +27,6 @@ $(eval $(call gb_Library_use_libraries,mcnttype,\
 	cppu \
 	cppuhelper \
 	sal \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,mcnttype,\
diff --git a/dtrans/Library_sysdtrans.mk b/dtrans/Library_sysdtrans.mk
index 5ba93cc51b60..c9ab99cc1c14 100644
--- a/dtrans/Library_sysdtrans.mk
+++ b/dtrans/Library_sysdtrans.mk
@@ -33,7 +33,6 @@ $(eval $(call gb_Library_use_libraries,sysdtrans,\
 	cppu \
 	cppuhelper \
 	sal \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_use_system_win32_libs,sysdtrans,\
diff --git a/dtrans/source/win32/workbench/makefile.mk b/dtrans/source/win32/workbench/makefile.mk
index 96646899f895..3c82289f8ee1 100644
--- a/dtrans/source/win32/workbench/makefile.mk
+++ b/dtrans/source/win32/workbench/makefile.mk
@@ -48,7 +48,6 @@ APP1OBJS=		$(OBJ)$/test_wincb.obj
 APP1STDLIBS=	$(SALLIB) \
                 $(CPPULIB)			\
                 $(CPPUHELPERLIB)	\
-                $(SOLARLIBDIR)$/uwinapi.lib\
                 $(USER32LIB) \
                 $(OLE32LIB)\
                 $(COMDLG32LIB)
diff --git a/editeng/CppunitTest_editeng_borderline.mk b/editeng/CppunitTest_editeng_borderline.mk
index 121f4951e26e..d5fee7c23d57 100644
--- a/editeng/CppunitTest_editeng_borderline.mk
+++ b/editeng/CppunitTest_editeng_borderline.mk
@@ -43,7 +43,6 @@ $(eval $(call gb_CppunitTest_use_libraries,editeng_borderline, \
     salhelper \
     i18nlangtag \
     i18nutil \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_use_externals,editeng_borderline,\
diff --git a/editeng/CppunitTest_editeng_core.mk b/editeng/CppunitTest_editeng_core.mk
index c7a9610e55a9..9cb41fe01cbc 100644
--- a/editeng/CppunitTest_editeng_core.mk
+++ b/editeng/CppunitTest_editeng_core.mk
@@ -40,7 +40,6 @@ $(eval $(call gb_CppunitTest_use_libraries,editeng_core, \
     utl \
     vcl \
     xo \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_use_externals,editeng_core,\
diff --git a/editeng/CppunitTest_editeng_lookuptree.mk b/editeng/CppunitTest_editeng_lookuptree.mk
index 0a1422d4b036..cdc421123d5e 100644
--- a/editeng/CppunitTest_editeng_lookuptree.mk
+++ b/editeng/CppunitTest_editeng_lookuptree.mk
@@ -43,7 +43,6 @@ $(eval $(call gb_CppunitTest_use_libraries,editeng_lookuptree, \
     salhelper \
     i18nlangtag \
     i18nutil \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_use_externals,editeng_lookuptree,\
diff --git a/editeng/Library_editeng.mk b/editeng/Library_editeng.mk
index 88ba8557bb50..81cbf9332255 100644
--- a/editeng/Library_editeng.mk
+++ b/editeng/Library_editeng.mk
@@ -148,7 +148,6 @@ $(eval $(call gb_Library_use_libraries,editeng,\
     sax \
     i18nlangtag \
     i18nutil \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_use_externals,editeng,\
diff --git a/embeddedobj/Library_embobj.mk b/embeddedobj/Library_embobj.mk
index 7de4e48dd5e8..87c33c893d6f 100644
--- a/embeddedobj/Library_embobj.mk
+++ b/embeddedobj/Library_embobj.mk
@@ -29,7 +29,6 @@ $(eval $(call gb_Library_use_libraries,embobj,\
 	svt \
 	vcl \
 	tl \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,embobj,\
diff --git a/embeddedobj/Library_emboleobj.mk b/embeddedobj/Library_emboleobj.mk
index 8878045469a2..9e3c1b5950d2 100644
--- a/embeddedobj/Library_emboleobj.mk
+++ b/embeddedobj/Library_emboleobj.mk
@@ -29,7 +29,6 @@ $(eval $(call gb_Library_use_libraries,emboleobj,\
 	tl \
 	utl \
 	vcl \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,emboleobj,\
diff --git a/embedserv/Library_emser.mk b/embedserv/Library_emser.mk
index c6c5b9aa6e62..559f8d713450 100644
--- a/embedserv/Library_emser.mk
+++ b/embedserv/Library_emser.mk
@@ -31,7 +31,6 @@ $(eval $(call gb_Library_use_libraries,emser,\
 	cppu \
 	cppuhelper \
 	sal \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_use_system_win32_libs,emser,\
diff --git a/embedserv/Library_inprocserv.mk b/embedserv/Library_inprocserv.mk
index a000c9cf4786..ee9c25497d93 100644
--- a/embedserv/Library_inprocserv.mk
+++ b/embedserv/Library_inprocserv.mk
@@ -21,10 +21,6 @@ $(eval $(call gb_Library_use_system_win32_libs,inprocserv,\
 	uuid \
 ))
 
-$(eval $(call gb_Library_use_libraries,inprocserv,\
-	$(gb_UWINAPI) \
-))
-
 ifeq ($(COM),MSC)
 $(eval $(call gb_Library_add_ldflags,inprocserv,\
 	/DEF:$(SRCDIR)/embedserv/source/inprocserv/inprocserv.def \
diff --git a/eventattacher/Library_evtatt.mk b/eventattacher/Library_evtatt.mk
index eff84dfd4a29..71ec10f86a18 100644
--- a/eventattacher/Library_evtatt.mk
+++ b/eventattacher/Library_evtatt.mk
@@ -18,7 +18,6 @@ $(eval $(call gb_Library_use_libraries,evtatt,\
 	cppuhelper \
 	cppu \
 	sal \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,evtatt,\
diff --git a/extensions/CppunitTest_extensions_test_update.mk b/extensions/CppunitTest_extensions_test_update.mk
index 1d802522c65e..9d494e4e5257 100644
--- a/extensions/CppunitTest_extensions_test_update.mk
+++ b/extensions/CppunitTest_extensions_test_update.mk
@@ -24,7 +24,6 @@ $(eval $(call gb_CppunitTest_use_libraries,extensions_test_update, \
 	salhelper \
 	test \
 	unotest \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_use_library_objects,extensions_test_update, \
diff --git a/extensions/Library_abp.mk b/extensions/Library_abp.mk
index e12bd2661e55..ad2f062b690a 100644
--- a/extensions/Library_abp.mk
+++ b/extensions/Library_abp.mk
@@ -58,7 +58,6 @@ $(eval $(call gb_Library_use_libraries,abp,\
 	utl \
 	vcl \
 	i18nlangtag \
-	$(gb_UWINAPI) \
 ))
 
 # vim:set noet sw=4 ts=4:
diff --git a/extensions/Library_bib.mk b/extensions/Library_bib.mk
index 2eff260de83f..1f04de241c23 100644
--- a/extensions/Library_bib.mk
+++ b/extensions/Library_bib.mk
@@ -52,7 +52,6 @@ $(eval $(call gb_Library_use_libraries,bib,\
 	sal \
 	salhelper \
 	i18nlangtag \
-	$(gb_UWINAPI) \
 ))
 
 # vim:set noet sw=4 ts=4:
diff --git a/extensions/Library_dbp.mk b/extensions/Library_dbp.mk
index 10019aa301c0..6ddd129a6ac6 100644
--- a/extensions/Library_dbp.mk
+++ b/extensions/Library_dbp.mk
@@ -54,7 +54,6 @@ $(eval $(call gb_Library_use_libraries,dbp,\
 	sal \
 	salhelper \
 	i18nlangtag \
-	$(gb_UWINAPI) \
 ))
 
 # vim:set noet sw=4 ts=4:
diff --git a/extensions/Library_log.mk b/extensions/Library_log.mk
index 99f8090db335..69115fe8d58e 100644
--- a/extensions/Library_log.mk
+++ b/extensions/Library_log.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_Library_use_libraries,log,\
 	cppu \
 	sal \
 	tl \
-	$(gb_UWINAPI) \
 ))
 
 # vim:set noet sw=4 ts=4:
diff --git a/extensions/Library_pcr.mk b/extensions/Library_pcr.mk
index 20de189063b2..58d9319c18e7 100644
--- a/extensions/Library_pcr.mk
+++ b/extensions/Library_pcr.mk
@@ -40,7 +40,6 @@ $(eval $(call gb_Library_use_libraries,pcr,\
 	cppu \
 	sal \
 	salhelper \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,pcr,\
diff --git a/extensions/Library_res.mk b/extensions/Library_res.mk
index 83603333064d..80505f471350 100644
--- a/extensions/Library_res.mk
+++ b/extensions/Library_res.mk
@@ -25,7 +25,6 @@ $(eval $(call gb_Library_use_libraries,res,\
 	cppu \
 	cppuhelper \
 	sal \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,res,\
diff --git a/extensions/Library_scn.mk b/extensions/Library_scn.mk
index 73716d1e9ab5..ef17a0ee3d85 100644
--- a/extensions/Library_scn.mk
+++ b/extensions/Library_scn.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Library_use_libraries,scn,\
 	cppu \
 	sal \
 	i18nlangtag \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,scn,\
diff --git a/external/coinmp/UnpackedTarball_coinmp.mk b/external/coinmp/UnpackedTarball_coinmp.mk
index 98d544034ff4..0bf3f8cfb60b 100644
--- a/external/coinmp/UnpackedTarball_coinmp.mk
+++ b/external/coinmp/UnpackedTarball_coinmp.mk
@@ -24,9 +24,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,coinmp,\
 	external/coinmp/werror-format-security.patch.0 \
 	external/coinmp/werror-undef.patch.0 \
 	external/coinmp/coinmp-msvc-disable-sse2.patch.1 \
-	$(if $(filter MSC,$(COM)),external/coinmp/windows.build.patch.1 \
-		$(if $(filter 120,$(VCVER)),external/coinmp/coinmp-vs2013.patch.1) \
-	) \
+	$(if $(filter MSC,$(COM)),external/coinmp/windows.build.patch.1) \
 	$(if $(filter MACOSX,$(OS)),external/coinmp/macosx.build.patch.1) \
 	external/coinmp/werror-format-pedantic.patch.0 \
 	external/coinmp/ubsan.patch.0 \
diff --git a/external/coinmp/coinmp-vs2013.patch.1 b/external/coinmp/coinmp-vs2013.patch.1
deleted file mode 100644
index 2b06c1519a78..000000000000
--- a/external/coinmp/coinmp-vs2013.patch.1
+++ /dev/null
@@ -1,352 +0,0 @@
--*- Mode:Diff -*-
---- coinmp/Cbc/MSVisualStudio/v9/libCbc/libCbc.vcxproj
-+++ coinmp/Cbc/MSVisualStudio/v9/libCbc/libCbc.vcxproj
-@@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="utf-8"?>
--<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-   <ItemGroup Label="ProjectConfigurations">
-     <ProjectConfiguration Include="Debug|Win32">
-       <Configuration>Debug</Configuration>
-@@ -25,25 +25,25 @@
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-     <ConfigurationType>StaticLibrary</ConfigurationType>
--    <PlatformToolset>v110</PlatformToolset>
-+    <PlatformToolset>v120</PlatformToolset>
-     <UseOfMfc>false</UseOfMfc>
-     <CharacterSet>MultiByte</CharacterSet>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-     <ConfigurationType>StaticLibrary</ConfigurationType>
--    <PlatformToolset>v110</PlatformToolset>
-+    <PlatformToolset>v120</PlatformToolset>
-     <UseOfMfc>false</UseOfMfc>
-     <CharacterSet>MultiByte</CharacterSet>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-     <ConfigurationType>StaticLibrary</ConfigurationType>
--    <PlatformToolset>v110</PlatformToolset>
-+    <PlatformToolset>v120</PlatformToolset>
-     <UseOfMfc>false</UseOfMfc>
-     <CharacterSet>MultiByte</CharacterSet>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-     <ConfigurationType>StaticLibrary</ConfigurationType>
--    <PlatformToolset>v110</PlatformToolset>
-+    <PlatformToolset>v120</PlatformToolset>
-     <UseOfMfc>false</UseOfMfc>
-     <CharacterSet>MultiByte</CharacterSet>
-   </PropertyGroup>
---- coinmp/Cbc/MSVisualStudio/v9/libCbcSolver/libCbcSolver.vcxproj
-+++ coinmp/Cbc/MSVisualStudio/v9/libCbcSolver/libCbcSolver.vcxproj
-@@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="utf-8"?>
--<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-   <ItemGroup Label="ProjectConfigurations">
-     <ProjectConfiguration Include="Debug|Win32">
-       <Configuration>Debug</Configuration>
-@@ -26,27 +26,27 @@
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-     <ConfigurationType>StaticLibrary</ConfigurationType>
--    <PlatformToolset>v110</PlatformToolset>
-+    <PlatformToolset>v120</PlatformToolset>
-     <CharacterSet>Unicode</CharacterSet>
-     <CLRSupport>false</CLRSupport>
-     <WholeProgramOptimization>false</WholeProgramOptimization>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-     <ConfigurationType>StaticLibrary</ConfigurationType>
--    <PlatformToolset>v110</PlatformToolset>
-+    <PlatformToolset>v120</PlatformToolset>
-     <CharacterSet>Unicode</CharacterSet>
-     <CLRSupport>false</CLRSupport>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-     <ConfigurationType>StaticLibrary</ConfigurationType>
--    <PlatformToolset>v110</PlatformToolset>
-+    <PlatformToolset>v120</PlatformToolset>
-     <CharacterSet>Unicode</CharacterSet>
-     <CLRSupport>false</CLRSupport>
-     <WholeProgramOptimization>false</WholeProgramOptimization>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-     <ConfigurationType>StaticLibrary</ConfigurationType>
--    <PlatformToolset>v110</PlatformToolset>
-+    <PlatformToolset>v120</PlatformToolset>
-     <CharacterSet>Unicode</CharacterSet>
-     <CLRSupport>false</CLRSupport>
-   </PropertyGroup>
---- coinmp/Cgl/MSVisualStudio/v9/libCgl/libCgl.vcxproj
-+++ coinmp/Cgl/MSVisualStudio/v9/libCgl/libCgl.vcxproj
-@@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="utf-8"?>
--<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-   <ItemGroup Label="ProjectConfigurations">
-     <ProjectConfiguration Include="Debug|Win32">
-       <Configuration>Debug</Configuration>
-@@ -25,25 +25,25 @@
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-     <ConfigurationType>StaticLibrary</ConfigurationType>
--    <PlatformToolset>v110</PlatformToolset>
-+    <PlatformToolset>v120</PlatformToolset>
-     <UseOfMfc>false</UseOfMfc>
-     <CharacterSet>MultiByte</CharacterSet>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-     <ConfigurationType>StaticLibrary</ConfigurationType>
--    <PlatformToolset>v110</PlatformToolset>
-+    <PlatformToolset>v120</PlatformToolset>
-     <UseOfMfc>false</UseOfMfc>
-     <CharacterSet>MultiByte</CharacterSet>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-     <ConfigurationType>StaticLibrary</ConfigurationType>
--    <PlatformToolset>v110</PlatformToolset>
-+    <PlatformToolset>v120</PlatformToolset>
-     <UseOfMfc>false</UseOfMfc>
-     <CharacterSet>MultiByte</CharacterSet>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-     <ConfigurationType>StaticLibrary</ConfigurationType>
--    <PlatformToolset>v110</PlatformToolset>
-+    <PlatformToolset>v120</PlatformToolset>
-     <UseOfMfc>false</UseOfMfc>
-     <CharacterSet>MultiByte</CharacterSet>
-   </PropertyGroup>
---- coinmp/Clp/MSVisualStudio/v9/libClp/libClp.vcxproj
-+++ coinmp/Clp/MSVisualStudio/v9/libClp/libClp.vcxproj
-@@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="utf-8"?>
--<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-   <ItemGroup Label="ProjectConfigurations">
-     <ProjectConfiguration Include="Debug|Win32">
-       <Configuration>Debug</Configuration>
-@@ -25,25 +25,25 @@
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-     <ConfigurationType>StaticLibrary</ConfigurationType>
--    <PlatformToolset>v110</PlatformToolset>
-+    <PlatformToolset>v120</PlatformToolset>
-     <UseOfMfc>false</UseOfMfc>
-     <CharacterSet>MultiByte</CharacterSet>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-     <ConfigurationType>StaticLibrary</ConfigurationType>
--    <PlatformToolset>v110</PlatformToolset>
-+    <PlatformToolset>v120</PlatformToolset>
-     <UseOfMfc>false</UseOfMfc>
-     <CharacterSet>MultiByte</CharacterSet>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-     <ConfigurationType>StaticLibrary</ConfigurationType>
--    <PlatformToolset>v110</PlatformToolset>
-+    <PlatformToolset>v120</PlatformToolset>
-     <UseOfMfc>false</UseOfMfc>
-     <CharacterSet>MultiByte</CharacterSet>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-     <ConfigurationType>StaticLibrary</ConfigurationType>
--    <PlatformToolset>v110</PlatformToolset>
-+    <PlatformToolset>v120</PlatformToolset>
-     <UseOfMfc>false</UseOfMfc>
-     <CharacterSet>MultiByte</CharacterSet>
-   </PropertyGroup>
---- coinmp/Clp/MSVisualStudio/v9/libOsiClp/libOsiClp.vcxproj
-+++ coinmp/Clp/MSVisualStudio/v9/libOsiClp/libOsiClp.vcxproj
-@@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="utf-8"?>
--<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-   <ItemGroup Label="ProjectConfigurations">
-     <ProjectConfiguration Include="Debug|Win32">
-       <Configuration>Debug</Configuration>
-@@ -25,25 +25,25 @@
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-     <ConfigurationType>StaticLibrary</ConfigurationType>
--    <PlatformToolset>v110</PlatformToolset>
-+    <PlatformToolset>v120</PlatformToolset>
-     <UseOfMfc>false</UseOfMfc>
-     <CharacterSet>MultiByte</CharacterSet>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-     <ConfigurationType>StaticLibrary</ConfigurationType>
--    <PlatformToolset>v110</PlatformToolset>
-+    <PlatformToolset>v120</PlatformToolset>
-     <UseOfMfc>false</UseOfMfc>
-     <CharacterSet>MultiByte</CharacterSet>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-     <ConfigurationType>StaticLibrary</ConfigurationType>
--    <PlatformToolset>v110</PlatformToolset>
-+    <PlatformToolset>v120</PlatformToolset>
-     <UseOfMfc>false</UseOfMfc>
-     <CharacterSet>MultiByte</CharacterSet>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-     <ConfigurationType>StaticLibrary</ConfigurationType>
--    <PlatformToolset>v110</PlatformToolset>
-+    <PlatformToolset>v120</PlatformToolset>
-     <UseOfMfc>false</UseOfMfc>
-     <CharacterSet>MultiByte</CharacterSet>
-   </PropertyGroup>
---- coinmp/CoinMP/MSVisualStudio/v9/CoinMP/CoinMP.vcxproj
-+++ coinmp/CoinMP/MSVisualStudio/v9/CoinMP/CoinMP.vcxproj
-@@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="utf-8"?>
--<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-   <ItemGroup Label="ProjectConfigurations">
-     <ProjectConfiguration Include="Debug|Win32">
-       <Configuration>Debug</Configuration>
-@@ -26,24 +26,24 @@
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-     <ConfigurationType>DynamicLibrary</ConfigurationType>
--    <PlatformToolset>v110</PlatformToolset>
-+    <PlatformToolset>v120</PlatformToolset>
-     <CharacterSet>Unicode</CharacterSet>
-     <WholeProgramOptimization>true</WholeProgramOptimization>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-     <ConfigurationType>DynamicLibrary</ConfigurationType>
--    <PlatformToolset>v110</PlatformToolset>
-+    <PlatformToolset>v120</PlatformToolset>
-     <CharacterSet>MultiByte</CharacterSet>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-     <ConfigurationType>DynamicLibrary</ConfigurationType>
--    <PlatformToolset>v110</PlatformToolset>
-+    <PlatformToolset>v120</PlatformToolset>
-     <CharacterSet>Unicode</CharacterSet>
-     <WholeProgramOptimization>true</WholeProgramOptimization>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-     <ConfigurationType>DynamicLibrary</ConfigurationType>
--    <PlatformToolset>v110</PlatformToolset>
-+    <PlatformToolset>v120</PlatformToolset>
-     <CharacterSet>MultiByte</CharacterSet>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
---- coinmp/CoinMP/MSVisualStudio/v9/unitTest/unitTest.vcxproj
-+++ coinmp/CoinMP/MSVisualStudio/v9/unitTest/unitTest.vcxproj
-@@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="utf-8"?>
--<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-   <ItemGroup Label="ProjectConfigurations">
-     <ProjectConfiguration Include="Debug|Win32">
-       <Configuration>Debug</Configuration>
-@@ -26,24 +26,24 @@
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <PlatformToolset>v110</PlatformToolset>
-+    <PlatformToolset>v120</PlatformToolset>
-     <CharacterSet>Unicode</CharacterSet>
-     <WholeProgramOptimization>true</WholeProgramOptimization>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <PlatformToolset>v110</PlatformToolset>
-+    <PlatformToolset>v120</PlatformToolset>
-     <CharacterSet>Unicode</CharacterSet>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <PlatformToolset>v110</PlatformToolset>
-+    <PlatformToolset>v120</PlatformToolset>
-     <CharacterSet>Unicode</CharacterSet>
-     <WholeProgramOptimization>true</WholeProgramOptimization>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <PlatformToolset>v110</PlatformToolset>
-+    <PlatformToolset>v120</PlatformToolset>
-     <CharacterSet>Unicode</CharacterSet>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
---- coinmp/CoinUtils/MSVisualStudio/v9/libCoinUtils/libCoinUtils.vcxproj
-+++ coinmp/CoinUtils/MSVisualStudio/v9/libCoinUtils/libCoinUtils.vcxproj
-@@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="utf-8"?>
--<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-   <ItemGroup Label="ProjectConfigurations">
-     <ProjectConfiguration Include="Debug|Win32">
-       <Configuration>Debug</Configuration>
-@@ -25,25 +25,25 @@
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-     <ConfigurationType>StaticLibrary</ConfigurationType>
--    <PlatformToolset>v110</PlatformToolset>
-+    <PlatformToolset>v120</PlatformToolset>
-     <UseOfMfc>false</UseOfMfc>
-     <CharacterSet>MultiByte</CharacterSet>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-     <ConfigurationType>StaticLibrary</ConfigurationType>
--    <PlatformToolset>v110</PlatformToolset>
-+    <PlatformToolset>v120</PlatformToolset>
-     <UseOfMfc>false</UseOfMfc>
-     <CharacterSet>MultiByte</CharacterSet>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-     <ConfigurationType>StaticLibrary</ConfigurationType>
--    <PlatformToolset>v110</PlatformToolset>
-+    <PlatformToolset>v120</PlatformToolset>
-     <UseOfMfc>false</UseOfMfc>
-     <CharacterSet>MultiByte</CharacterSet>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-     <ConfigurationType>StaticLibrary</ConfigurationType>
--    <PlatformToolset>v110</PlatformToolset>
-+    <PlatformToolset>v120</PlatformToolset>
-     <UseOfMfc>false</UseOfMfc>
-     <CharacterSet>MultiByte</CharacterSet>
-   </PropertyGroup>
---- coinmp/Osi/MSVisualStudio/v9/libOsi/libOsi.vcxproj
-+++ coinmp/Osi/MSVisualStudio/v9/libOsi/libOsi.vcxproj
-@@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="utf-8"?>
--<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-   <ItemGroup Label="ProjectConfigurations">
-     <ProjectConfiguration Include="Debug|Win32">
-       <Configuration>Debug</Configuration>
-@@ -24,25 +24,25 @@
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-     <ConfigurationType>StaticLibrary</ConfigurationType>
--    <PlatformToolset>v110</PlatformToolset>
-+    <PlatformToolset>v120</PlatformToolset>
-     <UseOfMfc>false</UseOfMfc>
-     <CharacterSet>MultiByte</CharacterSet>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-     <ConfigurationType>StaticLibrary</ConfigurationType>
--    <PlatformToolset>v110</PlatformToolset>
-+    <PlatformToolset>v120</PlatformToolset>
-     <UseOfMfc>false</UseOfMfc>
-     <CharacterSet>MultiByte</CharacterSet>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-     <ConfigurationType>StaticLibrary</ConfigurationType>
--    <PlatformToolset>v110</PlatformToolset>
-+    <PlatformToolset>v120</PlatformToolset>
-     <UseOfMfc>false</UseOfMfc>
-     <CharacterSet>MultiByte</CharacterSet>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-     <ConfigurationType>StaticLibrary</ConfigurationType>
--    <PlatformToolset>v110</PlatformToolset>
-+    <PlatformToolset>v120</PlatformToolset>
-     <UseOfMfc>false</UseOfMfc>
-     <CharacterSet>MultiByte</CharacterSet>
-   </PropertyGroup>
diff --git a/external/poppler/UnpackedTarball_poppler.mk b/external/poppler/UnpackedTarball_poppler.mk
index f72c040c513b..8c87693b82ec 100644
--- a/external/poppler/UnpackedTarball_poppler.mk
+++ b/external/poppler/UnpackedTarball_poppler.mk
@@ -13,7 +13,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,poppler,$(POPPLER_TARBALL),,poppler
 
 $(eval $(call gb_UnpackedTarball_add_patches,poppler,\
 	external/poppler/poppler-notests.patch.1 \
-	$(if $(filter MSC-120,$(COM)-$(VCVER)),external/poppler/poppler-snprintf.patch.1) \
 	external/poppler/poppler-mac-fake.patch.1 \
 	external/poppler/ubsan.patch.0 \
 	external/poppler/poppler-libjpeg.patch.1 \
diff --git a/external/poppler/poppler-snprintf.patch.1 b/external/poppler/poppler-snprintf.patch.1
deleted file mode 100644
index 577660580489..000000000000
--- a/external/poppler/poppler-snprintf.patch.1
+++ /dev/null
@@ -1,34 +0,0 @@
---- poppler-0.22.5/poppler/Catalog.cc	2013-06-09 12:16:12.000000000 +0200
-+++ poppler-0.22.5/poppler/Catalog.cc	2013-07-08 16:54:30.712095880 +0200
-@@ -40,6 +40,9 @@
- 
- #include <stddef.h>
- #include <stdlib.h>
-+#ifdef _WIN32
-+#  include <systools/win32/snprintf.h>
-+#endif
- #include "goo/gmem.h"
- #include "Object.h"
- #include "PDFDoc.h"
---- poppler-0.22.5/poppler/GlobalParams.cc	2013-03-25 22:48:34.000000000 +0100
-+++ poppler-0.22.5/poppler/GlobalParams.cc	2013-07-08 16:55:04.753303654 +0200
-@@ -57,6 +57,7 @@
- #ifdef _WIN32
- #  include <shlobj.h>
- #  include <mbstring.h>
-+#  include <systools/win32/snprintf.h>
- #endif
- #include "goo/gmem.h"
- #include "goo/GooString.h"
---- poppler-0.22.5/poppler/PageLabelInfo.cc	2013-03-25 22:48:34.000000000 +0100
-+++ poppler-0.22.5/poppler/PageLabelInfo.cc	2013-07-08 16:56:47.977901129 +0200
-@@ -17,6 +17,9 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <assert.h>
-+#ifdef _WIN32
-+#  include <systools/win32/snprintf.h>
-+#endif
- 
- #include "PageLabelInfo.h"
- #include "PageLabelInfo_p.h"
diff --git a/filter/CppunitTest_filter_dialogs_test.mk b/filter/CppunitTest_filter_dialogs_test.mk
index 32dd32471aff..7ae73639c7e2 100644
--- a/filter/CppunitTest_filter_dialogs_test.mk
+++ b/filter/CppunitTest_filter_dialogs_test.mk
@@ -48,7 +48,6 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_dialogs_test, \
     utl \
     vcl \
     xo \
-    $(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_use_external,filter_dialogs_test,boost_headers))
diff --git a/filter/CppunitTest_filter_dxf_test.mk b/filter/CppunitTest_filter_dxf_test.mk
index 19511c73ce6f..4a10c1845cef 100644
--- a/filter/CppunitTest_filter_dxf_test.mk
+++ b/filter/CppunitTest_filter_dxf_test.mk
@@ -22,7 +22,6 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_dxf_test, \
 	tl \
 	unotest \
 	vcl \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_use_sdk_api,filter_dxf_test))
diff --git a/filter/CppunitTest_filter_eps_test.mk b/filter/CppunitTest_filter_eps_test.mk
index befc029d6cfe..f708fb5a9bce 100644
--- a/filter/CppunitTest_filter_eps_test.mk
+++ b/filter/CppunitTest_filter_eps_test.mk
@@ -22,7 +22,6 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_eps_test, \
 	tl \
 	unotest \
 	vcl \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_use_sdk_api,filter_eps_test))
diff --git a/filter/CppunitTest_filter_met_test.mk b/filter/CppunitTest_filter_met_test.mk
index 4a0027fdde36..6bf756f2a671 100644
--- a/filter/CppunitTest_filter_met_test.mk
+++ b/filter/CppunitTest_filter_met_test.mk
@@ -22,7 +22,6 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_met_test, \
 	tl \
 	unotest \
 	vcl \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_use_sdk_api,filter_met_test))
diff --git a/filter/CppunitTest_filter_msfilter.mk b/filter/CppunitTest_filter_msfilter.mk
index aa567cd7c25e..ad4596d4edb0 100644
--- a/filter/CppunitTest_filter_msfilter.mk
+++ b/filter/CppunitTest_filter_msfilter.mk
@@ -26,7 +26,6 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_msfilter, \
 	cppu \
 	msfilter \
 	sal \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_use_components,filter_msfilter,\
diff --git a/filter/CppunitTest_filter_pcd_test.mk b/filter/CppunitTest_filter_pcd_test.mk
index 4d6406956aba..3741d5c9bf5a 100644
--- a/filter/CppunitTest_filter_pcd_test.mk
+++ b/filter/CppunitTest_filter_pcd_test.mk
@@ -22,7 +22,6 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_pcd_test, \
 	tl \
 	unotest \
 	vcl \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_use_sdk_api,filter_pcd_test))
diff --git a/filter/CppunitTest_filter_pcx_test.mk b/filter/CppunitTest_filter_pcx_test.mk
index 4a31c51f2d8c..12334d75ad42 100644
--- a/filter/CppunitTest_filter_pcx_test.mk
+++ b/filter/CppunitTest_filter_pcx_test.mk
@@ -22,7 +22,6 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_pcx_test, \
 	tl \
 	unotest \
 	vcl \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_use_sdk_api,filter_pcx_test))
diff --git a/filter/CppunitTest_filter_pict_test.mk b/filter/CppunitTest_filter_pict_test.mk
index 685863794a79..bba3113a4473 100644
--- a/filter/CppunitTest_filter_pict_test.mk
+++ b/filter/CppunitTest_filter_pict_test.mk
@@ -28,7 +28,6 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_pict_test, \
 	utl \
 	unotest \
 	vcl \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_use_library_objects,filter_pict_test, \
diff --git a/filter/CppunitTest_filter_ppm_test.mk b/filter/CppunitTest_filter_ppm_test.mk
index 5ccbde7df3de..273db952300d 100644
--- a/filter/CppunitTest_filter_ppm_test.mk
+++ b/filter/CppunitTest_filter_ppm_test.mk
@@ -22,7 +22,6 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_ppm_test, \
 	tl \
 	unotest \
 	vcl \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_use_sdk_api,filter_ppm_test))
diff --git a/filter/CppunitTest_filter_priority.mk b/filter/CppunitTest_filter_priority.mk
index e5046ac0e3a2..e9bc7de8f196 100644
--- a/filter/CppunitTest_filter_priority.mk
+++ b/filter/CppunitTest_filter_priority.mk
@@ -22,7 +22,6 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_priority, \
 	cppuhelper \
 	cppu \
 	sal \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_use_components,filter_priority,\
diff --git a/filter/CppunitTest_filter_psd_test.mk b/filter/CppunitTest_filter_psd_test.mk
index 503d1006e4e7..22a2531eb43f 100644
--- a/filter/CppunitTest_filter_psd_test.mk
+++ b/filter/CppunitTest_filter_psd_test.mk
@@ -22,7 +22,6 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_psd_test, \
 	tl \
 	unotest \
 	vcl \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_use_sdk_api,filter_psd_test))
diff --git a/filter/CppunitTest_filter_ras_test.mk b/filter/CppunitTest_filter_ras_test.mk
index 9265db9857ec..50f6852a7b2b 100644
--- a/filter/CppunitTest_filter_ras_test.mk
+++ b/filter/CppunitTest_filter_ras_test.mk
@@ -22,7 +22,6 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_ras_test, \
 	tl \
 	unotest \
 	vcl \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_use_sdk_api,filter_ras_test))
diff --git a/filter/CppunitTest_filter_tga_test.mk b/filter/CppunitTest_filter_tga_test.mk
index d62addca5bdd..33ae034c0e30 100644
--- a/filter/CppunitTest_filter_tga_test.mk
+++ b/filter/CppunitTest_filter_tga_test.mk
@@ -22,7 +22,6 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_tga_test, \
 	tl \
 	unotest \
 	vcl \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_use_sdk_api,filter_tga_test))
diff --git a/filter/CppunitTest_filter_tiff_test.mk b/filter/CppunitTest_filter_tiff_test.mk
index d3dfdae4a7a5..23a7bbf9ccac 100644
--- a/filter/CppunitTest_filter_tiff_test.mk
+++ b/filter/CppunitTest_filter_tiff_test.mk
@@ -22,7 +22,6 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_tiff_test, \
 	tl \
 	unotest \
 	vcl \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_use_sdk_api,filter_tiff_test))
diff --git a/filter/CppunitTest_filter_xslt.mk b/filter/CppunitTest_filter_xslt.mk
index 123149020eb7..8bf69a0aec93 100644
--- a/filter/CppunitTest_filter_xslt.mk
+++ b/filter/CppunitTest_filter_xslt.mk
@@ -24,7 +24,6 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_xslt, \
 	cppuhelper \
 	cppu \
 	sal \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_CppunitTest_use_components,filter_xslt,\
diff --git a/filter/Executable_svg2odf.mk b/filter/Executable_svg2odf.mk
index d5e32c74339c..d63808600bb1 100644
--- a/filter/Executable_svg2odf.mk
+++ b/filter/Executable_svg2odf.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_Executable_use_libraries,svg2odf,\
 	cppuhelper \
 	cppu \
 	sal \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,svg2odf,\
diff --git a/filter/Library_filterconfig.mk b/filter/Library_filterconfig.mk
index 602d2b17aa70..84321667f05f 100644
--- a/filter/Library_filterconfig.mk
+++ b/filter/Library_filterconfig.mk
@@ -42,7 +42,6 @@ $(eval $(call gb_Library_use_libraries,filterconfig,\
 	sal \
 	salhelper \
 	i18nlangtag \
-	$(gb_UWINAPI) \
 ))
 
 
diff --git a/filter/Library_flash.mk b/filter/Library_flash.mk
index f3ea2733d123..c0fc10a66e45 100644
--- a/filter/Library_flash.mk
+++ b/filter/Library_flash.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_Library_use_libraries,flash,\
 	cppuhelper \
 	cppu \
 	sal \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_use_externals,flash,\
diff --git a/filter/Library_gie.mk b/filter/Library_gie.mk
index 2c00c75e2ea6..167f6c758b34 100644
--- a/filter/Library_gie.mk
+++ b/filter/Library_gie.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_Library_use_libraries,gie,\
     tk \
     cppu \
     sal \
-    $(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,gie,\
diff --git a/filter/Library_graphicfilter.mk b/filter/Library_graphicfilter.mk
index b4201f1d8985..60b20eb2491d 100644
--- a/filter/Library_graphicfilter.mk
+++ b/filter/Library_graphicfilter.mk
@@ -44,7 +44,6 @@ $(eval $(call gb_Library_use_libraries,graphicfilter,\
 	cppuhelper \
 	cppu \
 	sal \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,graphicfilter,\
diff --git a/filter/Library_icg.mk b/filter/Library_icg.mk
index a84ae9a73bf4..54d733358937 100644
--- a/filter/Library_icg.mk
+++ b/filter/Library_icg.mk
@@ -31,7 +31,6 @@ $(eval $(call gb_Library_use_libraries,icg,\
 	tl \
 	cppu \
 	sal \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,icg,\
diff --git a/filter/Library_msfilter.mk b/filter/Library_msfilter.mk
index 87e89c6a3d33..b15e548f522a 100644
--- a/filter/Library_msfilter.mk
+++ b/filter/Library_msfilter.mk
@@ -49,7 +49,6 @@ $(eval $(call gb_Library_use_libraries,msfilter,\
 	cppuhelper \
 	cppu \
 	sal \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,msfilter,\
diff --git a/filter/Library_odfflatxml.mk b/filter/Library_odfflatxml.mk
index 528a2b0b0836..8ed2aa4ce199 100644
--- a/filter/Library_odfflatxml.mk
+++ b/filter/Library_odfflatxml.mk
@@ -27,7 +27,6 @@ $(eval $(call gb_Library_use_libraries,odfflatxml,\
 	cppuhelper \
 	cppu \
 	sal \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,odfflatxml,\
diff --git a/filter/Library_pdffilter.mk b/filter/Library_pdffilter.mk
index 6de7d341367e..21be2a1cd5ee 100644
--- a/filter/Library_pdffilter.mk
+++ b/filter/Library_pdffilter.mk
@@ -48,7 +48,6 @@ $(eval $(call gb_Library_use_libraries,pdffilter,\
 	cppuhelper \
 	cppu \
 	sal \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,pdffilter,\
diff --git a/filter/Library_storagefd.mk b/filter/Library_storagefd.mk
index 5b05e7e5c4ee..4b9d948f3d97 100644
--- a/filter/Library_storagefd.mk
+++ b/filter/Library_storagefd.mk
@@ -25,7 +25,6 @@ $(eval $(call gb_Library_use_libraries,storagefd,\
     sfx \
     tl \
     utl \
-    $(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,storagefd,\
diff --git a/filter/Library_svgfilter.mk b/filter/Library_svgfilter.mk
index 82f3aeedb615..2638d586129f 100644
--- a/filter/Library_svgfilter.mk
+++ b/filter/Library_svgfilter.mk
@@ -52,7 +52,6 @@ $(eval $(call gb_Library_use_libraries,svgfilter,\
 	cppuhelper \
 	cppu \
 	sal \
-	$(gb_UWINAPI) \
 ))
 

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list