diff --git a/demo/meson.build b/demo/meson.build
index 5cd05f0e48195ba998b6df1a49c3dda13f1d3ae5..90e07d3ad6746bb81db7ece3f2b00cdba0f85180 100644
--- a/demo/meson.build
+++ b/demo/meson.build
@@ -24,7 +24,6 @@ adwaita_demo_sources = [
 adwaita_demo = executable('adwaita-@0@-demo'.format(apiversion),
   adwaita_demo_sources,
   dependencies: libadwaita_dep,
-  gui_app: true,
   install: true,
 )
 
diff --git a/meson.build b/meson.build
index 4a5744587b4fe74524d7cebc38b49a37400363a9..8358c18be36584681749696c784a8d324804f07d 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
 project('libadwaita', 'c',
           version: '1.0.0.alpha.3',
           license: 'LGPL-2.1-or-later',
-    meson_version: '>= 0.53.0',
+    meson_version: '>= 0.59.0',
   default_options: [ 'warning_level=1', 'buildtype=debugoptimized', 'c_std=gnu11' ],
 )
 
@@ -28,7 +28,7 @@ libversion = '@0@.@1@.@2@'.format(soversion, current, revision)
 add_project_arguments([
   '-DHAVE_CONFIG_H',
   '-DADWAITA_COMPILATION',
-  '-I' + meson.build_root(),
+  '-I' + meson.project_build_root(),
 ], language: 'c')
 
 root_inc = include_directories('.')
@@ -140,4 +140,3 @@ summary(
     'Introspection': introspection,
     'Vapi': get_option('vapi'),
   }, section: 'Options')
-
diff --git a/src/meson.build b/src/meson.build
index 9a3be48e6350326741adc3501347ab3226846e8f..8ff2e9d73e242986b25dfc858af96aba0476075c 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -228,12 +228,8 @@ config_h.set_quoted('LOCALEDIR', get_option('prefix') / get_option('localedir'))
 if target_system == 'windows'
   config_h.set('DLL_EXPORT', true)
   config_h.set('_ADW_EXTERN', '__declspec(dllexport) extern')
-  if cc.get_id() != 'msvc'
-    libadwaita_c_args += ['-fvisibility=hidden']
-  endif
 else
   config_h.set('_ADW_EXTERN', '__attribute__((visibility("default"))) extern')
-  libadwaita_c_args += ['-fvisibility=hidden']
 endif
 
 configure_file(
@@ -245,7 +241,7 @@ libadwaita_link_args = []
 libadwaita_symbols_file = 'libadwaita.syms'
 
 # Check linker flags
-ld_version_script_arg = '-Wl,--version-script,@0@/@1@'.format(meson.source_root(),
+ld_version_script_arg = '-Wl,--version-script,@0@/@1@'.format(meson.project_source_root(),
                                                               libadwaita_symbols_file)
 if cc.links('int main() { return 0; }', args : ld_version_script_arg, name : 'ld_supports_version_script')
   libadwaita_link_args += [ld_version_script_arg]
@@ -258,17 +254,18 @@ else
   adwaita_libdir = libdir
 endif
 
-libadwaita = shared_library(
+libadwaita = library(
   'adwaita-' + apiversion,
   libadwaita_sources,
 
-            soversion: soversion,
-               c_args: libadwaita_c_args,
-         dependencies: libadwaita_deps,
-  include_directories: [ root_inc, src_inc ],
-              install: true,
-            link_args: libadwaita_link_args,
-          install_dir: adwaita_libdir,
+              soversion: soversion,
+                 c_args: libadwaita_c_args,
+           dependencies: libadwaita_deps,
+    include_directories: [ root_inc, src_inc ],
+                install: true,
+              link_args: libadwaita_link_args,
+            install_dir: adwaita_libdir,
+  gnu_symbol_visibility: 'hidden',
 )
 
 libadwaita_dep = declare_dependency(
@@ -278,6 +275,8 @@ libadwaita_dep = declare_dependency(
   include_directories: include_directories('.'),
 )
 
+meson.override_dependency(package_api_name, libadwaita_dep)
+
 if introspection
 
    libadwaita_gir_extra_args = [