[Libreoffice-commits] .: 4 commits - accessibility/Library_acc.mk accessibility/Library_java_uno_accessbridge.mk animations/Library_animcore.mk avmedia/Library_avmediagst.mk avmedia/Library_avmedia.mk avmedia/Library_avmediaQuickTime.mk avmedia/Library_avmediawin.mk basctl/Library_basctl.mk basebmp/Library_basebmp.mk basegfx/Library_basegfx.mk basic/Library_sb.mk binaryurp/Library_binaryurp.mk canvas/Library_cairocanvas.mk canvas/Library_canvasfactory.mk canvas/Library_canvastools.mk canvas/Library_directx9canvas.mk canvas/Library_gdipluscanvas.mk canvas/Library_nullcanvas.mk canvas/Library_simplecanvas.mk canvas/Library_vclcanvas.mk chart2/Library_chartcontroller.mk chart2/Library_chartmodel.mk chart2/Library_charttools.mk chart2/Library_chartview.mk comphelper/Library_comphelper.mk configmgr/Library_configmgr.mk connectivity/Library_ado.mk connectivity/Library_calc.mk connectivity/Library_dbase.mk connectivity/Library_dbpool2.mk connectivity/Library_dbtools.mk connectivity/Library_evoab .mk connectivity/Library_file.mk connectivity/Library_flat.mk connectivity/Library_hsqldb.mk connectivity/Library_jdbc.mk connectivity/Library_kab1.mk connectivity/Library_kabdrv1.mk connectivity/Library_macab1.mk connectivity/Library_macabdrv1.mk connectivity/Library_mozabdrv.mk connectivity/Library_mozab.mk connectivity/Library_mozbootstrap.mk connectivity/Library_mysql.mk connectivity/Library_odbcbase.mk connectivity/Library_odbc.mk connectivity/Library_postgresql-sdbc-impl.mk connectivity/Library_postgresql-sdbc.mk connectivity/Library_sdbc2.mk connectivity/Library_tdeab1.mk connectivity/Library_tdeabdrv1.mk cppcanvas/Library_cppcanvas.mk cppcanvas/Library_mtfrenderer.mk cppu/Library_affine_uno.mk cppu/Library_cppu.mk cppu/Library_log_uno.mk cppu/Library_purpenvhelper.mk cppu/Library_unsafe_uno.mk cui/Library_cui.mk dbaccess/Executable_odbcconfig.mk dbaccess/Library_dba.mk dbaccess/Library_dbaxml.mk dbaccess/Library_dbmm.mk dbaccess/Library_dbu.mk dbaccess/Library_sdbt.m k 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_spl_unx.mk desktop/Library_unopkgapp.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 editeng/Library_editeng.mk embeddedobj/Library_embobj.mk embeddedobj/Library_emboleobj.mk embedserv/Library_emser.mk extensions/Library_abp.mk extensions/Library_bib.mk extensions/Library_dbp.mk extensions/Library_ldapbe2.mk extensions/Library_log.mk extensions/Library_oleautobridge2.mk extensions/Library_oleautobridge.mk extensions/Library_pcr.mk extensions/Library_pl.mk extensions/Library_res.mk extensions/Library_scn.mk extensions/Library_so_activex.mk extensions/Library_so_activex_x64.mk extensions/Library_updatechec kui.mk extensions/Library_updatefeed.mk extensions/Library_updchk.mk fileaccess/Library_fileacc.mk filter/Library_egi.mk filter/Library_eme.mk filter/Library_epb.mk filter/Library_epg.mk filter/Library_epp.mk filter/Library_eps.mk filter/Library_ept.mk filter/Library_era.mk filter/Library_eti.mk filter/Library_exp.mk filter/Library_filterconfig.mk filter/Library_filtertracer.mk filter/Library_flash.mk filter/Library_icd.mk filter/Library_icg.mk filter/Library_idx.mk filter/Library_ime.mk filter/Library_ipb.mk filter/Library_ipd.mk filter/Library_ips.mk filter/Library_ipt.mk filter/Library_ipx.mk filter/Library_ira.mk filter/Library_itg.mk filter/Library_iti.mk filter/Library_msfilter.mk filter/Library_odfflatxml.mk filter/Library_pdffilter.mk filter/Library_placeware.mk filter/Library_PptImporter.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_xsltfil ter.mk formula/Library_for.mk formula/Library_forui.mk fpicker/Library_fpicker.mk fpicker/Library_fps_aqua.mk fpicker/Library_fps.mk fpicker/Library_fps_odma.mk fpicker/Library_fps_office.mk framework/Library_fwe.mk framework/Library_fwi.mk framework/Library_fwk.mk framework/Library_fwl.mk framework/Library_fwm.mk framework/Library_lomenubar.mk hwpfilter/Library_hwp.mk i18npool/Library_i18nisolang1.mk i18npool/Library_i18npool.mk i18npool/Library_i18nsearch.mk i18npool/Library_textconv_dict.mk i18nutil/Library_i18nutil.mk lingucomponent/Library_guesslang.mk lingucomponent/Library_hyphen.mk lingucomponent/Library_lnth.mk lingucomponent/Library_MacOSXSpell.mk lingucomponent/Library_spell.mk linguistic/Library_lng.mk lotuswordpro/Library_lwpft.mk oox/Library_oox.mk package/Library_package2.mk package/Library_xstor.mk padmin/Library_spa.mk regexp/Library_regexp.mk reportdesign/Library_rpt.mk reportdesign/Library_rptui.mk reportdesign/Library_rptxml.mk sax/Library_expwrap.mk sax/ Library_fastsax.mk sax/Library_sax.mk sccomp/Library_solver.mk sc/Library_scd.mk sc/Library_scfilt.mk sc/Library_sc.mk sc/Library_scui.mk scripting/Library_basprov.mk scripting/Library_protocolhandler.mk scripting/Library_scriptframe.mk scripting/Library_stringresource.mk sdext/Library_minimizer.mk sdext/Library_pdfimport.mk sdext/Library_presenter.mk sd/Library_sdd.mk sd/Library_sdfilt.mk sd/Library_sd.mk sd/Library_sdui.mk sfx2/Library_qstart.mk sfx2/Library_sfx.mk shell/Library_desktopbe.mk shell/Library_gconfbe.mk shell/Library_kde4be.mk shell/Library_kdebe.mk shell/Library_macbe.mk shell/Library_tdebe.mk slideshow/Executable_demoshow.mk slideshow/Library_OGLTrans.mk slideshow/Library_slideshow.mk smoketest/Library_smoketest.mk solenv/gbuild sot/Library_sot.mk starmath/Library_smd.mk starmath/Library_sm.mk svl/AllLangResTarget_svl.mk svl/inc svl/JunitTest_svl_complex.mk svl/Library_fsstorage.mk svl/Library_passwordcontainer.mk svl/Library_svl.mk svl/Module_svl.mk svl/Pac kage_inc.mk svl/qa svl/source svl/unx svl/util svtools/Library_hatchwindowfactory.mk svtools/Library_svt.mk svx/Library_svxcore.mk svx/Library_svx.mk svx/Library_textconversiondlgs.mk sw/Library_msword.mk sw/Library_swd.mk sw/Library_sw.mk sw/Library_swui.mk test/Library_subsequenttest.mk test/Library_test.mk toolkit/Library_tk.mk tools/Library_tl.mk touch/Library_libotouch.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_ucpgio1.mk ucb/Library_ucpgvfs1.mk ucb/Library_ucphier1.mk ucb/Library_ucpodma1.mk ucb/Library_ucppkg1.mk ucb/Library_ucptdoc1.mk udkapi/com UnoControls/Library_ctl.mk unotest/Library_unobootstrapprotector.mk unotest/Library_unoexceptionprotector.mk unotest/Library_unotest.mk unotools/Library_utl.mk unoxml/Library_unordf.mk unoxml/Library_unoxml.mk uui/Libr ary_uui.mk vcl/Library_desktop_detector.mk vcl/Library_vcl.mk vcl/Library_vclplug_gen.mk vcl/Library_vclplug_gtk3.mk vcl/Library_vclplug_gtk.mk vcl/Library_vclplug_kde4.mk vcl/Library_vclplug_kde.mk vcl/Library_vclplug_svp.mk vcl/Library_vclplug_tde.mk writerfilter/Library_writerfilter.mk writerfilter/Library_writerfilter_uno.mk writerperfect/Library_wpftdraw.mk writerperfect/Library_wpftwriter.mk xmlhelp/Library_tvhlp1.mk xmlhelp/Library_ucpchelp1.mk xmloff/Library_xof.mk xmloff/Library_xo.mk xmlreader/Library_xmlreader.mk xmlscript/Library_xcr.mk xmlsecurity/Library_xmlsecurity.mk xmlsecurity/Library_xsec_fw.mk xmlsecurity/Library_xsec_xmlsec.mk

