13 files changed, 15 insertions, 15 deletions
diff --git a/src/plugins/platforms/qnx/main.h b/src/plugins/platforms/qnx/main.h
index cc2cfdd000..4033a29121 100644
--- a/src/plugins/platforms/qnx/main.h
+++ b/src/plugins/platforms/qnx/main.h
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui/QPlatformIntegrationPlugin>
+#include <qpa/qplatformintegrationplugin.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/qnx/qqnxclipboard.h b/src/plugins/platforms/qnx/qqnxclipboard.h
index c9ceff41f6..7a9d7c3121 100644
--- a/src/plugins/platforms/qnx/qqnxclipboard.h
+++ b/src/plugins/platforms/qnx/qqnxclipboard.h
@@ -43,7 +43,7 @@
 #define QQNXCLIPBOARD_H
 
 #ifndef QT_NO_CLIPBOARD
-#include <QtGui/QPlatformClipboard>
+#include <qpa/qplatformclipboard.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/qnx/qqnxglbackingstore.h b/src/plugins/platforms/qnx/qqnxglbackingstore.h
index b694079f37..78ee58f215 100644
--- a/src/plugins/platforms/qnx/qqnxglbackingstore.h
+++ b/src/plugins/platforms/qnx/qqnxglbackingstore.h
@@ -42,7 +42,7 @@
 #ifndef QQNXGLBACKINGSTORE_H
 #define QQNXGLBACKINGSTORE_H
 
-#include <QtGui/qplatformbackingstore_qpa.h>
+#include <qpa/qplatformbackingstore.h>
 #include <QtOpenGL/private/qglpaintdevice_p.h>
 
 #include <screen/screen.h>
diff --git a/src/plugins/platforms/qnx/qqnxglcontext.h b/src/plugins/platforms/qnx/qqnxglcontext.h
index ee8d61ce00..8b587e7eb8 100644
--- a/src/plugins/platforms/qnx/qqnxglcontext.h
+++ b/src/plugins/platforms/qnx/qqnxglcontext.h
@@ -42,7 +42,7 @@
 #ifndef QQNXGLCONTEXT_H
 #define QQNXGLCONTEXT_H
 
-#include <QtGui/QPlatformOpenGLContext>
+#include <qpa/qplatformopenglcontext.h>
 #include <QtGui/QSurfaceFormat>
 #include <QtCore/QSize>
 
diff --git a/src/plugins/platforms/qnx/qqnxinputcontext_imf.h b/src/plugins/platforms/qnx/qqnxinputcontext_imf.h
index 5f7d95bc4a..f6f0f60204 100644
--- a/src/plugins/platforms/qnx/qqnxinputcontext_imf.h
+++ b/src/plugins/platforms/qnx/qqnxinputcontext_imf.h
@@ -42,11 +42,11 @@
 #ifndef QQNXINPUTCONTEXT_H
 #define QQNXINPUTCONTEXT_H
 
-#include <QtGui/QPlatformInputContext>
+#include <qpa/qplatforminputcontext.h>
 
 #include <QtCore/QLocale>
 #include <QtCore/QMetaType>
-#include <QtGui/QPlatformIntegration>
+#include <qpa/qplatformintegration.h>
 
 #include "imf/imf_client.h"
 #include "imf/input_control.h"
diff --git a/src/plugins/platforms/qnx/qqnxinputcontext_noimf.h b/src/plugins/platforms/qnx/qqnxinputcontext_noimf.h
index d73c5136b5..93512b26e5 100644
--- a/src/plugins/platforms/qnx/qqnxinputcontext_noimf.h
+++ b/src/plugins/platforms/qnx/qqnxinputcontext_noimf.h
@@ -43,8 +43,8 @@
 #define QQNXINPUTCONTEXT_H
 
 #include <QtCore/QLocale>
-#include <QtGui/QPlatformInputContext>
-#include <QtGui/QPlatformIntegration>
+#include <qpa/qplatforminputcontext.h>
+#include <qpa/qplatformintegration.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/qnx/qqnxintegration.cpp b/src/plugins/platforms/qnx/qqnxintegration.cpp
index 73d8cb2007..dd1a6f8b7e 100644
--- a/src/plugins/platforms/qnx/qqnxintegration.cpp
+++ b/src/plugins/platforms/qnx/qqnxintegration.cpp
@@ -79,7 +79,7 @@
 #include "private/qgenericunixeventdispatcher_p.h"
 #endif
 
