diff --git a/source/Makefile.deps.mk b/source/Makefile.deps.mk
index 0c64d6a8d..c9336821f 100644
--- a/source/Makefile.deps.mk
+++ b/source/Makefile.deps.mk
@@ -292,15 +292,19 @@ endif
 
 ifeq ($(HAVE_QT5),true)
 QT5_HOSTBINS = $(shell $(PKG_CONFIG) --variable=host_bins Qt5Core)
+else ifeq ($(HAVE_QT5PKG),true)
+QT5_HOSTBINS = $(shell $(PKG_CONFIG) --variable=prefix Qt5OpenGLExtensions)/bin
+endif
+
 MOC_QT5 ?= $(QT5_HOSTBINS)/moc
 RCC_QT5 ?= $(QT5_HOSTBINS)/rcc
+
 ifeq (,$(wildcard $(MOC_QT5)))
 HAVE_QT5 = false
 endif
 ifeq (,$(wildcard $(RCC_QT5)))
 HAVE_QT5 = false
 endif
-endif
 
 ifeq ($(HAVE_QT4),true)
 HAVE_QT = true
@@ -330,7 +334,7 @@ endif
 PYRCC ?= $(PYRCC5)
 PYUIC ?= $(PYUIC5)
 
-ifeq ($(HAVE_QT5),true)
+ifneq (,$(findstring true,$(HAVE_QT5)$(HAVE_QT5PKG)))
 HAVE_THEME = true
 endif
 
diff --git a/source/modules/juce_gui_basics/juce_gui_basics.cpp b/source/modules/juce_gui_basics/juce_gui_basics.cpp
index 574229cab..07038cfe1 100644
--- a/source/modules/juce_gui_basics/juce_gui_basics.cpp
+++ b/source/modules/juce_gui_basics/juce_gui_basics.cpp
@@ -51,7 +51,6 @@
 #if JUCE_MAC
  #import <WebKit/WebKit.h>
  #import <IOKit/pwr_mgt/IOPMLib.h>
- #import <MetalKit/MetalKit.h>
 
 #elif JUCE_IOS
  #if JUCE_PUSH_NOTIFICATIONS && defined (__IPHONE_10_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0
diff --git a/source/modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm b/source/modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm
index 8b8e65116..5875a75a7 100644
--- a/source/modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm
+++ b/source/modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm
@@ -23,8 +23,6 @@
   ==============================================================================
 */
 
-#include "juce_mac_CGMetalLayerRenderer.h"
-
 @interface NSEvent (DeviceDelta)
 - (float)deviceDeltaX;
 - (float)deviceDeltaY;