• Previous message: [Libreoffice-commits] .: offapi/com sw/inc sw/source
• Next message: [Libreoffice-commits] .: Branch 'libreoffice-3-5' - connectivity/source
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

 UnoControls/Library_ctl.mk                                  |    5 -
 accessibility/Library_acc.mk                                |    5 -
 accessibility/Library_java_uno_accessbridge.mk              |    5 -
 animations/Library_animcore.mk                              |    5 -
 avmedia/Library_avmedia.mk                                  |    5 -
 avmedia/Library_avmediaQuickTime.mk                         |    5 -
 avmedia/Library_avmediagst.mk                               |    5 -
 avmedia/Library_avmediawin.mk                               |    5 -
 basctl/Library_basctl.mk                                    |    5 -
 basebmp/Library_basebmp.mk                                  |    5 -
 basegfx/Library_basegfx.mk                                  |    5 -
 basic/Library_sb.mk                                         |    7 -
 binaryurp/Library_binaryurp.mk                              |    5 -
 canvas/Library_cairocanvas.mk                               |    5 -
 canvas/Library_canvasfactory.mk                             |    6 -
 canvas/Library_canvastools.mk                               |    5 -
 canvas/Library_directx9canvas.mk                            |    5 -
 canvas/Library_gdipluscanvas.mk                             |    5 -
 canvas/Library_nullcanvas.mk                                |    5 -
 canvas/Library_simplecanvas.mk                              |    5 -
 canvas/Library_vclcanvas.mk                                 |    5 -
 chart2/Library_chartcontroller.mk                           |    5 -
 chart2/Library_chartmodel.mk                                |    5 -
 chart2/Library_charttools.mk                                |    5 -
 chart2/Library_chartview.mk                                 |    5 -
 comphelper/Library_comphelper.mk                            |    5 -
 configmgr/Library_configmgr.mk                              |    5 -
 connectivity/Library_ado.mk                                 |    5 -
 connectivity/Library_calc.mk                                |    5 -
 connectivity/Library_dbase.mk                               |    5 -
 connectivity/Library_dbpool2.mk                             |    5 -
 connectivity/Library_dbtools.mk                             |    5 -
 connectivity/Library_evoab.mk                               |    5 -
 connectivity/Library_file.mk                                |    5 -
 connectivity/Library_flat.mk                                |    5 -
 connectivity/Library_hsqldb.mk                              |    5 -
 connectivity/Library_jdbc.mk                                |    5 -
 connectivity/Library_kab1.mk                                |    5 -
 connectivity/Library_kabdrv1.mk                             |    5 -
 connectivity/Library_macab1.mk                              |    5 -
 connectivity/Library_macabdrv1.mk                           |    5 -
 connectivity/Library_mozab.mk                               |    5 -
 connectivity/Library_mozabdrv.mk                            |    5 -
 connectivity/Library_mozbootstrap.mk                        |    5 -
 connectivity/Library_mysql.mk                               |    5 -
 connectivity/Library_odbc.mk                                |    5 -
 connectivity/Library_odbcbase.mk                            |    5 -
 connectivity/Library_postgresql-sdbc-impl.mk                |    5 -
 connectivity/Library_postgresql-sdbc.mk                     |    5 -
 connectivity/Library_sdbc2.mk                               |    5 -
 connectivity/Library_tdeab1.mk                              |    5 -
 connectivity/Library_tdeabdrv1.mk                           |    5 -
 cppcanvas/Library_cppcanvas.mk                              |    5 -
 cppcanvas/Library_mtfrenderer.mk                            |    5 -
 cppu/Library_affine_uno.mk                                  |    5 -
 cppu/Library_cppu.mk                                        |    5 -
 cppu/Library_log_uno.mk                                     |    5 -
 cppu/Library_purpenvhelper.mk                               |    5 -
 cppu/Library_unsafe_uno.mk                                  |    5 -
 cui/Library_cui.mk                                          |    5 -
 dbaccess/Executable_odbcconfig.mk                           |    5 -
 dbaccess/Library_dba.mk                                     |    5 -
 dbaccess/Library_dbaxml.mk                                  |    5 -
 dbaccess/Library_dbmm.mk                                    |    5 -
 dbaccess/Library_dbu.mk                                     |    5 -
 dbaccess/Library_sdbt.mk                                    |    5 -
 desktop/Library_deployment.mk                               |    5 -
 desktop/Library_deploymentgui.mk                            |    5 -
 desktop/Library_deploymentmisc.mk                           |    5 -
 desktop/Library_migrationoo2.mk                             |    5 -
 desktop/Library_migrationoo3.mk                             |    5 -
 desktop/Library_offacc.mk                                   |    5 -
 desktop/Library_sofficeapp.mk                               |    5 -
 desktop/Library_spl.mk                                      |    5 -
 desktop/Library_spl_unx.mk                                  |    5 -
 desktop/Library_unopkgapp.mk                                |    5 -
 drawinglayer/Library_drawinglayer.mk                        |    5 -
 dtrans/Library_dnd.mk                                       |    5 -
 dtrans/Library_dtrans.mk                                    |    5 -
 dtrans/Library_ftransl.mk                                   |    5 -
 dtrans/Library_mcnttype.mk                                  |    5 -
 dtrans/Library_sysdtrans.mk                                 |    5 -
 editeng/Library_editeng.mk                                  |    5 -
 embeddedobj/Library_embobj.mk                               |    5 -
 embeddedobj/Library_emboleobj.mk                            |    5 -
 embedserv/Library_emser.mk                                  |    4 
 extensions/Library_abp.mk                                   |    5 -
 extensions/Library_bib.mk                                   |    5 -
 extensions/Library_dbp.mk                                   |    5 -
 extensions/Library_ldapbe2.mk                               |    5 -
 extensions/Library_log.mk                                   |    5 -
 extensions/Library_oleautobridge.mk                         |    5 -
 extensions/Library_oleautobridge2.mk                        |    5 -
 extensions/Library_pcr.mk                                   |    5 -
 extensions/Library_pl.mk                                    |    5 -
 extensions/Library_res.mk                                   |    5 -
 extensions/Library_scn.mk                                   |    5 -
 extensions/Library_so_activex.mk                            |    5 -
 extensions/Library_so_activex_x64.mk                        |    5 -
 extensions/Library_updatecheckui.mk                         |    5 -
 extensions/Library_updatefeed.mk                            |    5 -
 extensions/Library_updchk.mk                                |    5 -
 fileaccess/Library_fileacc.mk                               |    5 -
 filter/Library_PptImporter.mk                               |    5 -
 filter/Library_egi.mk                                       |    5 -
 filter/Library_eme.mk                                       |    5 -
 filter/Library_epb.mk                                       |    5 -
 filter/Library_epg.mk                                       |    5 -
 filter/Library_epp.mk                                       |    5 -
 filter/Library_eps.mk                                       |    5 -
 filter/Library_ept.mk                                       |    5 -
 filter/Library_era.mk                                       |    5 -
 filter/Library_eti.mk                                       |    5 -
 filter/Library_exp.mk                                       |    5 -
 filter/Library_filterconfig.mk                              |    5 -
 filter/Library_filtertracer.mk                              |    5 -
 filter/Library_flash.mk                                     |    5 -
 filter/Library_icd.mk                                       |    5 -
 filter/Library_icg.mk                                       |    5 -
 filter/Library_idx.mk                                       |    5 -
 filter/Library_ime.mk                                       |    5 -
 filter/Library_ipb.mk                                       |    5 -
 filter/Library_ipd.mk                                       |    5 -
 filter/Library_ips.mk                                       |    5 -
 filter/Library_ipt.mk                                       |    5 -
 filter/Library_ipx.mk                                       |    5 -
 filter/Library_ira.mk                                       |    5 -
 filter/Library_itg.mk                                       |    5 -
 filter/Library_iti.mk                                       |    5 -
 filter/Library_msfilter.mk                                  |    5 -
 filter/Library_odfflatxml.mk                                |    5 -
 filter/Library_pdffilter.mk                                 |    5 -
 filter/Library_placeware.mk                                 |    5 -
 filter/Library_svgfilter.mk                                 |    5 -
 filter/Library_t602filter.mk                                |    5 -
 filter/Library_textfd.mk                                    |    5 -
 filter/Library_xmlfa.mk                                     |    5 -
 filter/Library_xmlfd.mk                                     |    5 -
 filter/Library_xsltdlg.mk                                   |    5 -
 filter/Library_xsltfilter.mk                                |    5 -
 formula/Library_for.mk                                      |    5 -
 formula/Library_forui.mk                                    |    5 -
 fpicker/Library_fpicker.mk                                  |    5 -
 fpicker/Library_fps.mk                                      |    5 -
 fpicker/Library_fps_aqua.mk                                 |    5 -
 fpicker/Library_fps_odma.mk                                 |    5 -
 fpicker/Library_fps_office.mk                               |    5 -
 framework/Library_fwe.mk                                    |    5 -
 framework/Library_fwi.mk                                    |    5 -
 framework/Library_fwk.mk                                    |    5 -
 framework/Library_fwl.mk                                    |    5 -
 framework/Library_fwm.mk                                    |    5 -
 framework/Library_lomenubar.mk                              |    5 -
 hwpfilter/Library_hwp.mk                                    |    5 -
 i18npool/Library_i18nisolang1.mk                            |    5 -
 i18npool/Library_i18npool.mk                                |    5 -
 i18npool/Library_i18nsearch.mk                              |    5 -
 i18npool/Library_textconv_dict.mk                           |    5 -
 i18nutil/Library_i18nutil.mk                                |    5 -
 lingucomponent/Library_MacOSXSpell.mk                       |    5 -
 lingucomponent/Library_guesslang.mk                         |    5 -
 lingucomponent/Library_hyphen.mk                            |    5 -
 lingucomponent/Library_lnth.mk                              |    5 -
 lingucomponent/Library_spell.mk                             |    5 -
 linguistic/Library_lng.mk                                   |    5 -
 lotuswordpro/Library_lwpft.mk                               |    5 -
 oox/Library_oox.mk                                          |    5 -
 package/Library_package2.mk                                 |    5 -
 package/Library_xstor.mk                                    |    5 -
 padmin/Library_spa.mk                                       |    5 -
 regexp/Library_regexp.mk                                    |    5 -
 reportdesign/Library_rpt.mk                                 |    5 -
 reportdesign/Library_rptui.mk                               |    5 -
 reportdesign/Library_rptxml.mk                              |    5 -
 sax/Library_expwrap.mk                                      |    5 -
 sax/Library_fastsax.mk                                      |    5 -
 sax/Library_sax.mk                                          |    5 -
 sc/Library_sc.mk                                            |    5 -
 sc/Library_scd.mk                                           |    5 -
 sc/Library_scfilt.mk                                        |    5 -
 sc/Library_scui.mk                                          |    5 -
 sccomp/Library_solver.mk                                    |    5 -
 scripting/Library_basprov.mk                                |    5 -
 scripting/Library_protocolhandler.mk                        |    5 -
 scripting/Library_scriptframe.mk                            |    5 -
 scripting/Library_stringresource.mk                         |    5 -
 sd/Library_sd.mk                                            |    5 -
 sd/Library_sdd.mk                                           |    5 -
 sd/Library_sdfilt.mk                                        |    5 -
 sd/Library_sdui.mk                                          |    5 -
 sdext/Library_minimizer.mk                                  |    5 -
 sdext/Library_pdfimport.mk                                  |    5 -
 sdext/Library_presenter.mk                                  |    5 -
 sfx2/Library_qstart.mk                                      |    5 -
 sfx2/Library_sfx.mk                                         |    5 -
 shell/Library_desktopbe.mk                                  |    5 -
 shell/Library_gconfbe.mk                                    |    5 -
 shell/Library_kde4be.mk                                     |    5 -
 shell/Library_kdebe.mk                                      |    5 -
 shell/Library_macbe.mk                                      |    5 -
 shell/Library_tdebe.mk                                      |    5 -
 slideshow/Executable_demoshow.mk                            |    5 -
 slideshow/Library_OGLTrans.mk                               |    5 -
 slideshow/Library_slideshow.mk                              |    5 -
 smoketest/Library_smoketest.mk                              |    5 -
 solenv/gbuild/Executable.mk                                 |    4 
 solenv/gbuild/Library.mk                                    |    4 
 solenv/gbuild/LinkTarget.mk                                 |    9 ++
 sot/Library_sot.mk                                          |    5 -
 starmath/Library_sm.mk                                      |    5 -
 starmath/Library_smd.mk                                     |    5 -
 svl/AllLangResTarget_svl.mk                                 |   33 ++-----
 svl/JunitTest_svl_complex.mk                                |   33 ++-----
 svl/Library_fsstorage.mk                                    |    5 -
 svl/Library_passwordcontainer.mk                            |    5 -
 svl/Library_svl.mk                                          |    5 -
 svl/Module_svl.mk                                           |   38 +++-----
 svl/Package_inc.mk                                          |   33 ++-----
 svl/inc/svl/PasswordHelper.hxx                              |   43 +++------
 svl/inc/svl/adrparse.hxx                                    |   37 +++-----
 svl/inc/svl/aeitem.hxx                                      |   43 +++------
 svl/inc/svl/asiancfg.hxx                                    |   37 +++-----
 svl/inc/svl/brdcst.hxx                                      |   37 +++-----
 svl/inc/svl/broadcast.hxx                                   |   43 +++------
 svl/inc/svl/cenumitm.hxx                                    |   37 +++-----
 svl/inc/svl/cintitem.hxx                                    |   37 +++-----
 svl/inc/svl/cjkoptions.hxx                                  |   37 +++-----
 svl/inc/svl/cntwall.hxx                                     |   37 +++-----
 svl/inc/svl/ctypeitm.hxx                                    |   37 +++-----
 svl/inc/svl/custritm.hxx                                    |   37 +++-----
 svl/inc/svl/dateitem.hxx                                    |   37 +++-----
 svl/inc/svl/filerec.hxx                                     |   37 +++-----
 svl/inc/svl/flagitem.hxx                                    |   37 +++-----
 svl/inc/svl/fstathelper.hxx                                 |   43 +++------
 svl/inc/svl/globalnameitem.hxx                              |   43 +++------
 svl/inc/svl/ilstitem.hxx                                    |   43 +++------
 svl/inc/svl/imageitm.hxx                                    |   43 +++------
 svl/inc/svl/inettype.hxx                                    |   37 +++-----
 svl/inc/svl/intitem.hxx                                     |   37 +++-----
 svl/inc/svl/isethint.hxx                                    |   43 +++------
 svl/inc/svl/itemiter.hxx                                    |   43 +++------
 svl/inc/svl/itempool.hxx                                    |   37 +++-----
 svl/inc/svl/itemprop.hxx                                    |   37 +++-----
 svl/inc/svl/itemset.hxx                                     |   37 +++-----
 svl/inc/svl/languageoptions.hxx                             |   37 +++-----
 svl/inc/svl/lckbitem.hxx                                    |   43 +++------
 svl/inc/svl/listeneriter.hxx                                |   37 +++-----
 svl/inc/svl/lngmisc.hxx                                     |   43 +++------
 svl/inc/svl/lstner.hxx                                      |   37 +++-----
 svl/inc/svl/macitem.hxx                                     |   37 +++-----
 svl/inc/svl/metitem.hxx                                     |   43 +++------
 svl/inc/svl/nfsymbol.hxx                                    |   43 +++------
 svl/inc/svl/nranges.hxx                                     |   37 +++-----
 svl/inc/svl/ownlist.hxx                                     |   37 +++-----
 svl/inc/svl/poolitem.hxx                                    |   37 +++-----
 svl/inc/svl/ptitem.hxx                                      |   37 +++-----
 svl/inc/svl/rectitem.hxx                                    |   37 +++-----
 svl/inc/svl/rngitem.hxx                                     |   37 +++-----
 svl/inc/svl/slstitm.hxx                                     |   37 +++-----
 svl/inc/svl/srchitem.hxx                                    |   37 +++-----
 svl/inc/svl/style.hxx                                       |   37 +++-----
 svl/inc/svl/svarray.hxx                                     |   37 +++-----
 svl/inc/svl/svdde.hxx                                       |   37 +++-----
 svl/inc/svl/svstdarr.hxx                                    |   43 +++------
 svl/inc/svl/szitem.hxx                                      |   37 +++-----
 svl/inc/svl/undo.hxx                                        |   48 ++++------
 svl/inc/svl/urihelper.hxx                                   |   37 +++-----
 svl/inc/svl/visitem.hxx                                     |   37 +++-----
 svl/inc/svl/whiter.hxx                                      |   43 +++------
 svl/inc/svl/zforlist.hxx                                    |   37 +++-----
 svl/inc/svl/zformat.hxx                                     |   37 +++-----
 svl/qa/unit/test_URIHelper.cxx                              |   37 +++-----
 svl/source/config/asiancfg.cxx                              |   37 +++-----
 svl/source/config/cjkoptions.cxx                            |   37 +++-----
 svl/source/config/ctloptions.cxx                            |   37 +++-----
 svl/source/config/itemholder2.cxx                           |   37 +++-----
 svl/source/config/itemholder2.hxx                           |   37 +++-----
 svl/source/config/languageoptions.cxx                       |   37 +++-----
 svl/source/filepicker/pickerhistory.cxx                     |   37 +++-----
 svl/source/filerec/filerec.cxx                              |   42 ++++-----
 svl/source/fsstor/fsfactory.cxx                             |   37 +++-----
 svl/source/fsstor/fsstorage.component                       |   43 +++------
 svl/source/fsstor/fsstorage.cxx                             |   37 +++-----
 svl/source/fsstor/fsstorage.hxx                             |   37 +++-----
 svl/source/inc/fsfactory.hxx                                |   43 +++------
 svl/source/inc/poolio.hxx                                   |   37 +++-----
 svl/source/items/aeitem.cxx                                 |   37 +++-----
 svl/source/items/cenumitm.cxx                               |   37 +++-----
 svl/source/items/cintitem.cxx                               |   37 +++-----
 svl/source/items/cntwall.cxx                                |   37 +++-----
 svl/source/items/ctypeitm.cxx                               |   37 +++-----
 svl/source/items/custritm.cxx                               |   37 +++-----
 svl/source/items/dateitem.cxx                               |   37 +++-----
 svl/source/items/flagitem.cxx                               |   37 +++-----
 svl/source/items/globalnameitem.cxx                         |   37 +++-----
 svl/source/items/ilstitem.cxx                               |   37 +++-----
 svl/source/items/imageitm.cxx                               |   37 +++-----
 svl/source/items/intitem.cxx                                |   37 +++-----
 svl/source/items/itemiter.cxx                               |   37 +++-----
 svl/source/items/itempool.cxx                               |   37 +++-----
 svl/source/items/itemprop.cxx                               |   37 +++-----
 svl/source/items/itemset.cxx                                |   37 +++-----
 svl/source/items/lckbitem.cxx                               |   37 +++-----
 svl/source/items/macitem.cxx                                |   37 +++-----
 svl/source/items/nranges.cxx                                |   37 +++-----
 svl/source/items/poolio.cxx                                 |   37 +++-----
 svl/source/items/poolitem.cxx                               |   37 +++-----
 svl/source/items/ptitem.cxx                                 |   37 +++-----
 svl/source/items/rectitem.cxx                               |   37 +++-----
 svl/source/items/rngitem_inc.cxx                            |   37 +++-----
 svl/source/items/sfontitm.cxx                               |   37 +++-----
 svl/source/items/slstitm.cxx                                |   37 +++-----
 svl/source/items/srchitem.cxx                               |   37 +++-----
 svl/source/items/stritem.cxx                                |   43 +++------
 svl/source/items/style.cxx                                  |   37 +++-----
 svl/source/items/stylepool.cxx                              |   37 +++-----
 svl/source/items/szitem.cxx                                 |   37 +++-----
 svl/source/items/visitem.cxx                                |   37 +++-----
 svl/source/items/whassert.hxx                               |   43 +++------
 svl/source/items/whiter.cxx                                 |   37 +++-----
 svl/source/memtools/svarray.cxx                             |   37 +++-----
 svl/source/misc/adrparse.cxx                                |   37 +++-----
 svl/source/misc/documentlockfile.cxx                        |   37 +++-----
 svl/source/misc/filenotation.cxx                            |   37 +++-----
 svl/source/misc/folderrestriction.cxx                       |   37 +++-----
 svl/source/misc/fstathelper.cxx                             |   37 +++-----
 svl/source/misc/getstringresource.cxx                       |   37 +++-----
 svl/source/misc/getstringresource.hxx                       |   43 +++------
 svl/source/misc/inethist.cxx                                |   37 +++-----
 svl/source/misc/inettype.cxx                                |   37 +++-----
 svl/source/misc/lngmisc.cxx                                 |   37 +++-----
 svl/source/misc/lockfilecommon.cxx                          |   37 +++-----
 svl/source/misc/mediatyp.src                                |   37 +++-----
 svl/source/misc/ownlist.cxx                                 |   37 +++-----
 svl/source/misc/restrictedpaths.cxx                         |   37 +++-----
 svl/source/misc/sharecontrolfile.cxx                        |   37 +++-----
 svl/source/misc/strmadpt.cxx                                |   37 +++-----
 svl/source/misc/urihelper.cxx                               |   37 +++-----
 svl/source/notify/brdcst.cxx                                |   37 +++-----
 svl/source/notify/broadcast.cxx                             |   37 +++-----
 svl/source/notify/isethint.cxx                              |   43 +++------
 svl/source/notify/listeneriter.cxx                          |   37 +++-----
 svl/source/notify/lstner.cxx                                |   37 +++-----
 svl/source/numbers/numfmuno.cxx                             |   37 +++-----
 svl/source/numbers/numhead.cxx                              |   37 +++-----
 svl/source/numbers/numhead.hxx                              |   37 +++-----
 svl/source/numbers/numuno.cxx                               |   37 +++-----
 svl/source/numbers/supservs.cxx                             |   37 +++-----
 svl/source/numbers/zforfind.cxx                             |   37 +++-----
 svl/source/numbers/zforfind.hxx                             |   37 +++-----
 svl/source/numbers/zforlist.cxx                             |   37 +++-----
 svl/source/numbers/zformat.cxx                              |   37 +++-----
 svl/source/numbers/zforscan.cxx                             |   37 +++-----
 svl/source/numbers/zforscan.hxx                             |   37 +++-----
 svl/source/passwordcontainer/passwordcontainer.component    |   43 +++------
 svl/source/passwordcontainer/passwordcontainer.cxx          |   37 +++-----
 svl/source/passwordcontainer/syscreds.cxx                   |   37 +++-----
 svl/source/svdde/ddecli.cxx                                 |   37 +++-----
 svl/source/svdde/ddedata.cxx                                |   37 +++-----
 svl/source/svdde/ddeimp.hxx                                 |   37 +++-----
 svl/source/svdde/ddeinf.cxx                                 |   43 +++------
 svl/source/svdde/ddesvr.cxx                                 |   37 +++-----
 svl/source/undo/undo.cxx                                    |   54 ++++--------
 svl/source/uno/pathservice.cxx                              |   37 +++-----
 svl/source/uno/registerservices.cxx                         |   37 +++-----
 svl/unx/inc/convert.hxx                                     |   43 +++------
 svl/unx/source/svdde/ddedummy.cxx                           |   37 +++-----
 svl/util/svl.component                                      |   43 +++------
 svtools/Library_hatchwindowfactory.mk                       |    5 -
 svtools/Library_svt.mk                                      |    5 -
 svx/Library_svx.mk                                          |    5 -
 svx/Library_svxcore.mk                                      |    5 -
 svx/Library_textconversiondlgs.mk                           |    5 -
 sw/Library_msword.mk                                        |    5 -
 sw/Library_sw.mk                                            |    5 -
 sw/Library_swd.mk                                           |    5 -
 sw/Library_swui.mk                                          |    5 -
 test/Library_subsequenttest.mk                              |    5 -
 test/Library_test.mk                                        |    5 -
 toolkit/Library_tk.mk                                       |    5 -
 tools/Library_tl.mk                                         |    5 -
 touch/Library_libotouch.mk                                  |    5 -
 ucb/Library_cached1.mk                                      |    5 -
 ucb/Library_srtrs1.mk                                       |    5 -
 ucb/Library_ucb1.mk                                         |    5 -
 ucb/Library_ucpcmis1.mk                                     |    5 -
 ucb/Library_ucpdav1.mk                                      |    5 -
 ucb/Library_ucpexpand1.mk                                   |    5 -
 ucb/Library_ucpext.mk                                       |    5 -
 ucb/Library_ucpfile1.mk                                     |    5 -
 ucb/Library_ucpftp1.mk                                      |    5 -
 ucb/Library_ucpgio1.mk                                      |    5 -
 ucb/Library_ucpgvfs1.mk                                     |    5 -
 ucb/Library_ucphier1.mk                                     |    5 -
 ucb/Library_ucpodma1.mk                                     |    5 -
 ucb/Library_ucppkg1.mk                                      |    5 -
 ucb/Library_ucptdoc1.mk                                     |    5 -
 ucbhelper/Library_ucbhelper.mk                              |    5 -
 udkapi/com/sun/star/beans/Ambiguous.idl                     |   43 +++------
 udkapi/com/sun/star/beans/Defaulted.idl                     |   43 +++------
 udkapi/com/sun/star/beans/Introspection.idl                 |   43 +++------
 udkapi/com/sun/star/beans/Optional.idl                      |   43 +++------
 udkapi/com/sun/star/beans/Pair.idl                          |   43 +++------
 udkapi/com/sun/star/beans/XHierarchicalPropertySet.idl      |   37 +++-----
 udkapi/com/sun/star/beans/XMultiPropertySet.idl             |   37 +++-----
 udkapi/com/sun/star/corba/giop/giop.idl                     |   37 +++-----
 udkapi/com/sun/star/corba/iiop/iiop.idl                     |   37 +++-----
 udkapi/com/sun/star/corba/iop/iop.idl                       |   37 +++-----
 udkapi/com/sun/star/io/TempFile.idl                         |   43 +++------
 udkapi/com/sun/star/io/XTempFile.idl                        |   37 +++-----
 udkapi/com/sun/star/lang/ServiceManager.idl                 |   37 +++-----
 udkapi/com/sun/star/lang/SystemDependent.idl                |   37 +++-----
 udkapi/com/sun/star/registry/ImplementationRegistration.idl |   43 +++------
 udkapi/com/sun/star/registry/SimpleRegistry.idl             |   43 +++------
 udkapi/com/sun/star/script/AllListenerAdapter.idl           |   43 +++------
 udkapi/com/sun/star/script/ArrayWrapper.idl                 |   43 +++------
 udkapi/com/sun/star/script/ContextInformation.idl           |   37 +++-----
 udkapi/com/sun/star/script/Converter.idl                    |   37 +++-----
 udkapi/com/sun/star/script/Invocation.idl                   |   43 +++------
 udkapi/com/sun/star/script/XAutomationInvocation.idl        |   48 ++++------
 udkapi/com/sun/star/script/XErrorQuery.idl                  |   20 ++++
 udkapi/com/sun/star/security/AccessController.idl           |   43 +++------
 udkapi/com/sun/star/security/Policy.idl                     |   43 +++------
 udkapi/com/sun/star/task/XInteractionHandler2.idl           |   43 +++------
 udkapi/com/sun/star/test/XSimpleTest.idl                    |   37 +++-----
 udkapi/com/sun/star/uno/NamingService.idl                   |   43 +++------
 unotest/Library_unobootstrapprotector.mk                    |    5 -
 unotest/Library_unoexceptionprotector.mk                    |    5 -
 unotest/Library_unotest.mk                                  |    5 -
 unotools/Library_utl.mk                                     |    5 -
 unoxml/Library_unordf.mk                                    |    5 -
 unoxml/Library_unoxml.mk                                    |    5 -
 uui/Library_uui.mk                                          |    5 -
 vcl/Library_desktop_detector.mk                             |    5 -
 vcl/Library_vcl.mk                                          |    5 -
 vcl/Library_vclplug_gen.mk                                  |    5 -
 vcl/Library_vclplug_gtk.mk                                  |    5 -
 vcl/Library_vclplug_gtk3.mk                                 |    5 -
 vcl/Library_vclplug_kde.mk                                  |    5 -
 vcl/Library_vclplug_kde4.mk                                 |    5 -
 vcl/Library_vclplug_svp.mk                                  |    5 -
 vcl/Library_vclplug_tde.mk                                  |    5 -
 writerfilter/Library_writerfilter.mk                        |    5 -
 writerfilter/Library_writerfilter_uno.mk                    |    5 -
 writerperfect/Library_wpftdraw.mk                           |    5 -
 writerperfect/Library_wpftwriter.mk                         |    5 -
 xmlhelp/Library_tvhlp1.mk                                   |    5 -
 xmlhelp/Library_ucpchelp1.mk                                |    5 -
 xmloff/Library_xo.mk                                        |    5 -
 xmloff/Library_xof.mk                                       |    5 -
 xmlreader/Library_xmlreader.mk                              |    5 -
 xmlscript/Library_xcr.mk                                    |    5 -
 xmlsecurity/Library_xmlsecurity.mk                          |    5 -
 xmlsecurity/Library_xsec_fw.mk                              |    5 -
 xmlsecurity/Library_xsec_xmlsec.mk                          |    5 -
 455 files changed, 2980 insertions(+), 5379 deletions(-)

New commits:
commit fdda178d888127c4b4dafd4b53800989929e9b6b
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Mon Jul 2 13:00:50 2012 +0100

    targetted improvement of UNO API includes / usage

