Break some long lines and sort dependencies

... so it'll be easier to track changes in the future.

Change-Id: I42eda79d585b6763953d531601e37a37848c5ef8

23 files changed, 669 insertions, 54 deletions

diff --git a/basic/meson.build b/basic/meson.build
index 44d21ed3594f..8259f564713a 100644
--- a/basic/meson.build
+++ b/basic/meson.build
@@ -77,6 +77,20 @@ sb_lib = shared_library('sblo',
   cpp_args: ['-DBASIC_DLLIMPLEMENTATION',
              '-DLIBO_INTERNAL_ONLY'],
   include_directories: [main_inc, udkh_inc, offapi_inc, oovbaapi_inc, 'source/inc', 'inc', setup_inc],
-  link_with: [comphelper_lib, cppuhelper_lib, cppu_lib, salhelper_lib, sal_lib, i18nlangtag_lib, sot_lib, svl_lib, svt_lib, tl_lib, utl_lib, vcl_lib, xmlscript_lib],
+  link_with: [
+    comphelper_lib,
+    cppuhelper_lib,
+    cppu_lib,
+    salhelper_lib,
+    sal_lib,
+    i18nlangtag_lib,
+    sot_lib,
+    svl_lib,
+    svt_lib,
+    tl_lib,
+    utl_lib,
+    vcl_lib,
+    xmlscript_lib,
+  ],
   install: true,
 )
diff --git a/connectivity/meson.build b/connectivity/meson.build
index 5832f178fba5..39198c0171b0 100644
--- a/connectivity/meson.build
+++ b/connectivity/meson.build
@@ -86,7 +86,18 @@ dbtools_lib = shared_library('dbtoolslo',
              '-DBOOST_SPIRIT_USE_OLD_NAMESPACE',
              '-DLIBO_INTERNAL_ONLY'],
   include_directories: [main_inc, udkh_inc, offapi_inc, 'inc', 'source/inc'],
-  link_with: [cppuhelper_lib, cppu_lib, salhelper_lib, sal_lib, utl_lib, tl_lib, comphelper_lib, i18nlangtag_lib, svt_lib, vcl_lib],
+  link_with: [
+    cppuhelper_lib,
+    cppu_lib,
+    salhelper_lib,
+    sal_lib,
+    utl_lib,
+    tl_lib,
+    comphelper_lib,
+    i18nlangtag_lib,
+    svt_lib,
+    vcl_lib,
+  ],
   dependencies: [],
   install: true,
 )
diff --git a/cppcanvas/meson.build b/cppcanvas/meson.build
index efbfd5600348..a55562d5a3d7 100644
--- a/cppcanvas/meson.build
+++ b/cppcanvas/meson.build
@@ -24,7 +24,17 @@ cppcanvas_lib = shared_library('cppcanvaslo',
   cpp_args: ['-DCPPCANVAS_DLLIMPLEMENTATION',
              '-DLIBO_INTERNAL_ONLY'],
   include_directories: [main_inc, udkh_inc, offapi_inc, 'source/inc'],
-  link_with: [basegfx_lib, canvastools_lib, vcl_lib, svt_lib, tl_lib, cppu_lib, cppuhelper_lib, i18nlangtag_lib, sal_lib],
+  link_with: [
+    basegfx_lib,
+    canvastools_lib,
+    cppu_lib,
+    cppuhelper_lib,
+    i18nlangtag_lib,
+    sal_lib,
+    svt_lib,
+    tl_lib,
+    vcl_lib,
+  ],
   install: true,
 )
 
diff --git a/cppuhelper/meson.build b/cppuhelper/meson.build
index 0def5c075435..58c161b628f4 100644
--- a/cppuhelper/meson.build
+++ b/cppuhelper/meson.build
@@ -34,7 +34,15 @@ cppuhelper_lib = shared_library('cppuhelperlo',
   udk_fake_h, off_fake_h, cppuhelper_fake_h,
   include_directories: [main_inc, udkh_inc, offapi_inc, cpphelper_uno_inc],
   cpp_args: ['-DCPPUHELPER_DLLIMPLEMENTATION', '-DLIBO_INTERNAL_ONLY'],
-  link_with: [temp_hack, cppu_lib, reg_lib, salhelper_lib, sal_lib, unoidl_lib, xmlreader_lib],
+  link_with: [
+    cppu_lib,
+    reg_lib,
+    sal_lib,
+    salhelper_lib,
+    temp_hack,
+    unoidl_lib,
+    xmlreader_lib
+  ],
   gnu_symbol_visibility: 'hidden',
   install: true,
 )
