diff --git a/src/gui/kernel/qplatformscreen.h b/src/gui/kernel/qplatformscreen.h
index de704f46357..a547a635e90 100644
--- a/src/gui/kernel/qplatformscreen.h
+++ b/src/gui/kernel/qplatformscreen.h
@@ -42,6 +42,7 @@ typedef QPair<qreal, qreal> QDpi;
 
 class Q_GUI_EXPORT QPlatformScreen
 {
+    Q_GADGET
     Q_DECLARE_PRIVATE(QPlatformScreen)
 
 public:
diff --git a/src/gui/kernel/qplatformsystemtrayicon.h b/src/gui/kernel/qplatformsystemtrayicon.h
index c2c80f9334b..76a7ef03d90 100644
--- a/src/gui/kernel/qplatformsystemtrayicon.h
+++ b/src/gui/kernel/qplatformsystemtrayicon.h
@@ -6,6 +6,7 @@
 #define QPLATFORMSYSTEMTRAYICON_H
 
 #include <QtGui/qtguiglobal.h>
+#include <qpa/qplatformscreen.h>
 #include "QtCore/qobject.h"
 
 #ifndef QT_NO_SYSTEMTRAYICON
@@ -13,7 +14,6 @@
 QT_BEGIN_NAMESPACE
 
 class QPlatformMenu;
-class QPlatformScreen;
 class QIcon;
 class QString;
 class QRect;
@@ -21,7 +21,6 @@ class QRect;
 class Q_GUI_EXPORT QPlatformSystemTrayIcon : public QObject
 {
     Q_OBJECT
-    Q_MOC_INCLUDE(<qpa/qplatformscreen.h>)
 public:
     enum ActivationReason {
         Unknown,