diff --git a/app/dialogs/meson.build b/app/dialogs/meson.build
index 26e73e06f5..935621e2ec 100644
--- a/app/dialogs/meson.build
+++ b/app/dialogs/meson.build
@@ -76,7 +76,9 @@ libappdialogs = static_library('appdialogs',
   include_directories: [ rootInclude, rootAppInclude, ],
   c_args: '-DG_LOG_DOMAIN="Gimp-Dialogs"',
   dependencies: [
-    gegl, gtk3,
     appstream_glib,
+    gegl,
+    gexiv2,
+    gtk3,
   ],
 )
diff --git a/app/display/gimpcanvasbufferpreview.c b/app/display/gimpcanvasbufferpreview.c
index 858bab634b..ec662fc75c 100644
--- a/app/display/gimpcanvasbufferpreview.c
+++ b/app/display/gimpcanvasbufferpreview.c
@@ -22,7 +22,7 @@
 
 #include <gegl.h>
 #include <gtk/gtk.h>
-#include <cairo/cairo.h>
+#include <cairo.h>
 
 #include "libgimpbase/gimpbase.h"
 #include "libgimpmath/gimpmath.h"
diff --git a/app/display/meson.build b/app/display/meson.build
index b5d657c991..fece21c9ca 100644
--- a/app/display/meson.build
+++ b/app/display/meson.build
@@ -114,6 +114,6 @@ libappdisplay = static_library('appdisplay',
   include_directories: [ rootInclude, rootAppInclude, ],
   c_args: '-DG_LOG_DOMAIN="Gimp-Display"',
   dependencies: [
-    gegl, gtk3,
+    gegl, gtk3, cairo,
   ],
 )
diff --git a/app/meson.build b/app/meson.build
index 4bc7ea2cca..a9d19ca10f 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -68,7 +68,7 @@ libapp = static_library('app',
   include_directories: [ rootInclude, rootAppInclude, configInclude, ],
   c_args: [ '-DG_LOG_DOMAIN="Gimp"', '-DGIMP_APP_GLUE_COMPILATION', ],
   dependencies: [
-    gegl, gdk_pixbuf, gtk3,
+    gdk_pixbuf, gegl, gexiv2, gtk3,
   ],
 )
 
@@ -89,6 +89,7 @@ endif
 
 libapp_dep = declare_dependency(
   dependencies: [
+    cairo,
     dbghelp,
     drmingw,
     gegl,
diff --git a/meson.build b/meson.build
index 615d1250df..0c35562fe6 100644
--- a/meson.build
+++ b/meson.build
@@ -1018,7 +1018,11 @@ endif
 
 # Check for GTK Mac Integration
 if platform_osx and (gtk3.get_pkgconfig_variable('targets').contains('quartz'))
-  gtk3_macos = dependency('gtk-mac-integration', version: '>=2.0.0')
+  # Support for homebrew version of gtk-mac-integration
+  gtk3_macos = dependency('gtk-mac-integration-gtk3', version: '>=3.0.1', required: false)
+  if not gtk3_macos.found()
+    gtk3_macos = dependency('gtk-mac-integration', version: '>=3.0.1')
+  endif
 else
   gtk3_macos = no_dep
 endif