diff --git a/UnoControls/Library_ctl.mk b/UnoControls/Library_ctl.mk
index 1bedad8..0727c5f 100644
--- a/UnoControls/Library_ctl.mk
+++ b/UnoControls/Library_ctl.mk
@@ -33,10 +33,7 @@ $(eval $(call gb_Library_set_include,ctl,\
     -I$(SRCDIR)/UnoControls/source/inc \
 ))
 
-$(eval $(call gb_Library_use_api,ctl,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,ctl))
 
 $(eval $(call gb_Library_use_libraries,ctl,\
     comphelper \
diff --git a/accessibility/Library_acc.mk b/accessibility/Library_acc.mk
index af15243..9693ddf 100644
--- a/accessibility/Library_acc.mk
+++ b/accessibility/Library_acc.mk
@@ -33,10 +33,7 @@ $(eval $(call gb_Library_set_include,acc,\
     -I$(SRCDIR)/accessibility/source/inc \
 ))
 
-$(eval $(call gb_Library_use_api,acc,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,acc))
 
 $(eval $(call gb_Library_use_libraries,acc,\
     comphelper \
diff --git a/accessibility/Library_java_uno_accessbridge.mk b/accessibility/Library_java_uno_accessbridge.mk
index dcf0acc..40f209f 100644
--- a/accessibility/Library_java_uno_accessbridge.mk
+++ b/accessibility/Library_java_uno_accessbridge.mk
@@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,java_uno_accessbridge))
 
 $(eval $(call gb_Library_use_custom_headers,java_uno_accessbridge,accessibility/bridge/inc))
 
-$(eval $(call gb_Library_use_api,java_uno_accessbridge,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,java_uno_accessbridge,))
 
 $(eval $(call gb_Library_use_libraries,java_uno_accessbridge,\
     cppu \
diff --git a/animations/Library_animcore.mk b/animations/Library_animcore.mk
index 7154286..1ff89b4 100644
--- a/animations/Library_animcore.mk
+++ b/animations/Library_animcore.mk
@@ -32,10 +32,7 @@ $(eval $(call gb_Library_use_package,animcore,animations_inc))
 
 $(eval $(call gb_Library_set_componentfile,animcore,animations/source/animcore/animcore))
 
-$(eval $(call gb_Library_use_api,animcore,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,animcore))
 
 $(eval $(call gb_Library_use_libraries,animcore,\
     cppu \
diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk
index 316b6d6..03f0441 100644
--- a/avmedia/Library_avmedia.mk
+++ b/avmedia/Library_avmedia.mk
@@ -38,10 +38,7 @@ $(eval $(call gb_Library_set_include,avmedia,\
 	-I$(SRCDIR)/avmedia/source/inc \
 ))
 
-$(eval $(call gb_Library_use_api,avmedia,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,avmedia,))
 
 $(eval $(call gb_Library_add_defs,avmedia,\
 	-DAVMEDIA_DLLIMPLEMENTATION \
diff --git a/avmedia/Library_avmediaQuickTime.mk b/avmedia/Library_avmediaQuickTime.mk
index d471c03..3b40326 100644
--- a/avmedia/Library_avmediaQuickTime.mk
+++ b/avmedia/Library_avmediaQuickTime.mk
@@ -35,10 +35,7 @@ $(eval $(call gb_Library_set_include,avmediaQuickTime,\
 	-I$(SRCDIR)/avmedia/source/inc \
 ))
 
-$(eval $(call gb_Library_use_api,avmediaQuickTime,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,avmediaQuickTime));
 
 $(eval $(call gb_Library_use_libraries,avmediaQuickTime,\
 	comphelper \
diff --git a/avmedia/Library_avmediagst.mk b/avmedia/Library_avmediagst.mk
index b6323bb..6336ee4 100644
--- a/avmedia/Library_avmediagst.mk
+++ b/avmedia/Library_avmediagst.mk
@@ -36,10 +36,7 @@ $(eval $(call gb_Library_set_include,avmediagst,\
 	$(shell pkg-config --cflags gstreamer-0.10, gstreamer-plugins-base-0.10) \
 ))
 
-$(eval $(call gb_Library_use_api,avmediagst,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,avmediagst))
 
 ifeq ($(GUI),WNT)
 $(eval $(call gb_Library_add_defs,avmediagst,\
diff --git a/avmedia/Library_avmediawin.mk b/avmedia/Library_avmediawin.mk
index 39a065c..9bca5f1 100644
--- a/avmedia/Library_avmediawin.mk
+++ b/avmedia/Library_avmediawin.mk
@@ -35,10 +35,7 @@ $(eval $(call gb_Library_set_include,avmediawin,\
 	-I$(SRCDIR)/avmedia/source/inc \
 ))
 
-$(eval $(call gb_Library_use_api,avmediawin,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,avmediawin))
 
 $(eval $(call gb_Library_use_libraries,avmediawin,\
 	comphelper \
diff --git a/basctl/Library_basctl.mk b/basctl/Library_basctl.mk
index 897600b..fc1e077 100644
--- a/basctl/Library_basctl.mk
+++ b/basctl/Library_basctl.mk
@@ -38,10 +38,7 @@ $(eval $(call gb_Library_set_include,basctl,\
 	-I$(WORKDIR)/SdiTarget/basctl/sdi \
 ))
 
-$(eval $(call gb_Library_use_api,basctl,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,basctl))
 
 $(eval $(call gb_Library_use_libraries,basctl,\
 	comphelper \
diff --git a/basebmp/Library_basebmp.mk b/basebmp/Library_basebmp.mk
index 1d92e05..756840b 100644
--- a/basebmp/Library_basebmp.mk
+++ b/basebmp/Library_basebmp.mk
@@ -11,10 +11,7 @@ $(eval $(call gb_Library_Library,basebmp))
 
 $(eval $(call gb_Library_use_package,basebmp,basebmp_inc))
 
-$(eval $(call gb_Library_use_api,basebmp,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,basebmp))
 
 $(eval $(call gb_Library_use_libraries,basebmp,\
     basegfx \
diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk
index d002f36..c2c9230 100644
--- a/basegfx/Library_basegfx.mk
+++ b/basegfx/Library_basegfx.mk
@@ -14,10 +14,7 @@ $(eval $(call gb_Library_use_packages,basegfx,\
     o3tl_inc \
 ))
 
-$(eval $(call gb_Library_use_api,basegfx,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,basegfx))
 
 $(eval $(call gb_Library_use_libraries,basegfx,\
     cppu \
diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk
index acf3996..71c0090 100644
--- a/basic/Library_sb.mk
+++ b/basic/Library_sb.mk
@@ -38,11 +38,8 @@ $(eval $(call gb_Library_set_include,sb,\
 	-I$(SRCDIR)/basic/source/inc \
 ))
 
-$(eval $(call gb_Library_use_api,sb,\
-	udkapi \
-	offapi \
-	oovbaapi \
-))
+$(eval $(call gb_Library_use_sdk_api,sb))
+$(eval $(call gb_Library_use_api,sb,oovbaapi))
 
 $(eval $(call gb_Library_add_defs,sb,\
 	-DBASIC_DLLIMPLEMENTATION \
diff --git a/binaryurp/Library_binaryurp.mk b/binaryurp/Library_binaryurp.mk
index f0b5173..2b936fb 100644
--- a/binaryurp/Library_binaryurp.mk
+++ b/binaryurp/Library_binaryurp.mk
@@ -30,10 +30,7 @@ $(eval $(call gb_Library_Library,binaryurp))
 
 $(eval $(call gb_Library_set_componentfile,binaryurp,binaryurp/source/binaryurp))
 
-$(eval $(call gb_Library_use_api,binaryurp,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,binaryurp))
 
 $(eval $(call gb_Library_use_libraries,binaryurp,\
 	cppu \
diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk
index d7d09e6..9f59fef 100644
--- a/canvas/Library_cairocanvas.mk
+++ b/canvas/Library_cairocanvas.mk
@@ -35,10 +35,7 @@ $(eval $(call gb_Library_set_include,cairocanvas,\
 	-I$(SRCDIR)/canvas/inc \
 ))
 
-$(eval $(call gb_Library_use_api,cairocanvas,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,cairocanvas))
 
 ifeq ($(OS),MACOSX)
 
diff --git a/canvas/Library_canvasfactory.mk b/canvas/Library_canvasfactory.mk
index cbdb02c..8ee7876 100644
--- a/canvas/Library_canvasfactory.mk
+++ b/canvas/Library_canvasfactory.mk
@@ -35,10 +35,8 @@ $(eval $(call gb_Library_set_include,canvasfactory,\
 	-I$(SRCDIR)/canvas/inc \
 ))
 
-$(eval $(call gb_Library_use_api,canvasfactory,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,canvasfactory))
+
 $(eval $(call gb_Library_use_libraries,canvasfactory,\
 	cppu \
 	cppuhelper \
diff --git a/canvas/Library_canvastools.mk b/canvas/Library_canvastools.mk
index 558cd24..1566082 100644
--- a/canvas/Library_canvastools.mk
+++ b/canvas/Library_canvastools.mk
@@ -35,10 +35,7 @@ $(eval $(call gb_Library_set_include,canvastools,\
 	-I$(SRCDIR)/canvas/inc \
 ))
 
-$(eval $(call gb_Library_use_api,canvastools,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,canvastools))
 
 $(eval $(call gb_Library_add_defs,canvastools,\
 	-DCANVASTOOLS_DLLIMPLEMENTATION \
diff --git a/canvas/Library_directx9canvas.mk b/canvas/Library_directx9canvas.mk
index ab9ec64..1a01475 100644
--- a/canvas/Library_directx9canvas.mk
+++ b/canvas/Library_directx9canvas.mk
@@ -35,10 +35,7 @@ $(eval $(call gb_Library_set_include,directx9canvas,\
 	-I$(SRCDIR)/canvas/inc \
 ))
 
-$(eval $(call gb_Library_use_api,directx9canvas,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,directx9canvas))
 
 # clear NOMINMAX because GdiplusTypes.h uses those macros :(
 $(eval $(call gb_Library_add_defs,directx9canvas,\
diff --git a/canvas/Library_gdipluscanvas.mk b/canvas/Library_gdipluscanvas.mk
index f3ddcb8..da8ffa6 100644
--- a/canvas/Library_gdipluscanvas.mk
+++ b/canvas/Library_gdipluscanvas.mk
@@ -35,10 +35,7 @@ $(eval $(call gb_Library_set_include,gdipluscanvas,\
 	-I$(SRCDIR)/canvas/inc \
 ))
 
-$(eval $(call gb_Library_use_api,gdipluscanvas,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,gdipluscanvas))
 
 # clear NOMINMAX because GdiplusTypes.h uses those macros :(
 $(eval $(call gb_Library_add_defs,gdipluscanvas,\
diff --git a/canvas/Library_nullcanvas.mk b/canvas/Library_nullcanvas.mk
index 42260bf..689bd7e 100644
--- a/canvas/Library_nullcanvas.mk
+++ b/canvas/Library_nullcanvas.mk
@@ -35,10 +35,7 @@ $(eval $(call gb_Library_set_include,nullcanvas,\
 	-I$(SRCDIR)/canvas/inc \
 ))
 
-$(eval $(call gb_Library_use_api,nullcanvas,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,nullcanvas))
 
 $(eval $(call gb_Library_use_libraries,nullcanvas,\
 	basegfx \
diff --git a/canvas/Library_simplecanvas.mk b/canvas/Library_simplecanvas.mk
index a76bfaf..470a993 100644
--- a/canvas/Library_simplecanvas.mk
+++ b/canvas/Library_simplecanvas.mk
@@ -35,10 +35,7 @@ $(eval $(call gb_Library_set_include,simplecanvas,\
 	-I$(SRCDIR)/canvas/inc \
 ))
 
-$(eval $(call gb_Library_use_api,simplecanvas,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,simplecanvas))
 
 $(eval $(call gb_Library_use_libraries,simplecanvas,\
 	basegfx \
diff --git a/canvas/Library_vclcanvas.mk b/canvas/Library_vclcanvas.mk
index 43cdc96..9118583 100644
--- a/canvas/Library_vclcanvas.mk
+++ b/canvas/Library_vclcanvas.mk
@@ -35,10 +35,7 @@ $(eval $(call gb_Library_set_include,vclcanvas,\
 	-I$(SRCDIR)/canvas/inc \
 ))
 
-$(eval $(call gb_Library_use_api,vclcanvas,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,vclcanvas))
 
 $(eval $(call gb_Library_use_libraries,vclcanvas,\
 	basegfx \
diff --git a/chart2/Library_chartcontroller.mk b/chart2/Library_chartcontroller.mk
index ea0b2c2..b42c0e8 100644
--- a/chart2/Library_chartcontroller.mk
+++ b/chart2/Library_chartcontroller.mk
@@ -33,10 +33,7 @@ $(eval $(call gb_Library_set_include,chartcontroller,\
     -I$(SRCDIR)/chart2/source/inc \
 ))
 
-$(eval $(call gb_Library_use_api,chartcontroller,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,chartcontroller))
 
 # TODO: is this still necessary?
 # (from chart2/source/controller/dialogs/makefile.mk)
diff --git a/chart2/Library_chartmodel.mk b/chart2/Library_chartmodel.mk
index c1da053..b421324 100644
--- a/chart2/Library_chartmodel.mk
+++ b/chart2/Library_chartmodel.mk
@@ -33,10 +33,7 @@ $(eval $(call gb_Library_set_include,chartmodel,\
     -I$(SRCDIR)/chart2/source/inc \
 ))
 
-$(eval $(call gb_Library_use_api,chartmodel,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,chartmodel))
 
 # TODO: is this still necessary?
 # (from chart2/source/model/template/makefile.mk)
diff --git a/chart2/Library_charttools.mk b/chart2/Library_charttools.mk
index 0c55770..d38804d 100644
--- a/chart2/Library_charttools.mk
+++ b/chart2/Library_charttools.mk
@@ -36,10 +36,7 @@ $(eval $(call gb_Library_add_defs,charttools,\
     -DOOO_DLLIMPLEMENTATION_CHARTTOOLS \
 ))
 
-$(eval $(call gb_Library_use_api,charttools,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,charttools))
 
 $(eval $(call gb_Library_use_libraries,charttools,\
     basegfx \
diff --git a/chart2/Library_chartview.mk b/chart2/Library_chartview.mk
index ab3952e..c5487a8 100644
--- a/chart2/Library_chartview.mk
+++ b/chart2/Library_chartview.mk
@@ -37,10 +37,7 @@ $(eval $(call gb_Library_add_defs,chartview,\
     -DOOO_DLLIMPLEMENTATION_CHARTVIEW \
 ))
 
-$(eval $(call gb_Library_use_api,chartview,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,chartview))
 
 $(eval $(call gb_Library_use_libraries,chartview,\
     basegfx \
diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk
index 09a55b2..5a2074a 100644
--- a/comphelper/Library_comphelper.mk
+++ b/comphelper/Library_comphelper.mk
@@ -41,10 +41,7 @@ $(eval $(call gb_Library_use_libraries,comphelper,\
     $(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_Library_use_api,comphelper,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,comphelper))
 
 $(eval $(call gb_Library_add_exception_objects,comphelper,\
     comphelper/source/compare/AnyCompareFactory \
diff --git a/configmgr/Library_configmgr.mk b/configmgr/Library_configmgr.mk
index 13cbdd8..68f9306 100644
--- a/configmgr/Library_configmgr.mk
+++ b/configmgr/Library_configmgr.mk
@@ -63,10 +63,7 @@ $(eval $(call gb_Library_add_exception_objects,configmgr, \
     configmgr/source/xmldata \
 ))
 
-$(eval $(call gb_Library_use_api,configmgr, \
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,configmgr))
 
 $(eval $(call gb_Library_use_libraries,configmgr, \
     comphelper \
diff --git a/connectivity/Library_ado.mk b/connectivity/Library_ado.mk
index a4f2f41..d9d120f 100644
--- a/connectivity/Library_ado.mk
+++ b/connectivity/Library_ado.mk
@@ -34,10 +34,7 @@ $(eval $(call gb_Library_set_include,ado,\
 	$$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_use_api,ado,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,ado))
 
 ifeq ($(COM),GCC)
 $(eval $(call gb_Library_add_cxxflags,ado,\
diff --git a/connectivity/Library_calc.mk b/connectivity/Library_calc.mk
index c9a83d1..93431fc 100644
--- a/connectivity/Library_calc.mk
+++ b/connectivity/Library_calc.mk
@@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,calc))
 
 $(eval $(call gb_Library_set_componentfile,calc,connectivity/source/drivers/calc/calc))
 
-$(eval $(call gb_Library_use_api,calc,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,calc))
 
 $(eval $(call gb_Library_set_include,calc,\
 	$$(INCLUDE) \
diff --git a/connectivity/Library_dbase.mk b/connectivity/Library_dbase.mk
index d26cc3b..5dd6932 100644
--- a/connectivity/Library_dbase.mk
+++ b/connectivity/Library_dbase.mk
@@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,dbase))
 
 $(eval $(call gb_Library_set_componentfile,dbase,connectivity/source/drivers/dbase/dbase))
 
-$(eval $(call gb_Library_use_api,dbase,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,dbase))
 
 $(eval $(call gb_Library_set_include,dbase,\
 	$$(INCLUDE) \
diff --git a/connectivity/Library_dbpool2.mk b/connectivity/Library_dbpool2.mk
index 008a658..127a3e7 100644
--- a/connectivity/Library_dbpool2.mk
+++ b/connectivity/Library_dbpool2.mk
@@ -35,10 +35,7 @@ $(eval $(call gb_Library_set_include,dbpool2,\
 	-I$(SRCDIR)/connectivity/source/inc \
 ))
 
-$(eval $(call gb_Library_use_api,dbpool2,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,dbpool2))
 
 $(eval $(call gb_Library_use_libraries,dbpool2,\
 	comphelper \
diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk
index 93539de..442eb1b 100644
--- a/connectivity/Library_dbtools.mk
+++ b/connectivity/Library_dbtools.mk
@@ -47,10 +47,7 @@ $(eval $(call gb_Library_set_include,dbtools,\
 	-I$(dir $(call gb_YaccTarget_get_target,connectivity/source/parse/sqlbison)) \
 ))
 
-$(eval $(call gb_Library_use_api,dbtools,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,dbtools))
 
 $(eval $(call gb_Library_use_libraries,dbtools,\
 	cppu \
diff --git a/connectivity/Library_evoab.mk b/connectivity/Library_evoab.mk
index 852685d..882cdb0 100644
--- a/connectivity/Library_evoab.mk
+++ b/connectivity/Library_evoab.mk
@@ -39,10 +39,7 @@ $(eval $(call gb_Library_use_externals,evoab,\
 
 $(eval $(call gb_Library_set_componentfile,evoab,connectivity/source/drivers/evoab2/evoab))
 
-$(eval $(call gb_Library_use_api,evoab,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,evoab))
 
 $(eval $(call gb_Library_use_libraries,evoab,\
 	comphelper \
diff --git a/connectivity/Library_file.mk b/connectivity/Library_file.mk
index b1757c1..0875433 100644
--- a/connectivity/Library_file.mk
+++ b/connectivity/Library_file.mk
@@ -37,10 +37,7 @@ $(eval $(call gb_Library_set_include,file,\
 	-I$(SRCDIR)/connectivity/source/inc \
 ))
 
-$(eval $(call gb_Library_use_api,file,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,file))
 
 $(eval $(call gb_Library_use_libraries,file,\
 	cppu \
diff --git a/connectivity/Library_flat.mk b/connectivity/Library_flat.mk
index 82885ce..a69d0f2 100644
--- a/connectivity/Library_flat.mk
+++ b/connectivity/Library_flat.mk
@@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,flat))
 
 $(eval $(call gb_Library_set_componentfile,flat,connectivity/source/drivers/flat/flat))
 
-$(eval $(call gb_Library_use_api,flat,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,flat))
 
 $(eval $(call gb_Library_set_include,flat,\
 	$$(INCLUDE) \
diff --git a/connectivity/Library_hsqldb.mk b/connectivity/Library_hsqldb.mk
index 8421818..a3aef6d 100644
--- a/connectivity/Library_hsqldb.mk
+++ b/connectivity/Library_hsqldb.mk
@@ -36,10 +36,7 @@ $(eval $(call gb_Library_use_externals,hsqldb,\
 	hsqldb \
 ))
 
-$(eval $(call gb_Library_use_api,hsqldb,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,hsqldb))
 
 $(eval $(call gb_Library_use_libraries,hsqldb,\
 	comphelper \
diff --git a/connectivity/Library_jdbc.mk b/connectivity/Library_jdbc.mk
index 470c19f..70e553d 100644
--- a/connectivity/Library_jdbc.mk
+++ b/connectivity/Library_jdbc.mk
@@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,jdbc))
 
 $(eval $(call gb_Library_set_componentfile,jdbc,connectivity/source/drivers/jdbc/jdbc))
 
-$(eval $(call gb_Library_use_api,jdbc,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,jdbc))
 
 $(eval $(call gb_Library_set_include,jdbc,\
 	$$(INCLUDE) \
diff --git a/connectivity/Library_kab1.mk b/connectivity/Library_kab1.mk
index 7480d29..86f713d 100644
--- a/connectivity/Library_kab1.mk
+++ b/connectivity/Library_kab1.mk
@@ -31,10 +31,7 @@ $(eval $(call gb_Library_use_externals,kab1,kde))
 
 $(eval $(call gb_Library_set_componentfile,kab1,connectivity/source/drivers/kab/kab1))
 
-$(eval $(call gb_Library_use_api,kab1,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,kab1))
 
 $(eval $(call gb_Library_set_include,kab1,\
 	-I$(SRCDIR)/connectivity/source/inc \
diff --git a/connectivity/Library_kabdrv1.mk b/connectivity/Library_kabdrv1.mk
index e5a1673..6a0f16c 100644
--- a/connectivity/Library_kabdrv1.mk
+++ b/connectivity/Library_kabdrv1.mk
@@ -31,10 +31,7 @@ $(eval $(call gb_Library_use_packages,kabdrv1,\
 	shell_inc \
 ))
 
-$(eval $(call gb_Library_use_api,kabdrv1,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,kabdrv1))
 
 $(eval $(call gb_Library_use_externals,kabdrv1,\
 	kde \
diff --git a/connectivity/Library_macab1.mk b/connectivity/Library_macab1.mk
index cf5168c..842394c 100644
--- a/connectivity/Library_macab1.mk
+++ b/connectivity/Library_macab1.mk
@@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,macab1))
 
 $(eval $(call gb_Library_set_componentfile,macab1,connectivity/source/drivers/macab/macab1))
 
-$(eval $(call gb_Library_use_api,macab1,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,macab1))
 
 $(eval $(call gb_Library_use_libraries,macab1,\
 	cppu \
diff --git a/connectivity/Library_macabdrv1.mk b/connectivity/Library_macabdrv1.mk
index 0f15bb4..471c6c7 100644
--- a/connectivity/Library_macabdrv1.mk
+++ b/connectivity/Library_macabdrv1.mk
@@ -27,10 +27,7 @@
 
 $(eval $(call gb_Library_Library,macabdrv1))
 
-$(eval $(call gb_Library_use_api,macabdrv1,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,macabdrv1))
 
 $(eval $(call gb_Library_add_libs,macabdrv1,\
 	-framework Carbon \
diff --git a/connectivity/Library_mozab.mk b/connectivity/Library_mozab.mk
index 4339eba..afde265 100644
--- a/connectivity/Library_mozab.mk
+++ b/connectivity/Library_mozab.mk
@@ -34,10 +34,7 @@ $(eval $(call gb_Library_set_include,mozab2,\
 	$$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_use_api,mozab2,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,mozab2))
 
 $(eval $(call gb_Library_use_libraries,mozab2,\
 	cppu \
diff --git a/connectivity/Library_mozabdrv.mk b/connectivity/Library_mozabdrv.mk
index 14dd787..b1c29ee 100644
--- a/connectivity/Library_mozabdrv.mk
+++ b/connectivity/Library_mozabdrv.mk
@@ -33,10 +33,7 @@ $(eval $(call gb_Library_set_include,mozabdrv,\
 	$$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_use_api,mozabdrv,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,mozabdrv))
 
 $(eval $(call gb_Library_use_libraries,mozabdrv,\
 	comphelper \
diff --git a/connectivity/Library_mozbootstrap.mk b/connectivity/Library_mozbootstrap.mk
index 36c7486..aab40dc 100644
--- a/connectivity/Library_mozbootstrap.mk
+++ b/connectivity/Library_mozbootstrap.mk
@@ -38,10 +38,7 @@ $(eval $(call gb_Library_set_include,mozbootstrap,\
 	$$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_use_api,mozbootstrap,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,mozbootstrap))
 
 $(eval $(call gb_Library_use_libraries,mozbootstrap,\
 	comphelper \
diff --git a/connectivity/Library_mysql.mk b/connectivity/Library_mysql.mk
index 73de22f..5e17042 100644
--- a/connectivity/Library_mysql.mk
+++ b/connectivity/Library_mysql.mk
@@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,mysql))
 
 $(eval $(call gb_Library_set_componentfile,mysql,connectivity/source/drivers/mysql/mysql))
 
-$(eval $(call gb_Library_use_api,mysql,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,mysql))
 
 $(eval $(call gb_Library_set_include,mysql,\
 	$$(INCLUDE) \
diff --git a/connectivity/Library_odbc.mk b/connectivity/Library_odbc.mk
index 797c1e7..d6c3dc5 100644
--- a/connectivity/Library_odbc.mk
+++ b/connectivity/Library_odbc.mk
@@ -31,10 +31,7 @@ $(eval $(call gb_Library_set_warnings_not_errors,odbc))
 
 $(eval $(call gb_Library_set_componentfile,odbc,connectivity/source/drivers/odbc/odbc))
 
-$(eval $(call gb_Library_use_api,odbc,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,odbc))
 
 $(eval $(call gb_Library_set_include,odbc,\
 	$$(INCLUDE) \
diff --git a/connectivity/Library_odbcbase.mk b/connectivity/Library_odbcbase.mk
index 5336326..4d25b1c 100644
--- a/connectivity/Library_odbcbase.mk
+++ b/connectivity/Library_odbcbase.mk
@@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,odbcbase))
 
 $(eval $(call gb_Library_set_warnings_not_errors,odbcbase))
 
-$(eval $(call gb_Library_use_api,odbcbase,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,odbcbase))
 
 $(eval $(call gb_Library_set_include,odbcbase,\
 	$$(INCLUDE) \
diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk
index da6fe98..979d166 100644
--- a/connectivity/Library_postgresql-sdbc-impl.mk
+++ b/connectivity/Library_postgresql-sdbc-impl.mk
@@ -33,10 +33,7 @@ $(eval $(call gb_Library_add_defs,postgresql-sdbc-impl,\
 	-DPQ_SDBC_MICRO=2 \
 ))
 
-$(eval $(call gb_Library_use_api,postgresql-sdbc-impl,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,postgresql-sdbc-impl))
 
 $(eval $(call gb_Library_use_libraries,postgresql-sdbc-impl,\
 	cppu \
diff --git a/connectivity/Library_postgresql-sdbc.mk b/connectivity/Library_postgresql-sdbc.mk
index 292db43..202614d 100644
--- a/connectivity/Library_postgresql-sdbc.mk
+++ b/connectivity/Library_postgresql-sdbc.mk
@@ -33,10 +33,7 @@ $(eval $(call gb_Library_add_defs,postgresql-sdbc,\
 	-DPQ_SDBC_MICRO=2 \
 ))
 
-$(eval $(call gb_Library_use_api,postgresql-sdbc,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,postgresql-sdbc))
 
 $(eval $(call gb_Library_use_libraries,postgresql-sdbc,\
 	cppu \
diff --git a/connectivity/Library_sdbc2.mk b/connectivity/Library_sdbc2.mk
index cb43941..eb8789c 100644
--- a/connectivity/Library_sdbc2.mk
+++ b/connectivity/Library_sdbc2.mk
@@ -30,10 +30,7 @@ $(eval $(call gb_Library_Library,sdbc2))
 $(eval $(call gb_Library_set_componentfile,sdbc2,connectivity/source/manager/sdbc2))
 
 
-$(eval $(call gb_Library_use_api,sdbc2,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,sdbc2))
 
 $(eval $(call gb_Library_set_include,sdbc2,\
 	$$(INCLUDE) \
diff --git a/connectivity/Library_tdeab1.mk b/connectivity/Library_tdeab1.mk
index 63602f4..eb6c102 100644
--- a/connectivity/Library_tdeab1.mk
+++ b/connectivity/Library_tdeab1.mk
@@ -33,10 +33,7 @@ $(eval $(call gb_Library_use_externals,tdeab1,\
 
 $(eval $(call gb_Library_set_componentfile,tdeab1,connectivity/source/drivers/kab/tdeab1))
 
-$(eval $(call gb_Library_use_api,tdeab1,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,tdeab1))
 
 $(eval $(call gb_Library_use_libraries,tdeab1,\
 	comphelper \
diff --git a/connectivity/Library_tdeabdrv1.mk b/connectivity/Library_tdeabdrv1.mk
index 1f3a8ea..fbbd57d 100644
--- a/connectivity/Library_tdeabdrv1.mk
+++ b/connectivity/Library_tdeabdrv1.mk
@@ -27,10 +27,7 @@
 
 $(eval $(call gb_Library_Library,tdeabdrv1))
 
-$(eval $(call gb_Library_use_api,tdeabdrv1,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,tdeabdrv1))
 
 $(eval $(call gb_Library_add_libs,tdeabdrv1,\
 	-lkabc \
diff --git a/cppcanvas/Library_cppcanvas.mk b/cppcanvas/Library_cppcanvas.mk
index aa768db..7b9ff2f 100644
--- a/cppcanvas/Library_cppcanvas.mk
+++ b/cppcanvas/Library_cppcanvas.mk
@@ -36,10 +36,7 @@ $(eval $(call gb_Library_set_include,cppcanvas,\
 	$$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_use_api,cppcanvas,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,cppcanvas))
 $(eval $(call gb_Library_add_defs,cppcanvas,\
 	-DCPPCANVAS_DLLIMPLEMENTATION \
 ))
diff --git a/cppcanvas/Library_mtfrenderer.mk b/cppcanvas/Library_mtfrenderer.mk
index f491344..4c4575d 100644
--- a/cppcanvas/Library_mtfrenderer.mk
+++ b/cppcanvas/Library_mtfrenderer.mk
@@ -40,10 +40,7 @@ $(eval $(call gb_Library_use_libraries,mtfrenderer,\
     $(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_Library_use_api,mtfrenderer,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,mtfrenderer))
 
 $(eval $(call gb_Library_add_exception_objects,mtfrenderer,\
 	cppcanvas/source/uno/uno_mtfrenderer \
diff --git a/cppu/Library_affine_uno.mk b/cppu/Library_affine_uno.mk
index b4ab2fd..68cf8d9 100644
--- a/cppu/Library_affine_uno.mk
+++ b/cppu/Library_affine_uno.mk
@@ -27,10 +27,7 @@
 
 $(eval $(call gb_Library_Library,affine_uno))
 
-$(eval $(call gb_Library_use_api,affine_uno,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,affine_uno))
 
 $(eval $(call gb_Library_use_libraries,affine_uno,\
 	purpenvhelper \
diff --git a/cppu/Library_cppu.mk b/cppu/Library_cppu.mk
index cc96d04..3a2ed52 100644
--- a/cppu/Library_cppu.mk
+++ b/cppu/Library_cppu.mk
@@ -31,10 +31,7 @@ $(eval $(call gb_Library_set_soversion_script,cppu,3,$(SRCDIR)/cppu/util/cppu.ma
 
 $(eval $(call gb_Library_use_package,cppu,cppu_inc))
 
-$(eval $(call gb_Library_use_api,cppu,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,cppu))
 
 $(eval $(call gb_Library_add_defs,cppu,\
 	-DCPPU_DLLIMPLEMENTATION \
diff --git a/cppu/Library_log_uno.mk b/cppu/Library_log_uno.mk
index 7e371e9..b0fa63e 100644
--- a/cppu/Library_log_uno.mk
+++ b/cppu/Library_log_uno.mk
@@ -27,10 +27,7 @@
 
 $(eval $(call gb_Library_Library,log_uno))
 
-$(eval $(call gb_Library_use_api,log_uno,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,log_uno))
 
 $(eval $(call gb_Library_use_libraries,log_uno,\
 	cppu \
diff --git a/cppu/Library_purpenvhelper.mk b/cppu/Library_purpenvhelper.mk
index 1deaca4..db2a90e 100644
--- a/cppu/Library_purpenvhelper.mk
+++ b/cppu/Library_purpenvhelper.mk
@@ -33,10 +33,7 @@ $(eval $(call gb_Library_add_defs,purpenvhelper,\
 	-DPURPENV_DLLIMPLEMENTATION \
 ))
 
-$(eval $(call gb_Library_use_api,purpenvhelper,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,purpenvhelper))
 
 $(eval $(call gb_Library_use_libraries,purpenvhelper,\
 	cppu \
diff --git a/cppu/Library_unsafe_uno.mk b/cppu/Library_unsafe_uno.mk
index bd680c0..be343aa 100644
--- a/cppu/Library_unsafe_uno.mk
+++ b/cppu/Library_unsafe_uno.mk
@@ -27,10 +27,7 @@
 
 $(eval $(call gb_Library_Library,unsafe_uno))
 
-$(eval $(call gb_Library_use_api,unsafe_uno,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,unsafe_uno))
 
 $(eval $(call gb_Library_use_libraries,unsafe_uno,\
 	purpenvhelper \
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index 4da2f8f..bfde9e1 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -41,10 +41,7 @@ $(eval $(call gb_Library_add_defs,cui,\
     $(if $(filter TRUE,$(ENABLE_KDE4)),-DENABLE_KDE4) \
 ))
 
-$(eval $(call gb_Library_use_api,cui,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,cui))
 
 $(eval $(call gb_Library_use_libraries,cui,\
     avmedia \
diff --git a/dbaccess/Executable_odbcconfig.mk b/dbaccess/Executable_odbcconfig.mk
index b81dc73..1e0f87e 100644
--- a/dbaccess/Executable_odbcconfig.mk
+++ b/dbaccess/Executable_odbcconfig.mk
@@ -34,10 +34,7 @@ $(eval $(call gb_Executable_set_include,odbcconfig,\
 	-I$(SRCDIR)/dbaccess/inc \
 ))
 
-$(eval $(call gb_Library_use_api,odbcconfig,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,odbcconfig))
 
 $(eval $(call gb_Executable_use_libraries,odbcconfig,\
     $(gb_STDLIBS) \
diff --git a/dbaccess/Library_dba.mk b/dbaccess/Library_dba.mk
index 0e71fd3..e32b93d 100644
--- a/dbaccess/Library_dba.mk
+++ b/dbaccess/Library_dba.mk
@@ -42,10 +42,7 @@ $(eval $(call gb_Library_add_defs,dba,\
     -DOOO_DLLIMPLEMENTATION_DBA \
 ))
 
-$(eval $(call gb_Library_use_api,dba,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,dba))
 
 $(eval $(call gb_Library_use_libraries,dba,\
     comphelper \
diff --git a/dbaccess/Library_dbaxml.mk b/dbaccess/Library_dbaxml.mk
index 0854533..e8b063a 100644
--- a/dbaccess/Library_dbaxml.mk
+++ b/dbaccess/Library_dbaxml.mk
@@ -32,10 +32,7 @@ $(eval $(call gb_Library_set_include,dbaxml,\
     -I$(SRCDIR)/dbaccess/source/inc \
 ))
 
-$(eval $(call gb_Library_use_api,dbaxml,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,dbaxml))
 
 $(eval $(call gb_Library_use_libraries,dbaxml,\
     comphelper \
diff --git a/dbaccess/Library_dbmm.mk b/dbaccess/Library_dbmm.mk
index cb9dc74..bb45c27 100644
--- a/dbaccess/Library_dbmm.mk
+++ b/dbaccess/Library_dbmm.mk
@@ -36,10 +36,7 @@ $(eval $(call gb_Library_set_include,dbmm,\
 	-I$(SRCDIR)/dbaccess/inc \
 ))
 
-$(eval $(call gb_Library_use_api,dbmm,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,dbmm))
 
 $(eval $(call gb_Library_use_libraries,dbmm,\
     comphelper \
diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk
index 2f8fdb0..80d32b1 100644
--- a/dbaccess/Library_dbu.mk
+++ b/dbaccess/Library_dbu.mk
@@ -35,10 +35,7 @@ $(eval $(call gb_Library_set_include,dbu,\
     -I$(call gb_SrsTemplateTarget_get_include_dir,dbaccess) \
 ))
 
-$(eval $(call gb_Library_use_api,dbu,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,dbu))
 
 $(eval $(call gb_Library_add_defs,dbu,\
     -DDBACCESS_DLLIMPLEMENTATION \
diff --git a/dbaccess/Library_sdbt.mk b/dbaccess/Library_sdbt.mk
index fa49d96..3e5aca5 100644
--- a/dbaccess/Library_sdbt.mk
+++ b/dbaccess/Library_sdbt.mk
@@ -38,10 +38,7 @@ $(eval $(call gb_Library_set_include,sdbt,\
 	-I$(SRCDIR)/dbaccess/source/sdbtools/inc \
 ))
 
-$(eval $(call gb_Library_use_api,sdbt,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,sdbt))
 
 $(eval $(call gb_Library_use_libraries,sdbt,\
     comphelper \
diff --git a/desktop/Library_deployment.mk b/desktop/Library_deployment.mk
index 3314c2e..2cde4ba 100644
--- a/desktop/Library_deployment.mk
+++ b/desktop/Library_deployment.mk
@@ -34,10 +34,7 @@ $(eval $(call gb_Library_set_include,deployment,\
     -I$(SRCDIR)/desktop/source/deployment/registry/inc \
 ))
 
-$(eval $(call gb_Library_use_api,deployment,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,deployment))
 
 $(eval $(call gb_Library_use_libraries,deployment,\
     comphelper \
diff --git a/desktop/Library_deploymentgui.mk b/desktop/Library_deploymentgui.mk
index c27c077..f5f48e4 100644
--- a/desktop/Library_deploymentgui.mk
+++ b/desktop/Library_deploymentgui.mk
@@ -34,10 +34,7 @@ $(eval $(call gb_Library_set_include,deploymentgui,\
     -I$(SRCDIR)/desktop/source/inc \
 ))
 
-$(eval $(call gb_Library_use_api,deploymentgui,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,deploymentgui))
 
 $(eval $(call gb_Library_use_libraries,deploymentgui,\
     comphelper \
diff --git a/desktop/Library_deploymentmisc.mk b/desktop/Library_deploymentmisc.mk
index c030177..551c639 100644
--- a/desktop/Library_deploymentmisc.mk
+++ b/desktop/Library_deploymentmisc.mk
@@ -33,10 +33,7 @@ $(eval $(call gb_Library_set_include,deploymentmisc,\
     -I$(SRCDIR)/desktop/source/deployment/inc \
 ))
 
-$(eval $(call gb_Library_use_api,deploymentmisc,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,deploymentmisc))
 
 $(eval $(call gb_Library_add_defs,deploymentmisc,\
     -DDESKTOP_DEPLOYMENTMISC_DLLIMPLEMENTATION \
diff --git a/desktop/Library_migrationoo2.mk b/desktop/Library_migrationoo2.mk
index 4c1d51d..838b475 100644
--- a/desktop/Library_migrationoo2.mk
+++ b/desktop/Library_migrationoo2.mk
@@ -31,10 +31,7 @@ $(eval $(call gb_Library_set_include,migrationoo2,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_use_api,migrationoo2,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,migrationoo2))
 
 $(eval $(call gb_Library_use_libraries,migrationoo2,\
     cppu \
diff --git a/desktop/Library_migrationoo3.mk b/desktop/Library_migrationoo3.mk
index 9689749..d39497e 100644
--- a/desktop/Library_migrationoo3.mk
+++ b/desktop/Library_migrationoo3.mk
@@ -31,10 +31,7 @@ $(eval $(call gb_Library_set_include,migrationoo3,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_use_api,migrationoo3,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,migrationoo3))
 
 $(eval $(call gb_Library_use_libraries,migrationoo3,\
     cppu \
diff --git a/desktop/Library_offacc.mk b/desktop/Library_offacc.mk
index cb088c0..f75728d 100644
--- a/desktop/Library_offacc.mk
+++ b/desktop/Library_offacc.mk
@@ -31,10 +31,7 @@ $(eval $(call gb_Library_set_include,offacc,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_use_api,offacc,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,offacc))
 
 $(eval $(call gb_Library_use_libraries,offacc,\
     cppu \
diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
index 4ed40fd..9495883 100644
--- a/desktop/Library_sofficeapp.mk
+++ b/desktop/Library_sofficeapp.mk
@@ -34,10 +34,7 @@ $(eval $(call gb_Library_set_include,sofficeapp,\
     -I$(SRCDIR)/desktop/source/deployment/inc \
 ))
 
-$(eval $(call gb_Library_use_api,sofficeapp,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,sofficeapp))
 
 $(eval $(call gb_Library_add_defs,sofficeapp,\
     -DDESKTOP_DLLIMPLEMENTATION \
diff --git a/desktop/Library_spl.mk b/desktop/Library_spl.mk
index 3552905..0d45c59 100644
--- a/desktop/Library_spl.mk
+++ b/desktop/Library_spl.mk
@@ -32,10 +32,7 @@ $(eval $(call gb_Library_set_include,spl,\
     -I$(SRCDIR)/desktop/inc \
 ))
 
-$(eval $(call gb_Library_use_api,spl,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,spl))
 
 $(eval $(call gb_Library_use_libraries,spl,\
     comphelper \
diff --git a/desktop/Library_spl_unx.mk b/desktop/Library_spl_unx.mk
index 9fd065c..08412d5 100644
--- a/desktop/Library_spl_unx.mk
+++ b/desktop/Library_spl_unx.mk
@@ -27,10 +27,7 @@
 
 $(eval $(call gb_Library_Library,spl_unx))
 
-$(eval $(call gb_Library_use_api,spl_unx,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,spl_unx))
 
 $(eval $(call gb_Library_use_libraries,spl_unx,\
     cppu \
diff --git a/desktop/Library_unopkgapp.mk b/desktop/Library_unopkgapp.mk
index 93ca09b..081fee9 100644
--- a/desktop/Library_unopkgapp.mk
+++ b/desktop/Library_unopkgapp.mk
@@ -34,10 +34,7 @@ $(eval $(call gb_Library_set_include,unopkgapp,\
     -I$(SRCDIR)/desktop/source/inc \
 ))
 
-$(eval $(call gb_Library_use_api,unopkgapp,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,unopkgapp))
 
 $(eval $(call gb_Library_add_defs,unopkgapp,\
     -DDESKTOP_DLLIMPLEMENTATION \
diff --git a/drawinglayer/Library_drawinglayer.mk b/drawinglayer/Library_drawinglayer.mk
index b59bd12..cfbf6b0 100644
--- a/drawinglayer/Library_drawinglayer.mk
+++ b/drawinglayer/Library_drawinglayer.mk
@@ -37,10 +37,7 @@ $(eval $(call gb_Library_add_defs,drawinglayer,\
 	-DDRAWINGLAYER_DLLIMPLEMENTATION \
 ))
 
-$(eval $(call gb_Library_use_api,drawinglayer,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,drawinglayer))
 
 $(eval $(call gb_Library_use_libraries,drawinglayer,\
     avmedia \
diff --git a/dtrans/Library_dnd.mk b/dtrans/Library_dnd.mk
index f567a74..8331586 100644
--- a/dtrans/Library_dnd.mk
+++ b/dtrans/Library_dnd.mk
@@ -34,10 +34,7 @@ $(eval $(call gb_Library_set_include,dnd,\
 	$$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_use_api,dnd,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,dnd))
 
 $(eval $(call gb_Library_use_libraries,dnd,\
 	advapi32 \
diff --git a/dtrans/Library_dtrans.mk b/dtrans/Library_dtrans.mk
index a043b58..79f18d8 100644
--- a/dtrans/Library_dtrans.mk
+++ b/dtrans/Library_dtrans.mk
@@ -34,10 +34,7 @@ $(eval $(call gb_Library_set_include,dtrans,\
 	$$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_use_api,dtrans,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,dtrans))
 
 $(eval $(call gb_Library_use_libraries,dtrans,\
 	cppu \
diff --git a/dtrans/Library_ftransl.mk b/dtrans/Library_ftransl.mk
index 9782531..1b9e873 100644
--- a/dtrans/Library_ftransl.mk
+++ b/dtrans/Library_ftransl.mk
@@ -34,10 +34,7 @@ $(eval $(call gb_Library_set_include,ftransl,\
 	$$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_use_api,ftransl,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,ftransl))
 
 $(eval $(call gb_Library_use_libraries,ftransl,\
 	advapi32 \
diff --git a/dtrans/Library_mcnttype.mk b/dtrans/Library_mcnttype.mk
index 4baffdc..04ae079 100644
--- a/dtrans/Library_mcnttype.mk
+++ b/dtrans/Library_mcnttype.mk
@@ -34,10 +34,7 @@ $(eval $(call gb_Library_set_include,mcnttype,\
 	$$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_use_api,mcnttype,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,mcnttype))
 
 $(eval $(call gb_Library_use_libraries,mcnttype,\
 	cppu \
diff --git a/dtrans/Library_sysdtrans.mk b/dtrans/Library_sysdtrans.mk
index 270bbc0..1b87a60 100644
--- a/dtrans/Library_sysdtrans.mk
+++ b/dtrans/Library_sysdtrans.mk
@@ -34,10 +34,7 @@ $(eval $(call gb_Library_set_include,sysdtrans,\
 	$$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_use_api,sysdtrans,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,sysdtrans))
 
 $(eval $(call gb_Library_add_defs,sysdtrans,\
 	-D_UNICODE \
diff --git a/editeng/Library_editeng.mk b/editeng/Library_editeng.mk
index 5d10613..276e062 100644
--- a/editeng/Library_editeng.mk
+++ b/editeng/Library_editeng.mk
@@ -39,10 +39,7 @@ $(eval $(call gb_Library_add_defs,editeng,\
     -DEDITENG_DLLIMPLEMENTATION \
 ))
 
-$(eval $(call gb_Library_use_api,editeng,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,editeng))
 
 $(eval $(call gb_Library_add_exception_objects,editeng,\
     editeng/source/accessibility/AccessibleComponentBase \
diff --git a/embeddedobj/Library_embobj.mk b/embeddedobj/Library_embobj.mk
index 307dac5..58e3f02 100644
--- a/embeddedobj/Library_embobj.mk
+++ b/embeddedobj/Library_embobj.mk
@@ -34,10 +34,7 @@ $(eval $(call gb_Library_set_include,embobj,\
 	$$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_use_api,embobj,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,embobj))
 
 $(eval $(call gb_Library_use_libraries,embobj,\
 	comphelper \
diff --git a/embeddedobj/Library_emboleobj.mk b/embeddedobj/Library_emboleobj.mk
index 5c9712a..97801d9 100644
--- a/embeddedobj/Library_emboleobj.mk
+++ b/embeddedobj/Library_emboleobj.mk
@@ -34,10 +34,7 @@ $(eval $(call gb_Library_set_include,emboleobj,\
 	$$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_use_api,emboleobj,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,emboleobj))
 
 $(eval $(call gb_Library_use_libraries,emboleobj,\
 	comphelper \
diff --git a/embedserv/Library_emser.mk b/embedserv/Library_emser.mk
index ebf7e63..9872b4f 100644
--- a/embedserv/Library_emser.mk
+++ b/embedserv/Library_emser.mk
@@ -39,10 +39,8 @@ $(eval $(call gb_Library_add_defs,emser,\
 	-UNOMINMAX \
 ))
 
+$(eval $(call gb_Library_use_api,emser))
 $(eval $(call gb_Library_use_api,emser,\
-	offapi \
-	udkapi \
-))
 
 $(eval $(call gb_Library_use_libraries,emser,\
 	comphelper \
diff --git a/extensions/Library_abp.mk b/extensions/Library_abp.mk
index d327c07..92f0848 100644
--- a/extensions/Library_abp.mk
+++ b/extensions/Library_abp.mk
@@ -51,10 +51,7 @@ $(eval $(call gb_Library_add_defs,abp,\
 	-DCOMPMOD_RESPREFIX=abp \
 ))
 
-$(eval $(call gb_Library_use_api,abp,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,abp))
 
 $(eval $(call gb_Library_add_exception_objects,abp,\
 	extensions/source/abpilot/abpfinalpage \
diff --git a/extensions/Library_bib.mk b/extensions/Library_bib.mk
index e31a429..5ce36cd 100644
--- a/extensions/Library_bib.mk
+++ b/extensions/Library_bib.mk
@@ -37,10 +37,7 @@ $(eval $(call gb_Library_set_include,bib,\
 	-I$(SRCDIR)/extensions/inc \
 ))
 
-$(eval $(call gb_Library_use_api,bib,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,bib))
 
 $(eval $(call gb_Library_add_exception_objects,bib,\
 	extensions/source/bibliography/bibbeam \
diff --git a/extensions/Library_dbp.mk b/extensions/Library_dbp.mk
index 988464d..cb52f4d 100644
--- a/extensions/Library_dbp.mk
+++ b/extensions/Library_dbp.mk
@@ -42,10 +42,7 @@ $(eval $(call gb_Library_add_defs,dbp,\
 	-DCOMPMOD_NAMESPACE=dbp \
 ))
 
-$(eval $(call gb_Library_use_api,dbp,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,dbp))
 
 $(eval $(call gb_Library_add_exception_objects,dbp,\
 	extensions/source/dbpilots/commonpagesdbp \
diff --git a/extensions/Library_ldapbe2.mk b/extensions/Library_ldapbe2.mk
index 37442a8..4dd04a4 100644
--- a/extensions/Library_ldapbe2.mk
+++ b/extensions/Library_ldapbe2.mk
@@ -32,10 +32,7 @@ $(eval $(call gb_Library_Library,ldapbe2))
 
 $(eval $(call gb_Library_set_componentfile,ldapbe2,extensions/source/config/ldap/ldapbe2))
 
-$(eval $(call gb_Library_use_api,ldapbe2,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,ldapbe2))
 
 ifeq ($(LDAPSDKINCLUDES),)
 ifneq ($(WITH_OPENLDAP),YES)
diff --git a/extensions/Library_log.mk b/extensions/Library_log.mk
index 247deb3..4e7e0d0 100644
--- a/extensions/Library_log.mk
+++ b/extensions/Library_log.mk
@@ -32,10 +32,7 @@ $(eval $(call gb_Library_Library,log))
 
 $(eval $(call gb_Library_set_componentfile,log,extensions/source/logging/log))
 
-$(eval $(call gb_Library_use_api,log,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,log))
 
 $(eval $(call gb_Library_add_exception_objects,log,\
 	extensions/source/logging/consolehandler \
diff --git a/extensions/Library_oleautobridge.mk b/extensions/Library_oleautobridge.mk
index 668e916..e02f65d 100644
--- a/extensions/Library_oleautobridge.mk
+++ b/extensions/Library_oleautobridge.mk
@@ -31,10 +31,7 @@ $(eval $(call gb_Library_Library,oleautobridge))
 
 $(eval $(call gb_Library_set_componentfile,oleautobridge,extensions/source/ole/oleautobridge))
 
-$(eval $(call gb_Library_use_api,oleautobridge,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,oleautobridge))
 
 $(eval $(call gb_Library_set_include,oleautobridge,\
 	$(foreach inc,$(ATL_INCLUDE),-I$(inc)) \
diff --git a/extensions/Library_oleautobridge2.mk b/extensions/Library_oleautobridge2.mk
index 697818e..5bbc832 100644
--- a/extensions/Library_oleautobridge2.mk
+++ b/extensions/Library_oleautobridge2.mk
@@ -34,10 +34,7 @@ $(eval $(call gb_Library_add_defs,oleautobridge2,\
 	 -DOWNGUID \
 ))
 
-$(eval $(call gb_Library_use_api,oleautobridge2,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,oleautobridge2))
 
 $(eval $(call gb_Library_set_include,oleautobridge2,\
 	-I$(SRCDIR)/extensions/source/ole \
diff --git a/extensions/Library_pcr.mk b/extensions/Library_pcr.mk
index 0221489..3504126 100644
--- a/extensions/Library_pcr.mk
+++ b/extensions/Library_pcr.mk
@@ -30,10 +30,7 @@ $(eval $(call gb_Library_Library,pcr))
 
 $(eval $(call gb_Library_set_componentfile,pcr,extensions/source/propctrlr/pcr))
 
-$(eval $(call gb_Library_use_api,pcr,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,pcr))
 
 $(eval $(call gb_Library_set_include,pcr,\
 	-I$(SRCDIR)/extensions/inc \
diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk
index cbcfc79..c1451f8 100644
--- a/extensions/Library_pl.mk
+++ b/extensions/Library_pl.mk
@@ -41,10 +41,7 @@ $(eval $(call gb_Library_set_include,pl,\
 	-I$(SRCDIR)/extensions/source/plugin/inc \
 ))
 
-$(eval $(call gb_Library_use_api,pl,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,pl))
 
 ifeq ($(SOLAR_JAVA),TRUE)
 $(eval $(call gb_Library_add_defs,pl,\
diff --git a/extensions/Library_res.mk b/extensions/Library_res.mk
index 2e03681..bc3de60 100644
--- a/extensions/Library_res.mk
+++ b/extensions/Library_res.mk
@@ -32,10 +32,7 @@ $(eval $(call gb_Library_Library,res))
 
 $(eval $(call gb_Library_set_componentfile,res,extensions/source/resource/res))
 
-$(eval $(call gb_Library_use_api,res,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,res))
 
 $(eval $(call gb_Library_use_libraries,res,\
 	vcl \
diff --git a/extensions/Library_scn.mk b/extensions/Library_scn.mk
index 83a0b6d..4dd0044 100644
--- a/extensions/Library_scn.mk
+++ b/extensions/Library_scn.mk
@@ -30,10 +30,7 @@ $(eval $(call gb_Library_Library,scn))
 
 $(eval $(call gb_Library_set_componentfile,scn,extensions/source/scanner/scn))
 
-$(eval $(call gb_Library_use_api,scn,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,scn))
 
 $(eval $(call gb_Library_use_libraries,scn,\
 	svt \
diff --git a/extensions/Library_so_activex.mk b/extensions/Library_so_activex.mk
index 899745b..33cccab 100644
--- a/extensions/Library_so_activex.mk
+++ b/extensions/Library_so_activex.mk
@@ -37,10 +37,7 @@ $(eval $(call gb_Library_set_include,so_activex,\
 	$(foreach i,$(ATL_INCLUDE), -I$(i)) \
 ))
 
-$(eval $(call gb_Library_use_api,so_activex,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,so_activex))
 
 $(eval $(call gb_Library_add_nativeres,so_activex,activex_res))
 
diff --git a/extensions/Library_so_activex_x64.mk b/extensions/Library_so_activex_x64.mk
index ea01b58..7bcf286 100644
--- a/extensions/Library_so_activex_x64.mk
+++ b/extensions/Library_so_activex_x64.mk
@@ -40,10 +40,7 @@ $(eval $(call gb_Library_set_include,so_activex_x64,\
 	$(foreach i,$(ATL_INCLUDE), -I$(i)) \
 ))
 
-$(eval $(call gb_Library_use_api,so_activex_x64,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,so_activex_x64))
 
 $(eval $(call gb_Library_add_nativeres,so_activex_x64,activex_res))
 
diff --git a/extensions/Library_updatecheckui.mk b/extensions/Library_updatecheckui.mk
index 196fe7f..75ac53f 100644
--- a/extensions/Library_updatecheckui.mk
+++ b/extensions/Library_updatecheckui.mk
@@ -30,10 +30,7 @@ $(eval $(call gb_Library_Library,updatecheckui))
 
 $(eval $(call gb_Library_set_componentfile,updatecheckui,extensions/source/update/ui/updchk))
 
-$(eval $(call gb_Library_use_api,updatecheckui,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,updatecheckui))
 
 $(eval $(call gb_Library_use_libraries,updatecheckui,\
 	vcl \
diff --git a/extensions/Library_updatefeed.mk b/extensions/Library_updatefeed.mk
index cd1b581..354834d 100644
--- a/extensions/Library_updatefeed.mk
+++ b/extensions/Library_updatefeed.mk
@@ -30,10 +30,7 @@ $(eval $(call gb_Library_Library,updatefeed))
 
 $(eval $(call gb_Library_set_componentfile,updatefeed,extensions/source/update/feed/updatefeed))
 
-$(eval $(call gb_Library_use_api,updatefeed,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,updatefeed))
 
 $(eval $(call gb_Library_use_libraries,updatefeed,\
 	cppuhelper \
diff --git a/extensions/Library_updchk.mk b/extensions/Library_updchk.mk
index 98577ee..cd291c8 100644
--- a/extensions/Library_updchk.mk
+++ b/extensions/Library_updchk.mk
@@ -36,10 +36,7 @@ $(eval $(call gb_Library_set_include,updchk,\
 	-I$(SRCDIR)/extensions/inc \
 ))
 
-$(eval $(call gb_Library_use_api,updchk,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,updchk))
 
 $(eval $(call gb_Library_use_libraries,updchk,\
 	cppuhelper \
diff --git a/fileaccess/Library_fileacc.mk b/fileaccess/Library_fileacc.mk
index 01300bb..88ca91d 100644
--- a/fileaccess/Library_fileacc.mk
+++ b/fileaccess/Library_fileacc.mk
@@ -31,10 +31,7 @@ $(eval $(call gb_Library_set_include,fileacc,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_use_api,fileacc,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,fileacc))
 
 $(eval $(call gb_Library_use_libraries,fileacc,\
     cppu \
diff --git a/filter/Library_PptImporter.mk b/filter/Library_PptImporter.mk
index f62f77b..abd5af7 100644
--- a/filter/Library_PptImporter.mk
+++ b/filter/Library_PptImporter.mk
@@ -18,10 +18,7 @@
 
 $(eval $(call gb_Library_Library,PptImporter))
 
-$(eval $(call gb_Library_use_api,PptImporter,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,PptImporter))
 
 $(eval $(call gb_Library_set_include,PptImporter,\
 	$$(INCLUDE) \
diff --git a/filter/Library_egi.mk b/filter/Library_egi.mk
index 5e04dc4..d753789 100644
--- a/filter/Library_egi.mk
+++ b/filter/Library_egi.mk
@@ -18,10 +18,7 @@
 
 $(eval $(call gb_Library_Library,egi))
 
-$(eval $(call gb_Library_use_api,egi,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,egi))
 
 $(eval $(call gb_Library_set_include,egi,\
 	$$(INCLUDE) \
diff --git a/filter/Library_eme.mk b/filter/Library_eme.mk
index 0a7bf20..efd5899 100644
--- a/filter/Library_eme.mk
+++ b/filter/Library_eme.mk
@@ -18,10 +18,7 @@
 
 $(eval $(call gb_Library_Library,eme))
 
-$(eval $(call gb_Library_use_api,eme,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,eme))
 
 $(eval $(call gb_Library_set_include,eme,\
 	$$(INCLUDE) \
diff --git a/filter/Library_epb.mk b/filter/Library_epb.mk
index eb38ca4..63f630c 100644
--- a/filter/Library_epb.mk
+++ b/filter/Library_epb.mk
@@ -18,10 +18,7 @@
 
 $(eval $(call gb_Library_Library,epb))
 
-$(eval $(call gb_Library_use_api,epb,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,epb))
 
 $(eval $(call gb_Library_set_include,epb,\
 	$$(INCLUDE) \
diff --git a/filter/Library_epg.mk b/filter/Library_epg.mk
index 935ab82..5166677 100644
--- a/filter/Library_epg.mk
+++ b/filter/Library_epg.mk
@@ -18,10 +18,7 @@
 
 $(eval $(call gb_Library_Library,epg))
 
-$(eval $(call gb_Library_use_api,epg,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,epg))
 
 $(eval $(call gb_Library_set_include,epg,\
 	$$(INCLUDE) \
diff --git a/filter/Library_epp.mk b/filter/Library_epp.mk
index 385a676..8346926 100644
--- a/filter/Library_epp.mk
+++ b/filter/Library_epp.mk
@@ -18,10 +18,7 @@
 
 $(eval $(call gb_Library_Library,epp))
 
-$(eval $(call gb_Library_use_api,epp,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,epp))
 
 $(eval $(call gb_Library_set_include,epp,\
 	$$(INCLUDE) \
diff --git a/filter/Library_eps.mk b/filter/Library_eps.mk
index 2855334..2ba9b40 100644
--- a/filter/Library_eps.mk
+++ b/filter/Library_eps.mk
@@ -18,10 +18,7 @@
 
 $(eval $(call gb_Library_Library,eps))
 
-$(eval $(call gb_Library_use_api,eps,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,eps))
 
 $(eval $(call gb_Library_set_include,eps,\
 	$$(INCLUDE) \
diff --git a/filter/Library_ept.mk b/filter/Library_ept.mk
index 1ebfe32..c1d9267 100644
--- a/filter/Library_ept.mk
+++ b/filter/Library_ept.mk
@@ -18,10 +18,7 @@
 
 $(eval $(call gb_Library_Library,ept))
 
-$(eval $(call gb_Library_use_api,ept,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,ept))
 
 $(eval $(call gb_Library_set_include,ept,\
 	$$(INCLUDE) \
diff --git a/filter/Library_era.mk b/filter/Library_era.mk
index a647f93..5035ab3 100644
--- a/filter/Library_era.mk
+++ b/filter/Library_era.mk
@@ -18,10 +18,7 @@
 
 $(eval $(call gb_Library_Library,era))
 
-$(eval $(call gb_Library_use_api,era,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,era))
 
 $(eval $(call gb_Library_set_include,era,\
 	$$(INCLUDE) \
diff --git a/filter/Library_eti.mk b/filter/Library_eti.mk
index 00c1e42..3d63404 100644
--- a/filter/Library_eti.mk
+++ b/filter/Library_eti.mk
@@ -18,10 +18,7 @@
 
 $(eval $(call gb_Library_Library,eti))
 
-$(eval $(call gb_Library_use_api,eti,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,eti))
 
 $(eval $(call gb_Library_set_include,eti,\
 	$$(INCLUDE) \
diff --git a/filter/Library_exp.mk b/filter/Library_exp.mk
index 67d3937..b447fdb 100644
--- a/filter/Library_exp.mk
+++ b/filter/Library_exp.mk
@@ -18,10 +18,7 @@
 
 $(eval $(call gb_Library_Library,exp))
 
-$(eval $(call gb_Library_use_api,exp,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,exp))
 
 $(eval $(call gb_Library_set_include,exp,\
 	$$(INCLUDE) \
diff --git a/filter/Library_filterconfig.mk b/filter/Library_filterconfig.mk
index 627b186..3dd322a 100644
--- a/filter/Library_filterconfig.mk
+++ b/filter/Library_filterconfig.mk
@@ -20,10 +20,7 @@ $(eval $(call gb_Library_Library,filterconfig))
 
 $(eval $(call gb_Library_set_componentfile,filterconfig,filter/source/config/cache/filterconfig1))
 
-$(eval $(call gb_Library_use_api,filterconfig,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,filterconfig))
 
 $(eval $(call gb_Library_set_include,filterconfig,\
 	$$(INCLUDE) \
diff --git a/filter/Library_filtertracer.mk b/filter/Library_filtertracer.mk
index 72d8343..efd029a 100644
--- a/filter/Library_filtertracer.mk
+++ b/filter/Library_filtertracer.mk
@@ -18,10 +18,7 @@
 
 $(eval $(call gb_Library_Library,filtertracer))
 
-$(eval $(call gb_Library_use_api,filtertracer,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,filtertracer))
 
 $(eval $(call gb_Library_set_include,filtertracer,\
 	$$(INCLUDE) \
diff --git a/filter/Library_flash.mk b/filter/Library_flash.mk
index 80b2b3e..77668e0 100644
--- a/filter/Library_flash.mk
+++ b/filter/Library_flash.mk
@@ -20,10 +20,7 @@ $(eval $(call gb_Library_Library,flash))
 
 $(eval $(call gb_Library_set_componentfile,flash,filter/source/flash/flash))
 
-$(eval $(call gb_Library_use_api,flash,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,flash))
 
 $(eval $(call gb_Library_set_include,flash,\
 	$$(INCLUDE) \
diff --git a/filter/Library_icd.mk b/filter/Library_icd.mk
index fbfa2ac..e38f745 100644
--- a/filter/Library_icd.mk
+++ b/filter/Library_icd.mk
@@ -18,10 +18,7 @@
 
 $(eval $(call gb_Library_Library,icd))
 
-$(eval $(call gb_Library_use_api,icd,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,icd))
 
 $(eval $(call gb_Library_set_include,icd,\
 	$$(INCLUDE) \
diff --git a/filter/Library_icg.mk b/filter/Library_icg.mk
index 5d90f0e..0e319ab 100644
--- a/filter/Library_icg.mk
+++ b/filter/Library_icg.mk
@@ -18,10 +18,7 @@
 
 $(eval $(call gb_Library_Library,icg))
 
-$(eval $(call gb_Library_use_api,icg,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,icg))
 
 $(eval $(call gb_Library_set_include,icg,\
 	$$(INCLUDE) \
diff --git a/filter/Library_idx.mk b/filter/Library_idx.mk
index f610be5..62fb96d 100644
--- a/filter/Library_idx.mk
+++ b/filter/Library_idx.mk
@@ -18,10 +18,7 @@
 
 $(eval $(call gb_Library_Library,idx))
 
-$(eval $(call gb_Library_use_api,idx,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,idx))
 
 $(eval $(call gb_Library_set_include,idx,\
 	$$(INCLUDE) \
diff --git a/filter/Library_ime.mk b/filter/Library_ime.mk
index b5662c5..65927bb 100644
--- a/filter/Library_ime.mk
+++ b/filter/Library_ime.mk
@@ -18,10 +18,7 @@
 
 $(eval $(call gb_Library_Library,ime))
 
-$(eval $(call gb_Library_use_api,ime,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,ime))
 
 $(eval $(call gb_Library_set_include,ime,\
 	$$(INCLUDE) \
diff --git a/filter/Library_ipb.mk b/filter/Library_ipb.mk
index 0058182..281d832 100644
--- a/filter/Library_ipb.mk
+++ b/filter/Library_ipb.mk
@@ -18,10 +18,7 @@
 
 $(eval $(call gb_Library_Library,ipb))
 
-$(eval $(call gb_Library_use_api,ipb,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,ipb))
 
 $(eval $(call gb_Library_set_include,ipb,\
 	$$(INCLUDE) \
diff --git a/filter/Library_ipd.mk b/filter/Library_ipd.mk
index 1b37d12..c81aeb2 100644
--- a/filter/Library_ipd.mk
+++ b/filter/Library_ipd.mk
@@ -18,10 +18,7 @@
 
 $(eval $(call gb_Library_Library,ipd))
 
-$(eval $(call gb_Library_use_api,ipd,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,ipd))
 
 $(eval $(call gb_Library_set_include,ipd,\
 	$$(INCLUDE) \
diff --git a/filter/Library_ips.mk b/filter/Library_ips.mk
index 74bee0b..19a908e 100644
--- a/filter/Library_ips.mk
+++ b/filter/Library_ips.mk
@@ -18,10 +18,7 @@
 
 $(eval $(call gb_Library_Library,ips))
 
-$(eval $(call gb_Library_use_api,ips,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,ips))
 
 $(eval $(call gb_Library_set_include,ips,\
 	$$(INCLUDE) \
diff --git a/filter/Library_ipt.mk b/filter/Library_ipt.mk
index 7f73f83..5924518 100644
--- a/filter/Library_ipt.mk
+++ b/filter/Library_ipt.mk
@@ -18,10 +18,7 @@
 
 $(eval $(call gb_Library_Library,ipt))
 
-$(eval $(call gb_Library_use_api,ipt,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,ipt))
 
 $(eval $(call gb_Library_set_include,ipt,\
 	$$(INCLUDE) \
diff --git a/filter/Library_ipx.mk b/filter/Library_ipx.mk
index ea377a3..8382b1a 100644
--- a/filter/Library_ipx.mk
+++ b/filter/Library_ipx.mk
@@ -18,10 +18,7 @@
 
 $(eval $(call gb_Library_Library,ipx))
 
-$(eval $(call gb_Library_use_api,ipx,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,ipx))
 
 $(eval $(call gb_Library_set_include,ipx,\
 	$$(INCLUDE) \
diff --git a/filter/Library_ira.mk b/filter/Library_ira.mk
index 3729daf..31d689c 100644
--- a/filter/Library_ira.mk
+++ b/filter/Library_ira.mk
@@ -18,10 +18,7 @@
 
 $(eval $(call gb_Library_Library,ira))
 
-$(eval $(call gb_Library_use_api,ira,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,ira))
 
 $(eval $(call gb_Library_set_include,ira,\
 	$$(INCLUDE) \
diff --git a/filter/Library_itg.mk b/filter/Library_itg.mk
index 3362d63..5ce1c04 100644
--- a/filter/Library_itg.mk
+++ b/filter/Library_itg.mk
@@ -18,10 +18,7 @@
 
 $(eval $(call gb_Library_Library,itg))
 
-$(eval $(call gb_Library_use_api,itg,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,itg))
 
 $(eval $(call gb_Library_set_include,itg,\
 	$$(INCLUDE) \
diff --git a/filter/Library_iti.mk b/filter/Library_iti.mk
index c02894d..85a4ac7 100644
--- a/filter/Library_iti.mk
+++ b/filter/Library_iti.mk
@@ -18,10 +18,7 @@
 
 $(eval $(call gb_Library_Library,iti))
 
-$(eval $(call gb_Library_use_api,iti,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,iti))
 
 $(eval $(call gb_Library_set_include,iti,\
 	$$(INCLUDE) \
diff --git a/filter/Library_msfilter.mk b/filter/Library_msfilter.mk
index 339f5c4..ceb7d0a 100644
--- a/filter/Library_msfilter.mk
+++ b/filter/Library_msfilter.mk
@@ -22,10 +22,7 @@ $(eval $(call gb_Library_use_package,msfilter,filter_inc))
 
 $(eval $(call gb_Library_set_componentfile,msfilter,filter/source/msfilter/msfilter))
 
-$(eval $(call gb_Library_use_api,msfilter,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,msfilter))
 
 $(eval $(call gb_Library_set_include,msfilter,\
 	$$(INCLUDE) \
diff --git a/filter/Library_odfflatxml.mk b/filter/Library_odfflatxml.mk
index 2e2d03b..a3d28af 100644
--- a/filter/Library_odfflatxml.mk
+++ b/filter/Library_odfflatxml.mk
@@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,odfflatxml))
 
 $(eval $(call gb_Library_set_componentfile,odfflatxml,filter/source/odfflatxml/odfflatxml))
 
-$(eval $(call gb_Library_use_api,odfflatxml,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,odfflatxml))
 
 $(eval $(call gb_Library_set_include,odfflatxml,\
 	$$(INCLUDE) \
diff --git a/filter/Library_pdffilter.mk b/filter/Library_pdffilter.mk
index c3c9e2c..46e9973 100644
--- a/filter/Library_pdffilter.mk
+++ b/filter/Library_pdffilter.mk
@@ -20,10 +20,7 @@ $(eval $(call gb_Library_Library,pdffilter))
 
 $(eval $(call gb_Library_set_componentfile,pdffilter,filter/source/pdf/pdffilter))
 
-$(eval $(call gb_Library_use_api,pdffilter,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,pdffilter))
 
 $(eval $(call gb_Library_set_include,pdffilter,\
 	-I$(SRCDIR)/filter/inc \
diff --git a/filter/Library_placeware.mk b/filter/Library_placeware.mk
index 1cc69ac..4bb4ef1 100644
--- a/filter/Library_placeware.mk
+++ b/filter/Library_placeware.mk
@@ -20,10 +20,7 @@ $(eval $(call gb_Library_Library,placeware))
 
 $(eval $(call gb_Library_set_componentfile,placeware,filter/source/placeware/placeware))
 
-$(eval $(call gb_Library_use_api,placeware,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,placeware))
 
 $(eval $(call gb_Library_set_include,placeware,\
 	$$(INCLUDE) \
diff --git a/filter/Library_svgfilter.mk b/filter/Library_svgfilter.mk
index af281e2..f292755 100644
--- a/filter/Library_svgfilter.mk
+++ b/filter/Library_svgfilter.mk
@@ -32,10 +32,7 @@ $(eval $(call gb_Library_set_include,svgfilter,\
     -I$(SRCDIR)/filter/inc \
 ))
 
-$(eval $(call gb_Library_use_api,svgfilter,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,svgfilter))
 
 $(eval $(call gb_Library_use_libraries,svgfilter,\
 	svxcore \
diff --git a/filter/Library_t602filter.mk b/filter/Library_t602filter.mk
index a866b25..8bf2446 100644
--- a/filter/Library_t602filter.mk
+++ b/filter/Library_t602filter.mk
@@ -20,10 +20,7 @@ $(eval $(call gb_Library_Library,t602filter))
 
 $(eval $(call gb_Library_set_componentfile,t602filter,filter/source/t602/t602filter))
 
-$(eval $(call gb_Library_use_api,t602filter,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,t602filter))
 
 $(eval $(call gb_Library_set_include,t602filter,\
 	$$(INCLUDE) \
diff --git a/filter/Library_textfd.mk b/filter/Library_textfd.mk
index ac7303a..9ab5a7c 100644
--- a/filter/Library_textfd.mk
+++ b/filter/Library_textfd.mk
@@ -32,10 +32,7 @@ $(eval $(call gb_Library_Library,textfd))
 
 $(eval $(call gb_Library_set_componentfile,textfd,filter/source/textfilterdetect/textfd))
 
-$(eval $(call gb_Library_use_api,textfd,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,textfd))
 
 $(eval $(call gb_Library_set_include,textfd,\
 	$$(INCLUDE) \
diff --git a/filter/Library_xmlfa.mk b/filter/Library_xmlfa.mk
index 7dd3364..f9260d5 100644
--- a/filter/Library_xmlfa.mk
+++ b/filter/Library_xmlfa.mk
@@ -20,10 +20,7 @@ $(eval $(call gb_Library_Library,xmlfa))
 
 $(eval $(call gb_Library_set_componentfile,xmlfa,filter/source/xmlfilteradaptor/xmlfa))
 
-$(eval $(call gb_Library_use_api,xmlfa,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,xmlfa))
 
 $(eval $(call gb_Library_set_include,xmlfa,\
 	$$(INCLUDE) \
diff --git a/filter/Library_xmlfd.mk b/filter/Library_xmlfd.mk
index faa5e81..19f0509 100644
--- a/filter/Library_xmlfd.mk
+++ b/filter/Library_xmlfd.mk
@@ -20,10 +20,7 @@ $(eval $(call gb_Library_Library,xmlfd))
 
 $(eval $(call gb_Library_set_componentfile,xmlfd,filter/source/xmlfilterdetect/xmlfd))
 
-$(eval $(call gb_Library_use_api,xmlfd,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,xmlfd))
 
 $(eval $(call gb_Library_set_include,xmlfd,\
 	$$(INCLUDE) \
diff --git a/filter/Library_xsltdlg.mk b/filter/Library_xsltdlg.mk
index c85f046..ba4f043 100644
--- a/filter/Library_xsltdlg.mk
+++ b/filter/Library_xsltdlg.mk
@@ -20,10 +20,7 @@ $(eval $(call gb_Library_Library,xsltdlg))
 
 $(eval $(call gb_Library_set_componentfile,xsltdlg,filter/source/xsltdialog/xsltdlg))
 
-$(eval $(call gb_Library_use_api,xsltdlg,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,xsltdlg))
 
 $(eval $(call gb_Library_set_include,xsltdlg,\
 	$$(INCLUDE) \
diff --git a/filter/Library_xsltfilter.mk b/filter/Library_xsltfilter.mk
index 36c6814..9688d59 100644
--- a/filter/Library_xsltfilter.mk
+++ b/filter/Library_xsltfilter.mk
@@ -20,10 +20,7 @@ $(eval $(call gb_Library_Library,xsltfilter))
 
 $(eval $(call gb_Library_set_componentfile,xsltfilter,filter/source/xsltfilter/xsltfilter))
 
-$(eval $(call gb_Library_use_api,xsltfilter,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,xsltfilter))
 
 $(eval $(call gb_Library_set_include,xsltfilter,\
 	$$(INCLUDE) \
diff --git a/formula/Library_for.mk b/formula/Library_for.mk
index 1c4852c..90820c3 100644
--- a/formula/Library_for.mk
+++ b/formula/Library_for.mk
@@ -40,10 +40,7 @@ $(eval $(call gb_Library_add_defs,for,\
     -DFORMULA_DLLIMPLEMENTATION \
 ))
 
-$(eval $(call gb_Library_use_api,for,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,for))
 
 $(eval $(call gb_Library_use_libraries,for,\
     comphelper \
diff --git a/formula/Library_forui.mk b/formula/Library_forui.mk
index a2a90a8..5aaea81 100644
--- a/formula/Library_forui.mk
+++ b/formula/Library_forui.mk
@@ -37,10 +37,7 @@ $(eval $(call gb_Library_add_defs,forui,\
     -DFORMULA_DLLIMPLEMENTATION \
 ))
 
-$(eval $(call gb_Library_use_api,forui,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,forui))
 
 $(eval $(call gb_Library_use_libraries,forui,\
     comphelper \
diff --git a/fpicker/Library_fpicker.mk b/fpicker/Library_fpicker.mk
index ba14d33..780a28a 100644
--- a/fpicker/Library_fpicker.mk
+++ b/fpicker/Library_fpicker.mk
@@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,fpicker))
 
 $(eval $(call gb_Library_set_componentfile,fpicker,fpicker/source/generic/fpicker))
 
-$(eval $(call gb_Library_use_api,fpicker,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,fpicker))
 
 $(eval $(call gb_Library_use_libraries,fpicker,\
 	cppu \
diff --git a/fpicker/Library_fps.mk b/fpicker/Library_fps.mk
index 000a4cf..431fc27 100644
--- a/fpicker/Library_fps.mk
+++ b/fpicker/Library_fps.mk
@@ -35,10 +35,7 @@ $(eval $(call gb_Library_use_packages,fps,\
 	vcl_inc \
 ))
 
-$(eval $(call gb_Library_use_api,fps,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,fps))
 
 $(eval $(call gb_Library_add_defs,fps,\
 	-D_UNICODE \
diff --git a/fpicker/Library_fps_aqua.mk b/fpicker/Library_fps_aqua.mk
index 12e36d6..cb7e1a9 100644
--- a/fpicker/Library_fps_aqua.mk
+++ b/fpicker/Library_fps_aqua.mk
@@ -33,10 +33,7 @@ $(eval $(call gb_Library_use_packages,fps_aqua,\
 	vcl_inc \
 ))
 
-$(eval $(call gb_Library_use_api,fps_aqua,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,fps_aqua))
 
 $(eval $(call gb_Library_add_libs,fps_aqua,\
     -framework Cocoa \
diff --git a/fpicker/Library_fps_odma.mk b/fpicker/Library_fps_odma.mk
index d55c1d1..1eae7a8 100644
--- a/fpicker/Library_fps_odma.mk
+++ b/fpicker/Library_fps_odma.mk
@@ -27,10 +27,7 @@
 
 $(eval $(call gb_Library_Library,fps_odma))
 
-$(eval $(call gb_Library_use_api,fps_odma,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,fps_odma))
 
 $(eval $(call gb_Library_use_libraries,fps_odma,\
 	comphelper \
diff --git a/fpicker/Library_fps_office.mk b/fpicker/Library_fps_office.mk
index b9c9414..6a80ed9 100644
--- a/fpicker/Library_fps_office.mk
+++ b/fpicker/Library_fps_office.mk
@@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,fps_office))
 
 $(eval $(call gb_Library_set_componentfile,fps_office,fpicker/source/office/fps_office))
 
-$(eval $(call gb_Library_use_api,fps_office,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,fps_office))
 
 $(eval $(call gb_Library_set_include,fps_office,\
     $$(INCLUDE) \
diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk
index 4513bcc..b517187 100644
--- a/framework/Library_fwe.mk
+++ b/framework/Library_fwe.mk
@@ -38,10 +38,7 @@ $(eval $(call gb_Library_add_defs,fwe,\
     -DFWE_DLLIMPLEMENTATION\
 ))
 
-$(eval $(call gb_Library_use_api,fwe,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,fwe))
 
 $(eval $(call gb_Library_use_libraries,fwe,\
     comphelper \
diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk
index 9b15a2d..5d51f55 100644
--- a/framework/Library_fwi.mk
+++ b/framework/Library_fwi.mk
@@ -34,10 +34,7 @@ $(eval $(call gb_Library_add_defs,fwi,\
     -DFWI_DLLIMPLEMENTATION \
 ))
 
-$(eval $(call gb_Library_use_api,fwi,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,fwi))
 
 $(eval $(call gb_Library_set_include,fwi,\
     -I$(SRCDIR)/framework/source/inc \
diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
index b78dd0c..b312d88 100644
--- a/framework/Library_fwk.mk
+++ b/framework/Library_fwk.mk
@@ -36,10 +36,7 @@ $(eval $(call gb_Library_set_include,fwk,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_use_api,fwk,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,fwk))
 
 $(eval $(call gb_Library_use_libraries,fwk,\
     comphelper \
diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk
index c9bda5b..155af1a 100644
--- a/framework/Library_fwl.mk
+++ b/framework/Library_fwl.mk
@@ -36,10 +36,7 @@ $(eval $(call gb_Library_set_include,fwl,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_use_api,fwl,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,fwl))
 
 $(eval $(call gb_Library_use_libraries,fwl,\
     comphelper \
diff --git a/framework/Library_fwm.mk b/framework/Library_fwm.mk
index d704d16..5043a3d 100644
--- a/framework/Library_fwm.mk
+++ b/framework/Library_fwm.mk
@@ -36,10 +36,7 @@ $(eval $(call gb_Library_set_include,fwm,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_use_api,fwm,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,fwm))
 
 $(eval $(call gb_Library_use_libraries,fwm,\
     comphelper \
diff --git a/framework/Library_lomenubar.mk b/framework/Library_lomenubar.mk
index 302ad5a..7ce6d10 100644
--- a/framework/Library_lomenubar.mk
+++ b/framework/Library_lomenubar.mk
@@ -31,10 +31,7 @@ $(eval $(call gb_Library_Library,lomenubar))
 $(eval $(call gb_Library_set_componentfile,lomenubar,framework/util/lomenubar))
 
 
-$(eval $(call gb_Library_use_api,lomenubar,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,lomenubar))
 
 $(eval $(call gb_Library_use_externals,lomenubar,\
 	gtk \
diff --git a/hwpfilter/Library_hwp.mk b/hwpfilter/Library_hwp.mk
index ec189cd..bc51391 100644
--- a/hwpfilter/Library_hwp.mk
+++ b/hwpfilter/Library_hwp.mk
@@ -31,10 +31,7 @@ $(eval $(call gb_Library_set_include,hwp,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_use_api,hwp,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,hwp))
 
 $(eval $(call gb_Library_use_libraries,hwp,\
     comphelper \
diff --git a/i18npool/Library_i18nisolang1.mk b/i18npool/Library_i18nisolang1.mk
index 2ed16de..c41f71e 100644
--- a/i18npool/Library_i18nisolang1.mk
+++ b/i18npool/Library_i18nisolang1.mk
@@ -34,10 +34,7 @@ $(eval $(call gb_Library_set_include,i18nisolang1,\
 	$$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_use_api,i18nisolang1,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,i18nisolang1))
 
 $(eval $(call gb_Library_add_defs,i18nisolang1,\
 	-DI18NISOLANG_DLLIMPLEMENTATION \
diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk
index fd85033..6d3eead 100644
--- a/i18npool/Library_i18npool.mk
+++ b/i18npool/Library_i18npool.mk
@@ -35,10 +35,7 @@ $(eval $(call gb_Library_set_include,i18npool,\
 	-I$(SRCDIR)/i18npool/inc \
 ))
 
-$(eval $(call gb_Library_use_api,i18npool,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,i18npool))
 
 $(eval $(call gb_Library_use_libraries,i18npool,\
 	comphelper \
diff --git a/i18npool/Library_i18nsearch.mk b/i18npool/Library_i18nsearch.mk
index 4194c53..bfe6450 100644
--- a/i18npool/Library_i18nsearch.mk
+++ b/i18npool/Library_i18nsearch.mk
@@ -36,10 +36,7 @@ $(eval $(call gb_Library_set_include,i18nsearch,\
 	$$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_use_api,i18nsearch,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,i18nsearch))
 
 $(eval $(call gb_Library_use_libraries,i18nsearch,\
 	cppu \
diff --git a/i18npool/Library_textconv_dict.mk b/i18npool/Library_textconv_dict.mk
index 675f615..e98a452 100644
--- a/i18npool/Library_textconv_dict.mk
+++ b/i18npool/Library_textconv_dict.mk
@@ -33,10 +33,7 @@ $(eval $(call gb_Library_set_include,textconv_dict,\
 	-I$(SRCDIR)/i18npool/inc \
 ))
 
-$(eval $(call gb_Library_use_api,textconv_dict,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,textconv_dict))
 
 $(eval $(call gb_Library_use_libraries,textconv_dict,\
     $(gb_STDLIBS) \
diff --git a/i18nutil/Library_i18nutil.mk b/i18nutil/Library_i18nutil.mk
index 216dbec..10cdad6 100644
--- a/i18nutil/Library_i18nutil.mk
+++ b/i18nutil/Library_i18nutil.mk
@@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,i18nutil))
 
 $(eval $(call gb_Library_use_package,i18nutil,i18nutil_inc))
 
-$(eval $(call gb_Library_use_api,i18nutil,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,i18nutil))
 
 $(eval $(call gb_Library_add_defs,i18nutil,\
 	-DI18NUTIL_DLLIMPLEMENTATION \
diff --git a/lingucomponent/Library_MacOSXSpell.mk b/lingucomponent/Library_MacOSXSpell.mk
index 4c99452..f3f37e2 100644
--- a/lingucomponent/Library_MacOSXSpell.mk
+++ b/lingucomponent/Library_MacOSXSpell.mk
@@ -34,10 +34,7 @@ $(eval $(call gb_Library_set_include,MacOSXSpell,\
 	-I$(SRCDIR)/lingucomponent/source/lingutil \
 ))
 
-$(eval $(call gb_Library_use_api,MacOSXSpell,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,MacOSXSpell))
 
 $(eval $(call gb_Library_use_libraries,MacOSXSpell,\
 	$(gb_STDLIBS) \
diff --git a/lingucomponent/Library_guesslang.mk b/lingucomponent/Library_guesslang.mk
index 0e1ea8d..a2e3ad8 100644
--- a/lingucomponent/Library_guesslang.mk
+++ b/lingucomponent/Library_guesslang.mk
@@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,guesslang))
 
 $(eval $(call gb_Library_set_componentfile,guesslang,lingucomponent/source/languageguessing/guesslang))
 
-$(eval $(call gb_Library_use_api,guesslang,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,guesslang))
 
 $(eval $(call gb_Library_use_libraries,guesslang,\
 	$(gb_STDLIBS) \
diff --git a/lingucomponent/Library_hyphen.mk b/lingucomponent/Library_hyphen.mk
index d518d63..1fd9e79 100644
--- a/lingucomponent/Library_hyphen.mk
+++ b/lingucomponent/Library_hyphen.mk
@@ -34,10 +34,7 @@ $(eval $(call gb_Library_set_include,hyphen,\
 	-I$(SRCDIR)/lingucomponent/source/lingutil \
 ))
 
-$(eval $(call gb_Library_use_api,hyphen,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,hyphen))
 
 $(eval $(call gb_Library_use_libraries,hyphen,\
 	$(gb_STDLIBS) \
diff --git a/lingucomponent/Library_lnth.mk b/lingucomponent/Library_lnth.mk
index ae39262..a406d83 100644
--- a/lingucomponent/Library_lnth.mk
+++ b/lingucomponent/Library_lnth.mk
@@ -34,10 +34,7 @@ $(eval $(call gb_Library_set_include,lnth,\
 	-I$(SRCDIR)/lingucomponent/source/lingutil \
 ))
 
-$(eval $(call gb_Library_use_api,lnth,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,lnth))
 
 $(eval $(call gb_Library_use_libraries,lnth,\
 	$(gb_STDLIBS) \
diff --git a/lingucomponent/Library_spell.mk b/lingucomponent/Library_spell.mk
index 1914917..a9349e0 100644
--- a/lingucomponent/Library_spell.mk
+++ b/lingucomponent/Library_spell.mk
@@ -34,10 +34,7 @@ $(eval $(call gb_Library_set_include,spell,\
 	-I$(SRCDIR)/lingucomponent/source/lingutil \
 ))
 
-$(eval $(call gb_Library_use_api,spell,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,spell))
 
 $(eval $(call gb_Library_use_libraries,spell,\
 	$(gb_STDLIBS) \
diff --git a/linguistic/Library_lng.mk b/linguistic/Library_lng.mk
index f9a363b..4459c45 100644
--- a/linguistic/Library_lng.mk
+++ b/linguistic/Library_lng.mk
@@ -37,10 +37,7 @@ $(eval $(call gb_Library_set_include,lng,\
 	-I$(SRCDIR)/linguistic/inc \
 ))
 
-$(eval $(call gb_Library_use_api,lng,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,lng))
 
 $(eval $(call gb_Library_add_defs,lng,\
 	-DLNG_DLLIMPLEMENTATION \
diff --git a/lotuswordpro/Library_lwpft.mk b/lotuswordpro/Library_lwpft.mk
index b6e92cd..5d6ffb2 100644
--- a/lotuswordpro/Library_lwpft.mk
+++ b/lotuswordpro/Library_lwpft.mk
@@ -31,10 +31,7 @@ $(eval $(call gb_Library_set_include,lwpft,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_use_api,lwpft,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,lwpft))
 
 $(eval $(call gb_Library_use_libraries,lwpft,\
     comphelper \
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index 928e0b6..8a48bdc 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -54,10 +54,7 @@ $(eval $(call gb_Library_add_defs,oox,\
     -DOOX_DLLIMPLEMENTATION \
 ))
 
-$(eval $(call gb_Library_use_api,oox,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,oox))
 
 $(eval $(call gb_Library_use_libraries,oox,\
     basegfx \
diff --git a/package/Library_package2.mk b/package/Library_package2.mk
index 987c342..e5b5023 100644
--- a/package/Library_package2.mk
+++ b/package/Library_package2.mk
@@ -37,10 +37,7 @@ $(eval $(call gb_Library_set_include,package2,\
 	-I$(SRCDIR)/package/inc \
 ))
 
-$(eval $(call gb_Library_use_api,package2,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,package2))
 
 $(eval $(call gb_Library_add_defs,package2,\
 	-DDLLIMPLEMENTATION_PACKAGE \
diff --git a/package/Library_xstor.mk b/package/Library_xstor.mk
index 458e4a0..a91533f 100644
--- a/package/Library_xstor.mk
+++ b/package/Library_xstor.mk
@@ -35,10 +35,7 @@ $(eval $(call gb_Library_set_include,xstor,\
 	-I$(SRCDIR)/package/inc \
 ))
 
-$(eval $(call gb_Library_use_api,xstor,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,xstor))
 
 $(eval $(call gb_Library_use_libraries,xstor,\
 	comphelper \
diff --git a/padmin/Library_spa.mk b/padmin/Library_spa.mk
index cfae49a..bdfec9f 100644
--- a/padmin/Library_spa.mk
+++ b/padmin/Library_spa.mk
@@ -32,10 +32,7 @@ $(eval $(call gb_Library_add_defs,spa,\
     -DSPA_DLLIMPLEMENTATION \
 ))
 
-$(eval $(call gb_Library_use_api,spa,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,spa))
 
 $(eval $(call gb_Library_use_libraries,spa,\
     svt \
diff --git a/regexp/Library_regexp.mk b/regexp/Library_regexp.mk
index 4599c76..e7714c4 100644
--- a/regexp/Library_regexp.mk
+++ b/regexp/Library_regexp.mk
@@ -30,10 +30,7 @@ $(eval $(call gb_Library_Library,i18nregexp))
 
 $(eval $(call gb_Library_use_package,i18nregexp,regexp_inc))
 
-$(eval $(call gb_Library_use_api,i18nregexp,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,i18nregexp))
 
 $(eval $(call gb_Library_add_defs,i18nregexp,\
 	-DREGEXP_DLLIMPLEMENTATION \
diff --git a/reportdesign/Library_rpt.mk b/reportdesign/Library_rpt.mk
index 0e18a8e..ae4318f 100644
--- a/reportdesign/Library_rpt.mk
+++ b/reportdesign/Library_rpt.mk
@@ -38,10 +38,7 @@ $(eval $(call gb_Library_add_defs,rpt,\
     -DREPORTDESIGN_DLLIMPLEMENTATION \
 ))
 
-$(eval $(call gb_Library_use_api,rpt,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,rpt))
 
 $(eval $(call gb_Library_use_libraries,rpt,\
     comphelper \
diff --git a/reportdesign/Library_rptui.mk b/reportdesign/Library_rptui.mk
index 83d91f3..3755165 100644
--- a/reportdesign/Library_rptui.mk
+++ b/reportdesign/Library_rptui.mk
@@ -34,10 +34,7 @@ $(eval $(call gb_Library_set_include,rptui,\
     -I$(SRCDIR)/reportdesign/source/ui/inc \
 ))
 
-$(eval $(call gb_Library_use_api,rptui,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,rptui))
 
 $(eval $(call gb_Library_use_libraries,rptui,\
     comphelper \
diff --git a/reportdesign/Library_rptxml.mk b/reportdesign/Library_rptxml.mk
index d27e64b..bdc3cda 100644
--- a/reportdesign/Library_rptxml.mk
+++ b/reportdesign/Library_rptxml.mk
@@ -33,10 +33,7 @@ $(eval $(call gb_Library_set_include,rptxml,\
     -I$(SRCDIR)/reportdesign/source/inc \
 ))
 
-$(eval $(call gb_Library_use_api,rptxml,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,rptxml))
 
 $(eval $(call gb_Library_use_libraries,rptxml,\
     comphelper \
diff --git a/sax/Library_expwrap.mk b/sax/Library_expwrap.mk
index dca2b33..9710431 100644
--- a/sax/Library_expwrap.mk
+++ b/sax/Library_expwrap.mk
@@ -12,10 +12,7 @@ $(eval $(call gb_Library_Library,expwrap))
 $(eval $(call gb_Library_set_componentfile,expwrap,sax/source/expatwrap/expwrap))
 
 
-$(eval $(call gb_Library_use_api,expwrap,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,expwrap))
 
 $(eval $(call gb_Library_use_externals,expwrap,\
     expat_utf16 \
diff --git a/sax/Library_fastsax.mk b/sax/Library_fastsax.mk
index e866cb8..212752b 100644
--- a/sax/Library_fastsax.mk
+++ b/sax/Library_fastsax.mk
@@ -11,10 +11,7 @@ $(eval $(call gb_Library_Library,fastsax))
 
 $(eval $(call gb_Library_set_componentfile,fastsax,sax/source/fastparser/fastsax))
 
-$(eval $(call gb_Library_use_api,fastsax,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,fastsax))
 
 $(eval $(call gb_Library_use_externals,fastsax,\
         expat_utf8 \
diff --git a/sax/Library_sax.mk b/sax/Library_sax.mk
index 9b6b860..690bff7 100644
--- a/sax/Library_sax.mk
+++ b/sax/Library_sax.mk
@@ -13,10 +13,7 @@ $(eval $(call gb_Library_use_package,sax,\
     sax_inc \
 ))
 
-$(eval $(call gb_Library_use_api,sax,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,sax))
 
 $(eval $(call gb_Library_use_libraries,sax,\
     comphelper \
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 274c504..cba0dab 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -40,10 +40,7 @@ $(eval $(call gb_Library_add_defs,sc,\
 	-DSC_INFO_OSVERSION=\"$(OS)\" \
 ))
 
-$(eval $(call gb_Library_use_api,sc,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,sc))
 
 $(eval $(call gb_Library_use_libraries,sc,\
 	avmedia \
diff --git a/sc/Library_scd.mk b/sc/Library_scd.mk
index c85f039..6b74917 100644
--- a/sc/Library_scd.mk
+++ b/sc/Library_scd.mk
@@ -29,10 +29,7 @@ $(eval $(call gb_Library_set_include,scd,\
 	$$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_use_api,scd,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,scd))
 
 $(eval $(call gb_Library_use_libraries,scd,\
 	comphelper \
diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk
index 388686c..76066b6 100644
--- a/sc/Library_scfilt.mk
+++ b/sc/Library_scfilt.mk
@@ -32,10 +32,7 @@ $(eval $(call gb_Library_set_include,scfilt,\
 	$$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_use_api,scfilt,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,scfilt))
 
 $(eval $(call gb_Library_use_libraries,scfilt,\
 	basegfx \
diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk
index 0cb2780..bcde415 100644
--- a/sc/Library_scui.mk
+++ b/sc/Library_scui.mk
@@ -31,10 +31,7 @@ $(eval $(call gb_Library_set_include,scui,\
 	$$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_use_api,scui,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,scui))
 
 $(eval $(call gb_Library_use_libraries,scui,\
 	comphelper \
diff --git a/sccomp/Library_solver.mk b/sccomp/Library_solver.mk
index a889f44..2db18f5 100644
--- a/sccomp/Library_solver.mk
+++ b/sccomp/Library_solver.mk
@@ -30,10 +30,7 @@ $(eval $(call gb_Library_Library,solver))
 
 $(eval $(call gb_Library_set_componentfile,solver,sccomp/source/solver/solver))
 
-$(eval $(call gb_Library_use_api,solver,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,solver))
 
 $(eval $(call gb_Library_use_libraries,solver,\
 	comphelper \
diff --git a/scripting/Library_basprov.mk b/scripting/Library_basprov.mk
index 0bc98fd..a71e3e6 100644
--- a/scripting/Library_basprov.mk
+++ b/scripting/Library_basprov.mk
@@ -35,10 +35,7 @@ $(eval $(call gb_Library_set_include,basprov,\
 	-I$(SRCDIR)/scripting/source/inc \
 ))
 
-$(eval $(call gb_Library_use_api,basprov,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,basprov))
 
 $(eval $(call gb_Library_use_libraries,basprov,\
 	comphelper \
diff --git a/scripting/Library_protocolhandler.mk b/scripting/Library_protocolhandler.mk
index dcac02f..35e47be 100644
--- a/scripting/Library_protocolhandler.mk
+++ b/scripting/Library_protocolhandler.mk
@@ -35,10 +35,7 @@ $(eval $(call gb_Library_set_include,protocolhandler,\
 	-I$(SRCDIR)/scripting/source/inc \
 ))
 
-$(eval $(call gb_Library_use_api,protocolhandler,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,protocolhandler))
 
 $(eval $(call gb_Library_use_libraries,protocolhandler,\
 	cppu \
diff --git a/scripting/Library_scriptframe.mk b/scripting/Library_scriptframe.mk
index 1c3a103..ee5f420 100644
--- a/scripting/Library_scriptframe.mk
+++ b/scripting/Library_scriptframe.mk
@@ -35,10 +35,7 @@ $(eval $(call gb_Library_set_include,scriptframe,\
 	-I$(SRCDIR)/scripting/source/inc \
 ))
 
-$(eval $(call gb_Library_use_api,scriptframe,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,scriptframe))
 
 $(eval $(call gb_Library_use_libraries,scriptframe,\
 	comphelper \
diff --git a/scripting/Library_stringresource.mk b/scripting/Library_stringresource.mk
index 271ec3d..faca2a0 100644
--- a/scripting/Library_stringresource.mk
+++ b/scripting/Library_stringresource.mk
@@ -35,10 +35,7 @@ $(eval $(call gb_Library_set_include,stringresource,\
 	-I$(SRCDIR)/scripting/source/inc \
 ))
 
-$(eval $(call gb_Library_use_api,stringresource,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,stringresource))
 
 $(eval $(call gb_Library_use_libraries,stringresource,\
 	cppu \
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 2f3c0d0..07b85ea 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -71,10 +71,7 @@ $(eval $(call gb_Library_set_defs,sd,\
 ))
 endif
 
-$(eval $(call gb_Library_use_api,sd,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,sd))
 
 $(eval $(call gb_Library_use_libraries,sd,\
     avmedia \
diff --git a/sd/Library_sdd.mk b/sd/Library_sdd.mk
index 5fe3c0d..68d6b6d 100644
--- a/sd/Library_sdd.mk
+++ b/sd/Library_sdd.mk
@@ -32,10 +32,7 @@ $(eval $(call gb_Library_set_include,sdd,\
     -I$(SRCDIR)/sd/inc \
 ))
 
-$(eval $(call gb_Library_use_api,sdd,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,sdd))
 
 $(eval $(call gb_Library_use_libraries,sdd,\
     cppu \
diff --git a/sd/Library_sdfilt.mk b/sd/Library_sdfilt.mk
index 327ac8b..3250fbf 100644
--- a/sd/Library_sdfilt.mk
+++ b/sd/Library_sdfilt.mk
@@ -42,10 +42,7 @@ $(eval $(call gb_Library_add_defs,sdfilt,\
 ))
 endif
 
-$(eval $(call gb_Library_use_api,sdfilt,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,sdfilt))
 
 $(eval $(call gb_Library_use_libraries,sdfilt,\
     comphelper \
diff --git a/sd/Library_sdui.mk b/sd/Library_sdui.mk
index a83d944..102f88b 100644
--- a/sd/Library_sdui.mk
+++ b/sd/Library_sdui.mk
@@ -37,10 +37,7 @@ $(eval $(call gb_Library_add_defs,sdui,\
     -DSD_DLLIMPLEMENTATION \
 ))
 
-$(eval $(call gb_Library_use_api,sdui,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,sdui))
 
 $(eval $(call gb_Library_use_libraries,sdui,\
     basegfx \
diff --git a/sdext/Library_minimizer.mk b/sdext/Library_minimizer.mk
index 5c918c3..409b146 100644
--- a/sdext/Library_minimizer.mk
+++ b/sdext/Library_minimizer.mk
@@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,SunPresentationMinimizer))
 
 $(eval $(call gb_Library_set_componentfile,SunPresentationMinimizer,sdext/source/minimizer/minimizer))
 
-$(eval $(call gb_Library_use_api,SunPresentationMinimizer,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,SunPresentationMinimizer))
 
 $(eval $(call gb_Library_use_libraries,SunPresentationMinimizer,\
     cppu \
diff --git a/sdext/Library_pdfimport.mk b/sdext/Library_pdfimport.mk
index ddc6f3b..11f4f07 100644
--- a/sdext/Library_pdfimport.mk
+++ b/sdext/Library_pdfimport.mk
@@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,pdfimport))
 
 $(eval $(call gb_Library_set_componentfile,pdfimport,sdext/source/pdfimport/pdfimport))
 
-$(eval $(call gb_Library_use_api,pdfimport,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,pdfimport))
 
 $(eval $(call gb_Library_set_include,pdfimport,\
     -I$(SRCDIR)/sdext/source/pdfimport/inc \
diff --git a/sdext/Library_presenter.mk b/sdext/Library_presenter.mk
index 058d8be..ca404ca 100644
--- a/sdext/Library_presenter.mk
+++ b/sdext/Library_presenter.mk
@@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,PresenterScreen))
 
 $(eval $(call gb_Library_set_componentfile,PresenterScreen,sdext/source/presenter/presenter))
 
-$(eval $(call gb_Library_use_api,PresenterScreen,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,PresenterScreen))
 
 $(eval $(call gb_Library_add_defs,PresenterScreen,\
     -DPRESENTER_IMPL_IDENTIFIER=\"com.sun.PresenterScreen-$(sdext_PLATFORM)\" \
diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk
index a1372e5..2ed08af 100644
--- a/sfx2/Library_qstart.mk
+++ b/sfx2/Library_qstart.mk
@@ -35,10 +35,7 @@ $(eval $(call gb_Library_set_include,qstart_gtk,\
     -I$(SRCDIR)/sfx2/inc/sfx2 \
 ))
 
-$(eval $(call gb_Library_use_api,qstart_gtk,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,qstart_gtk))
 
 $(eval $(call gb_Library_add_defs,qstart_gtk,\
     -DENABLE_QUICKSTART_APPLET \
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index 6da9165..562d3c2 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -37,10 +37,7 @@ $(eval $(call gb_Library_add_sdi_headers,sfx,sfx2/sdi/sfxslots))
 
 $(eval $(call gb_Library_set_componentfile,sfx,sfx2/util/sfx))
 
-$(eval $(call gb_Library_use_api,sfx,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,sfx))
 
 $(eval $(call gb_Library_set_include,sfx,\
     -I$(SRCDIR)/sfx2/inc \
diff --git a/shell/Library_desktopbe.mk b/shell/Library_desktopbe.mk
index 0c2fad8..90821f6 100644
--- a/shell/Library_desktopbe.mk
+++ b/shell/Library_desktopbe.mk
@@ -27,10 +27,7 @@
 
 $(eval $(call gb_Library_Library,desktopbe1))
 
-$(eval $(call gb_Library_use_api,desktopbe1,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,desktopbe1))
 
 $(eval $(call gb_Library_use_libraries,desktopbe1,\
 	cppu \
diff --git a/shell/Library_gconfbe.mk b/shell/Library_gconfbe.mk
index 0616898..5e51323 100644
--- a/shell/Library_gconfbe.mk
+++ b/shell/Library_gconfbe.mk
@@ -33,10 +33,7 @@ $(eval $(call gb_Library_add_defs,gconfbe1,\
 ))
 endif
 
-$(eval $(call gb_Library_use_api,gconfbe1,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,gconfbe1))
 
 $(eval $(call gb_Library_use_externals,gconfbe1,\
 	gconf \
diff --git a/shell/Library_kde4be.mk b/shell/Library_kde4be.mk
index 4aa63bd..c31fb68 100644
--- a/shell/Library_kde4be.mk
+++ b/shell/Library_kde4be.mk
@@ -27,10 +27,7 @@
 
 $(eval $(call gb_Library_Library,kde4be1))
 
-$(eval $(call gb_Library_use_api,kde4be1,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,kde4be1))
 
 $(eval $(call gb_Library_use_externals,kde4be1,\
 	kde4 \
diff --git a/shell/Library_kdebe.mk b/shell/Library_kdebe.mk
index 3761a8b..a367c8d 100644
--- a/shell/Library_kdebe.mk
+++ b/shell/Library_kdebe.mk
@@ -35,10 +35,7 @@ $(eval $(call gb_Library_add_libs,kdebe1,\
 	-lkio \
 ))
 
-$(eval $(call gb_Library_use_api,kdebe1,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,kdebe1))
 
 $(eval $(call gb_Library_use_externals,kdebe1,\
 	kde \
diff --git a/shell/Library_macbe.mk b/shell/Library_macbe.mk
index bb305c1..4251247 100644
--- a/shell/Library_macbe.mk
+++ b/shell/Library_macbe.mk
@@ -27,10 +27,7 @@
 
 $(eval $(call gb_Library_Library,macbe1))
 
-$(eval $(call gb_Library_use_api,macbe1,\
-    udkapi \
-    offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,macbe1))
 
 $(eval $(call gb_Library_use_internal_api,macbe1,\
 	macbe \
diff --git a/shell/Library_tdebe.mk b/shell/Library_tdebe.mk
index aea171a..a6ca92b 100644
--- a/shell/Library_tdebe.mk
+++ b/shell/Library_tdebe.mk
@@ -31,10 +31,7 @@ $(eval $(call gb_Library_use_packages,tdebe1,\
 	shell_inc \
 ))
 
-$(eval $(call gb_Library_use_api,tdebe1,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,tdebe1))
 
 $(eval $(call gb_Library_use_externals,tdebe1,\
 	tde \
diff --git a/slideshow/Executable_demoshow.mk b/slideshow/Executable_demoshow.mk
index 91e6a02..f658f7f 100644
--- a/slideshow/Executable_demoshow.mk
+++ b/slideshow/Executable_demoshow.mk
@@ -48,10 +48,7 @@ $(eval $(call gb_Executable_set_defs,demoshow,\
 ))
 endif
 
-$(eval $(call gb_Library_use_api,demoshow,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,demoshow))
 
 $(eval $(call gb_Executable_use_libraries,demoshow,\
     basegfx \
diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk
index b4f634f..51e9bbd 100644
--- a/slideshow/Library_OGLTrans.mk
+++ b/slideshow/Library_OGLTrans.mk
@@ -43,10 +43,7 @@ $(eval $(call gb_Library_add_defs,OGLTrans,\
 ))
 endif
 
-$(eval $(call gb_Library_use_api,OGLTrans,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,OGLTrans))
 
 $(eval $(call gb_Library_use_libraries,OGLTrans,\
     canvastools \
diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk
index 658456d..68c940a 100644
--- a/slideshow/Library_slideshow.mk
+++ b/slideshow/Library_slideshow.mk
@@ -47,10 +47,7 @@ $(eval $(call gb_Library_add_defs,slideshow,\
 ))
 endif
 
-$(eval $(call gb_Library_use_api,slideshow,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,slideshow))
 
 $(eval $(call gb_Library_use_libraries,slideshow,\
     avmedia \
diff --git a/smoketest/Library_smoketest.mk b/smoketest/Library_smoketest.mk
index c62e015..5832bd4 100644
--- a/smoketest/Library_smoketest.mk
+++ b/smoketest/Library_smoketest.mk
@@ -33,10 +33,7 @@ $(eval $(call gb_Library_add_defs,smoketest,\
 	-DCPPUNIT_PLUGIN_EXPORT='extern "C" SAL_DLLPUBLIC_EXPORT' \
 ))
 
-$(eval $(call gb_Library_use_api,smoketest,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,smoketest))
 
 $(eval $(call gb_Library_use_libraries,smoketest,\
 	cppu \
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index a89676e..fd3269c 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -109,6 +109,10 @@ $(eval $(foreach method,\
 	set_library_path_flags \
 	add_api \
 	use_api \
+	use_sdk_api \
+	use_sdk_api \
+	use_udk_api \
+	use_udk_api \
 	add_internal_api \
 	use_internal_api \
 	add_internal_bootstrap_api \
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index cb043d0..1471b04 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -190,6 +190,10 @@ $(eval $(foreach method,\
 	set_library_path_flags \
 	add_api \
 	use_api \
+	use_sdk_api \
+	use_sdk_api \
+	use_udk_api \
+	use_udk_api \
 	add_internal_api \
 	use_internal_api \
 	add_internal_bootstrap_api \
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index e4185a0..7036bfa 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -642,6 +642,15 @@ $(foreach api,$(2),$(call gb_LinkTarget__use_api,$(1),$(api)))
 
 endef
 
+define gb_LinkTarget_use_udk_api
+$(call gb_LinkTarget__use_api,$(1),udkapi)
+endef
+
+define gb_LinkTarget_use_sdk_api
+$(call gb_LinkTarget__use_api,$(1),udkapi)
+$(call gb_LinkTarget__use_api,$(1),offapi)
+endef
+
 define gb_LinkTarget__use_internal_api_one
 $(call gb_LinkTarget_get_external_headers_target,$(1)) :| \
 	$(call gb_UnoApiHeadersTarget_get_$(3)target,$(2))
diff --git a/sot/Library_sot.mk b/sot/Library_sot.mk
index 5f620bc..ddb21b2 100644
--- a/sot/Library_sot.mk
+++ b/sot/Library_sot.mk
@@ -36,10 +36,7 @@ $(eval $(call gb_Library_set_include,sot,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_use_api,sot,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,sot))
 
 $(eval $(call gb_Library_add_defs,sot,\
     -DSOT_DLLIMPLEMENTATION \
diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk
index 6546f5f..f23cfd9 100644
--- a/starmath/Library_sm.mk
+++ b/starmath/Library_sm.mk
@@ -32,10 +32,7 @@ $(eval $(call gb_Library_set_include,sm,\
         $$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_use_api,sm,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,sm))
 
 $(eval $(call gb_Library_use_libraries,sm,\
         comphelper \
diff --git a/starmath/Library_smd.mk b/starmath/Library_smd.mk
index e47a547..86d4fb2 100644
--- a/starmath/Library_smd.mk
+++ b/starmath/Library_smd.mk
@@ -29,10 +29,7 @@ $(eval $(call gb_Library_set_include,smd,\
         $$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_use_api,smd,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,smd))
 
 $(eval $(call gb_Library_use_libraries,smd,\
         cppu \
diff --git a/svl/Library_fsstorage.mk b/svl/Library_fsstorage.mk
index 48a06d9..fc65cb1 100644
--- a/svl/Library_fsstorage.mk
+++ b/svl/Library_fsstorage.mk
@@ -37,10 +37,7 @@ $(eval $(call gb_Library_set_include,fsstorage,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_use_api,fsstorage,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,fsstorage))
 
 $(eval $(call gb_Library_use_libraries,fsstorage,\
     comphelper \
diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk
index d09ad30..b9d5dc0 100644
--- a/svl/Library_passwordcontainer.mk
+++ b/svl/Library_passwordcontainer.mk
@@ -37,10 +37,7 @@ $(eval $(call gb_Library_set_include,passwordcontainer,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_use_api,passwordcontainer,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,passwordcontainer))
 
 $(eval $(call gb_Library_use_libraries,passwordcontainer,\
     cppu \
diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk
index 603154f..41f91b5 100644
--- a/svl/Library_svl.mk
+++ b/svl/Library_svl.mk
@@ -40,10 +40,7 @@ $(eval $(call gb_Library_set_include,svl,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_use_api,svl,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,svl))
 
 $(eval $(call gb_Library_add_defs,svl,\
     -DSVL_DLLIMPLEMENTATION \

... etc. - the rest is truncated

• Previous message: [Libreoffice-commits] .: offapi/com sw/inc sw/source
• Next message: [Libreoffice-commits] .: Branch 'libreoffice-3-5' - connectivity/source
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]