diff --git a/cui/meson.build b/cui/meson.build
index 77bfc4ebcad1..88a09977c16d 100644
--- a/cui/meson.build
+++ b/cui/meson.build
@@ -135,7 +135,8 @@ cui_lib = shared_library('cuilo',
   cpp_args: ['-DCUI_DLLIMPLEMENTATION',
              '-DLIBO_INTERNAL_ONLY'],
   include_directories: [main_inc, udkh_inc, offapi_inc, 'inc', 'source/inc', setup_inc],
-  link_with: [avmedia_lib,
+  link_with: [
+    avmedia_lib,
     basegfx_lib,
     comphelper_lib,
     cppu_lib,
@@ -153,13 +154,13 @@ cui_lib = shared_library('cuilo',
     sot_lib,
     svl_lib,
     svt_lib,
-    svxcore_lib,
     svx_lib,
+    svxcore_lib,
     tk_lib,
     tl_lib,
     ucbhelper_lib,
     utl_lib,
-    vcl_lib
+    vcl_lib,
   ],
   dependencies: [libxml_dep, icuuc_dep, qrcodegen_dep],
   install: true,
diff --git a/drawinglayer/meson.build b/drawinglayer/meson.build
index a7e7605c2d8e..47443e444d6e 100644
--- a/drawinglayer/meson.build
+++ b/drawinglayer/meson.build
@@ -138,7 +138,20 @@ drawinglayer_lib = shared_library('drawinglayerlo',
   cpp_args: ['-DDRAWINGLAYER_DLLIMPLEMENTATION',
              '-DLIBO_INTERNAL_ONLY'],
   include_directories: [main_inc, udkh_inc, offapi_inc, 'inc'],
-  link_with: [basegfx_lib, comphelper_lib, i18nlangtag_lib, cppuhelper_lib, cppu_lib, tl_lib, svl_lib, svt_lib, vcl_lib, salhelper_lib, tk_lib, sal_lib],
+  link_with: [
+    basegfx_lib,
+    comphelper_lib,
+    i18nlangtag_lib,
+    cppuhelper_lib,
+    cppu_lib,
+    tl_lib,
+    svl_lib,
+    svt_lib,
+    vcl_lib,
+    salhelper_lib,
+    tk_lib,
+    sal_lib
+  ],
   dependencies: [libxml_dep],
   install: true,
 )
diff --git a/editeng/meson.build b/editeng/meson.build
index 64ff3d9f8466..14dfb706c673 100644
--- a/editeng/meson.build
+++ b/editeng/meson.build
@@ -96,7 +96,28 @@ editeng_lib = shared_library('editenglo',
   cpp_args: ['-DTOOLS_DLLIMPLEMENTATION',
              '-DLIBO_INTERNAL_ONLY'],
   include_directories: [main_inc, udkh_inc, offapi_inc, 'inc'],
-  link_with: [xo_lib, basegfx_lib, lng_lib, svt_lib, tk_lib, vcl_lib, svl_lib, sot_lib, sfx_lib, utl_lib, tl_lib, comphelper_lib, ucbhelper_lib, cppuhelper_lib, cppu_lib, sal_lib, salhelper_lib, sax_lib, i18nlangtag_lib, i18nutil_lib],
+  link_with: [
+    basegfx_lib,
+    comphelper_lib,
+    cppu_lib,
+    cppuhelper_lib,
+    i18nlangtag_lib,
+    i18nutil_lib,
+    lng_lib,
+    sal_lib,
+    salhelper_lib,
+    sax_lib,
+    sfx_lib,
+    sot_lib,
+    svl_lib,
+    svt_lib,
+    tk_lib,
+    tl_lib,
+    ucbhelper_lib,
+    utl_lib,
+    vcl_lib,
+    xo_lib,
+  ],
   dependencies: [libxml_dep, icuuc_dep],
   install: true,
 )
diff --git a/filter/meson.build b/filter/meson.build
index 3d5788a2b16a..2db6aaa18f1e 100644
--- a/filter/meson.build
+++ b/filter/meson.build
@@ -55,7 +55,27 @@ msfilter_lib = shared_library('msfilterlo',
   cpp_args: ['-DLIBO_INTERNAL_ONLY',
              '-DMSFILTER_DLLIMPLEMENTATION'],
   include_directories: [main_inc, udkh_inc, offapi_inc, 'inc', setup_inc],
-  link_with: [svxcore_lib, editeng_lib, sfx_lib, xo_lib, sb_lib, salhelper_lib, svt_lib, tk_lib, vcl_lib, svl_lib, sot_lib, xmlscript_lib, utl_lib, tl_lib, comphelper_lib, basegfx_lib, cppuhelper_lib, cppu_lib, sal_lib],
+  link_with: [
+    basegfx_lib,
+    comphelper_lib,
+    cppu_lib,
+    cppuhelper_lib,
+    editeng_lib,
+    sal_lib,
+    salhelper_lib,
+    sb_lib,
+    sfx_lib,
+    sot_lib,
+    svl_lib,
+    svt_lib,
+    svxcore_lib,
+    tk_lib,
+    tl_lib,
+    utl_lib,
+    vcl_lib,
+    xmlscript_lib,
+    xo_lib,
+  ],
   dependencies: [],
   install: true,
 )
diff --git a/framework/meson.build b/framework/meson.build
index 62ea0c81538f..92dc4097eec2 100644
--- a/framework/meson.build
+++ b/framework/meson.build
@@ -13,7 +13,19 @@ fwi_lib = shared_library('fwilo',
   cpp_args: ['-DFWI_DLLIMPLEMENTATION',
              '-DLIBO_INTERNAL_ONLY'],
   include_directories: [main_inc, udkh_inc, offapi_inc, 'source/inc', 'inc'],
-  link_with: [i18nlangtag_lib, cppuhelper_lib, cppu_lib, comphelper_lib, vcl_lib, svl_lib, svt_lib, tl_lib, utl_lib, salhelper_lib, sal_lib],
+  link_with: [
+    comphelper_lib,
+    cppu_lib,
+    cppuhelper_lib,
+    i18nlangtag_lib,
+    sal_lib,
+    salhelper_lib,
+    svl_lib,
+    svt_lib,
+    tl_lib,
+    utl_lib,
+    vcl_lib,
+  ],
   install: true,
 )
 
@@ -48,7 +60,19 @@ fwe_lib = shared_library('fwelo',
   cpp_args: ['-DFWE_DLLIMPLEMENTATION',
              '-DLIBO_INTERNAL_ONLY'],
   include_directories: [main_inc, udkh_inc, offapi_inc, 'source/inc', 'inc'],
-  link_with: [cppuhelper_lib, fwi_lib, cppu_lib, comphelper_lib, vcl_lib, svl_lib, svt_lib, tl_lib, utl_lib, salhelper_lib, sal_lib],
+  link_with: [
+    comphelper_lib,
+    cppu_lib,
+    cppuhelper_lib,
+    fwi_lib,
+    sal_lib,
+    salhelper_lib,
+    svl_lib,
+    svt_lib,
+    tl_lib,
+    utl_lib,
+    vcl_lib,
+  ],
   install: true,
 )
 
@@ -76,7 +100,22 @@ fwl_lib = shared_library('fwllo',
   cpp_args: ['-DFWL_DLLIMPLEMENTATION',
              '-DLIBO_INTERNAL_ONLY'],
   include_directories: [main_inc, udkh_inc, offapi_inc, 'source/inc', 'inc', setup_inc],
-  link_with: [fwe_lib, fwi_lib, cppuhelper_lib, i18nlangtag_lib, cppu_lib, comphelper_lib, svt_lib, svl_lib, svt_lib, tk_lib, tl_lib, utl_lib, vcl_lib, sal_lib],
+  link_with: [
+    comphelper_lib,
+    cppu_lib,
+    cppuhelper_lib,
+    fwe_lib,
+    fwi_lib,
+    i18nlangtag_lib,
+    sal_lib,
+    svl_lib,
+    svt_lib,
+    svt_lib,
+    tk_lib,
+    tl_lib,
+    utl_lib,
+    vcl_lib,
+  ],
   install: true,
 )
 
@@ -89,7 +128,14 @@ fwm_lib = shared_library('fwmlo',
   cpp_args: ['-DFWM_DLLIMPLEMENTATION',
              '-DLIBO_INTERNAL_ONLY'],
   include_directories: [main_inc, udkh_inc, offapi_inc, 'source/inc', 'inc', setup_inc],
-  link_with: [comphelper_lib, fwi_lib, cppuhelper_lib, cppu_lib, vcl_lib, sal_lib],
+  link_with: [
+    comphelper_lib,
+    fwi_lib,
+    cppuhelper_lib,
+    cppu_lib,
+    vcl_lib,
+    sal_lib,
+  ],
   install: true,
 )
 
@@ -212,6 +258,22 @@ fwk_lib = shared_library('fwklo',
   cpp_args: ['-DFWK_DLLIMPLEMENTATION',
              '-DLIBO_INTERNAL_ONLY'],
   include_directories: [main_inc, udkh_inc, offapi_inc, 'source/inc', 'inc', setup_inc],
-  link_with: [comphelper_lib, i18nlangtag_lib, cppuhelper_lib, cppu_lib, svt_lib, svl_lib, tk_lib, tl_lib, vcl_lib, ucbhelper_lib, utl_lib, fwe_lib, fwi_lib, salhelper_lib, sal_lib],
+  link_with: [
+    comphelper_lib,
+    cppu_lib,
+    cppuhelper_lib,
+    fwe_lib,
+    fwi_lib,
+    i18nlangtag_lib,
+    sal_lib,
+    salhelper_lib,
+    svl_lib,
+    svt_lib,
+    tk_lib,
+    tl_lib,
+    ucbhelper_lib,
+    utl_lib,
+    vcl_lib,
+  ],
   install: true,
 )
diff --git a/linguistic/meson.build b/linguistic/meson.build
index 2ded8af471ce..1d0fa10d6100 100644
--- a/linguistic/meson.build
+++ b/linguistic/meson.build
@@ -22,7 +22,20 @@ lng_lib = shared_library('lnglo',
   cpp_args: ['-DLNG_DLLIMPLEMENTATION',
              '-DLIBO_INTERNAL_ONLY'],
   include_directories: [main_inc, udkh_inc, offapi_inc, 'inc'],
-  link_with: [comphelper_lib, cppuhelper_lib, cppu_lib, i18nlangtag_lib, sal_lib, sax_lib, svl_lib, tl_lib, ucbhelper_lib, utl_lib, vcl_lib, xo_lib],
+  link_with: [
+    comphelper_lib,
+    cppu_lib,
+    cppuhelper_lib,
+    i18nlangtag_lib,
+    sal_lib,
+    sax_lib,
+    svl_lib,
+    tl_lib,
+    ucbhelper_lib,
+    utl_lib,
+    vcl_lib,
+    xo_lib,
+  ],
   dependencies: [icuuc_dep],
   install: true,
 )
diff --git a/sal/meson.build b/sal/meson.build
index 308e551b59dc..61ff8f6136ee 100644
--- a/sal/meson.build
+++ b/sal/meson.build
@@ -116,7 +116,11 @@ sal_lib = shared_library('sallo',
              '-DLIBO_INTERNAL_ONLY',
              '-DSAL_DLLIMPLEMENTATION'],
   link_args: system_link_args,
-  dependencies: [thread_dep, osx_frameworks_dep, dl_dep],
+  dependencies: [
+    dl_dep,
+    osx_frameworks_dep,
+    thread_dep,
+  ],
   gnu_symbol_visibility: 'hidden',
   install: true,
 )
diff --git a/sc/meson.build b/sc/meson.build
index a73a220e0542..633aa4513416 100644
--- a/sc/meson.build
+++ b/sc/meson.build
@@ -609,8 +609,19 @@ sc_lib = shared_library('sclo',
   cpp_args: ['-DSC_DLLIMPLEMENTATION',
              '-DSC_INFO_OSVERSION="linux"',
              '-DLIBO_INTERNAL_ONLY'],
-  include_directories: [main_inc, udkh_inc, offapi_inc, oovbaapi_inc, 'inc', 'source/core/inc', 'source/ui/inc', 'source/filter/inc', setup_inc],
-  link_with: [avmedia_lib,
+  include_directories: [
+    'inc',
+    main_inc,
+    offapi_inc,
+    oovbaapi_inc,
+    setup_inc,
+    'source/core/inc',
+    'source/filter/inc',
+    'source/ui/inc',
+    udkh_inc,
+  ],
+  link_with: [
+    avmedia_lib,
     basegfx_lib,
     comphelper_lib,
     cppu_lib,
@@ -639,8 +650,14 @@ sc_lib = shared_library('sclo',
     vbahelper_lib,
     vcl_lib,
     xo_lib,
-    ],
-  dependencies: [libxml_dep, icuuc_dep, icu18_dep, mdds_dep, orcus_dep],
+  ],
+  dependencies: [
+    icu18_dep,
+    icuuc_dep,
+    libxml_dep,
+    mdds_dep,
+    orcus_dep,
+  ], 
   gnu_symbol_visibility: 'hidden',
   install: true,
 )
@@ -703,7 +720,14 @@ scui_lib = shared_library('scuilo',
   'source/ui/styleui/styledlg.cxx',
   udk_fake_h, off_fake_h, calc_hxx,
   cpp_args: ['-DLIBO_INTERNAL_ONLY'],
-  include_directories: [main_inc, udkh_inc, offapi_inc, 'inc', 'source/ui/inc', setup_inc],
+  include_directories: [
+    'inc',
+    main_inc,
+    offapi_inc,
+    setup_inc,
+    'source/ui/inc',
+    udkh_inc,
+  ],
   link_with: [
     comphelper_lib,
     cppu_lib,
diff --git a/sd/meson.build b/sd/meson.build
index 4244feabf932..31e75c1a6775 100644
--- a/sd/meson.build
+++ b/sd/meson.build
@@ -406,8 +406,36 @@ sd_lib = shared_library('sdlo',
              '-DLIBO_INTERNAL_ONLY',
              '-DSDUI_DLL_NAME="libsdui.so"'],
   include_directories: [main_inc, udkh_inc, offapi_inc, 'inc', 'source/ui/inc', 'source/ui/slidesorter/inc', setup_inc, '../oox'],
-  link_with: [avmedia_lib, basegfx_lib, canvastools_lib, comphelper_lib, cppcanvas_lib, cppu_lib, cppuhelper_lib, drawinglayer_lib, editeng_lib, i18nlangtag_lib, i18nutil_lib, msfilter_lib, oox_lib, sal_lib, salhelper_lib, sax_lib, sb_lib, sfx_lib, sot_lib, svl_lib, svt_lib, svxcore_lib, svx_lib, tk_lib, tl_lib, ucbhelper_lib, utl_lib, vcl_lib,
-],
+  link_with: [
+    avmedia_lib,
+    basegfx_lib,
+    canvastools_lib,
+    comphelper_lib,
+    cppcanvas_lib,
+    cppu_lib,
+    cppuhelper_lib,
+    drawinglayer_lib,
+    editeng_lib,
+    i18nlangtag_lib,
+    i18nutil_lib,
+    msfilter_lib,
+    oox_lib,
+    sal_lib,
+    salhelper_lib,
+    sax_lib,
+    sb_lib,
+    sfx_lib,
+    sot_lib,
+    svl_lib,
+    svt_lib,
+    svx_lib,
+    svxcore_lib,
+    tk_lib,
+    tl_lib,
+    ucbhelper_lib,
+    utl_lib,
+    vcl_lib,
+  ],
   dependencies: [libxml_dep],
   gnu_symbol_visibility: 'hidden',
   install: true,
@@ -446,7 +474,30 @@ sdui_lib = shared_library('sduilo',
   udk_fake_h, off_fake_h, impress_hxx,
   cpp_args: ['-DLIBO_INTERNAL_ONLY'],
   include_directories: [main_inc, udkh_inc, offapi_inc, 'inc', 'source/ui/inc', setup_inc],
-  link_with: [basegfx_lib, comphelper_lib, cppcanvas_lib, cppu_lib, cppuhelper_lib, editeng_lib, i18nlangtag_lib, fwl_lib, fwe_lib, sal_lib, salhelper_lib, sd_lib, sfx_lib, sot_lib, svl_lib, svt_lib, svxcore_lib, svx_lib, tl_lib, utl_lib, vcl_lib, cui_lib],
+  link_with: [
+    basegfx_lib,
+    comphelper_lib,
+    cppcanvas_lib,
+    cppu_lib,
+    cppuhelper_lib,
+    cui_lib,
+    editeng_lib,
+    fwe_lib,
+    fwl_lib,
+    i18nlangtag_lib,
+    sal_lib,
+    salhelper_lib,
+    sd_lib,
+    sfx_lib,
+    sot_lib,
+    svl_lib,
+    svt_lib,
+    svx_lib,
+    svxcore_lib,
+    tl_lib,
+    utl_lib,
+    vcl_lib,
+  ],
   dependencies: [],
   gnu_symbol_visibility: 'hidden',
   install: true,
@@ -472,7 +523,29 @@ sdfilt_lib = shared_library('sdfiltlo',
   udk_fake_h, off_fake_h,
   cpp_args: ['-DLIBO_INTERNAL_ONLY'],
   include_directories: [main_inc, udkh_inc, offapi_inc, 'inc', 'source/ui/inc', '../oox'],
-  link_with: [comphelper_lib, cppu_lib, cppuhelper_lib, editeng_lib, i18nlangtag_lib, i18nutil_lib, msfilter_lib, oox_lib, sal_lib, sax_lib, sd_lib, sfx_lib, sot_lib, svl_lib, svt_lib, svxcore_lib, tl_lib, ucbhelper_lib, utl_lib, vcl_lib, basegfx_lib],
+  link_with: [
+    basegfx_lib,
+    comphelper_lib,
+    cppu_lib,
+    cppuhelper_lib,
+    editeng_lib,
+    i18nlangtag_lib,
+    i18nutil_lib,
+    msfilter_lib,
+    oox_lib,
+    sal_lib,
+    sax_lib,
+    sd_lib,
+    sfx_lib,
+    sot_lib,
+    svl_lib,
+    svt_lib,
+    svxcore_lib,
+    tl_lib,
+    ucbhelper_lib,
+    utl_lib,
+    vcl_lib,
+  ],
   dependencies: [],
   gnu_symbol_visibility: 'hidden',
   install: true,
diff --git a/sfx2/meson.build b/sfx2/meson.build
index 1ae7afbcf0ae..1842d4bdc95f 100644
--- a/sfx2/meson.build
+++ b/sfx2/meson.build
@@ -247,7 +247,31 @@ sfx_lib = shared_library('sfxlo',
   cpp_args: ['-DSFX2_DLLIMPLEMENTATION',
              '-DLIBO_INTERNAL_ONLY'],
   include_directories: [main_inc, udkh_inc, offapi_inc, 'inc', 'source/inc', setup_inc],
-  link_with: [comphelper_lib, basegfx_lib, cppuhelper_lib, cppu_lib, drawinglayer_lib, fwe_lib, i18nutil_lib, i18nlangtag_lib, salhelper_lib, sal_lib, sax_lib, sb_lib, sot_lib, svl_lib, svt_lib, tk_lib, tl_lib, ucbhelper_lib, utl_lib, vcl_lib],
-  dependencies: [orcus_dep, libxml_dep],
+  link_with: [
+    basegfx_lib,
+    comphelper_lib,
+    cppu_lib,
+    cppuhelper_lib,
+    drawinglayer_lib,
+    fwe_lib,
+    i18nlangtag_lib,
+    i18nutil_lib,
+    sal_lib,
+    salhelper_lib,
+    sax_lib,
+    sb_lib,
+    sot_lib,
+    svl_lib,
+    svt_lib,
+    tk_lib,
+    tl_lib,
+    ucbhelper_lib,
+    utl_lib,
+    vcl_lib,
+  ],
+  dependencies: [
+    libxml_dep,
+    orcus_dep,
+  ],
   install: true,
 )
diff --git a/svl/meson.build b/svl/meson.build
index 6ad6063b90bc..ed9e3d303b0f 100644
--- a/svl/meson.build
+++ b/svl/meson.build
@@ -80,7 +80,20 @@ svl_lib = shared_library('svllo',
   cpp_args: ['-DSVL_DLLIMPLEMENTATION',
              '-DLIBO_INTERNAL_ONLY'],
   include_directories: [main_inc, udkh_inc, offapi_inc, setup_inc, 'source/inc'],
-  link_with: [basegfx_lib, comphelper_lib, cppuhelper_lib, cppu_lib, i18nutil_lib, i18nlangtag_lib, sal_lib, sot_lib, jvmfwk_lib, tl_lib, ucbhelper_lib, utl_lib],
+  link_with: [
+    basegfx_lib,
+    comphelper_lib,
+    cppu_lib,
+    cppuhelper_lib,
+    i18nlangtag_lib,
+    i18nutil_lib,
+    jvmfwk_lib,
+    sal_lib,
+    sot_lib,
+    tl_lib,
+    ucbhelper_lib,
+    utl_lib,
+  ],
   dependencies: [icuuc_dep, icu18_dep, libxml_dep, mdds_dep],
   gnu_symbol_visibility: 'hidden',
   install: true,
diff --git a/svtools/meson.build b/svtools/meson.build
index fc8b5aed0794..1d4307d4bb0f 100644
--- a/svtools/meson.build
+++ b/svtools/meson.build
@@ -119,6 +119,22 @@ svt_lib = shared_library('svtlo',
   cpp_args: ['-DSVT_DLLIMPLEMENTATION',
              '-DLIBO_INTERNAL_ONLY'],
   include_directories: [main_inc, udkh_inc, offapi_inc, 'inc', 'source/inc', setup_inc],
-  link_with: [basegfx_lib, vcl_lib, i18nlangtag_lib, i18nutil_lib, utl_lib, cppuhelper_lib, cppu_lib, comphelper_lib, sot_lib, svl_lib, tk_lib, tl_lib, ucbhelper_lib, salhelper_lib, sal_lib],
+  link_with: [
+    basegfx_lib,
+    comphelper_lib,
+    cppu_lib,
+    cppuhelper_lib,
+    i18nlangtag_lib,
+    i18nutil_lib,
+    sal_lib,
+    salhelper_lib,
+    sot_lib,
+    svl_lib,
+    tk_lib,
+    tl_lib,
+    ucbhelper_lib,
+    utl_lib,
+    vcl_lib,
+  ],
   install: true,
 )
diff --git a/svx/meson.build b/svx/meson.build
index a6e4de50023c..cbfa718fca28 100644
--- a/svx/meson.build
+++ b/svx/meson.build
@@ -382,7 +382,35 @@ svxcore_lib = shared_library('svxcorelo',
              '-DBOOST_SPIRIT_USE_OLD_NAMESPACE',
              '-DLIBO_INTERNAL_ONLY'],
   include_directories: [main_inc, udkh_inc, offapi_inc, 'inc', 'source/inc', setup_inc],
-  link_with: [avmedia_lib, basegfx_lib, fwe_lib, sb_lib, comphelper_lib, cppuhelper_lib, cppu_lib, dbtools_lib, dbtools_lib, drawinglayer_lib, editeng_lib, i18nutil_lib, i18nlangtag_lib, lng_lib, sal_lib, salhelper_lib, sax_lib, sfx_lib, sot_lib, svl_lib, svt_lib, tk_lib, tl_lib, ucbhelper_lib, utl_lib, vcl_lib, xo_lib],
+  link_with: [
+    avmedia_lib,
+    basegfx_lib,
+    comphelper_lib,
+    cppu_lib,
+    cppuhelper_lib,
+    dbtools_lib,
+    dbtools_lib,
+    drawinglayer_lib,
+    editeng_lib,
+    fwe_lib,
+    i18nlangtag_lib,
+    i18nutil_lib,
+    lng_lib,
+    sal_lib,
+    salhelper_lib,
+    sax_lib,
+    sb_lib,
+    sfx_lib,
+    sot_lib,
+    svl_lib,
+    svt_lib,
+    tk_lib,
+    tl_lib,
+    ucbhelper_lib,
+    utl_lib,
+    vcl_lib,
+    xo_lib
+  ],
   dependencies: [libxml_dep, icuuc_dep],
   install: true,
 )
@@ -566,7 +594,34 @@ svx_lib = shared_library('svxlo',
              '-DBOOST_SPIRIT_USE_OLD_NAMESPACE',
              '-DLIBO_INTERNAL_ONLY'],
   include_directories: [main_inc, udkh_inc, offapi_inc, 'inc', 'source/inc', setup_inc],
-  link_with: [avmedia_lib, basegfx_lib, sb_lib, comphelper_lib, cppuhelper_lib, cppu_lib, dbtools_lib, drawinglayer_lib, editeng_lib, fwe_lib, i18nlangtag_lib, i18nutil_lib, sal_lib, salhelper_lib, sfx_lib, sot_lib, svl_lib, svt_lib, svxcore_lib, tk_lib, tl_lib, ucbhelper_lib, utl_lib, vcl_lib, xo_lib, xmlscript_lib],
+  link_with: [
+    avmedia_lib,
+    basegfx_lib,
+    comphelper_lib,
+    cppu_lib,
+    cppuhelper_lib,
+    dbtools_lib,
+    drawinglayer_lib,
+    editeng_lib,
+    fwe_lib,
+    i18nlangtag_lib,
+    i18nutil_lib,
+    sal_lib,
+    salhelper_lib,
+    sb_lib,
+    sfx_lib,
+    sot_lib,
+    svl_lib,
+    svt_lib,
+    svxcore_lib,
+    tk_lib,
+    tl_lib,
+    ucbhelper_lib,
+    utl_lib,
+    vcl_lib,
+    xmlscript_lib,
+    xo_lib,
+  ],
   dependencies: [icuuc_dep],
   install: true,
 )
diff --git a/sw/meson.build b/sw/meson.build
index 4ce84c92afa3..d031ffdc1be9 100644
--- a/sw/meson.build
+++ b/sw/meson.build
@@ -716,7 +716,38 @@ sw_lib = shared_library('swlo',
              '-DLIBO_INTERNAL_ONLY',
              '-DSWUI_DLL_NAME="libswui.so"'],
   include_directories: [main_inc, udkh_inc, offapi_inc, oovbaapi_inc, 'inc', 'source/core/inc', 'source/uibase/inc', 'source/filter/inc', setup_inc],
-  link_with: [avmedia_lib, basegfx_lib, comphelper_lib, cppuhelper_lib, cppu_lib, dbtools_lib, drawinglayer_lib, editeng_lib, i18nlangtag_lib, i18nutil_lib, lng_lib, msfilter_lib, salhelper_lib, sal_lib, sax_lib, sb_lib, sfx_lib, sot_lib, svl_lib, svt_lib, svxcore_lib, svx_lib, tk_lib, tl_lib, ucbhelper_lib, utl_lib, vbahelper_lib, vcl_lib, xmlreader_lib, xo_lib],
+  link_with: [
+    avmedia_lib,
+    basegfx_lib,
+    comphelper_lib,
+    cppu_lib,
+    cppuhelper_lib,
+    dbtools_lib,
+    drawinglayer_lib,
+    editeng_lib,
+    i18nlangtag_lib,
+    i18nutil_lib,
+    lng_lib,
+    msfilter_lib,
+    sal_lib,
+    salhelper_lib,
+    sax_lib,
+    sb_lib,
+    sfx_lib,
+    sot_lib,
+    svl_lib,
+    svt_lib,
+    svx_lib,
+    svxcore_lib,
+    tk_lib,
+    tl_lib,
+    ucbhelper_lib,
+    utl_lib,
+    vbahelper_lib,
+    vcl_lib,
+    xmlreader_lib,
+    xo_lib
+  ],
   dependencies: [icuuc_dep, libxml_dep],
   gnu_symbol_visibility: 'hidden',
   install: true,
@@ -820,7 +851,31 @@ swui_lib = shared_library('swuilo',
   udk_fake_h, off_fake_h, writer_hxx, compatibility_hxx,
   cpp_args: ['-DLIBO_INTERNAL_ONLY'],
   include_directories: [main_inc, udkh_inc, offapi_inc, 'inc', 'source/uibase/inc', 'source/ui/inc', setup_inc],
-  link_with: [comphelper_lib, cppuhelper_lib, cppu_lib, dbtools_lib, editeng_lib, i18nlangtag_lib, i18nutil_lib, msfilter_lib, sal_lib, salhelper_lib, sfx_lib, sot_lib, svl_lib, svt_lib, svx_lib, svxcore_lib, sw_lib, tk_lib, tl_lib, ucbhelper_lib, utl_lib, vcl_lib, drawinglayer_lib],
+  link_with: [
+    comphelper_lib,
+    cppu_lib,
+    cppuhelper_lib,
+    dbtools_lib,
+    drawinglayer_lib,
+    editeng_lib,
+    i18nlangtag_lib,
+    i18nutil_lib,
+    msfilter_lib,
+    sal_lib,
+    salhelper_lib,
+    sfx_lib,
+    sot_lib,
+    svl_lib,
+    svt_lib,
+    svx_lib,
+    svxcore_lib,
+    sw_lib,
+    tk_lib,
+    tl_lib,
+    ucbhelper_lib,
+    utl_lib,
+    vcl_lib,
+  ],
   dependencies: [],
   gnu_symbol_visibility: 'hidden',
   install: true,
@@ -869,7 +924,32 @@ msword_lib = shared_library('mswordlo',
   udk_fake_h, off_fake_h,
   cpp_args: ['-DLIBO_INTERNAL_ONLY'],
   include_directories: [main_inc, udkh_inc, offapi_inc, 'inc', 'source/filter/inc', '../oox'],
-  link_with: [basegfx_lib, comphelper_lib, cppuhelper_lib, cppu_lib, editeng_lib, i18nlangtag_lib, i18nutil_lib, msfilter_lib, sal_lib, sax_lib, sb_lib, oox_lib, sfx_lib, sot_lib, svl_lib, svt_lib, svx_lib, svxcore_lib, sw_lib, tk_lib, tl_lib, ucbhelper_lib, utl_lib, vcl_lib],
+  link_with: [
+    basegfx_lib,
+    comphelper_lib,
+    cppu_lib,
+    cppuhelper_lib,
+    editeng_lib,
+    i18nlangtag_lib,
+    i18nutil_lib,
+    msfilter_lib,
+    oox_lib,
+    sal_lib,
+    sax_lib,
+    sb_lib,
+    sfx_lib,
+    sot_lib,
+    svl_lib,
+    svt_lib,
+    svx_lib,
+    svxcore_lib,
+    sw_lib,
+    tk_lib,
+    tl_lib,
+    ucbhelper_lib,
+    utl_lib,
+    vcl_lib,
+  ],
   dependencies: [libxml_dep, icuuc_dep],
   install: true,
 )
@@ -949,7 +1029,26 @@ vbaswobj_lib = shared_library('vbaswobjlo',
   udk_fake_h, off_fake_h, oovba_fake_h,
   cpp_args: ['-DLIBO_INTERNAL_ONLY'],
   include_directories: [main_inc, udkh_inc, offapi_inc, oovbaapi_inc, 'inc'],
-  link_with: [comphelper_lib, cppu_lib, cppuhelper_lib, editeng_lib, i18nlangtag_lib, sal_lib, sb_lib, sfx_lib, svl_lib, svt_lib, svx_lib, svxcore_lib, sw_lib, tk_lib, tl_lib, utl_lib, vbahelper_lib, vcl_lib],
+  link_with: [
+    comphelper_lib,
+    cppu_lib,
+    cppuhelper_lib,
+    editeng_lib,
+    i18nlangtag_lib,
+    sal_lib,
+    sb_lib,
+    sfx_lib,
+    svl_lib,
+    svt_lib,
+    svx_lib,
+    svxcore_lib,
+    sw_lib,
+    tk_lib,
+    tl_lib,
+    utl_lib,
+    vbahelper_lib,
+    vcl_lib
+  ],
   dependencies: [libxml_dep],
 
   install: true,
diff --git a/tools/meson.build b/tools/meson.build
index 34fc834ee7fe..2f94657b0980 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -50,7 +50,14 @@ tl_lib = shared_library('tllo',
   cpp_args: ['-DTOOLS_DLLIMPLEMENTATION',
              '-DLIBO_INTERNAL_ONLY'],
   include_directories: [main_inc, udkh_inc, offapi_inc, 'inc'],
-  link_with: [basegfx_lib, comphelper_lib, i18nlangtag_lib, cppu_lib, cppuhelper_lib, sal_lib],
+  link_with: [
+    basegfx_lib,
+    comphelper_lib,
+    cppu_lib,
+    cppuhelper_lib,
+    i18nlangtag_lib,
+    sal_lib,
+  ],
   dependencies: [libxml_dep, zlib_dep],
   gnu_symbol_visibility: 'hidden',
   install: true,
diff --git a/ucbhelper/meson.build b/ucbhelper/meson.build
index dc7c35b39c52..98468e02ebd8 100644
--- a/ucbhelper/meson.build
+++ b/ucbhelper/meson.build
@@ -28,7 +28,12 @@ ucbhelper_lib = shared_library('ucbhelperlo',
   cpp_args: ['-DUCBHELPER_DLLIMPLEMENTATION',
              '-DLIBO_INTERNAL_ONLY'  ],
   include_directories: [main_inc, udkh_inc, offapi_inc],
-  link_with: [cppuhelper_lib, cppu_lib, salhelper_lib, sal_lib],
+  link_with: [
+    cppuhelper_lib,
+    cppu_lib,
+    salhelper_lib,
+    sal_lib,
+  ],
   gnu_symbol_visibility: 'hidden',
   install: true,
 )
diff --git a/vbahelper/meson.build b/vbahelper/meson.build
index ca21f0959f0a..12d5db99cd13 100644
--- a/vbahelper/meson.build
+++ b/vbahelper/meson.build
@@ -28,7 +28,22 @@ vbahelper_lib = shared_library('vbahelperlo',
   cpp_args: ['-DVBAHELPER_DLLIMPLEMENTATION',
              '-DLIBO_INTERNAL_ONLY'],
   include_directories: [main_inc, udkh_inc, offapi_inc, oovbaapi_inc, 'inc'],
-  link_with: [comphelper_lib, cppuhelper_lib, cppu_lib, msfilter_lib, sal_lib, sb_lib, sfx_lib, svl_lib, svt_lib, svxcore_lib, tk_lib, tl_lib, utl_lib, vcl_lib],
+  link_with: [
+    comphelper_lib,
+    cppuhelper_lib,
+    cppu_lib,
+    msfilter_lib,
+    sal_lib,
+    sb_lib,
+    sfx_lib,
+    svl_lib,
+    svt_lib,
+    svxcore_lib,
+    tk_lib,
+    tl_lib,
+    utl_lib,
+    vcl_lib,
+  ], 
   dependencies: [],
   install: true,
 )
@@ -59,7 +74,22 @@ msforms_lib = shared_library('msformslo',
   udk_fake_h, off_fake_h, oovba_fake_h,
   include_directories: [main_inc, udkh_inc, offapi_inc, oovbaapi_inc, 'inc'],
   cpp_args: ['-DLIBO_INTERNAL_ONLY'],
-  link_with: [comphelper_lib, cppuhelper_lib, cppu_lib, sal_lib, sb_lib, sfx_lib, svl_lib, svt_lib, svx_lib, svxcore_lib, tk_lib, tl_lib, vbahelper_lib, vcl_lib],
+  link_with: [
+    comphelper_lib,
+    cppu_lib,
+    cppuhelper_lib,
+    sal_lib,
+    sb_lib,
+    sfx_lib,
+    svl_lib,
+    svt_lib,
+    svx_lib,
+    svxcore_lib,
+    tk_lib,
+    tl_lib,
+    vbahelper_lib,
+    vcl_lib,
+  ],
   dependencies: [],
   install: true,
 )
diff --git a/vcl/meson.build b/vcl/meson.build
index ce930f36028c..dcbdb95d7747 100644
--- a/vcl/meson.build
+++ b/vcl/meson.build
@@ -424,8 +424,41 @@ vcl_lib = shared_library('vcllo',
              '-DGLM_ENABLE_EXPERIMENTAL',
              '-DDESKTOP_DETECTOR_DLL_NAME="libdesktopdetector.so"',
              '-DTK_DLL_NAME="libtklo.so"'],
-  link_with: [svl_lib, tl_lib, utl_lib, sot_lib, ucbhelper_lib, basegfx_lib, comphelper_lib, cppuhelper_lib, i18nlangtag_lib, i18nutil_lib, cppu_lib, salhelper_lib, sal_lib, xmlreader_lib],
-  dependencies: [harfbuzz_dep, harfbuzz_icu_dep, fc_dep, glm_dep, cairo_dep, eot_dep, jpg_dep, png_dep, icuuc_dep, graphite_dep, dl_dep, lcms_dep, epoxy_dep, gio_dep, dbus_dep, xext_dep, x11_dep],
+  link_with: [
+    basegfx_lib,
+    comphelper_lib,
+    cppu_lib,
+    cppuhelper_lib,
+    i18nlangtag_lib,
+    i18nutil_lib,
+    sal_lib,
+    salhelper_lib,
+    sot_lib,
+    svl_lib,
+    tl_lib,
+    ucbhelper_lib,
+    utl_lib,
+    xmlreader_lib,
+  ], 
+  dependencies: [
+    cairo_dep,
+    dbus_dep,
+    dl_dep,
+    eot_dep,
+    epoxy_dep,
+    fc_dep,
+    gio_dep,
+    glm_dep,
+    graphite_dep,
+    harfbuzz_dep,
+    harfbuzz_icu_dep,
+    icuuc_dep,
+    jpg_dep,
+    lcms_dep,
+    png_dep,
+    x11_dep,
+    xext_dep,
+  ], 
   gnu_symbol_visibility: 'hidden',
   install: true,
 )
@@ -469,8 +502,28 @@ vclplug_gtk3 = shared_library('vclplug_gtk3lo',
   cpp_args: ['-DLIBO_INTERNAL_ONLY',
              '-DVCLPLUG_GTK_IMPLEMENTATION',
              '-Wno-deprecated-declarations'],
-  link_with: [vcl_lib, svl_lib, utl_lib, ucbhelper_lib, basegfx_lib, comphelper_lib, cppuhelper_lib, tl_lib, sot_lib, i18nlangtag_lib, i18nutil_lib, cppu_lib, sal_lib],
-  dependencies: [gtk3_dep, gtkprint_dep, epoxy_dep, dl_dep, x11_dep],
+  link_with: [
+    basegfx_lib,
+    comphelper_lib,
+    cppuhelper_lib,
+    cppu_lib,
+    i18nlangtag_lib,
+    i18nutil_lib,
+    sal_lib,
+    sot_lib,
+    svl_lib,
+    tl_lib,
+    ucbhelper_lib,
+    utl_lib,
+    vcl_lib,
+  ],
+  dependencies: [
+    dl_dep,
+    epoxy_dep,
+    gtk3_dep,
+    gtkprint_dep,
+    x11_dep,
+  ],
   gnu_symbol_visibility: 'hidden',
   install: true,
 )
@@ -518,20 +571,34 @@ vclplug_gen = shared_library('vclplug_genlo',
              '-DLIBO_INTERNAL_ONLY',
              '-DUSE_RANDR'],
   include_directories: [main_inc, udkh_inc, offapi_inc, 'inc'],
-  link_with: [vcl_lib,
-    tl_lib,
-    utl_lib,
-    sot_lib,
-    ucbhelper_lib,
+  link_with: [
     basegfx_lib,
     comphelper_lib,
     cppuhelper_lib,
+    cppu_lib,
     i18nlangtag_lib,
     i18nutil_lib,
-    cppu_lib,
     sal_lib,
+    sot_lib,
+    svl_lib,
+    tl_lib,
+    ucbhelper_lib,
+    utl_lib,
+    vcl_lib,
   ],
-  dependencies: [harfbuzz_dep, freetype_dep, cairo_dep, epoxy_dep, xrender_dep, xrandr_dep, xext_dep, sm_dep, ice_dep, x11_dep],
+  dependencies: [
+    cairo_dep,
+    dl_dep,
+    epoxy_dep,
+    freetype_dep,
+    harfbuzz_dep,
+    ice_dep,
+    sm_dep,
+    x11_dep,
+    xext_dep,
+    xrandr_dep,
+    xrender_dep,
+  ], 
   gnu_symbol_visibility: 'hidden',
   install: true,
 )
@@ -562,7 +629,11 @@ executable('vcldemo',
     vcl_lib,
   ],
   install: true,
-  dependencies: [harfbuzz_dep, dl_dep, x11_dep],
+  dependencies: [
+    dl_dep,
+    harfbuzz_dep,
+    x11_core_dep,
+  ],
 )
 
 desktopdetector_lib = shared_library('desktopdetector',
diff --git a/xmloff/meson.build b/xmloff/meson.build
index 91b27671a8ed..973bf2c807e1 100644
--- a/xmloff/meson.build
+++ b/xmloff/meson.build
@@ -316,7 +316,20 @@ xo_lib = shared_library('xolo',
   cpp_args: ['-DXMLOFF_DLLIMPLEMENTATION',
              '-DLIBO_INTERNAL_ONLY'],
   include_directories: [main_inc, udkh_inc, offapi_inc, 'inc', setup_inc, '..'],
-  link_with: [basegfx_lib, comphelper_lib, cppuhelper_lib, cppu_lib, i18nlangtag_lib, salhelper_lib, sal_lib, sax_lib, svl_lib, tl_lib, utl_lib, vcl_lib],
+  link_with: [
+    basegfx_lib,
+    comphelper_lib,
+    cppu_lib,
+    cppuhelper_lib,
+    i18nlangtag_lib,
+    sal_lib,
+    salhelper_lib,
+    sax_lib,
+    svl_lib,
+    tl_lib,
+    utl_lib,
+    vcl_lib,
+  ],
   install: true,
 )
 
@@ -363,6 +376,14 @@ xof_lib = shared_library('xoflo',
   udk_fake_h, off_fake_h, tokens_hxx,
   cpp_args: ['-DLIBO_INTERNAL_ONLY'],
   include_directories: [main_inc, udkh_inc, offapi_inc, 'inc', setup_inc, '..'],
-  link_with: [comphelper_lib, cppu_lib, cppuhelper_lib, sal_lib, salhelper_lib, sax_lib, xo_lib],
+  link_with: [
+    comphelper_lib,
+    cppu_lib,
+    cppuhelper_lib,
+    sal_lib,
+    salhelper_lib,
+    sax_lib,
+    xo_lib,
+  ],
   install: true,
 )