diff --git a/src/gui/macutilities.h b/src/gui/macutilities.h
index cbf00bc09..bb7e5c28e 100644
--- a/src/gui/macutilities.h
+++ b/src/gui/macutilities.h
@@ -29,10 +29,14 @@
 #ifndef MACUTILITIES_H
 #define MACUTILITIES_H
 
-#include <QPixmap>
-#include <QSize>
 #include <objc/objc.h>
 
+#include <QSet>
+
+class QPixmap;
+class QSize;
+class QString;
+
 namespace MacUtils
 {
     QPixmap pixmapForExtension(const QString &ext, const QSize &size);
diff --git a/src/gui/macutilities.mm b/src/gui/macutilities.mm
index 5a8e81aeb..f1072058a 100644
--- a/src/gui/macutilities.mm
+++ b/src/gui/macutilities.mm
@@ -28,10 +28,14 @@
 
 #include "macutilities.h"
 
+#import <Cocoa/Cocoa.h>
+#include <objc/message.h>
+
+#include <QPixmap>
 #include <QSet>
+#include <QSize>
+#include <QString>
 #include <QtMac>
-#include <objc/message.h>
-#import <Cocoa/Cocoa.h>
 
 namespace MacUtils
 {
diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index 72261b2a7..f850c006b 100644
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -107,10 +107,6 @@
 #include "programupdater.h"
 #endif
 
-#ifdef Q_OS_MAC
-void qt_mac_set_dock_menu(QMenu *menu);
-#endif
-
 #define TIME_TRAY_BALLOON 5000
 #define PREVENT_SUSPEND_INTERVAL 60000
 
@@ -469,7 +465,7 @@ MainWindow::MainWindow(QWidget *parent)
 #endif
 #ifdef Q_OS_MAC
     setupDockClickHandler();
-    qt_mac_set_dock_menu(trayIconMenu());
+    trayIconMenu()->setAsDockMenu();
 #endif
 }
 
@@ -1815,7 +1811,6 @@ void MainWindow::on_actionDownloadFromURL_triggered()
 }
 
 #if defined(Q_OS_WIN) || defined(Q_OS_MAC)
-
 void MainWindow::handleUpdateCheckFinished(bool updateAvailable, QString newVersion, bool invokedByUser)
 {
     QMessageBox::StandardButton answer = QMessageBox::Yes;