-#include <QtGui/QPlatformWindow>
+#include <qpa/qplatformwindow.h>
 #include <QtGui/QWindowSystemInterface>
 
 #if !defined(QT_NO_OPENGL)
diff --git a/src/plugins/platforms/qnx/qqnxintegration.h b/src/plugins/platforms/qnx/qqnxintegration.h
index a3c476f16e..e0da8cc5f2 100644
--- a/src/plugins/platforms/qnx/qqnxintegration.h
+++ b/src/plugins/platforms/qnx/qqnxintegration.h
@@ -42,7 +42,7 @@
 #ifndef QQNXINTEGRATION_H
 #define QQNXINTEGRATION_H
 
-#include <QtGui/qplatformintegration_qpa.h>
+#include <qpa/qplatformintegration.h>
 
 #include <QtCore/qmutex.h>
 
diff --git a/src/plugins/platforms/qnx/qqnxnativeinterface.h b/src/plugins/platforms/qnx/qqnxnativeinterface.h
index ec896d40fa..f176b0a538 100644
--- a/src/plugins/platforms/qnx/qqnxnativeinterface.h
+++ b/src/plugins/platforms/qnx/qqnxnativeinterface.h
@@ -42,7 +42,7 @@
 #ifndef QQNXNATIVEINTERFACE_H
 #define QQNXNATIVEINTERFACE_H
 
-#include <QtGui/QPlatformNativeInterface>
+#include <qpa/qplatformnativeinterface.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/qnx/qqnxrasterbackingstore.h b/src/plugins/platforms/qnx/qqnxrasterbackingstore.h
index 7a7f211e9a..6a559492e1 100644
--- a/src/plugins/platforms/qnx/qqnxrasterbackingstore.h
+++ b/src/plugins/platforms/qnx/qqnxrasterbackingstore.h
@@ -42,7 +42,7 @@
 #ifndef QQNXRASTERWINDOWSURFACE_H
 #define QQNXRASTERWINDOWSURFACE_H
 
-#include <QtGui/qplatformbackingstore_qpa.h>
+#include <qpa/qplatformbackingstore.h>
 
 #include <screen/screen.h>
 
diff --git a/src/plugins/platforms/qnx/qqnxscreen.h b/src/plugins/platforms/qnx/qqnxscreen.h
index 7816661323..4a13946ec3 100644
--- a/src/plugins/platforms/qnx/qqnxscreen.h
+++ b/src/plugins/platforms/qnx/qqnxscreen.h
@@ -42,7 +42,7 @@
 #ifndef QBBSCREEN_H
 #define QBBSCREEN_H
 
-#include <QtGui/QPlatformScreen>
+#include <qpa/qplatformscreen.h>
 
 #include "qqnxrootwindow.h"
 
diff --git a/src/plugins/platforms/qnx/qqnxservices.h b/src/plugins/platforms/qnx/qqnxservices.h
index fe7c014047..e9fc7cf2e5 100644
--- a/src/plugins/platforms/qnx/qqnxservices.h
+++ b/src/plugins/platforms/qnx/qqnxservices.h
@@ -42,7 +42,7 @@
 #ifndef QQNXSERVICES_H
 #define QQNXSERVICES_H
 
-#include <QtGui/QPlatformServices>
+#include <qpa/qplatformservices.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/qnx/qqnxwindow.h b/src/plugins/platforms/qnx/qqnxwindow.h
index 2ea7bbca51..50b9a423f5 100644
--- a/src/plugins/platforms/qnx/qqnxwindow.h
+++ b/src/plugins/platforms/qnx/qqnxwindow.h
@@ -42,7 +42,7 @@
 #ifndef QQNXWINDOW_H
 #define QQNXWINDOW_H
 
-#include <QtGui/QPlatformWindow>
+#include <qpa/qplatformwindow.h>
 
 #include "qqnxbuffer.h"