diff --git a/bin/syncqt b/bin/syncqt
index bc2ccf38ae71780416dcc03bab0bcdd4963aa821..8b4ce6f46aab07586acccee35ad6af3263d24d30 100755
--- a/bin/syncqt
+++ b/bin/syncqt
@@ -992,7 +992,11 @@ foreach my $lib (@modules_to_sync) {
                         my $header_copies = 0;
                         #figure out if it is a public header
                         my $public_header = $header;
-                        if($allheadersprivate || $public_header =~ /_p.h$/ || $public_header =~ /_pch.h$/) {
+                        my $qpa_header = 0;
+                        if($public_header =~ /^qplatform/) {
+                            $public_header = 0;
+                            $qpa_header = 1;
+                        } elsif($allheadersprivate || $public_header =~ /_p.h$/ || $public_header =~ /_pch.h$/) {
                             $public_header = 0;
                         } else {
                             foreach (@ignore_for_master_contents) {
@@ -1040,13 +1044,20 @@ foreach my $lib (@modules_to_sync) {
                                     $header_copies++ if(syncHeader($lib, "$out_basedir/include/$lib/$explicitheaders{$lib}{basename($header)}", "$out_basedir/include/$lib/$header", 0, $ts));
                                 }
 
-                            } elsif ($create_private_headers) {
+                            } elsif ($create_private_headers && !$qpa_header) {
                                 if ($module_version) {
                                     @headers = ( "$out_basedir/include/$lib/$module_version/$lib/private/$header" );
                                 } else {
                                     @headers = ( "$out_basedir/include/$lib/private/$header" );
                                 }
+                            } elsif ($create_private_headers) {
+                                if ($module_version) {
+                                    @headers = ( "$out_basedir/include/$lib/$module_version/$lib/qpa/$header" );
+                                } else {
+                                    @headers = ( "$out_basedir/include/$lib/qpa/$header" );
+                                }
                             }
+
                             foreach(@headers) { #sync them
                                 $header_copies++ if(syncHeader($lib, $_, $iheader, $copy_headers && !$shadow, $ts));
                             }
@@ -1317,6 +1328,8 @@ if($check_includes) {
                         my $public_header = $header;
                         if($public_header =~ /_p.h$/ || $public_header =~ /_pch.h$/) {
                             $public_header = 0;
+                        } elsif ($public_header =~ /^qplatform/) {
+                            $public_header = 0;
                         } else {
                             foreach (@ignore_for_master_contents) {
                                 $public_header = 0 if($header eq $_);
diff --git a/examples/opengl/hellowindow/main.cpp b/examples/opengl/hellowindow/main.cpp
index 9723e8f9de90cc49b392a4e387610d1c3e894310..e1fde9b5b88c8f122e147ceda508270712de54fd 100644
--- a/examples/opengl/hellowindow/main.cpp
+++ b/examples/opengl/hellowindow/main.cpp
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 #include <QGuiApplication>
-#include <QPlatformIntegration>
+#include <qpa/qplatformintegration.h>
 #include <private/qguiapplication_p.h>
 #include <QScreen>
 #include <QThread>
diff --git a/src/gui/accessible/accessible.pri b/src/gui/accessible/accessible.pri
index 70ac033f77ee5637f599e61edb04e7412d82d47e..abffa2ade8a45cae05df04cbb259c2a37846ccee 100644
--- a/src/gui/accessible/accessible.pri
+++ b/src/gui/accessible/accessible.pri
@@ -6,7 +6,7 @@ contains(QT_CONFIG, accessibility) {
         accessible/qaccessible2.h \
         accessible/qaccessibleobject.h \
         accessible/qaccessibleplugin.h \
-        accessible/qplatformaccessibility_qpa.h
+        accessible/qplatformaccessibility.h
 
     SOURCES += accessible/qaccessible.cpp \
         accessible/qaccessible2.cpp \
diff --git a/src/gui/accessible/qaccessible.cpp b/src/gui/accessible/qaccessible.cpp
index 02318468bb33f8f3d0bf9f133679ff72e37b91b7..af75693ca2554ac31ec879bd3c97bf0565c21bc8 100644
--- a/src/gui/accessible/qaccessible.cpp
+++ b/src/gui/accessible/qaccessible.cpp
@@ -48,8 +48,8 @@
 #include "qaccessiblebridge.h"
 #include <QtGui/QGuiApplication>
 #include <private/qguiapplication_p.h>
-#include "qplatformaccessibility_qpa.h"
-#include "qplatformintegration_qpa.h"
+#include <qpa/qplatformaccessibility.h>
+#include <qpa/qplatformintegration.h>
 
 #include <QtCore/qdebug.h>
 #include <QtCore/qmetaobject.h>
diff --git a/src/gui/accessible/qplatformaccessibility_qpa.h b/src/gui/accessible/qplatformaccessibility.h
similarity index 100%
rename from src/gui/accessible/qplatformaccessibility_qpa.h
rename to src/gui/accessible/qplatformaccessibility.h
diff --git a/src/gui/accessible/qplatformaccessibility_qpa.cpp b/src/gui/accessible/qplatformaccessibility_qpa.cpp
index 91b5de1198bc1c9c0a61c55d9656791f4fd7bdea..7ea5a5d2c8025a7834cf73d7e894a38920c69a50 100644
--- a/src/gui/accessible/qplatformaccessibility_qpa.cpp
+++ b/src/gui/accessible/qplatformaccessibility_qpa.cpp
@@ -38,7 +38,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "qplatformaccessibility_qpa.h"
+#include "qplatformaccessibility.h"
 #include <private/qfactoryloader_p.h>
 #include "qaccessibleplugin.h"
 #include "qaccessibleobject.h"
diff --git a/src/gui/image/image.pri b/src/gui/image/image.pri
index 34a33aa0f0945e227cdfe008c90e4791b5c3254d..737b7fcbd468bce65b5d6b2f0e0e197c34fbbf18 100644
--- a/src/gui/image/image.pri
+++ b/src/gui/image/image.pri
@@ -21,7 +21,7 @@ HEADERS += \
         image/qpixmap_blitter_p.h \
         image/qpixmapcache.h \
         image/qpixmapcache_p.h \
-        image/qplatformpixmap_qpa.h \
+        image/qplatformpixmap.h \
         image/qimagepixmapcleanuphooks_p.h \
 
 SOURCES += \
diff --git a/src/gui/image/qbitmap.cpp b/src/gui/image/qbitmap.cpp
index f3c26dd5b2f75ea45a83d5993e50987069396f3a..499f9f48f2e09f209182e9b1fb60bef8c3048f9f 100644
--- a/src/gui/image/qbitmap.cpp
+++ b/src/gui/image/qbitmap.cpp
@@ -40,8 +40,8 @@
 ****************************************************************************/
 
 #include "qbitmap.h"
-#include "qplatformpixmap_qpa.h"
-#include "qplatformintegration_qpa.h"
+#include <qpa/qplatformpixmap.h>
+#include <qpa/qplatformintegration.h>
 #include "qimage.h"
 #include "qscreen.h"
 #include "qvariant.h"
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp
index b8ec7de8518d8c053c78d9f6b3d7ab8ac8ba4ad1..91b21227dfb86bc5c3fbc85be9b3fa251ba22840 100644
--- a/src/gui/image/qimage.cpp
+++ b/src/gui/image/qimage.cpp
@@ -50,13 +50,13 @@
 #include "qstringlist.h"
 #include "qvariant.h"
 #include "qimagepixmapcleanuphooks_p.h"
-#include "qplatformintegration_qpa.h"
+#include <qpa/qplatformintegration.h>
 #include <private/qguiapplication_p.h>
 #include <ctype.h>
 #include <stdlib.h>
 #include <limits.h>
 #include <math.h>
-#include <qplatformpixmap_qpa.h>
+#include <qpa/qplatformpixmap.h>
 #include <private/qdrawhelper_p.h>
 #include <private/qmemrotate_p.h>
 #include <private/qimagescale_p.h>
diff --git a/src/gui/image/qimagepixmapcleanuphooks.cpp b/src/gui/image/qimagepixmapcleanuphooks.cpp
index b118f5f85668290e23bdc2d1af49b9b4ff74e46a..548934829e6fdee9764d6488a6ff14023e39e234 100644
--- a/src/gui/image/qimagepixmapcleanuphooks.cpp
+++ b/src/gui/image/qimagepixmapcleanuphooks.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qimagepixmapcleanuphooks_p.h"
-#include "qplatformpixmap_qpa.h"
+#include <qpa/qplatformpixmap.h>
 #include "private/qimage_p.h"
 
 
diff --git a/src/gui/image/qnativeimage.cpp b/src/gui/image/qnativeimage.cpp
index 96d7a0487bf34f118099a509e9c852ccb76aa8a9..c562b0bd6d781f628934f0ce7ff6034f8100701b 100644
--- a/src/gui/image/qnativeimage.cpp
+++ b/src/gui/image/qnativeimage.cpp
@@ -41,7 +41,7 @@
 
 #include <qdebug.h>
 #include "qnativeimage_p.h"
-#include "qplatformscreen_qpa.h"
+#include <qpa/qplatformscreen.h>
 #include "private/qguiapplication_p.h"
 #include "qscreen.h"
 
diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp
index cefb8edf74dd0e88408c0032a8a273bbedbc91ea..248caf7f3d0ee145bbffa54a68344fcce6e825c4 100644
--- a/src/gui/image/qpixmap.cpp
+++ b/src/gui/image/qpixmap.cpp
@@ -42,7 +42,7 @@
 #include <qglobal.h>
 
 #include "qpixmap.h"
-#include "qplatformpixmap_qpa.h"
+#include <qpa/qplatformpixmap.h>
 #include "qimagepixmapcleanuphooks_p.h"
 
 #include "qbitmap.h"
@@ -63,7 +63,7 @@
 #include "qthread.h"
 #include "qdebug.h"
 
-# include "qplatformintegration_qpa.h"
+#include <qpa/qplatformintegration.h>
 
 #include "qpixmap_raster_p.h"
 #include "private/qhexstring_p.h"
diff --git a/src/gui/image/qpixmap_blitter_p.h b/src/gui/image/qpixmap_blitter_p.h
index 95397374c66dad61f6b9ae5c452cdcdc30d1afe1..174277f9eb47966f9603d4a3e9710167ff217773 100644
--- a/src/gui/image/qpixmap_blitter_p.h
+++ b/src/gui/image/qpixmap_blitter_p.h
@@ -42,7 +42,7 @@
 #ifndef QPIXMAP_BLITTER_P_H
 #define QPIXMAP_BLITTER_P_H
 
-#include <qplatformpixmap_qpa.h>
+#include <qpa/qplatformpixmap.h>
 #include <private/qpaintengine_blitter_p.h>
 
 #ifndef QT_NO_BLITTABLE
diff --git a/src/gui/image/qpixmap_raster_p.h b/src/gui/image/qpixmap_raster_p.h
index 864fad42ec59a2df8ee618c92709786a3cb07a67..8e1a8ccc03b6c9e0ce412050a5fcbd7b7c74c9f6 100644
--- a/src/gui/image/qpixmap_raster_p.h
+++ b/src/gui/image/qpixmap_raster_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include <QtGui/qplatformpixmap_qpa.h>
+#include <qpa/qplatformpixmap.h>
 
 
 QT_BEGIN_NAMESPACE
diff --git a/src/gui/image/qpixmap_win.cpp b/src/gui/image/qpixmap_win.cpp
index 66a829f5dec7b8cabc630ff7244f1ca366041533..c25393c72e8921344306bda292f4d3929c033b58 100644
--- a/src/gui/image/qpixmap_win.cpp
+++ b/src/gui/image/qpixmap_win.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qpixmap.h"
-#include "qplatformpixmap_qpa.h"
+#include <qpa/qplatformpixmap.h>
 #include "qpixmap_raster_p.h"
 
 #include <qglobal.h>
diff --git a/src/gui/image/qplatformpixmap.cpp b/src/gui/image/qplatformpixmap.cpp
index 073c267fbe6b1e54113d28cf34049bdc38e9b4e9..769cf5f90bff40582a5d4a3d9593b36c0b4c54e6 100644
--- a/src/gui/image/qplatformpixmap.cpp
+++ b/src/gui/image/qplatformpixmap.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qplatformpixmap_qpa.h"
-#include "qplatformintegration_qpa.h"
+#include "qplatformpixmap.h"
+#include <qpa/qplatformintegration.h>
 #include <QtCore/qbuffer.h>
 #include <QtGui/qbitmap.h>
 #include <QtGui/qimagereader.h>
diff --git a/src/gui/image/qplatformpixmap_qpa.h b/src/gui/image/qplatformpixmap.h
similarity index 100%
rename from src/gui/image/qplatformpixmap_qpa.h
rename to src/gui/image/qplatformpixmap.h
diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri
index 3c1b6b4e48fb5fc6a4eb93cbad8d0323a5592252..525871c89bfdb4e4b519409877b0eec1d0d91cd5 100644
--- a/src/gui/kernel/kernel.pri
+++ b/src/gui/kernel/kernel.pri
@@ -10,27 +10,27 @@ HEADERS += \
         kernel/qgenericplugin_qpa.h \
         kernel/qwindowsysteminterface_qpa.h \
         kernel/qwindowsysteminterface_qpa_p.h \
-        kernel/qplatformintegration_qpa.h \
-        kernel/qplatformdrag_qpa.h \
-        kernel/qplatformscreen_qpa.h \
-        kernel/qplatformscreen_qpa_p.h \
-        kernel/qplatforminputcontext_qpa.h \
-        kernel/qplatforminputcontext_qpa_p.h \
-        kernel/qplatformintegrationfactory_qpa_p.h \
-        kernel/qplatformintegrationplugin_qpa.h \
-        kernel/qplatformtheme_qpa.h\
-        kernel/qplatformthemefactory_qpa_p.h \
-        kernel/qplatformthemeplugin_qpa.h \
-        kernel/qplatformwindow_qpa.h \
-        kernel/qplatformcursor_qpa.h \
-        kernel/qplatformclipboard_qpa.h \
-        kernel/qplatformnativeinterface_qpa.h \
+        kernel/qplatformintegration.h \
+        kernel/qplatformdrag.h \
+        kernel/qplatformscreen.h \
+        kernel/qplatformscreen_p.h \
+        kernel/qplatforminputcontext.h \
+        kernel/qplatforminputcontext_p.h \
+        kernel/qplatformintegrationfactory_p.h \
+        kernel/qplatformintegrationplugin.h \
+        kernel/qplatformtheme.h\
+        kernel/qplatformthemefactory_p.h \
+        kernel/qplatformthemeplugin.h \
+        kernel/qplatformwindow.h \
+        kernel/qplatformcursor.h \
+        kernel/qplatformclipboard.h \
+        kernel/qplatformnativeinterface.h \
         kernel/qsurfaceformat.h \
         kernel/qguiapplication.h \
         kernel/qguiapplication_p.h \
         kernel/qwindow_p.h \
         kernel/qwindow.h \
-        kernel/qplatformsurface_qpa.h \
+        kernel/qplatformsurface.h \
         kernel/qsurface.h \
         kernel/qclipboard.h \
         kernel/qcursor.h \
@@ -55,10 +55,10 @@ HEADERS += \
         kernel/qstylehints.h \
         kernel/qtouchdevice.h \
         kernel/qtouchdevice_p.h \
-        kernel/qplatformsharedgraphicscache_qpa.h \
-        kernel/qplatformdialoghelper_qpa.h \
-        kernel/qplatformservices_qpa.h \
-        kernel/qplatformscreenpageflipper_qpa.h
+        kernel/qplatformsharedgraphicscache.h \
+        kernel/qplatformdialoghelper.h \
+        kernel/qplatformservices.h \
+        kernel/qplatformscreenpageflipper.h
 
 SOURCES += \
         kernel/qclipboard_qpa.cpp \
@@ -107,7 +107,7 @@ SOURCES += \
 
 contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles2) {
     HEADERS += \
-            kernel/qplatformopenglcontext_qpa.h \
+            kernel/qplatformopenglcontext.h \
             kernel/qopenglcontext.h \
             kernel/qopenglcontext_p.h
 
diff --git a/src/gui/kernel/qclipboard_qpa.cpp b/src/gui/kernel/qclipboard_qpa.cpp
index 187e09253e0ab6743447b93d4a43a245b915ba73..284775c4e20500e27d86fa0cd19bc34af54415b0 100644
--- a/src/gui/kernel/qclipboard_qpa.cpp
+++ b/src/gui/kernel/qclipboard_qpa.cpp
@@ -45,8 +45,8 @@
 
 #include "qmimedata.h"
 #include "private/qguiapplication_p.h"
-#include "qplatformclipboard_qpa.h"
-#include "qplatformintegration_qpa.h"
+#include <qpa/qplatformclipboard.h>
+#include <qpa/qplatformintegration.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/kernel/qcursor_qpa.cpp b/src/gui/kernel/qcursor_qpa.cpp
index 1c719c839e2b4f15eee1cf6b30f48b8295f4cf51..cc9163fbc0085f44b9f0e9439c2e346bcac08e81 100644
--- a/src/gui/kernel/qcursor_qpa.cpp
+++ b/src/gui/kernel/qcursor_qpa.cpp
@@ -42,7 +42,7 @@
 #include <qcursor.h>
 #include <qscreen.h>
 #include <private/qcursor_p.h>
-#include <qplatformcursor_qpa.h>
+#include <qpa/qplatformcursor.h>
 #include <private/qguiapplication_p.h>
 #include <qbitmap.h>
 
diff --git a/src/gui/kernel/qdnd.cpp b/src/gui/kernel/qdnd.cpp
index 1ed4a96192a18fabfc95cda13ffb25a74cc13c25..8182719830935291e1c388e60ce847e409269856 100644
--- a/src/gui/kernel/qdnd.cpp
+++ b/src/gui/kernel/qdnd.cpp
@@ -59,8 +59,8 @@
 #include "qimagewriter.h"
 #include "qdebug.h"
 #include <ctype.h>
-#include <qplatformintegration_qpa.h>
-#include <qplatformdrag_qpa.h>
+#include <qpa/qplatformintegration.h>
+#include <qpa/qplatformdrag.h>
 
 #include <private/qguiapplication_p.h>
 
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index 27e84b71a9640aa6ea4d4b047786189b43c3210b..631592aacedb833ac1dd98cd3dca89c4c25a28f3 100644
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -42,14 +42,14 @@
 #include "qguiapplication.h"
 
 #include "private/qguiapplication_p.h"
-#include "private/qplatformintegrationfactory_qpa_p.h"
+#include <qpa/qplatformintegrationfactory_p.h>
 #include "private/qevent_p.h"
 #include "qfont.h"
-#include "qplatformfontdatabase_qpa.h"
-#include "qplatformwindow_qpa.h"
-#include "qplatformnativeinterface_qpa.h"
-#include "qplatformtheme_qpa.h"
-#include "qplatformintegration_qpa.h"
+#include <qpa/qplatformfontdatabase.h>
+#include <qpa/qplatformwindow.h>
+#include <qpa/qplatformnativeinterface.h>
+#include <qpa/qplatformtheme.h>
+#include <qpa/qplatformintegration.h>
 
 #include <QtCore/QAbstractEventDispatcher>
 #include <QtCore/QVariant>
@@ -64,14 +64,14 @@
 #include <private/qscreen_p.h>
 #include <private/qdrawhelper_p.h>
 
-#include <QtGui/QPlatformIntegration>
+#include <qpa/qplatformintegration.h>
 #include <QtGui/QGenericPluginFactory>
 #include <QtGui/qstylehints.h>
 #include <QtGui/qinputpanel.h>
 #include <QtGui/qpixmapcache.h>
-#include <QtGui/qplatformtheme_qpa.h>
-#include <QtGui/qplatforminputcontext_qpa.h>
-#include <private/qplatforminputcontext_qpa_p.h>
+#include <qpa/qplatformtheme.h>
+#include <qpa/qplatforminputcontext.h>
+#include <qpa/qplatforminputcontext_p.h>
 
 #include <QWindowSystemInterface>
 #include "private/qwindowsysteminterface_qpa_p.h"
@@ -79,11 +79,11 @@
 #include "private/qcursor_p.h"
 
 #include "private/qdnd_p.h"
-#include <private/qplatformthemefactory_qpa_p.h>
-#include "qplatformdrag_qpa.h"
+#include <qpa/qplatformthemefactory_p.h>
+#include <qpa/qplatformdrag.h>
 
 #ifndef QT_NO_CURSOR
-#include "qplatformcursor_qpa.h"
+#include <qpa/qplatformcursor.h>
 #endif
 
 #include <QtGui/QPixmap>
diff --git a/src/gui/kernel/qguiapplication_p.h b/src/gui/kernel/qguiapplication_p.h
index 78641de55b09677448469fb85223c00e9817d874..cb3587ba6308c4e986b7be079224f66820d75fd8 100644
--- a/src/gui/kernel/qguiapplication_p.h
+++ b/src/gui/kernel/qguiapplication_p.h
@@ -53,7 +53,7 @@
 #include "private/qwindowsysteminterface_qpa_p.h"
 #include "private/qshortcutmap_p.h"
 
-#include "qplatformdrag_qpa.h"
+#include <qpa/qplatformdrag.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/gui/kernel/qinputmethod.cpp b/src/gui/kernel/qinputmethod.cpp
index 0e0bc7237a396d8b8864a15307888063959744be..a699938dc62c5117bf1263ddbb5bd11fd651adc9 100644
--- a/src/gui/kernel/qinputmethod.cpp
+++ b/src/gui/kernel/qinputmethod.cpp
@@ -43,7 +43,7 @@
 #include <private/qinputmethod_p.h>
 #include <qguiapplication.h>
 #include <qtimer.h>
-#include <private/qplatforminputcontext_qpa_p.h>
+#include <qpa/qplatforminputcontext_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/kernel/qinputmethod_p.h b/src/gui/kernel/qinputmethod_p.h
index 1e55b00318b3f67ae61c5def6b7fa663b1913c04..ad3d2141c1a7c6b326a7390ebf4bf189e857da95 100644
--- a/src/gui/kernel/qinputmethod_p.h
+++ b/src/gui/kernel/qinputmethod_p.h
@@ -46,8 +46,8 @@
 #include <private/qobject_p.h>
 #include <QtCore/QWeakPointer>
 #include <QTransform>
-#include <qplatforminputcontext_qpa.h>
-#include <qplatformintegration_qpa.h>
+#include <qpa/qplatforminputcontext.h>
+#include <qpa/qplatformintegration.h>
 #include <private/qguiapplication_p.h>
 
 QT_BEGIN_HEADER
diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp
index 4946a1dc1830516269683fa12c76ed629d6bbff8..e88d901a2bab7d1068445c5d8f32c504d936bb2a 100644
--- a/src/gui/kernel/qkeysequence.cpp
+++ b/src/gui/kernel/qkeysequence.cpp
@@ -41,7 +41,7 @@
 
 #include "qkeysequence.h"
 #include "qkeysequence_p.h"
-#include "qplatformtheme_qpa.h"
+#include <qpa/qplatformtheme.h>
 #include "private/qguiapplication_p.h"
 
 #ifndef QT_NO_SHORTCUT
diff --git a/src/gui/kernel/qopenglcontext.cpp b/src/gui/kernel/qopenglcontext.cpp
index 4668f9e750aafa1273577cf07d02456ac662a954..b99a4dbd046f67ba5f7e9369504ec3d4dd84a068 100644
--- a/src/gui/kernel/qopenglcontext.cpp
+++ b/src/gui/kernel/qopenglcontext.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qplatformopenglcontext_qpa.h"
-#include "qplatformintegration_qpa.h"
+#include <qpa/qplatformopenglcontext.h>
+#include <qpa/qplatformintegration.h>
 #include "qopenglcontext.h"
 #include "qopenglcontext_p.h"
 #include "qwindow.h"
diff --git a/src/gui/kernel/qplatformclipboard_qpa.h b/src/gui/kernel/qplatformclipboard.h
similarity index 100%
rename from src/gui/kernel/qplatformclipboard_qpa.h
rename to src/gui/kernel/qplatformclipboard.h
diff --git a/src/gui/kernel/qplatformclipboard_qpa.cpp b/src/gui/kernel/qplatformclipboard_qpa.cpp
index 7273450077b84f04405510258ab6e3b6eff09746..5a29606391e77bda3afd730ae44aedb6accfc027 100644
--- a/src/gui/kernel/qplatformclipboard_qpa.cpp
+++ b/src/gui/kernel/qplatformclipboard_qpa.cpp
@@ -38,7 +38,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "qplatformclipboard_qpa.h"
+#include "qplatformclipboard.h"
 
 #ifndef QT_NO_CLIPBOARD
 
diff --git a/src/gui/kernel/qplatformcursor_qpa.h b/src/gui/kernel/qplatformcursor.h
similarity index 99%
rename from src/gui/kernel/qplatformcursor_qpa.h
rename to src/gui/kernel/qplatformcursor.h
index fb3e4604d24ba26d3f7634840674983db610492b..1f339c86b78d889fd7f7bf763e6eeb1e76b4ed47 100644
--- a/src/gui/kernel/qplatformcursor_qpa.h
+++ b/src/gui/kernel/qplatformcursor.h
@@ -57,7 +57,7 @@
 #include <QtGui/QMouseEvent>
 #include <QtCore/QWeakPointer>
 #include <QtCore/QObject>
-#include <QtGui/QPlatformScreen>
+#include <qpa/qplatformscreen.h>
 #include <QtGui/QCursor>
 
 QT_BEGIN_HEADER
diff --git a/src/gui/kernel/qplatformcursor_qpa.cpp b/src/gui/kernel/qplatformcursor_qpa.cpp
index 5ea080c40a70ae2df33163e3f47ad38424d0b6d2..40b7967af7c82982630d928a4ba46bb8e86e6a1a 100644
--- a/src/gui/kernel/qplatformcursor_qpa.cpp
+++ b/src/gui/kernel/qplatformcursor_qpa.cpp
@@ -38,13 +38,13 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "qplatformcursor_qpa.h"
+#include "qplatformcursor.h"
 
 #include <QPainter>
 #include <QBitmap>
 #include <QGuiApplication>
 #include <QScreen>
-#include <QPlatformScreen>
+#include <qpa/qplatformscreen.h>
 #include <private/qguiapplication_p.h>
 
 #include <QDebug>
diff --git a/src/gui/kernel/qplatformdialoghelper_qpa.h b/src/gui/kernel/qplatformdialoghelper.h
similarity index 100%
rename from src/gui/kernel/qplatformdialoghelper_qpa.h
rename to src/gui/kernel/qplatformdialoghelper.h
diff --git a/src/gui/kernel/qplatformdialoghelper_qpa.cpp b/src/gui/kernel/qplatformdialoghelper_qpa.cpp
index f2114d17e0a2da1be5b715ec62db3b6a1e50e2d6..ec9906ca0e2df9543df101ef920b7f6078d1322c 100644
--- a/src/gui/kernel/qplatformdialoghelper_qpa.cpp
+++ b/src/gui/kernel/qplatformdialoghelper_qpa.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qplatformdialoghelper_qpa.h"
+#include "qplatformdialoghelper.h"
 
 #include <QtCore/QVariant>
 #include <QtCore/QSharedData>
diff --git a/src/gui/kernel/qplatformdrag_qpa.h b/src/gui/kernel/qplatformdrag.h
similarity index 100%
rename from src/gui/kernel/qplatformdrag_qpa.h
rename to src/gui/kernel/qplatformdrag.h
diff --git a/src/gui/kernel/qplatformdrag_qpa.cpp b/src/gui/kernel/qplatformdrag_qpa.cpp
index d9fc3a2ab8d43007ac6d5e1a37326bbbdb14bbbf..8367ad8e06d0b30738bc5c83486b76f998b2f931 100644
--- a/src/gui/kernel/qplatformdrag_qpa.cpp
+++ b/src/gui/kernel/qplatformdrag_qpa.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qplatformdrag_qpa.h"
+#include "qplatformdrag.h"
 
 #include <QtGui/private/qdnd_p.h>
 #include <QtGui/QKeyEvent>
diff --git a/src/gui/kernel/qplatforminputcontext_qpa.h b/src/gui/kernel/qplatforminputcontext.h
similarity index 100%
rename from src/gui/kernel/qplatforminputcontext_qpa.h
rename to src/gui/kernel/qplatforminputcontext.h
diff --git a/src/gui/kernel/qplatforminputcontext_qpa_p.h b/src/gui/kernel/qplatforminputcontext_p.h
similarity index 100%
rename from src/gui/kernel/qplatforminputcontext_qpa_p.h
rename to src/gui/kernel/qplatforminputcontext_p.h
diff --git a/src/gui/kernel/qplatforminputcontext_qpa.cpp b/src/gui/kernel/qplatforminputcontext_qpa.cpp
index 53839088c56d968e5b22c2209877ae672472c05b..0a8633b61d21cd57925364e48f4dbf6e7c9ab25e 100644
--- a/src/gui/kernel/qplatforminputcontext_qpa.cpp
+++ b/src/gui/kernel/qplatforminputcontext_qpa.cpp
@@ -39,11 +39,11 @@
 **
 ****************************************************************************/
 
-#include <qplatforminputcontext_qpa.h>
+#include "qplatforminputcontext.h"
 #include <qguiapplication.h>
 #include <QRect>
 #include "private/qkeymapper_p.h"
-#include "private/qplatforminputcontext_qpa_p.h"
+#include <qpa/qplatforminputcontext_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/kernel/qplatformintegration_qpa.h b/src/gui/kernel/qplatformintegration.h
similarity index 99%
rename from src/gui/kernel/qplatformintegration_qpa.h
rename to src/gui/kernel/qplatformintegration.h
index a44f4343ef8ce32108adb8c523380842516daaed..fb62dafc5cb336002c2c556d4019ab087f86d5eb 100644
--- a/src/gui/kernel/qplatformintegration_qpa.h
+++ b/src/gui/kernel/qplatformintegration.h
@@ -54,7 +54,7 @@
 //
 
 #include <QtGui/qwindowdefs.h>
-#include <QtGui/qplatformscreen_qpa.h>
+#include <qpa/qplatformscreen.h>
 #include <QtGui/qsurfaceformat.h>
 
 QT_BEGIN_HEADER
diff --git a/src/gui/kernel/qplatformintegration_qpa.cpp b/src/gui/kernel/qplatformintegration_qpa.cpp
index 5269d8fb2467eb6cec66bffed2c4894786069e4d..8e4ed0557669eabce356f205a755e8f54aaca8d3 100644
--- a/src/gui/kernel/qplatformintegration_qpa.cpp
+++ b/src/gui/kernel/qplatformintegration_qpa.cpp
@@ -39,15 +39,15 @@
 **
 ****************************************************************************/
 
-#include "qplatformintegration_qpa.h"
+#include "qplatformintegration.h"
 
-#include <QtGui/QPlatformFontDatabase>
-#include <QtGui/QPlatformClipboard>
-#include <QtGui/QPlatformAccessibility>
-#include <QtGui/QPlatformTheme>
+#include <qpa/qplatformfontdatabase.h>
+#include <qpa/qplatformclipboard.h>
+#include <qpa/qplatformaccessibility.h>
+#include <qpa/qplatformtheme.h>
 #include <QtGui/private/qguiapplication_p.h>
 #include <QtGui/private/qpixmap_raster_p.h>
-#include <QtGui/private/qplatformscreen_qpa_p.h>
+#include <qpa/qplatformscreen_p.h>
 #include <private/qdnd_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/gui/kernel/qplatformintegrationfactory_qpa_p.h b/src/gui/kernel/qplatformintegrationfactory_p.h
similarity index 100%
rename from src/gui/kernel/qplatformintegrationfactory_qpa_p.h
rename to src/gui/kernel/qplatformintegrationfactory_p.h
diff --git a/src/gui/kernel/qplatformintegrationfactory_qpa.cpp b/src/gui/kernel/qplatformintegrationfactory_qpa.cpp
index a84c24335568e67b40fda9e86b78520ec029cb18..2092f2d0baed9c651bfa391ac8834d071cdcac64 100644
--- a/src/gui/kernel/qplatformintegrationfactory_qpa.cpp
+++ b/src/gui/kernel/qplatformintegrationfactory_qpa.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qplatformintegrationfactory_qpa_p.h"
-#include <QPlatformIntegrationPlugin>
+#include <qpa/qplatformintegrationfactory_p.h>
+#include <qpa/qplatformintegrationplugin.h>
 #include "private/qfactoryloader_p.h"
 #include "qmutex.h"
 
diff --git a/src/gui/kernel/qplatformintegrationplugin_qpa.h b/src/gui/kernel/qplatformintegrationplugin.h
similarity index 100%
rename from src/gui/kernel/qplatformintegrationplugin_qpa.h
rename to src/gui/kernel/qplatformintegrationplugin.h
diff --git a/src/gui/kernel/qplatformintegrationplugin_qpa.cpp b/src/gui/kernel/qplatformintegrationplugin_qpa.cpp
index 7bd1caa1d34242a0a1a33bede418475f6530fe2e..d4debd1f3a7339c9db70a8298f7bb6c130b2c906 100644
--- a/src/gui/kernel/qplatformintegrationplugin_qpa.cpp
+++ b/src/gui/kernel/qplatformintegrationplugin_qpa.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qplatformintegrationplugin_qpa.h"
+#include "qplatformintegrationplugin.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/kernel/qplatformnativeinterface_qpa.h b/src/gui/kernel/qplatformnativeinterface.h
similarity index 100%
rename from src/gui/kernel/qplatformnativeinterface_qpa.h
rename to src/gui/kernel/qplatformnativeinterface.h
diff --git a/src/gui/kernel/qplatformnativeinterface_qpa.cpp b/src/gui/kernel/qplatformnativeinterface_qpa.cpp
index c17eee4415f1c838e23157eda5eb53f3986d7ea3..f0bd3f0658a565b63aabc26c16467b1faa363008 100644
--- a/src/gui/kernel/qplatformnativeinterface_qpa.cpp
+++ b/src/gui/kernel/qplatformnativeinterface_qpa.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qplatformnativeinterface_qpa.h"
+#include "qplatformnativeinterface.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/kernel/qplatformopenglcontext_qpa.h b/src/gui/kernel/qplatformopenglcontext.h
similarity index 100%
rename from src/gui/kernel/qplatformopenglcontext_qpa.h
rename to src/gui/kernel/qplatformopenglcontext.h
diff --git a/src/gui/kernel/qplatformopenglcontext_qpa.cpp b/src/gui/kernel/qplatformopenglcontext_qpa.cpp
index 33adc264820a8ff4a8f44fa9f421bbb30439a2fa..d38a5864d6c03d2aaff60f2e410cc6f40098a22e 100644
--- a/src/gui/kernel/qplatformopenglcontext_qpa.cpp
+++ b/src/gui/kernel/qplatformopenglcontext_qpa.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qplatformopenglcontext_qpa.h"
+#include "qplatformopenglcontext.h"
 
 #include <QOpenGLFunctions>
 
diff --git a/src/gui/kernel/qplatformscreen_qpa.h b/src/gui/kernel/qplatformscreen.h
similarity index 98%
rename from src/gui/kernel/qplatformscreen_qpa.h
rename to src/gui/kernel/qplatformscreen.h
index 71d734867ec39df4dcea02e3d497cbd3f88235e1..075dfb114b93765db378d6a39ad0eb9b11a31db1 100644
--- a/src/gui/kernel/qplatformscreen_qpa.h
+++ b/src/gui/kernel/qplatformscreen.h
@@ -63,7 +63,7 @@
 #include <QtGui/qcursor.h>
 #include <QtGui/qimage.h>
 #include <QtGui/qwindowdefs.h>
-#include <QtGui/qplatformpixmap_qpa.h>
+#include <qpa/qplatformpixmap.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/gui/kernel/qplatformscreen_qpa_p.h b/src/gui/kernel/qplatformscreen_p.h
similarity index 100%
rename from src/gui/kernel/qplatformscreen_qpa_p.h
rename to src/gui/kernel/qplatformscreen_p.h
diff --git a/src/gui/kernel/qplatformscreen_qpa.cpp b/src/gui/kernel/qplatformscreen_qpa.cpp
index a26bd25408b85115aceb7b95bd62733da18ae0d9..6c2f98beb418ac29913486ade38303874eb3e962 100644
--- a/src/gui/kernel/qplatformscreen_qpa.cpp
+++ b/src/gui/kernel/qplatformscreen_qpa.cpp
@@ -39,12 +39,12 @@
 **
 ****************************************************************************/
 
-#include "qplatformscreen_qpa.h"
+#include "qplatformscreen.h"
 #include <QtGui/qguiapplication.h>
-#include <QtGui/qplatformcursor_qpa.h>
+#include <qpa/qplatformcursor.h>
 #include <QtGui/private/qguiapplication_p.h>
-#include <QtGui/private/qplatformscreen_qpa_p.h>
-#include <QtGui/qplatformintegration_qpa.h>
+#include <qpa/qplatformscreen_p.h>
+#include <qpa/qplatformintegration.h>
 #include <QtGui/qscreen.h>
 #include <QtGui/qwindow.h>
 
diff --git a/src/gui/kernel/qplatformscreenpageflipper_qpa.h b/src/gui/kernel/qplatformscreenpageflipper.h
similarity index 100%
rename from src/gui/kernel/qplatformscreenpageflipper_qpa.h
rename to src/gui/kernel/qplatformscreenpageflipper.h
diff --git a/src/gui/kernel/qplatformscreenpageflipper_qpa.cpp b/src/gui/kernel/qplatformscreenpageflipper_qpa.cpp
index b912c6055eb301626e9094fe48235e05c44a133d..babecb061f3a02374b0c85a8121507b98c5deb94 100644
--- a/src/gui/kernel/qplatformscreenpageflipper_qpa.cpp
+++ b/src/gui/kernel/qplatformscreenpageflipper_qpa.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qplatformscreenpageflipper_qpa.h"
+#include "qplatformscreenpageflipper.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/kernel/qplatformservices_qpa.h b/src/gui/kernel/qplatformservices.h
similarity index 100%
rename from src/gui/kernel/qplatformservices_qpa.h
rename to src/gui/kernel/qplatformservices.h
diff --git a/src/gui/kernel/qplatformservices_qpa.cpp b/src/gui/kernel/qplatformservices_qpa.cpp
index 7993a82f4e789b72a0328a5a9590a796c057aeb5..dac9e64e406f4e22a64cd4c9ed6dbe5f4159cc6d 100644
--- a/src/gui/kernel/qplatformservices_qpa.cpp
+++ b/src/gui/kernel/qplatformservices_qpa.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qplatformservices_qpa.h"
+#include "qplatformservices.h"
 
 #include <QtCore/QUrl>
 #include <QtCore/QString>
diff --git a/src/gui/kernel/qplatformsharedgraphicscache_qpa.h b/src/gui/kernel/qplatformsharedgraphicscache.h
similarity index 100%
rename from src/gui/kernel/qplatformsharedgraphicscache_qpa.h
rename to src/gui/kernel/qplatformsharedgraphicscache.h
diff --git a/src/gui/kernel/qplatformsharedgraphicscache_qpa.cpp b/src/gui/kernel/qplatformsharedgraphicscache_qpa.cpp
index 539bb1458fd56f63e3cd6be6cedd717aa775ebe6..a3bb8da3582c4ad701a8b5126c2f0beb2a7ea3de 100644
--- a/src/gui/kernel/qplatformsharedgraphicscache_qpa.cpp
+++ b/src/gui/kernel/qplatformsharedgraphicscache_qpa.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qplatformsharedgraphicscache_qpa.h"
+#include "qplatformsharedgraphicscache.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/kernel/qplatformsurface_qpa.h b/src/gui/kernel/qplatformsurface.h
similarity index 100%
rename from src/gui/kernel/qplatformsurface_qpa.h
rename to src/gui/kernel/qplatformsurface.h
diff --git a/src/gui/kernel/qplatformsurface_qpa.cpp b/src/gui/kernel/qplatformsurface_qpa.cpp
index 1f752fe3e21a11e4cae01af2cce3a78119c4ea19..50cdd68ab6550ed6b5e293bc2737539eefbd7d83 100644
--- a/src/gui/kernel/qplatformsurface_qpa.cpp
+++ b/src/gui/kernel/qplatformsurface_qpa.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qplatformsurface_qpa.h"
+#include "qplatformsurface.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/kernel/qplatformtheme_qpa.h b/src/gui/kernel/qplatformtheme.h
similarity index 100%
rename from src/gui/kernel/qplatformtheme_qpa.h
rename to src/gui/kernel/qplatformtheme.h
diff --git a/src/gui/kernel/qplatformtheme_qpa.cpp b/src/gui/kernel/qplatformtheme_qpa.cpp
index c6314825d7eb1e7693b79beb34e8f29390b62821..07a1d7f365934587099874024309bafdd7902cc5 100644
--- a/src/gui/kernel/qplatformtheme_qpa.cpp
+++ b/src/gui/kernel/qplatformtheme_qpa.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qplatformtheme_qpa.h"
+#include "qplatformtheme.h"
 
 #include <QtCore/QVariant>
 #include <QtCore/QStringList>
diff --git a/src/gui/kernel/qplatformthemefactory_qpa_p.h b/src/gui/kernel/qplatformthemefactory_p.h
similarity index 100%
rename from src/gui/kernel/qplatformthemefactory_qpa_p.h
rename to src/gui/kernel/qplatformthemefactory_p.h
diff --git a/src/gui/kernel/qplatformthemefactory_qpa.cpp b/src/gui/kernel/qplatformthemefactory_qpa.cpp
index c023a73e7e6badd04761443497dd4aadfeb84b8e..8294591c4bd57c3f13fbb6206ebe0d665a420215 100644
--- a/src/gui/kernel/qplatformthemefactory_qpa.cpp
+++ b/src/gui/kernel/qplatformthemefactory_qpa.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qplatformthemefactory_qpa_p.h"
-#include <QPlatformThemePlugin>
+#include <qpa/qplatformthemefactory_p.h>
+#include <qpa/qplatformthemeplugin.h>
 #include "private/qfactoryloader_p.h"
 #include "qmutex.h"
 
diff --git a/src/gui/kernel/qplatformthemeplugin_qpa.h b/src/gui/kernel/qplatformthemeplugin.h
similarity index 100%
rename from src/gui/kernel/qplatformthemeplugin_qpa.h
rename to src/gui/kernel/qplatformthemeplugin.h
diff --git a/src/gui/kernel/qplatformthemeplugin_qpa.cpp b/src/gui/kernel/qplatformthemeplugin_qpa.cpp
index da2743d6e3d27902f8b86cf724eb4c214fa0b3ad..be18716b281c94fb918b347f012db0af62a64bf1 100644
--- a/src/gui/kernel/qplatformthemeplugin_qpa.cpp
+++ b/src/gui/kernel/qplatformthemeplugin_qpa.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qplatformthemeplugin_qpa.h"
+#include "qplatformthemeplugin.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/kernel/qplatformwindow_qpa.h b/src/gui/kernel/qplatformwindow.h
similarity index 97%
rename from src/gui/kernel/qplatformwindow_qpa.h
rename to src/gui/kernel/qplatformwindow.h
index 729f35e0252e24d77bce501d6e068bad41226c9b..0b4c675e56cc51d8a585679ba60c5a84aab13b47 100644
--- a/src/gui/kernel/qplatformwindow_qpa.h
+++ b/src/gui/kernel/qplatformwindow.h
@@ -58,8 +58,8 @@
 #include <QtCore/qstring.h>
 #include <QtGui/qwindowdefs.h>
 #include <QtGui/qwindow.h>
-#include <QtGui/qplatformopenglcontext_qpa.h>
-#include <QtGui/qplatformsurface_qpa.h>
+#include <qpa/qplatformopenglcontext.h>
+#include <qpa/qplatformsurface.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/gui/kernel/qplatformwindow_qpa.cpp b/src/gui/kernel/qplatformwindow_qpa.cpp
index b507eb4fdd8d604290c5ee035f9f42b0b7825d27..20817361f86e03272a087fe9973bc562f633e5e2 100644
--- a/src/gui/kernel/qplatformwindow_qpa.cpp
+++ b/src/gui/kernel/qplatformwindow_qpa.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qplatformwindow_qpa.h"
+#include "qplatformwindow.h"
 
 #include <QtGui/qwindowsysteminterface_qpa.h>
 #include <QtGui/qwindow.h>
diff --git a/src/gui/kernel/qscreen.cpp b/src/gui/kernel/qscreen.cpp
index 3546ce01ddad131e6d92a725e713bef24b54422d..716caacb40cfc7ff610556795367d24d17ceacab 100644
--- a/src/gui/kernel/qscreen.cpp
+++ b/src/gui/kernel/qscreen.cpp
@@ -42,7 +42,7 @@
 #include "qscreen.h"
 #include "qscreen_p.h"
 #include "qpixmap.h"
-#include "qplatformscreen_qpa.h"
+#include <qpa/qplatformscreen.h>
 
 #include <QtCore/private/qobject_p.h>
 
diff --git a/src/gui/kernel/qscreen_p.h b/src/gui/kernel/qscreen_p.h
index c6bf37e87a400be9f934fa50ccd6f1d4facf3660..0167384b01313f0fdc79041d7bd5ccd0c7c93c56 100644
--- a/src/gui/kernel/qscreen_p.h
+++ b/src/gui/kernel/qscreen_p.h
@@ -43,7 +43,7 @@
 #define QSCREEN_P_H
 
 #include <QtGui/qscreen.h>
-#include <QtGui/qplatformscreen_qpa.h>
+#include <qpa/qplatformscreen.h>
 
 #include <QtCore/private/qobject_p.h>
 
diff --git a/src/gui/kernel/qstylehints.cpp b/src/gui/kernel/qstylehints.cpp
index 9384d34097da30c34f8c48937991dfd665985eaa..a98e5fbd76e178643836801e74388214c04bc6f1 100644
--- a/src/gui/kernel/qstylehints.cpp
+++ b/src/gui/kernel/qstylehints.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include <qstylehints.h>
-#include <qplatformintegration_qpa.h>
+#include <qpa/qplatformintegration.h>
 #include <private/qguiapplication_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp
index 8b37fce50c3b6336c48cf1105f3c9bbe9e1871fa..6183b3f6ac17c47afafd78432bddad7f30ca4a94 100644
--- a/src/gui/kernel/qwindow.cpp
+++ b/src/gui/kernel/qwindow.cpp
@@ -41,11 +41,11 @@
 
 #include "qwindow.h"
 
-#include "qplatformwindow_qpa.h"
-#include "qplatformintegration_qpa.h"
+#include <qpa/qplatformwindow.h>
+#include <qpa/qplatformintegration.h>
 #include "qsurfaceformat.h"
 #ifndef QT_NO_OPENGL
-#include "qplatformopenglcontext_qpa.h"
+#include <qpa/qplatformopenglcontext.h>
 #include "qopenglcontext.h"
 #endif
 #include "qscreen.h"
diff --git a/src/gui/kernel/qwindow_p.h b/src/gui/kernel/qwindow_p.h
index 0afd903ead610b9759aa53ffd6ffa3330d85f36b..92eaf90188f49197db88b75f692a9acb2afc5841 100644
--- a/src/gui/kernel/qwindow_p.h
+++ b/src/gui/kernel/qwindow_p.h
@@ -43,7 +43,7 @@
 #define QWINDOW_P_H
 
 #include <QtGui/qwindow.h>
-#include <QtGui/qplatformwindow_qpa.h>
+#include <qpa/qplatformwindow.h>
 
 #include <QtCore/private/qobject_p.h>
 
diff --git a/src/gui/kernel/qwindowsysteminterface_qpa.cpp b/src/gui/kernel/qwindowsysteminterface_qpa.cpp
index a0b77b8208af9cbb6b6a42351127da1071aa14a3..83cf8c338cee00f919d03356278550328a5b90e9 100644
--- a/src/gui/kernel/qwindowsysteminterface_qpa.cpp
+++ b/src/gui/kernel/qwindowsysteminterface_qpa.cpp
@@ -39,13 +39,13 @@
 **
 ****************************************************************************/
 #include "qwindowsysteminterface_qpa.h"
-#include "qplatformwindow_qpa.h"
+#include <qpa/qplatformwindow.h>
 #include "qwindowsysteminterface_qpa_p.h"
 #include "private/qguiapplication_p.h"
 #include "private/qevent_p.h"
 #include "private/qtouchdevice_p.h"
 #include <QAbstractEventDispatcher>
-#include <QPlatformDrag>
+#include <qpa/qplatformdrag.h>
 #include <qdebug.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/gui/opengl/qopengltexturecache.cpp b/src/gui/opengl/qopengltexturecache.cpp
index e4d5ff974ddbf21626a7847b4fdd87317311cd99..d514d714bd8a67ef137a681c877078edd94b4520 100644
--- a/src/gui/opengl/qopengltexturecache.cpp
+++ b/src/gui/opengl/qopengltexturecache.cpp
@@ -42,7 +42,7 @@
 #include "qopengltexturecache_p.h"
 #include <private/qopenglcontext_p.h>
 #include <private/qimagepixmapcleanuphooks_p.h>
-#include <qplatformpixmap_qpa.h>
+#include <qpa/qplatformpixmap.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri
index a8f6a5bf8fb1436c5e9febc0e8ae7db7046a1e67..7a20f35b337fbdcce5604832a10224cb551032f6 100644
--- a/src/gui/painting/painting.pri
+++ b/src/gui/painting/painting.pri
@@ -33,7 +33,7 @@ HEADERS += \
         painting/qstroker_p.h \
         painting/qtextureglyphcache_p.h \
         painting/qtransform.h \
-        painting/qplatformbackingstore_qpa.h \
+        painting/qplatformbackingstore.h \
         painting/qpaintbuffer_p.h \
         painting/qpathsimplifier_p.h
 
diff --git a/src/gui/painting/qbackingstore.cpp b/src/gui/painting/qbackingstore.cpp
index 63f7ba594f51f9cbeff0b13b971b877f6304507e..14694769a94b539b69968bc52c3a90232cd71379 100644
--- a/src/gui/painting/qbackingstore.cpp
+++ b/src/gui/painting/qbackingstore.cpp
@@ -42,8 +42,8 @@
 #include <qbackingstore.h>
 #include <qwindow.h>
 #include <qpixmap.h>
-#include <qplatformbackingstore_qpa.h>
-#include <qplatformintegration_qpa.h>
+#include <qpa/qplatformbackingstore.h>
+#include <qpa/qplatformintegration.h>
 #include <qscreen.h>
 
 #include <private/qguiapplication_p.h>
diff --git a/src/gui/painting/qplatformbackingstore_qpa.h b/src/gui/painting/qplatformbackingstore.h
similarity index 100%
rename from src/gui/painting/qplatformbackingstore_qpa.h
rename to src/gui/painting/qplatformbackingstore.h
diff --git a/src/gui/painting/qplatformbackingstore_qpa.cpp b/src/gui/painting/qplatformbackingstore_qpa.cpp
index 485190d301a0c2830a1af6299de40086e38a60a8..34cda00a6e0e52397b2d0fc9da3c9c56424705a8 100644
--- a/src/gui/painting/qplatformbackingstore_qpa.cpp
+++ b/src/gui/painting/qplatformbackingstore_qpa.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <qplatformbackingstore_qpa.h>
+#include "qplatformbackingstore.h"
 #include <qwindow.h>
 #include <qpixmap.h>
 #include <private/qwindow_p.h>
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp
index 161bb4e23dc7ded9e9e46510dd84a1e5c63d1f4e..ccbd335d616174df36610c5e52726ac41f9f4081 100644
--- a/src/gui/text/qfont.cpp
+++ b/src/gui/text/qfont.cpp
@@ -62,7 +62,7 @@
 #include <private/qtextengine_p.h>
 #include <limits.h>
 
-#include <QtGui/qplatformscreen_qpa.h>
+#include <qpa/qplatformscreen.h>
 #include <QtGui/private/qguiapplication_p.h>
 
 #include <QtCore/QMutexLocker>
diff --git a/src/gui/text/qfont_qpa.cpp b/src/gui/text/qfont_qpa.cpp
index b73b03025b43d138276b272a70b6068609f2366d..8422409cb396fed02c7323c9274f996517ee580b 100644
--- a/src/gui/text/qfont_qpa.cpp
+++ b/src/gui/text/qfont_qpa.cpp
@@ -40,8 +40,8 @@
 ****************************************************************************/
 
 #include <QtGui/private/qguiapplication_p.h>
-#include <QtGui/QPlatformIntegration>
-#include <QtGui/QPlatformFontDatabase>
+#include <qpa/qplatformintegration.h>
+#include <qpa/qplatformfontdatabase.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp
index a1af8569926c5c719c8a6ecfcfbe792d6a926aca..0a56ca37422eb6638029568d28aecc0367a96b4a 100644
--- a/src/gui/text/qfontdatabase.cpp
+++ b/src/gui/text/qfontdatabase.cpp
@@ -50,10 +50,10 @@
 #include "qfileinfo.h"
 #include "private/qunicodetables_p.h"
 #include "qfontengine_p.h"
-#include "qplatformintegration_qpa.h"
+#include <qpa/qplatformintegration.h>
 
 #include <QtGui/private/qguiapplication_p.h>
-#include <QtGui/qplatformfontdatabase_qpa.h>
+#include <qpa/qplatformfontdatabase.h>
 
 #include <stdlib.h>
 #include <limits.h>
diff --git a/src/gui/text/qfontdatabase_qpa.cpp b/src/gui/text/qfontdatabase_qpa.cpp
index c2a3aa9722868c318faee29714f540c401dcf8e1..d7e5441931bf5e163e4502c1a5746236597f83ed 100644
--- a/src/gui/text/qfontdatabase_qpa.cpp
+++ b/src/gui/text/qfontdatabase_qpa.cpp
@@ -46,7 +46,7 @@
 #include "qplatformdefs.h"
 
 #include <QtGui/private/qguiapplication_p.h>
-#include <QtGui/qplatformfontdatabase_qpa.h>
+#include <qpa/qplatformfontdatabase.h>
 
 #include <QtCore/qmath.h>
 
diff --git a/src/gui/text/qfontengine_qpa.cpp b/src/gui/text/qfontengine_qpa.cpp
index bf0cfd14043b8d3cd5507e92d1f1fa0f02c5cad3..dcb0a4f8d1b9619f03806fdbab919f2c61e77970 100644
--- a/src/gui/text/qfontengine_qpa.cpp
+++ b/src/gui/text/qfontengine_qpa.cpp
@@ -48,8 +48,8 @@
 
 #include <QtGui/private/qpaintengine_raster_p.h>
 #include <QtGui/private/qguiapplication_p.h>
-#include <QtGui/QPlatformFontDatabase>
-#include <QtGui/QPlatformIntegration>
+#include <qpa/qplatformfontdatabase.h>
+#include <qpa/qplatformintegration.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/text/qplatformfontdatabase_qpa.h b/src/gui/text/qplatformfontdatabase.h
similarity index 100%
rename from src/gui/text/qplatformfontdatabase_qpa.h
rename to src/gui/text/qplatformfontdatabase.h
diff --git a/src/gui/text/qplatformfontdatabase_qpa.cpp b/src/gui/text/qplatformfontdatabase_qpa.cpp
index 632d2d89d9c566af8d0715c2f72e0c3590f42821..3531202eff02d0e49622efb1987265d0c6fc0e9e 100644
--- a/src/gui/text/qplatformfontdatabase_qpa.cpp
+++ b/src/gui/text/qplatformfontdatabase_qpa.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qplatformfontdatabase_qpa.h"
+#include "qplatformfontdatabase.h"
 #include <QtGui/private/qfontengine_p.h>
 #include <QtGui/private/qfontengine_qpa_p.h>
 #include <QtCore/QLibraryInfo>
diff --git a/src/gui/text/qrawfont_qpa.cpp b/src/gui/text/qrawfont_qpa.cpp
index d037d5902d35fb18715104bf4ce094579fce4539..7289450e7f96d217986a93703aef48a9cc8e654d 100644
--- a/src/gui/text/qrawfont_qpa.cpp
+++ b/src/gui/text/qrawfont_qpa.cpp
@@ -44,8 +44,8 @@
 #if !defined(QT_NO_RAWFONT)
 
 #include "qrawfont_p.h"
-#include "qplatformintegration_qpa.h"
-#include <QtGui/qplatformfontdatabase_qpa.h>
+#include <qpa/qplatformintegration.h>
+#include <qpa/qplatformfontdatabase.h>
 #include <private/qguiapplication_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/gui/text/text.pri b/src/gui/text/text.pri
index 6587769712b869190c650ec7d13b6656cf741e80..d0dd0ed129cf15e7b0fc8a1a485deeaa71ca14f8 100644
--- a/src/gui/text/text.pri
+++ b/src/gui/text/text.pri
@@ -102,7 +102,7 @@ SOURCES += \
       text/qrawfont_qpa.cpp
 
 HEADERS += \
-      text/qplatformfontdatabase_qpa.h
+      text/qplatformfontdatabase.h
 
 DEFINES += QT_NO_OPENTYPE
 INCLUDEPATH += ../3rdparty/harfbuzz/src
diff --git a/src/gui/util/qdesktopservices.cpp b/src/gui/util/qdesktopservices.cpp
index a941c060310903a96f1abc4eb00e5c480256e20f..0fba6e6f3a260a5607063773a5f7186d99b113ca 100644
--- a/src/gui/util/qdesktopservices.cpp
+++ b/src/gui/util/qdesktopservices.cpp
@@ -52,8 +52,8 @@
 #include <private/qguiapplication_p.h>
 #include <qurl.h>
 #include <qmutex.h>
-#include <qplatformservices_qpa.h>
-#include <qplatformintegration_qpa.h>
+#include <qpa/qplatformservices.h>
+#include <qpa/qplatformintegration.h>
 #include <qdir.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index e306ea44760b7947efedbb259d725b5081898d47..d298777c30b67409c1be09322feb2b6abc108347 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -55,13 +55,13 @@
 
 #include "gl2paintengineex/qpaintengineex_opengl2_p.h"
 
-#include <QtGui/QPlatformOpenGLContext>
+#include <qpa/qplatformopenglcontext.h>
 
 #include <qglpixelbuffer.h>
 #include <qglframebufferobject.h>
 
 #include <private/qimage_p.h>
-#include <qplatformpixmap_qpa.h>
+#include <qpa/qplatformpixmap.h>
 #include <private/qglpixelbuffer_p.h>
 #include <private/qimagepixmapcleanuphooks_p.h>
 #include "qcolormap.h"
diff --git a/src/opengl/qgl_qpa.cpp b/src/opengl/qgl_qpa.cpp
index 8810b70f0872f39b7a6e96d1857062412150eea6..05c0d9fe39e4b3b9b011e57e33fffa11d3f9cbbe 100644
--- a/src/opengl/qgl_qpa.cpp
+++ b/src/opengl/qgl_qpa.cpp
@@ -45,8 +45,8 @@
 #include <QDebug>
 
 #include <private/qapplication_p.h>
-#include <QtGui/QPlatformOpenGLContext>
-#include <QtGui/QPlatformWindow>
+#include <qpa/qplatformopenglcontext.h>
+#include <qpa/qplatformwindow.h>
 #include <QtGui/QSurfaceFormat>
 
 #include "qgl.h"
diff --git a/src/platformsupport/dnd/qsimpledrag_p.h b/src/platformsupport/dnd/qsimpledrag_p.h
index 72706840820ca6698ebbe2bc56a84b8f8bfab91e..fa87f09d060416484c2dd2b40fda8db859a95884 100644
--- a/src/platformsupport/dnd/qsimpledrag_p.h
+++ b/src/platformsupport/dnd/qsimpledrag_p.h
@@ -42,7 +42,7 @@
 #ifndef QSIMPLEDRAG_H
 #define QSIMPLEDRAG_H
 
-#include <qplatformdrag_qpa.h>
+#include <qpa/qplatformdrag.h>
 
 #include <QtCore/QObject>
 
diff --git a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp
index 71e18203fbdcc32b4254e91bf2a95b0c2317bdf1..97b4571dbf794ce7366c9e09864c569bc23bc9dd 100644
--- a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp
+++ b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp
@@ -43,7 +43,7 @@
 
 #include "qeglconvenience_p.h"
 
-#include <QtGui/QPlatformWindow>
+#include <qpa/qplatformwindow.h>
 
 #include <EGL/egl.h>
 
diff --git a/src/platformsupport/eglconvenience/qeglplatformcontext_p.h b/src/platformsupport/eglconvenience/qeglplatformcontext_p.h
index 75375fa781407c05ffa9e5cba7eb81e5c5999979..d48d49a696e0bd02d10c13dacef804767830d4ca 100644
--- a/src/platformsupport/eglconvenience/qeglplatformcontext_p.h
+++ b/src/platformsupport/eglconvenience/qeglplatformcontext_p.h
@@ -42,8 +42,8 @@
 #ifndef QEGLPLATFORMCONTEXT_H
 #define QEGLPLATFORMCONTEXT_H
 
-#include <QtGui/QPlatformWindow>
-#include <QtGui/QPlatformOpenGLContext>
+#include <qpa/qplatformwindow.h>
+#include <qpa/qplatformopenglcontext.h>
 #include <EGL/egl.h>
 
 class QEGLPlatformContext : public QPlatformOpenGLContext
diff --git a/src/platformsupport/fb_base/fb_base.cpp b/src/platformsupport/fb_base/fb_base.cpp
index 0cdd091df2da7feed32e021c3d63245a2d49f0e5..516274962db7e7647b9f8172470af45b08a0070a 100644
--- a/src/platformsupport/fb_base/fb_base.cpp
+++ b/src/platformsupport/fb_base/fb_base.cpp
@@ -43,7 +43,7 @@
 #include <qpainter.h>
 #include <qdebug.h>
 #include <qbitmap.h>
-#include <QPlatformCursor>
+#include <qpa/qplatformcursor.h>
 #include <QWindowSystemInterface>
 
 QPlatformSoftwareCursor::QPlatformSoftwareCursor(QPlatformScreen *scr)
diff --git a/src/platformsupport/fb_base/fb_base_p.h b/src/platformsupport/fb_base/fb_base_p.h
index c9862c6c58bae5cc0ec69d43acf632a7eacfd077..187ae961bf4fc6a5ce287e44971977f597731b5a 100644
--- a/src/platformsupport/fb_base/fb_base_p.h
+++ b/src/platformsupport/fb_base/fb_base_p.h
@@ -46,9 +46,9 @@
 #include <qimage.h>
 #include <qtimer.h>
 #include <qpainter.h>
-#include <QPlatformCursor>
-#include <QPlatformScreen>
-#include <QPlatformWindow>
+#include <qpa/qplatformcursor.h>
+#include <qpa/qplatformscreen.h>
+#include <qpa/qplatformwindow.h>
 #include <QtGui/private/qwindowsurface_p.h>
 
 class QMouseEvent;
diff --git a/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp b/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp
index cddc08c7500726a8f5808abb91ec854c4ae0b017..e96659d4f6a9136fa4ef820ed72aa03e61e092b5 100644
--- a/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp
+++ b/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp
@@ -42,7 +42,7 @@
 #include "qbasicfontdatabase_p.h"
 
 #include <QtGui/private/qguiapplication_p.h>
-#include <QtGui/QPlatformScreen>
+#include <qpa/qplatformscreen.h>
 
 #include <QtCore/QFile>
 #include <QtCore/QLibraryInfo>
diff --git a/src/platformsupport/fontdatabases/basic/qbasicfontdatabase_p.h b/src/platformsupport/fontdatabases/basic/qbasicfontdatabase_p.h
index fd6e180c75189848d065692968e4f72a68e83a0c..eb4b11ca976d126ef163b926580f252e8dbed6f7 100644
--- a/src/platformsupport/fontdatabases/basic/qbasicfontdatabase_p.h
+++ b/src/platformsupport/fontdatabases/basic/qbasicfontdatabase_p.h
@@ -42,7 +42,7 @@
 #ifndef QBASICFONTDATABASE_H
 #define QBASICFONTDATABASE_H
 
-#include <QPlatformFontDatabase>
+#include <qpa/qplatformfontdatabase.h>
 #include <QtCore/QByteArray>
 #include <QtCore/QString>
 
diff --git a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
index 9ad9b96d1506a59be36dd3cd4cc8c2483b6940b6..d995ffbbad186ca1f329b67d2a37c6a14887aa4e 100644
--- a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
+++ b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
@@ -47,7 +47,7 @@
 
 #include <QtCore/QElapsedTimer>
 
-#include <QtGui/QPlatformScreen>
+#include <qpa/qplatformscreen.h>
 
 #include <QtGui/private/qfontengine_ft_p.h>
 #include <QtGui/private/qfontengine_p.h>
diff --git a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase_p.h b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase_p.h
index df62ddeb0bf1cce2afe4a264320e63a03581bb1b..9859bd7082468731912ab5bf25a9f526e1f659ef 100644
--- a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase_p.h
+++ b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase_p.h
@@ -42,7 +42,7 @@
 #ifndef QFONTCONFIGDATABASE_H
 #define QFONTCONFIGDATABASE_H
 
-#include <QPlatformFontDatabase>
+#include <qpa/qplatformfontdatabase.h>
 #include <QtPlatformSupport/private/qbasicfontdatabase_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h
index 01aed89d4750e44d96c1d45be8f5cfa54d634055..e38e01d25dc5e31589946f41330e816ff54fd146 100644
--- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h
+++ b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h
@@ -42,7 +42,7 @@
 #ifndef QCORETEXTFONTDATABASE_H
 #define QCORETEXTFONTDATABASE_H
 
-#include <QPlatformFontDatabase>
+#include <qpa/qplatformfontdatabase.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/platformsupport/inputcontext/inputcontext.pri b/src/platformsupport/inputcontext/inputcontext.pri
index e1a44684bac78e64a928800ca6e01a967862eb1b..8debcd01292e162c3e95e061b43b0e56f1483720 100644
--- a/src/platformsupport/inputcontext/inputcontext.pri
+++ b/src/platformsupport/inputcontext/inputcontext.pri
@@ -1,6 +1,6 @@
 HEADERS += \
-    $$PWD/qplatforminputcontextplugin_qpa_p.h \
-    $$PWD/qplatforminputcontextfactory_qpa_p.h
+    $$PWD/qplatforminputcontextplugin_p.h \
+    $$PWD/qplatforminputcontextfactory_p.h
 SOURCES += \
     $$PWD/qplatforminputcontextplugin_qpa.cpp \
     $$PWD/qplatforminputcontextfactory_qpa.cpp
diff --git a/src/platformsupport/inputcontext/qplatforminputcontextfactory_qpa_p.h b/src/platformsupport/inputcontext/qplatforminputcontextfactory_p.h
similarity index 100%
rename from src/platformsupport/inputcontext/qplatforminputcontextfactory_qpa_p.h
rename to src/platformsupport/inputcontext/qplatforminputcontextfactory_p.h
diff --git a/src/platformsupport/inputcontext/qplatforminputcontextfactory_qpa.cpp b/src/platformsupport/inputcontext/qplatforminputcontextfactory_qpa.cpp
index ca3673f670ad5bb8c5925ce32eb129c754cab7e0..6d909426a8b3db8f17bb5ed293f159e723c48557 100644
--- a/src/platformsupport/inputcontext/qplatforminputcontextfactory_qpa.cpp
+++ b/src/platformsupport/inputcontext/qplatforminputcontextfactory_qpa.cpp
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include "qplatforminputcontextfactory_qpa_p.h"
-#include "qplatforminputcontextplugin_qpa_p.h"
-#include <QPlatformInputContext>
+#include <qpa/qplatforminputcontextfactory_p.h>
+#include <qpa/qplatforminputcontextplugin_p.h>
+#include <qpa/qplatforminputcontext.h>
 #include "private/qfactoryloader_p.h"
 
 #include "qguiapplication.h"
diff --git a/src/platformsupport/inputcontext/qplatforminputcontextplugin_qpa_p.h b/src/platformsupport/inputcontext/qplatforminputcontextplugin_p.h
similarity index 100%
rename from src/platformsupport/inputcontext/qplatforminputcontextplugin_qpa_p.h
rename to src/platformsupport/inputcontext/qplatforminputcontextplugin_p.h
diff --git a/src/platformsupport/inputcontext/qplatforminputcontextplugin_qpa.cpp b/src/platformsupport/inputcontext/qplatforminputcontextplugin_qpa.cpp
index 88cd9cdf6747f1df68372bc170f524ad82fe5075..670bfd0de550ade8c55d99b383978785676a72e8 100644
--- a/src/platformsupport/inputcontext/qplatforminputcontextplugin_qpa.cpp
+++ b/src/platformsupport/inputcontext/qplatforminputcontextplugin_qpa.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qplatforminputcontextplugin_qpa_p.h"
+#include "qplatforminputcontextplugin_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/platformsupport/printersupport/genericunix/qgenericunixprintersupport_p.h b/src/platformsupport/printersupport/genericunix/qgenericunixprintersupport_p.h
index 369e8274fd84288b3320d239581189588fa6525e..d6b2d0d080303c7c6a94a93269cff58bc9750895 100644
--- a/src/platformsupport/printersupport/genericunix/qgenericunixprintersupport_p.h
+++ b/src/platformsupport/printersupport/genericunix/qgenericunixprintersupport_p.h
@@ -42,7 +42,7 @@
 #ifndef QGENERICUNIXPRINTINGSUPPORT_H
 #define QGENERICUNIXPRINTINGSUPPORT_H
 
-#include <QtPrintSupport/QPlatformPrinterSupport>
+#include <qpa/qplatformprintersupport.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/platformsupport/services/genericunix/qgenericunixservices_p.h b/src/platformsupport/services/genericunix/qgenericunixservices_p.h
index 3923a45f89701d7386a641e05fa67c3eb99dcdba..b0dbccc099641ce7cf9c1ec266346933325dd5b6 100644
--- a/src/platformsupport/services/genericunix/qgenericunixservices_p.h
+++ b/src/platformsupport/services/genericunix/qgenericunixservices_p.h
@@ -42,7 +42,7 @@
 #ifndef QGENERICUNIXDESKTOPSERVICES_H
 #define QGENERICUNIXDESKTOPSERVICES_H
 
-#include <QtGui/qplatformservices_qpa.h>
+#include <qpa/qplatformservices.h>
 #include <QtCore/QString>
 
 QT_BEGIN_HEADER
diff --git a/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h b/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h
index cabffc021225f895577e8fbe146badbe0d32c872..a1b50865edc1abdb32e25448b9c0937a245a0f50 100644
--- a/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h
+++ b/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h
@@ -42,7 +42,7 @@
 #ifndef QGENERICUNIXTHEMES_H
 #define QGENERICUNIXTHEMES_H
 
-#include <QtGui/QPlatformTheme>
+#include <qpa/qplatformtheme.h>
 #include <QtCore/QString>
 #include <QtCore/QStringList>
 
diff --git a/src/plugins/platforminputcontexts/ibus/ibus.pro b/src/plugins/platforminputcontexts/ibus/ibus.pro
index 12419343faaecad5505040862f3016513830093c..0fb92f23a852b2f8b6939cd82688315c258cab3d 100644
--- a/src/plugins/platforminputcontexts/ibus/ibus.pro
+++ b/src/plugins/platforminputcontexts/ibus/ibus.pro
@@ -3,7 +3,7 @@ load(qt_plugin)
 
 QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforminputcontexts
 
-QT += dbus platformsupport-private
+QT += dbus platformsupport-private gui-private
 SOURCES += $$PWD/qibusplatforminputcontext.cpp \
            $$PWD/qibusproxy.cpp \
            $$PWD/qibusinputcontextproxy.cpp \
diff --git a/src/plugins/platforminputcontexts/ibus/main.cpp b/src/plugins/platforminputcontexts/ibus/main.cpp
index 19f032b7dfb3333f40a4fac7d4635afe447114bc..d841426ea708fa86b4ec7b0d1434958e97eb5351 100644
--- a/src/plugins/platforminputcontexts/ibus/main.cpp
+++ b/src/plugins/platforminputcontexts/ibus/main.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <private/qplatforminputcontextplugin_qpa_p.h>
+#include <qpa/qplatforminputcontextplugin_p.h>
 #include <QtCore/QStringList>
 #include "qibusplatforminputcontext.h"
 
diff --git a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h
index 1ed4262ef65178770185addb744eeaf971c57296..4d9f42e8d0bf788344647da3e43d18d66a846823 100644
--- a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h
+++ b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h
@@ -41,7 +41,7 @@
 #ifndef QIBUSPLATFORMINPUTCONTEXT_H
 #define QIBUSPLATFORMINPUTCONTEXT_H
 
-#include <QPlatformInputContext>
+#include <qpa/qplatforminputcontext.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforminputcontexts/maliit/main.cpp b/src/plugins/platforminputcontexts/maliit/main.cpp
index 2552cc0aa6a8e3ba688fddb332baff97fe351cb0..adeaa7bb3139a74c5285647309ac40b95f851856 100644
--- a/src/plugins/platforminputcontexts/maliit/main.cpp
+++ b/src/plugins/platforminputcontexts/maliit/main.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <private/qplatforminputcontextplugin_qpa_p.h>
+#include <qpa/qplatforminputcontextplugin_p.h>
 #include <QtCore/QStringList>
 #include "qmaliitplatforminputcontext.h"
 
diff --git a/src/plugins/platforminputcontexts/maliit/maliit.pro b/src/plugins/platforminputcontexts/maliit/maliit.pro
index 445e172637644a1bb3cd35bbf7d750b9edb61de3..dbcd22efcbb51a4c00d7d6189e64c8eff4c3c48b 100644
--- a/src/plugins/platforminputcontexts/maliit/maliit.pro
+++ b/src/plugins/platforminputcontexts/maliit/maliit.pro
@@ -3,7 +3,7 @@ load(qt_plugin)
 
 QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforminputcontexts
 
-QT += dbus platformsupport-private
+QT += dbus platformsupport-private gui-private
 SOURCES += $$PWD/qmaliitplatforminputcontext.cpp \
            $$PWD/serverproxy.cpp \
            $$PWD/serveraddressproxy.cpp \
diff --git a/src/plugins/platforminputcontexts/maliit/qmaliitplatforminputcontext.h b/src/plugins/platforminputcontexts/maliit/qmaliitplatforminputcontext.h
index 261252461958ee269aef3aa15d76b3e9839206f1..cb32feed61165388b1a6c78257cdd64b933fdf9c 100644
--- a/src/plugins/platforminputcontexts/maliit/qmaliitplatforminputcontext.h
+++ b/src/plugins/platforminputcontexts/maliit/qmaliitplatforminputcontext.h
@@ -41,7 +41,7 @@
 #ifndef QMALIITPLATFORMINPUTCONTEXT_H
 #define QMALIITPLATFORMINPUTCONTEXT_H
 
-#include <QPlatformInputContext>
+#include <qpa/qplatforminputcontext.h>
 #include <QDBusArgument>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/cocoa/cocoa.pro b/src/plugins/platforms/cocoa/cocoa.pro
index f149a6775bc78bee7a477b7ec6d9bc51c13231c5..ccd98c5b3c8014c6117af72b958b6b6debd1b990 100644
--- a/src/plugins/platforms/cocoa/cocoa.pro
+++ b/src/plugins/platforms/cocoa/cocoa.pro
@@ -77,7 +77,7 @@ RESOURCES += qcocoaresources.qrc
 
 LIBS += -framework Cocoa -framework IOKit
 
-QT += core-private gui-private widgets-private platformsupport-private printsupport
+QT += core-private gui-private widgets-private platformsupport-private printsupport-private
 
 OTHER_FILES += cocoa.json
 target.path += $$[QT_INSTALL_PLUGINS]/platforms
diff --git a/src/plugins/platforms/cocoa/main.mm b/src/plugins/platforms/cocoa/main.mm
index 9857a4e17718c1568fd746fd5d0dc7d6f9a8baa3..fc17bd3fe281b62fd5095baa96f49158eeac9118 100644
--- a/src/plugins/platforms/cocoa/main.mm
+++ b/src/plugins/platforms/cocoa/main.mm
@@ -41,8 +41,8 @@
 
 #include <Cocoa/Cocoa.h>
 
-#include <QtGui/QPlatformIntegrationPlugin>
-#include <QtGui/QPlatformThemePlugin>
+#include <qpa/qplatformintegrationplugin.h>
+#include <qpa/qplatformthemeplugin.h>
 #include "qcocoaintegration.h"
 #include "qcocoatheme.h"
 
diff --git a/src/plugins/platforms/cocoa/qcocoabackingstore.h b/src/plugins/platforms/cocoa/qcocoabackingstore.h
index 72bb5936c03610518a9b268b7116f2742c946641..36fb4b42ffb1f0355b54ec77d1c02d9ce30deea6 100644
--- a/src/plugins/platforms/cocoa/qcocoabackingstore.h
+++ b/src/plugins/platforms/cocoa/qcocoabackingstore.h
@@ -47,7 +47,7 @@
 #include "qcocoawindow.h"
 #include "qnsview.h"
 
-#include <QPlatformBackingStore>
+#include <qpa/qplatformbackingstore.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/cocoa/qcocoaclipboard.h b/src/plugins/platforms/cocoa/qcocoaclipboard.h
index 27505058bf40f6931ea547deb2401274e82baae2..d387ae9eb0e2c3adbae622138cc04c9642c239f9 100644
--- a/src/plugins/platforms/cocoa/qcocoaclipboard.h
+++ b/src/plugins/platforms/cocoa/qcocoaclipboard.h
@@ -42,7 +42,7 @@
 #ifndef QCOCOACLIPBOARD_H
 #define QCOCOACLIPBOARD_H
 
-#include <qplatformclipboard_qpa.h>
+#include <qpa/qplatformclipboard.h>
 #include "qmacclipboard.h"
 #include <QtCore/QScopedPointer>
 
diff --git a/src/plugins/platforms/cocoa/qcocoacolordialoghelper.h b/src/plugins/platforms/cocoa/qcocoacolordialoghelper.h
index 4b901f3ef39b6feac1b3e7c168ffdb71cc333d95..8845d7fdcd6452457a37a41283acba2b9f8aa50e 100644
--- a/src/plugins/platforms/cocoa/qcocoacolordialoghelper.h
+++ b/src/plugins/platforms/cocoa/qcocoacolordialoghelper.h
@@ -43,7 +43,7 @@
 #define QCOCOACOLORDIALOGHELPER_H
 
 #include <QObject>
-#include <qplatformdialoghelper_qpa.h>
+#include <qpa/qplatformdialoghelper.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/cocoa/qcocoacursor.h b/src/plugins/platforms/cocoa/qcocoacursor.h
index 85892ee820f9152a217be0174f966eb5369c9135..b57d624b61dc6668f2ff191e2cea758552709758 100644
--- a/src/plugins/platforms/cocoa/qcocoacursor.h
+++ b/src/plugins/platforms/cocoa/qcocoacursor.h
@@ -45,7 +45,7 @@
 #include <Cocoa/Cocoa.h>
 
 #include <QtCore>
-#include <QtGui/QPlatformCursor>
+#include <qpa/qplatformcursor.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/cocoa/qcocoadrag.h b/src/plugins/platforms/cocoa/qcocoadrag.h
index 17df54f748b27262b47ad45c9c3d17d01c7f4290..5a0a3fa2715bd07922538a917c938bc68e1f2776 100644
--- a/src/plugins/platforms/cocoa/qcocoadrag.h
+++ b/src/plugins/platforms/cocoa/qcocoadrag.h
@@ -44,7 +44,7 @@
 
 #include <Cocoa/Cocoa.h>
 #include <QtGui>
-#include <qplatformdrag_qpa.h>
+#include <qpa/qplatformdrag.h>
 #include <QtPlatformSupport/private/qsimpledrag_p.h>
 
 #include <QtGui/private/qdnd_p.h>
diff --git a/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm b/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm
index a3bd4a95cafd5b85a93ebb647da421aae4181bdb..ddaa7a762bed7ee109fe02ae9bb64ca6a4cd886a 100644
--- a/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm
+++ b/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm
@@ -81,8 +81,8 @@
 #include "qhash.h"
 #include "qmutex.h"
 #include "qsocketnotifier.h"
-#include <qplatformwindow_qpa.h>
-#include <qplatformnativeinterface_qpa.h>
+#include <qpa/qplatformwindow.h>
+#include <qpa/qplatformnativeinterface.h>
 #include "private/qthread_p.h"
 #include "private/qguiapplication_p.h"
 #include <qdebug.h>
diff --git a/src/plugins/platforms/cocoa/qcocoafiledialoghelper.h b/src/plugins/platforms/cocoa/qcocoafiledialoghelper.h
index 9768d3e6f9a50f1bc8c4deb84b2ce211b27a6a27..5b7af09fb8e2d72c7b2a00c00f36042eda58befe 100644
--- a/src/plugins/platforms/cocoa/qcocoafiledialoghelper.h
+++ b/src/plugins/platforms/cocoa/qcocoafiledialoghelper.h
@@ -43,7 +43,7 @@
 #define QCOCOAFILEDIALOGHELPER_H
 
 #include <QObject>
-#include <qplatformdialoghelper_qpa.h>
+#include <qpa/qplatformdialoghelper.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/cocoa/qcocoafontdialoghelper.h b/src/plugins/platforms/cocoa/qcocoafontdialoghelper.h
index f9dd4357a5d45dbe198dfbe61e80b229c09facaa..501e67deb370501f67b7081ccc07fcdb7268a0c2 100644
--- a/src/plugins/platforms/cocoa/qcocoafontdialoghelper.h
+++ b/src/plugins/platforms/cocoa/qcocoafontdialoghelper.h
@@ -43,7 +43,7 @@
 #define QCOCOAFONTDIALOGHELPER_H
 
 #include <QObject>
-#include <qplatformdialoghelper_qpa.h>
+#include <qpa/qplatformdialoghelper.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/cocoa/qcocoaglcontext.h b/src/plugins/platforms/cocoa/qcocoaglcontext.h
index 4f80511f6125ba7703ba34bcfd49cbe1ecf6a2d2..6c0fcd1077119882fdd90b86bc1ab426f89419ee 100644
--- a/src/plugins/platforms/cocoa/qcocoaglcontext.h
+++ b/src/plugins/platforms/cocoa/qcocoaglcontext.h
@@ -43,7 +43,7 @@
 #define QCOCOAGLCONTEXT_H
 
 #include <QtCore/QWeakPointer>
-#include <QtGui/QPlatformOpenGLContext>
+#include <qpa/qplatformopenglcontext.h>
 #include <QtGui/QOpenGLContext>
 #include <QtGui/QWindow>
 
diff --git a/src/plugins/platforms/cocoa/qcocoahelpers.mm b/src/plugins/platforms/cocoa/qcocoahelpers.mm
index 60590b966ec37b9875c59a3d61666f4a60b3fe4e..8f8d7b84a67e14372a56b55db4d8fecdafa04a17 100644
--- a/src/plugins/platforms/cocoa/qcocoahelpers.mm
+++ b/src/plugins/platforms/cocoa/qcocoahelpers.mm
@@ -45,7 +45,7 @@
 
 #include <QtCore>
 #include <QtGui>
-#include <qplatformscreen_qpa.h>
+#include <qpa/qplatformscreen.h>
 #include <private/qguiapplication_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/cocoa/qcocoainputcontext.h b/src/plugins/platforms/cocoa/qcocoainputcontext.h
index 1fda29209d60f74e886aef2c33f3c6ee5b34364c..743931193d5e09df06ff032f8b85f0ab9c4271b6 100644
--- a/src/plugins/platforms/cocoa/qcocoainputcontext.h
+++ b/src/plugins/platforms/cocoa/qcocoainputcontext.h
@@ -42,7 +42,7 @@
 #ifndef QCOCOAINPUTCONTEXT_H
 #define QCOCOAINPUTCONTEXT_H
 
-#include <QtGui/QPlatformInputContext>
+#include <qpa/qplatforminputcontext.h>
 #include <QtCore/QPointer>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.h b/src/plugins/platforms/cocoa/qcocoaintegration.h
index a001b6234a0133613d801066a3b779244ec4823d..da84969f003ee9be8fbd1edccd4a771d9d03b8e5 100644
--- a/src/plugins/platforms/cocoa/qcocoaintegration.h
+++ b/src/plugins/platforms/cocoa/qcocoaintegration.h
@@ -51,7 +51,7 @@
 #include "qcocoaservices.h"
 
 #include <QtCore/QScopedPointer>
-#include <QtGui/QPlatformIntegration>
+#include <qpa/qplatformintegration.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm
index 0b87773deeba74688b538b81f9a746717d9e6a8b..b82519fd97f9c21a62585f7e2df8f552be277c87 100644
--- a/src/plugins/platforms/cocoa/qcocoaintegration.mm
+++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm
@@ -55,7 +55,7 @@
 #include "qcocoainputcontext.h"
 #include "qmacmime.h"
 
-#include <QtGui/qplatformaccessibility_qpa.h>
+#include <qpa/qplatformaccessibility.h>
 #include <QtCore/qcoreapplication.h>
 
 #include <QtWidgets/QDialog>
diff --git a/src/plugins/platforms/cocoa/qcocoanativeinterface.h b/src/plugins/platforms/cocoa/qcocoanativeinterface.h
index bb4d0f9f6ca9626cac20ee4edb703c855f4f9162..0346eafec447a2997546dc15d2aaa5684287182e 100644
--- a/src/plugins/platforms/cocoa/qcocoanativeinterface.h
+++ b/src/plugins/platforms/cocoa/qcocoanativeinterface.h
@@ -42,8 +42,8 @@
 #ifndef QCOCOANATIVEINTERFACE_H
 #define QCOCOANATIVEINTERFACE_H
 
-#include <QtGui/QPlatformNativeInterface>
-#include <QtPrintSupport/QPlatformPrinterSupport>
+#include <qpa/qplatformnativeinterface.h>
+#include <qpa/qplatformprintersupport.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/cocoa/qcocoanativeinterface.mm b/src/plugins/platforms/cocoa/qcocoanativeinterface.mm
index ca15b6bbfb672942dfa9b0f41709a9d7da55cf03..df9ae23606874fdb879222fc5c23c759eabac41a 100644
--- a/src/plugins/platforms/cocoa/qcocoanativeinterface.mm
+++ b/src/plugins/platforms/cocoa/qcocoanativeinterface.mm
@@ -46,9 +46,9 @@
 
 #include <qbytearray.h>
 #include <qwindow.h>
-#include "qplatformwindow_qpa.h"
+#include <qpa/qplatformwindow.h>
 #include "qsurfaceformat.h"
-#include "qplatformopenglcontext_qpa.h"
+#include <qpa/qplatformopenglcontext.h>
 #include "qopenglcontext.h"
 #include <qdebug.h>
 
diff --git a/src/plugins/platforms/cocoa/qcocoaprintersupport.h b/src/plugins/platforms/cocoa/qcocoaprintersupport.h
index 2309025bb33917571d03bb0dd9c9b5596045af1e..88a83a4f4e334946cf1bb0f1e1f0fa9fc13df6a5 100644
--- a/src/plugins/platforms/cocoa/qcocoaprintersupport.h
+++ b/src/plugins/platforms/cocoa/qcocoaprintersupport.h
@@ -42,7 +42,7 @@
 #ifndef QCOCOAPRINTERSUPPORT_H
 #define QCOCOAPRINTERSUPPORT_H
 
-#include <QtPrintSupport/QPlatformPrinterSupport>
+#include <qpa/qplatformprintersupport.h>
 
 class QCocoaPrinterSupport : public QPlatformPrinterSupport
 {
diff --git a/src/plugins/platforms/cocoa/qcocoaservices.h b/src/plugins/platforms/cocoa/qcocoaservices.h
index 022c39dc57cdc224dbd10b9ac738ef91ddf91087..e3f5b3dbf0ab8e03c4a240fad0ad1371bcbabe9b 100644
--- a/src/plugins/platforms/cocoa/qcocoaservices.h
+++ b/src/plugins/platforms/cocoa/qcocoaservices.h
@@ -42,7 +42,7 @@
 #ifndef QCOCOADESKTOPSERVICES_H
 #define QCOCOADESKTOPSERVICES_H
 
-#include <QtGui/qplatformservices_qpa.h>
+#include <qpa/qplatformservices.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/cocoa/qcocoasystemsettings.h b/src/plugins/platforms/cocoa/qcocoasystemsettings.h
index 10cac27dcd23cc9f4e3ce50dd99546895561ec44..5e1249759b0e7507f666ff4fb7fe1f2a6602bfb6 100644
--- a/src/plugins/platforms/cocoa/qcocoasystemsettings.h
+++ b/src/plugins/platforms/cocoa/qcocoasystemsettings.h
@@ -44,7 +44,7 @@
 
 #include <QtCore/qhash.h>
 #include <QtGui/qpalette.h>
-#include <QtGui/qplatformtheme_qpa.h>
+#include <qpa/qplatformtheme.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/cocoa/qcocoatheme.h b/src/plugins/platforms/cocoa/qcocoatheme.h
index 5cb6f7437d62a8c568ab108075a9f78680c58087..791f1d4a504e156e19fc7be05d60c6fcd5382e5f 100644
--- a/src/plugins/platforms/cocoa/qcocoatheme.h
+++ b/src/plugins/platforms/cocoa/qcocoatheme.h
@@ -43,7 +43,7 @@
 #define QPLATFORMTHEME_COCOA_H
 
 #include <QtCore/QHash>
-#include <QtGui/QPlatformTheme>
+#include <qpa/qplatformtheme.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.h b/src/plugins/platforms/cocoa/qcocoawindow.h
index d08bbe79ce0a4f2ad944833a49099c82ace2e67e..f2d6ac67bbfd06e89aa73dc001ace02ca7ed5344 100644
--- a/src/plugins/platforms/cocoa/qcocoawindow.h
+++ b/src/plugins/platforms/cocoa/qcocoawindow.h
@@ -44,7 +44,7 @@
 
 #include <Cocoa/Cocoa.h>
 
-#include <QPlatformWindow>
+#include <qpa/qplatformwindow.h>
 #include <QRect>
 
 #include "qcocoaglcontext.h"
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm
index 83b6534b7c75f7d8a6e31d2d64856416de49a834..5480b32083af3cc405bb2239e0f021d0f929fe27 100644
--- a/src/plugins/platforms/cocoa/qcocoawindow.mm
+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
@@ -48,7 +48,7 @@
 #include <QtCore/private/qcore_mac_p.h>
 #include <qwindow.h>
 #include <QWindowSystemInterface>
-#include <QPlatformScreen>
+#include <qpa/qplatformscreen.h>
 
 #include <Cocoa/Cocoa.h>
 #include <Carbon/Carbon.h>
diff --git a/src/plugins/platforms/cocoa/qmenu_mac.h b/src/plugins/platforms/cocoa/qmenu_mac.h
index d41540a3419435d865ad439d4982be4d62e1e3ed..7a91e2d5e8846d7d333a6d9306a93228ee088178 100644
--- a/src/plugins/platforms/cocoa/qmenu_mac.h
+++ b/src/plugins/platforms/cocoa/qmenu_mac.h
@@ -43,7 +43,7 @@
 #include <QtCore/qpointer.h>
 #include <QtWidgets/qmenu.h>
 #include <QtWidgets/qmenubar.h>
-#include <QtWidgets/qplatformmenu_qpa.h>
+#include <qpa/qplatformmenu.h>
 
 @class NSMenuItem;
 
diff --git a/src/plugins/platforms/cocoa/qpaintengine_mac.mm b/src/plugins/platforms/cocoa/qpaintengine_mac.mm
index 87f37139200ec6be210dd2c0c3b6048e390496aa..33e6e397a20fd1b8dc797ad56d010cee435b52b8 100644
--- a/src/plugins/platforms/cocoa/qpaintengine_mac.mm
+++ b/src/plugins/platforms/cocoa/qpaintengine_mac.mm
@@ -56,7 +56,7 @@
 #include <qcoreapplication.h>
 #include <qmath.h>
 
-#include <QtGui/qplatformpixmap_qpa.h>
+#include <qpa/qplatformpixmap.h>
 
 #include <private/qfont_p.h>
 #include <private/qfontengine_p.h>
diff --git a/src/plugins/platforms/cocoa/qprintengine_mac.mm b/src/plugins/platforms/cocoa/qprintengine_mac.mm
index e432b12e67231984ced414960592c4bfdfe456f6..921dd2f78fd32a3d9376f1212c28db1ca0e126bb 100644
--- a/src/plugins/platforms/cocoa/qprintengine_mac.mm
+++ b/src/plugins/platforms/cocoa/qprintengine_mac.mm
@@ -43,7 +43,7 @@
 #include <qdebug.h>
 #include <qthread.h>
 #include <QtCore/qcoreapplication.h>
-#include <QtPrintSupport/QPlatformPrinterSupport>
+#include <qpa/qplatformprintersupport.h>
 
 #include "qcocoaautoreleasepool.h"
 
diff --git a/src/plugins/platforms/directfb/main.cpp b/src/plugins/platforms/directfb/main.cpp
index 26bdd719ca32340893a1845b417c8b9a580b7ef4..86af13724963c365b0771cadc4e1e342ceb091db 100644
--- a/src/plugins/platforms/directfb/main.cpp
+++ b/src/plugins/platforms/directfb/main.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui/QPlatformIntegrationPlugin>
+#include <qpa/qplatformintegrationplugin.h>
 #include "qdirectfbintegration.h"
 #include "qdirectfb_egl.h"
 
diff --git a/src/plugins/platforms/directfb/qdirectfb_egl.cpp b/src/plugins/platforms/directfb/qdirectfb_egl.cpp
index ac9142c0f4b5e8335bed9d56515306f7b35f9b2b..f595cc4286af4be3d01c51911ac8cdee1245d82d 100644
--- a/src/plugins/platforms/directfb/qdirectfb_egl.cpp
+++ b/src/plugins/platforms/directfb/qdirectfb_egl.cpp
@@ -45,7 +45,7 @@
 #include "qdirectfbeglhooks.h"
 
 #include <QtGui/QOpenGLContext>
-#include <QtGui/QPlatformOpenGLContext>
+#include <qpa/qplatformopenglcontext.h>
 #include <QtGui/QScreen>
 
 #include <QtPlatformSupport/private/qeglplatformcontext_p.h>
diff --git a/src/plugins/platforms/directfb/qdirectfbbackingstore.h b/src/plugins/platforms/directfb/qdirectfbbackingstore.h
index 327329a563a2deb4fa8d135cabc4de3aae21fd6a..63ce626f06eb742517cef2ff6bbbd72ec1190c42 100644
--- a/src/plugins/platforms/directfb/qdirectfbbackingstore.h
+++ b/src/plugins/platforms/directfb/qdirectfbbackingstore.h
@@ -42,7 +42,7 @@
 #ifndef QWINDOWSURFACE_DIRECTFB_H
 #define QWINDOWSURFACE_DIRECTFB_H
 
-#include <qplatformbackingstore_qpa.h>
+#include <qpa/qplatformbackingstore.h>
 #include <private/qpixmap_blitter_p.h>
 
 #include <directfb.h>
diff --git a/src/plugins/platforms/directfb/qdirectfbcursor.h b/src/plugins/platforms/directfb/qdirectfbcursor.h
index f28e225dc7302ed845e2b63eca496f65d7d6f49a..64133901d78c2b3166c304abd7250f4591779b3a 100644
--- a/src/plugins/platforms/directfb/qdirectfbcursor.h
+++ b/src/plugins/platforms/directfb/qdirectfbcursor.h
@@ -42,7 +42,7 @@
 #ifndef QDIRECTFBCURSOR_H
 #define QDIRECTFBCURSOR_H
 
-#include <QPlatformCursor>
+#include <qpa/qplatformcursor.h>
 #include <directfb.h>
 
 #include "qdirectfbconvenience.h"
diff --git a/src/plugins/platforms/directfb/qdirectfbeglhooks.h b/src/plugins/platforms/directfb/qdirectfbeglhooks.h
index d0711b62dd9b0d58b77a34996b558e67c3198781..96bce3b3e8f65326b04d38c16357bd658ead2d3a 100644
--- a/src/plugins/platforms/directfb/qdirectfbeglhooks.h
+++ b/src/plugins/platforms/directfb/qdirectfbeglhooks.h
@@ -42,7 +42,7 @@
 #ifndef QDIRECTFBEGL_HOOKS_H
 #define QDIRECTFBEGL_HOOKS_H
 
-#include "qplatformintegration_qpa.h"
+#include <qpa/qplatformintegration.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/directfb/qdirectfbglcontext.h b/src/plugins/platforms/directfb/qdirectfbglcontext.h
index 7aac12c2f9327d16b5f6eb0be419c4c1977715bc..3e684ceef937c0a68172dad7af6ad3f3f65ca0d6 100644
--- a/src/plugins/platforms/directfb/qdirectfbglcontext.h
+++ b/src/plugins/platforms/directfb/qdirectfbglcontext.h
@@ -42,7 +42,7 @@
 #ifndef QDIRECTFBGLCONTEXT_H
 #define QDIRECTFBGLCONTEXT_H
 
-#include <QPlatformOpenGLContext>
+#include <qpa/qplatformopenglcontext.h>
 
 #include "qdirectfbconvenience.h"
 
diff --git a/src/plugins/platforms/directfb/qdirectfbintegration.cpp b/src/plugins/platforms/directfb/qdirectfbintegration.cpp
index d167c465bec4102f86b295172b97c648370d5ccf..834e7dace7c15f0c9707cdb34caaaf901337b794 100644
--- a/src/plugins/platforms/directfb/qdirectfbintegration.cpp
+++ b/src/plugins/platforms/directfb/qdirectfbintegration.cpp
@@ -52,7 +52,7 @@
 #include <QtGui/private/qpixmap_blitter_p.h>
 #include <QtGui/private/qpixmap_raster_p.h>
 #include <QtGui/private/qguiapplication_p.h>
-#include <QtGui/qplatformpixmap_qpa.h>
+#include <qpa/qplatformpixmap.h>
 #include <QtCore/QCoreApplication>
 #include <QtCore/QThread>
 #include <QtCore/QAbstractEventDispatcher>
diff --git a/src/plugins/platforms/directfb/qdirectfbintegration.h b/src/plugins/platforms/directfb/qdirectfbintegration.h
index 56d785e00fc7f41b8493b098ad459ce23aa63bd0..c959ae5a337d5b53e67613a9c9d5faff68038da2 100644
--- a/src/plugins/platforms/directfb/qdirectfbintegration.h
+++ b/src/plugins/platforms/directfb/qdirectfbintegration.h
@@ -45,7 +45,7 @@
 #include "qdirectfbinput.h"
 #include "qdirectfbscreen.h"
 
-#include <QtGui/QPlatformIntegration>
+#include <qpa/qplatformintegration.h>
 #include <directfb.h>
 #include <directfb_version.h>
 
diff --git a/src/plugins/platforms/directfb/qdirectfbscreen.h b/src/plugins/platforms/directfb/qdirectfbscreen.h
index 85352390882479c71f300a13d049d70cf3825698..6e2aa0d9bf5ffa7522ac8a97d048fee3b9f935bf 100644
--- a/src/plugins/platforms/directfb/qdirectfbscreen.h
+++ b/src/plugins/platforms/directfb/qdirectfbscreen.h
@@ -45,7 +45,7 @@
 #include "qdirectfbconvenience.h"
 #include "qdirectfbcursor.h"
 
-#include <QtGui/QPlatformIntegration>
+#include <qpa/qplatformintegration.h>
 
 #include <directfb.h>
 
diff --git a/src/plugins/platforms/directfb/qdirectfbwindow.h b/src/plugins/platforms/directfb/qdirectfbwindow.h
index e0206b5d0262a916c59fec4859214c11a43d297c..bc9e4d9c4ee6723ab26844ff9f768aefbe8cfac9 100644
--- a/src/plugins/platforms/directfb/qdirectfbwindow.h
+++ b/src/plugins/platforms/directfb/qdirectfbwindow.h
@@ -42,7 +42,7 @@
 #ifndef QDIRECTFBWINDOW_H
 #define QDIRECTFBWINDOW_H
 
-#include <QPlatformWindow>
+#include <qpa/qplatformwindow.h>
 
 #include "qdirectfbconvenience.h"
 #include "qdirectfbinput.h"
diff --git a/src/plugins/platforms/eglfs/main.cpp b/src/plugins/platforms/eglfs/main.cpp
index 2ca2199619edba3e28bd9577b1f10ddb9e0f54de..4565b79610b673b57dd7e1cc153bf6c2477a5c29 100644
--- a/src/plugins/platforms/eglfs/main.cpp
+++ b/src/plugins/platforms/eglfs/main.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui/QPlatformIntegrationPlugin>
+#include <qpa/qplatformintegrationplugin.h>
 #include "qeglfsintegration.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/eglfs/qeglfsbackingstore.h b/src/plugins/platforms/eglfs/qeglfsbackingstore.h
index f723bca685b033dde383b8879c64bbf31a75d12d..e9808b7f95429fa8ad7fb437979be8aab094a381 100644
--- a/src/plugins/platforms/eglfs/qeglfsbackingstore.h
+++ b/src/plugins/platforms/eglfs/qeglfsbackingstore.h
@@ -42,7 +42,7 @@
 #ifndef QEGLFSBACKINGSTORE_H
 #define QEGLFSBACKINGSTORE_H
 
-#include <QtGui/qplatformbackingstore_qpa.h>
+#include <qpa/qplatformbackingstore.h>
 
 #include <QImage>
 #include <QRegion>
diff --git a/src/plugins/platforms/eglfs/qeglfshooks.h b/src/plugins/platforms/eglfs/qeglfshooks.h
index a56c80261b23225d9b5283b9a9943e98a0a34797..c6ea209a6fe6247a32520c2fedb081290f8ad53b 100644
--- a/src/plugins/platforms/eglfs/qeglfshooks.h
+++ b/src/plugins/platforms/eglfs/qeglfshooks.h
@@ -42,7 +42,7 @@
 #ifndef QEGLFSHOOKS_H
 #define QEGLFSHOOKS_H
 
-#include "qplatformintegration_qpa.h"
+#include <qpa/qplatformintegration.h>
 #include <EGL/egl.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/eglfs/qeglfsintegration.cpp b/src/plugins/platforms/eglfs/qeglfsintegration.cpp
index 9b7d9246f96c9326a0f34692efe92df43869b1a8..7025aed4a8b01b640756f60e325d9d3adc2575df 100644
--- a/src/plugins/platforms/eglfs/qeglfsintegration.cpp
+++ b/src/plugins/platforms/eglfs/qeglfsintegration.cpp
@@ -48,7 +48,7 @@
 #include <QtPlatformSupport/private/qgenericunixfontdatabase_p.h>
 #include <QtPlatformSupport/private/qgenericunixeventdispatcher_p.h>
 
-#include <QtGui/QPlatformWindow>
+#include <qpa/qplatformwindow.h>
 #include <QtGui/QSurfaceFormat>
 #include <QtGui/QOpenGLContext>
 #include <QtGui/QScreen>
diff --git a/src/plugins/platforms/eglfs/qeglfsintegration.h b/src/plugins/platforms/eglfs/qeglfsintegration.h
index eea36a489d58ab689fa6f7709f8992afffd9697a..b7cb715a9c8e78bfee66795f9cd4462e1353404b 100644
--- a/src/plugins/platforms/eglfs/qeglfsintegration.h
+++ b/src/plugins/platforms/eglfs/qeglfsintegration.h
@@ -44,8 +44,8 @@
 
 #include "qeglfsscreen.h"
 
-#include <QtGui/QPlatformIntegration>
-#include <QtGui/QPlatformScreen>
+#include <qpa/qplatformintegration.h>
+#include <qpa/qplatformscreen.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/plugins/platforms/eglfs/qeglfsscreen.h b/src/plugins/platforms/eglfs/qeglfsscreen.h
index 66e600d7c2ae4a71c57d07bf0fb8286b35502e49..8c67bf1956e248c5cd985c24f8ace405547afeb8 100644
--- a/src/plugins/platforms/eglfs/qeglfsscreen.h
+++ b/src/plugins/platforms/eglfs/qeglfsscreen.h
@@ -42,7 +42,7 @@
 #ifndef QEGLFSSCREEN_H
 #define QEGLFSSCREEN_H
 
-#include <QPlatformScreen>
+#include <qpa/qplatformscreen.h>
 
 #include <QtCore/QTextStream>
 
diff --git a/src/plugins/platforms/eglfs/qeglfswindow.h b/src/plugins/platforms/eglfs/qeglfswindow.h
index 7f40c78550d48fee846f000a1e31ded4c9f2fe08..3e7a68953a22a8dbd7da612da5456abe8512ddc3 100644
--- a/src/plugins/platforms/eglfs/qeglfswindow.h
+++ b/src/plugins/platforms/eglfs/qeglfswindow.h
@@ -45,7 +45,7 @@
 #include "qeglfsintegration.h"
 #include "qeglfsscreen.h"
 
-#include <QPlatformWindow>
+#include <qpa/qplatformwindow.h>
 #include <QtWidgets/QWidget>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/kms/main.cpp b/src/plugins/platforms/kms/main.cpp
index 422fc5fba663e0065c43db7e693039a85abb76b2..c1baaf3a4e9ff0caf6015807c5c1c296cdc93236 100644
--- a/src/plugins/platforms/kms/main.cpp
+++ b/src/plugins/platforms/kms/main.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui/QPlatformIntegrationPlugin>
+#include <qpa/qplatformintegrationplugin.h>
 #include "qkmsintegration.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/kms/qkmsbackingstore.h b/src/plugins/platforms/kms/qkmsbackingstore.h
index ab276fa753c532d762f76c7e071a48bcdee1e00b..59d9c9ad9437b7552b7ac6d6dac3cfac680344f9 100644
--- a/src/plugins/platforms/kms/qkmsbackingstore.h
+++ b/src/plugins/platforms/kms/qkmsbackingstore.h
@@ -42,7 +42,7 @@
 #ifndef QBACKINGSTORE_KMS_H
 #define QBACKINGSTORE_KMS_H
 
-#include <QtGui/QPlatformBackingStore>
+#include <qpa/qplatformbackingstore.h>
 #include <QImage>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/kms/qkmscontext.h b/src/plugins/platforms/kms/qkmscontext.h
index 6378780f34700855b30189b8c4666ae0bbbd6a40..32223ada51545c2a76765b3b73fb5992fcddbfa7 100644
--- a/src/plugins/platforms/kms/qkmscontext.h
+++ b/src/plugins/platforms/kms/qkmscontext.h
@@ -42,7 +42,7 @@
 #ifndef QKMSCONTEXT_H
 #define QKMSCONTEXT_H
 
-#include <QtGui/QPlatformOpenGLContext>
+#include <qpa/qplatformopenglcontext.h>
 
 #define EGL_EGLEXT_PROTOTYPES 1
 #include <EGL/egl.h>
diff --git a/src/plugins/platforms/kms/qkmscursor.h b/src/plugins/platforms/kms/qkmscursor.h
index f6e1176a3659e3019ab9c2ccba355e4fc805522a..c0734eb68a30fe17f7747d39885502ba7ee978b9 100644
--- a/src/plugins/platforms/kms/qkmscursor.h
+++ b/src/plugins/platforms/kms/qkmscursor.h
@@ -42,7 +42,7 @@
 #ifndef QKMSCURSOR_H
 #define QKMSCURSOR_H
 
-#include <QtGui/QPlatformCursor>
+#include <qpa/qplatformcursor.h>
 
 #define EGL_EGLEXT_PROTOTYPES 1
 
diff --git a/src/plugins/platforms/kms/qkmsintegration.h b/src/plugins/platforms/kms/qkmsintegration.h
index 03fc5080a6804930f25293f0f291b4f53ed46b3e..93b3084e9bebe6c497a422d6f01511d82fc743fc 100644
--- a/src/plugins/platforms/kms/qkmsintegration.h
+++ b/src/plugins/platforms/kms/qkmsintegration.h
@@ -42,8 +42,8 @@
 #ifndef QPLATFORMINTEGRATION_KMS_H
 #define QPLATFORMINTEGRATION_KMS_H
 
-#include <QtGui/QPlatformIntegration>
-#include <QtGui/QPlatformNativeInterface>
+#include <qpa/qplatformintegration.h>
+#include <qpa/qplatformnativeinterface.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/kms/qkmsnativeinterface.h b/src/plugins/platforms/kms/qkmsnativeinterface.h
index 77a95732505a0b1874308c6673126bfd197cd747..20949becba08bd8bdb3049f40928b8180eb42217 100644
--- a/src/plugins/platforms/kms/qkmsnativeinterface.h
+++ b/src/plugins/platforms/kms/qkmsnativeinterface.h
@@ -44,7 +44,7 @@
 
 #include "qkmsscreen.h"
 
-#include <QtGui/QPlatformNativeInterface>
+#include <qpa/qplatformnativeinterface.h>
 
 class QKmsNativeInterface : public QPlatformNativeInterface
 {
diff --git a/src/plugins/platforms/kms/qkmsscreen.h b/src/plugins/platforms/kms/qkmsscreen.h
index 058314a515ce1bf2a7ed1aad55e18750dbed13e0..e8e6bda22d764049e81bfdfdd16605650ae2113f 100644
--- a/src/plugins/platforms/kms/qkmsscreen.h
+++ b/src/plugins/platforms/kms/qkmsscreen.h
@@ -42,7 +42,7 @@
 #ifndef QKMSSCREEN_H
 #define QKMSSCREEN_H
 
-#include <QtGui/QPlatformScreen>
+#include <qpa/qplatformscreen.h>
 #include "qkmsbuffermanager.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/kms/qkmswindow.h b/src/plugins/platforms/kms/qkmswindow.h
index 2a7839681f877f82e1b1249760b8b4101d573ef1..c9b3c2692fa50a8554a1d002bd62ce7ce95cebab 100644
--- a/src/plugins/platforms/kms/qkmswindow.h
+++ b/src/plugins/platforms/kms/qkmswindow.h
@@ -42,7 +42,7 @@
 #ifndef QKMSWINDOW_H
 #define QKMSWINDOW_H
 
-#include <QtGui/QPlatformWindow>
+#include <qpa/qplatformwindow.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/linuxfb/main.cpp b/src/plugins/platforms/linuxfb/main.cpp
index 13397005342ccf6f84a9630cfbdb26c3df769fee..f670b6f5d4171d44a019407d2bf3b78c1dbdf7e5 100644
--- a/src/plugins/platforms/linuxfb/main.cpp
+++ b/src/plugins/platforms/linuxfb/main.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QPlatformIntegrationPlugin>
+#include <qpa/qplatformintegrationplugin.h>
 #include "qlinuxfbintegration.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/linuxfb/qlinuxfbintegration.h b/src/plugins/platforms/linuxfb/qlinuxfbintegration.h
index 3c8f03374afd30fbeeccfb1988d9c1b3c9aa41f9..200cd81bd41b8d98a98616095f97e7db04ffd8eb 100644
--- a/src/plugins/platforms/linuxfb/qlinuxfbintegration.h
+++ b/src/plugins/platforms/linuxfb/qlinuxfbintegration.h
@@ -42,7 +42,7 @@
 #ifndef QGRAPHICSSYSTEM_LINUXFB_H
 #define QGRAPHICSSYSTEM_LINUXFB_H
 
-#include <QPlatformIntegration>
+#include <qpa/qplatformintegration.h>
 #include "../fb_base/fb_base.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/minimal/main.cpp b/src/plugins/platforms/minimal/main.cpp
index 8a6e8fb4b099328e825301d445de8df539a07194..9ac75e105067b59954e9787acd291cf3965adad2 100644
--- a/src/plugins/platforms/minimal/main.cpp
+++ b/src/plugins/platforms/minimal/main.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 
-#include <QtGui/QPlatformIntegrationPlugin>
+#include <qpa/qplatformintegrationplugin.h>
 #include "qminimalintegration.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/minimal/qminimalbackingstore.cpp b/src/plugins/platforms/minimal/qminimalbackingstore.cpp
index 5336dbf3bd2da5255372f5ee0d27dc5baa57fb6c..d47633e67350c5a3692eca8d4433745c9058c7ca 100644
--- a/src/plugins/platforms/minimal/qminimalbackingstore.cpp
+++ b/src/plugins/platforms/minimal/qminimalbackingstore.cpp
@@ -43,7 +43,7 @@
 #include "qminimalbackingstore.h"
 #include "qscreen.h"
 #include <QtCore/qdebug.h>
-#include <QtGui/QPlatformScreen>
+#include <qpa/qplatformscreen.h>
 #include <private/qguiapplication_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/minimal/qminimalbackingstore.h b/src/plugins/platforms/minimal/qminimalbackingstore.h
index 375edaa2f335dfa5db38a5aebed5a32438fa690f..ff670f5eb265fde5858e330f784bff8faa72a6a9 100644
--- a/src/plugins/platforms/minimal/qminimalbackingstore.h
+++ b/src/plugins/platforms/minimal/qminimalbackingstore.h
@@ -42,8 +42,8 @@
 #ifndef QBACKINGSTORE_MINIMAL_H
 #define QBACKINGSTORE_MINIMAL_H
 
-#include <QtGui/QPlatformBackingStore>
-#include <QtGui/QPlatformWindow>
+#include <qpa/qplatformbackingstore.h>
+#include <qpa/qplatformwindow.h>
 #include <QtGui/QImage>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/minimal/qminimalintegration.cpp b/src/plugins/platforms/minimal/qminimalintegration.cpp
index 874f270f426dd6517e0dbc96b69da413e4036805..3ad5f6e309b3134496b1066d351a44d53ccca527 100644
--- a/src/plugins/platforms/minimal/qminimalintegration.cpp
+++ b/src/plugins/platforms/minimal/qminimalintegration.cpp
@@ -49,7 +49,7 @@
 
 #include <QtGui/private/qpixmap_raster_p.h>
 #include <QtGui/private/qguiapplication_p.h>
-#include <QtGui/QPlatformWindow>
+#include <qpa/qplatformwindow.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/minimal/qminimalintegration.h b/src/plugins/platforms/minimal/qminimalintegration.h
index 2b345e009e8e4c921fb7a00d595ec1f62f755779..7d9db08f3d79518651c3b77b036b5d3636da2867 100644
--- a/src/plugins/platforms/minimal/qminimalintegration.h
+++ b/src/plugins/platforms/minimal/qminimalintegration.h
@@ -42,8 +42,8 @@
 #ifndef QPLATFORMINTEGRATION_MINIMAL_H
 #define QPLATFORMINTEGRATION_MINIMAL_H
 
-#include <QtGui/QPlatformIntegration>
-#include <QtGui/QPlatformScreen>
+#include <qpa/qplatformintegration.h>
+#include <qpa/qplatformscreen.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/openwfd/main.cpp b/src/plugins/platforms/openwfd/main.cpp
index 4e583e9b2dda2657806f919dedf6a30b3bfa1b61..0d9508da6cad2b7e25ba9ce1b7e691b531ac0351 100644
--- a/src/plugins/platforms/openwfd/main.cpp
+++ b/src/plugins/platforms/openwfd/main.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui/QPlatformIntegrationPlugin>
+#include <qpa/qplatformintegrationplugin.h>
 #include "qopenwfdintegration.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/openwfd/qopenwfdbackingstore.h b/src/plugins/platforms/openwfd/qopenwfdbackingstore.h
index 4002fd8ffc9cc8cec268bdd466d8e60cd32214a0..84caa81f9748b01db25f241190f4fb9498a3256a 100644
--- a/src/plugins/platforms/openwfd/qopenwfdbackingstore.h
+++ b/src/plugins/platforms/openwfd/qopenwfdbackingstore.h
@@ -42,7 +42,7 @@
 #ifndef QOPENWFDBACKINGSTORE_H
 #define QOPENWFDBACKINGSTORE_H
 
-#include <QtGui/QPlatformBackingStore>
+#include <qpa/qplatformbackingstore.h>
 #include <QtGui/QImage>
 
 class QOpenWFDBackingStore : public QPlatformBackingStore
diff --git a/src/plugins/platforms/openwfd/qopenwfdglcontext.h b/src/plugins/platforms/openwfd/qopenwfdglcontext.h
index d353eddbb080e88a34ead1fa3a0fd17a24809926..7a613cc8a79e9d5a1f81cb434ed2662f3c014e69 100644
--- a/src/plugins/platforms/openwfd/qopenwfdglcontext.h
+++ b/src/plugins/platforms/openwfd/qopenwfdglcontext.h
@@ -42,7 +42,7 @@
 #ifndef QOPENWFDGLCONTEXT_H
 #define QOPENWFDGLCONTEXT_H
 
-#include <QtGui/QPlatformOpenGLContext>
+#include <qpa/qplatformopenglcontext.h>
 
 #include "qopenwfddevice.h"
 
diff --git a/src/plugins/platforms/openwfd/qopenwfdintegration.h b/src/plugins/platforms/openwfd/qopenwfdintegration.h
index 5737dbb00e896132ebbe411447b12633b2c4a842..7b6a95497f52f6c56a5e3d8173cd254ee6f05595 100644
--- a/src/plugins/platforms/openwfd/qopenwfdintegration.h
+++ b/src/plugins/platforms/openwfd/qopenwfdintegration.h
@@ -42,8 +42,8 @@
 #ifndef QOPENWFDINTEGRATION_H
 #define QOPENWFDINTEGRATION_H
 
-#include <QtGui/QPlatformIntegration>
-#include <QtGui/QPlatformScreen>
+#include <qpa/qplatformintegration.h>
+#include <qpa/qplatformscreen.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/openwfd/qopenwfdnativeinterface.h b/src/plugins/platforms/openwfd/qopenwfdnativeinterface.h
index 955fca7d41ce7ec3b096ab01aa242ad7c29046fa..f4ccfe5958e4b8aefe7a8e9efdf7de77b1ab24c1 100644
--- a/src/plugins/platforms/openwfd/qopenwfdnativeinterface.h
+++ b/src/plugins/platforms/openwfd/qopenwfdnativeinterface.h
@@ -42,7 +42,7 @@
 #ifndef QOPENWFDNATIVEINTERFACE_H
 #define QOPENWFDNATIVEINTERFACE_H
 
-#include <QtGui/QPlatformNativeInterface>
+#include <qpa/qplatformnativeinterface.h>
 
 #include <WF/wfdplatform.h>
 
diff --git a/src/plugins/platforms/openwfd/qopenwfdscreen.h b/src/plugins/platforms/openwfd/qopenwfdscreen.h
index 8993205a1629735ab3d04faa2f4e645ff28aedae..ff4a83f66370c7cc930bac0ae40bab41d851c79c 100644
--- a/src/plugins/platforms/openwfd/qopenwfdscreen.h
+++ b/src/plugins/platforms/openwfd/qopenwfdscreen.h
@@ -42,7 +42,7 @@
 #ifndef QOPENWFDSCREEN_H
 #define QOPENWFDSCREEN_H
 
-#include <QtGui/QPlatformScreen>
+#include <qpa/qplatformscreen.h>
 
 
 #include "qopenwfdoutputbuffer.h"
diff --git a/src/plugins/platforms/openwfd/qopenwfdwindow.h b/src/plugins/platforms/openwfd/qopenwfdwindow.h
index ca531b07aee2b6be84b26bcc038e521a8c1b7002..9f777b3c4aa2239d0f00d5a88423add3cb2ad618 100644
--- a/src/plugins/platforms/openwfd/qopenwfdwindow.h
+++ b/src/plugins/platforms/openwfd/qopenwfdwindow.h
@@ -42,7 +42,7 @@
 #ifndef QOPENWFDWINDOW_H
 #define QOPENWFDWINDOW_H
 
-#include <QtGui/QPlatformWindow>
+#include <qpa/qplatformwindow.h>
 #include <QtCore/QVarLengthArray>
 
 #include "qopenwfdport.h"
diff --git a/src/plugins/platforms/qnx/main.h b/src/plugins/platforms/qnx/main.h
index cc2cfdd0007379b504555ee3c2584e4710338237..4033a2912116e376b53822664049fdf4f88e6260 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 c9ceff41f6608ba4086133c89f4a803ded48052e..7a9d7c312138fb5a2a7bc7a5ff60dbb5d2ffcb6e 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 b694079f37a6c090e08321ece22b57afef396402..78ee58f2156f28b381d2f1783e73d3146b1da66a 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 ee8d61ce00d2509edc5b8d3a14eed154c6b186b3..8b587e7eb84fc2059390a993dbda29b30f382748 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 5f7d95bc4a649326f5df4ad4c0873f7cf3cc22fd..f6f0f60204d16a43e9961c8683331ded3811f5ed 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 d73c5136b58d6c34105b12e56822919b190af8ad..93512b26e59b2c026cb46a4f2b99588341c730cb 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 73d8cb2007bddda1aa49b953deb9acab5c2d8350..dd1a6f8b7e3427695ae5743f5a6a6d046211e272 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 a3c476f16e625d1520b651fcb66b51e1537efead..e0da8cc5f248ee4edd29c11eac45deeeadd73aa4 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 ec896d40faeacf3913f41e8f91ebe0559082b311..f176b0a538110080e9f5290044c39e39e433e1c8 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 7a7f211e9a4701c7c486d72e189b875cdf7f95db..6a559492e12f999c2b3f717d1871baf5786f05bb 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 781666132397e1af7a1883f6792431418b2299a7..4a13946ec3f6baecae49482f32bed443994405b4 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 fe7c014047f250299281957c934e75b7ceb1990e..e9fc7cf2e56b3bdbd545188ec70e880378fa06cf 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 2ea7bbca5118f2dbb19aaa508874b5ab714ae7c6..50b9a423f516a5afe29291045609ec891aee8817 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"
 
diff --git a/src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp b/src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp
index 17ee6eb82c7a2e60ef45470c14c75b1127e66e57..6f2a601c500a1feca12dd362c20aea32c9fc7613 100644
--- a/src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp
+++ b/src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp
@@ -51,7 +51,7 @@
 #include <QtCore/qsettings.h>
 #include <QtGui/qaccessible.h>
 #include <QtGui/qaccessible2.h>
-#include <QtGui/qplatformnativeinterface_qpa.h>
+#include <qpa/qplatformnativeinterface.h>
 #include <QtGui/qwindow.h>
 #include <QtGui/qguiapplication.h>
 
diff --git a/src/plugins/platforms/windows/accessible/qwindowsaccessibility.h b/src/plugins/platforms/windows/accessible/qwindowsaccessibility.h
index 3366c32daae4f477a0daa6fb2596efbc44ce4acb..67aaa5b9937591c80fcf649576accf328471c8f3 100644
--- a/src/plugins/platforms/windows/accessible/qwindowsaccessibility.h
+++ b/src/plugins/platforms/windows/accessible/qwindowsaccessibility.h
@@ -44,7 +44,7 @@
 
 #include "../qtwindowsglobal.h"
 #include "../qwindowscontext.h"
-#include <QtGui/QPlatformAccessibility>
+#include <qpa/qplatformaccessibility.h>
 
 #include <oleacc.h>
 
diff --git a/src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.cpp b/src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.cpp
index 5003d9effd634cf0442a229ec5cc0c551f987d4f..fafe624e4b523bf7f35b2d2566d4c3153b2535e1 100644
--- a/src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.cpp
+++ b/src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.cpp
@@ -56,7 +56,7 @@
 #include <QtGui/qaccessible.h>
 #include <QtGui/qaccessible2.h>
 #include <QtGui/qguiapplication.h>
-#include <QtGui/qplatformnativeinterface_qpa.h>
+#include <qpa/qplatformnativeinterface.h>
 #include <QtGui/qwindow.h>
 #include <QtWidgets/qapplication.h>
 #include <QtWidgets/qgraphicsitem.h>
diff --git a/src/plugins/platforms/windows/main.cpp b/src/plugins/platforms/windows/main.cpp
index 9f6ce99836ede9924a8b82c0cdb09e805a6628b7..5404d916799a9ebdc35ba4d7b108264c952c3568 100644
--- a/src/plugins/platforms/windows/main.cpp
+++ b/src/plugins/platforms/windows/main.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 
-#include <QtGui/QPlatformIntegrationPlugin>
+#include <qpa/qplatformintegrationplugin.h>
 #include <QtCore/QStringList>
 
 #include "qwindowsintegration.h"
diff --git a/src/plugins/platforms/windows/qwindowsbackingstore.h b/src/plugins/platforms/windows/qwindowsbackingstore.h
index 14ce6c34383e038a9f42d94470c2e217905db204..75b6e5f736f87ac46cc958683c4d6c409e8ea019 100644
--- a/src/plugins/platforms/windows/qwindowsbackingstore.h
+++ b/src/plugins/platforms/windows/qwindowsbackingstore.h
@@ -44,7 +44,7 @@
 
 #include "qtwindows_additional.h"
 
-#include <QtGui/QPlatformBackingStore>
+#include <qpa/qplatformbackingstore.h>
 #include <QtCore/QScopedPointer>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/windows/qwindowsclipboard.h b/src/plugins/platforms/windows/qwindowsclipboard.h
index 643c785e8bacd174926a7a60e3d33f738e22abaf..00c975eae641bf5b23fc5909db8edf75d3a777e8 100644
--- a/src/plugins/platforms/windows/qwindowsclipboard.h
+++ b/src/plugins/platforms/windows/qwindowsclipboard.h
@@ -44,7 +44,7 @@
 
 #include "qwindowsinternalmimedata.h"
 
-#include <QtGui/QPlatformClipboard>
+#include <qpa/qplatformclipboard.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/windows/qwindowscontext.cpp b/src/plugins/platforms/windows/qwindowscontext.cpp
index 4d284e05915df272a653670db5f1ccc78bc0828f..3a2113520d0bd9478997cc8e4e0aaace8b4bb94c 100644
--- a/src/plugins/platforms/windows/qwindowscontext.cpp
+++ b/src/plugins/platforms/windows/qwindowscontext.cpp
@@ -55,7 +55,7 @@
 
 #include <QtGui/QWindow>
 #include <QtGui/QWindowSystemInterface>
-#include <QtGui/QPlatformNativeInterface>
+#include <qpa/qplatformnativeinterface.h>
 #include <QtGui/QGuiApplication>
 
 #include <QtCore/QSet>
diff --git a/src/plugins/platforms/windows/qwindowscursor.h b/src/plugins/platforms/windows/qwindowscursor.h
index 61c43dc4d260a32409110e8963ad632da95499a2..c1bccde46c060c1e8482c4a6b1a414a013f496b5 100644
--- a/src/plugins/platforms/windows/qwindowscursor.h
+++ b/src/plugins/platforms/windows/qwindowscursor.h
@@ -44,7 +44,7 @@
 
 #include "qtwindows_additional.h"
 
-#include <QtGui/QPlatformCursor>
+#include <qpa/qplatformcursor.h>
 #include <QtCore/QSharedDataPointer>
 #include <QtCore/QHash>
 
diff --git a/src/plugins/platforms/windows/qwindowsdialoghelpers.h b/src/plugins/platforms/windows/qwindowsdialoghelpers.h
index 909ce5984e2264fcee6cfc249409fdba4d374e64..285c58dc5f28c98c238988f81a98eb77b2fffea4 100644
--- a/src/plugins/platforms/windows/qwindowsdialoghelpers.h
+++ b/src/plugins/platforms/windows/qwindowsdialoghelpers.h
@@ -43,8 +43,8 @@
 #define QWINDOWSDIALOGHELPER_H
 
 #include "qtwindows_additional.h"
-#include <QtGui/QPlatformDialogHelper>
-#include <QtGui/QPlatformTheme>
+#include <qpa/qplatformdialoghelper.h>
+#include <qpa/qplatformtheme.h>
 #include <QtCore/QStringList>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/windows/qwindowsdrag.h b/src/plugins/platforms/windows/qwindowsdrag.h
index 7b629bacccc2974250caf888af8dc23ec6425c28..867093ab602260c8958ae75c0a71ba14453f7e84 100644
--- a/src/plugins/platforms/windows/qwindowsdrag.h
+++ b/src/plugins/platforms/windows/qwindowsdrag.h
@@ -44,7 +44,7 @@
 
 #include "qwindowsinternalmimedata.h"
 
-#include <QtGui/QPlatformDrag>
+#include <qpa/qplatformdrag.h>
 #include <QtGui/QPixmap>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/windows/qwindowsfontdatabase.h b/src/plugins/platforms/windows/qwindowsfontdatabase.h
index f442f492aad84bbd6b1b5e84d894817812d51517..6441e79177a37e4623fb1c1095ca9d363484bcdd 100644
--- a/src/plugins/platforms/windows/qwindowsfontdatabase.h
+++ b/src/plugins/platforms/windows/qwindowsfontdatabase.h
@@ -42,7 +42,7 @@
 #ifndef QWINDOWSFONTDATABASE_H
 #define QWINDOWSFONTDATABASE_H
 
-#include <QtGui/QPlatformFontDatabase>
+#include <qpa/qplatformfontdatabase.h>
 #include <QtCore/QSharedPointer>
 #include "qtwindows_additional.h"
 
diff --git a/src/plugins/platforms/windows/qwindowsglcontext.cpp b/src/plugins/platforms/windows/qwindowsglcontext.cpp
index f16a0ca73d99602d2a562ecc1aa82d4f7fec4ce4..607dabc9664b9a41954c38d61f9fb327509c8c99 100644
--- a/src/plugins/platforms/windows/qwindowsglcontext.cpp
+++ b/src/plugins/platforms/windows/qwindowsglcontext.cpp
@@ -46,7 +46,7 @@
 #include <QtCore/QDebug>
 #include <QtCore/QSysInfo>
 #include <QtGui/QGuiApplication>
-#include <QtGui/QPlatformNativeInterface>
+#include <qpa/qplatformnativeinterface.h>
 
 #include <wingdi.h>
 #include <GL/gl.h>
diff --git a/src/plugins/platforms/windows/qwindowsglcontext.h b/src/plugins/platforms/windows/qwindowsglcontext.h
index a0489e2d028b8657f1980274ea944e05488a2e51..b83a57d13adcd483909bc4d65fedefd375743846 100644
--- a/src/plugins/platforms/windows/qwindowsglcontext.h
+++ b/src/plugins/platforms/windows/qwindowsglcontext.h
@@ -45,7 +45,7 @@
 #include "array.h"
 #include "qtwindows_additional.h"
 
-#include <QtGui/QPlatformOpenGLContext>
+#include <qpa/qplatformopenglcontext.h>
 #include <QtGui/QOpenGLContext>
 #include <QtCore/QSharedPointer>
 
diff --git a/src/plugins/platforms/windows/qwindowsinputcontext.h b/src/plugins/platforms/windows/qwindowsinputcontext.h
index 610bad08dd149871681df9a0876cc9b96b9ecaaf..134dfdbd2e51c7a754696e1635dadf00b94c8501 100644
--- a/src/plugins/platforms/windows/qwindowsinputcontext.h
+++ b/src/plugins/platforms/windows/qwindowsinputcontext.h
@@ -44,7 +44,7 @@
 
 #include "qtwindows_additional.h"
 
-#include <QtGui/QPlatformInputContext>
+#include <qpa/qplatforminputcontext.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/windows/qwindowsintegration.cpp b/src/plugins/platforms/windows/qwindowsintegration.cpp
index 45f6ecf652fb42d6fbc77b977598612c09872e98..69ae653f5b0ddaf818240c5dcc06e7a47f882dcf 100644
--- a/src/plugins/platforms/windows/qwindowsintegration.cpp
+++ b/src/plugins/platforms/windows/qwindowsintegration.cpp
@@ -60,7 +60,7 @@
 #include "accessible/qwindowsaccessibility.h"
 #endif
 
-#include <QtGui/QPlatformNativeInterface>
+#include <qpa/qplatformnativeinterface.h>
 #include <QtGui/QWindowSystemInterface>
 #include <QtGui/QBackingStore>
 #include <QtGui/private/qpixmap_raster_p.h>
diff --git a/src/plugins/platforms/windows/qwindowsintegration.h b/src/plugins/platforms/windows/qwindowsintegration.h
index 84bbf6103a883c10f37ee7ce80800368a07d1703..76393be4023ea3d1a52c654f115fa1c36caf9cec 100644
--- a/src/plugins/platforms/windows/qwindowsintegration.h
+++ b/src/plugins/platforms/windows/qwindowsintegration.h
@@ -42,7 +42,7 @@
 #ifndef QWINDOWSINTEGRATION_H
 #define QWINDOWSINTEGRATION_H
 
-#include <QtGui/QPlatformIntegration>
+#include <qpa/qplatformintegration.h>
 #include <QtCore/QScopedPointer>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/windows/qwindowsscreen.h b/src/plugins/platforms/windows/qwindowsscreen.h
index 5b9a50b2abf85be34bf2233fc7bcccd499552884..56e9ab304eb278366dcfa7f154f7f313286559e2 100644
--- a/src/plugins/platforms/windows/qwindowsscreen.h
+++ b/src/plugins/platforms/windows/qwindowsscreen.h
@@ -47,7 +47,7 @@
 #include <QtCore/QList>
 #include <QtCore/QPair>
 #include <QtCore/QSharedPointer>
-#include <QtGui/QPlatformScreen>
+#include <qpa/qplatformscreen.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/windows/qwindowsservices.h b/src/plugins/platforms/windows/qwindowsservices.h
index d979ed1af1361ffe9d28d41bca50ed73c1fd8968..c9954b5257cf95b7af428c6610d34d40fa004156 100644
--- a/src/plugins/platforms/windows/qwindowsservices.h
+++ b/src/plugins/platforms/windows/qwindowsservices.h
@@ -42,7 +42,7 @@
 #ifndef QWINDOWSDESKTOPSERVICES_H
 #define QWINDOWSDESKTOPSERVICES_H
 
-#include <QtGui/qplatformservices_qpa.h>
+#include <qpa/qplatformservices.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/windows/qwindowstheme.h b/src/plugins/platforms/windows/qwindowstheme.h
index 7515a13a72df063d3a8c3a413587ea682170dc8d..223a98caf53a71cbb3cf1d1ee53281fa8c5e0f8d 100644
--- a/src/plugins/platforms/windows/qwindowstheme.h
+++ b/src/plugins/platforms/windows/qwindowstheme.h
@@ -42,7 +42,7 @@
 #ifndef QWINDOWSTHEME_H
 #define QWINDOWSTHEME_H
 
-#include <QtGui/QPlatformTheme>
+#include <qpa/qplatformtheme.h>
 #include <QtGui/QColor>
 
 #include "qtwindows_additional.h"
diff --git a/src/plugins/platforms/windows/qwindowswindow.h b/src/plugins/platforms/windows/qwindowswindow.h
index badc2297184fd73c88e413576c708093248b971a..87c22c76d1e6a285a89e0454f47624f3fad072ae 100644
--- a/src/plugins/platforms/windows/qwindowswindow.h
+++ b/src/plugins/platforms/windows/qwindowswindow.h
@@ -45,7 +45,7 @@
 #include "qtwindows_additional.h"
 #include "qwindowscursor.h"
 
-#include <QtGui/QPlatformWindow>
+#include <qpa/qplatformwindow.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/xcb/main.cpp b/src/plugins/platforms/xcb/main.cpp
index 50c5a1a01788760ddaddd1b326f59f21c4952e46..4474a474fd609044b0cad4809d1a67dd98ca5a62 100644
--- a/src/plugins/platforms/xcb/main.cpp
+++ b/src/plugins/platforms/xcb/main.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui/QPlatformIntegrationPlugin>
+#include <qpa/qplatformintegrationplugin.h>
 #include "qxcbintegration.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/xcb/qdri2context.h b/src/plugins/platforms/xcb/qdri2context.h
index d0a1b469a9eb9010353994e6b7f710a3a408da6b..8945744b22f89502cdb51a951b0fbd5528323a9a 100644
--- a/src/plugins/platforms/xcb/qdri2context.h
+++ b/src/plugins/platforms/xcb/qdri2context.h
@@ -42,7 +42,7 @@
 #ifndef QDRI2CONTEXT_H
 #define QDRI2CONTEXT_H
 
-#include <QtGui/QPlatformOpenGLContext>
+#include <qpa/qplatformopenglcontext.h>
 
 struct xcb_dri2_dri2_buffer_t;
 
diff --git a/src/plugins/platforms/xcb/qglxintegration.h b/src/plugins/platforms/xcb/qglxintegration.h
index dce9193eba5d6750a8f92af9e4ab5ff586efe01e..8d114b75dbfcb9c764efb025bf317596c97e1743 100644
--- a/src/plugins/platforms/xcb/qglxintegration.h
+++ b/src/plugins/platforms/xcb/qglxintegration.h
@@ -45,7 +45,7 @@
 #include "qxcbwindow.h"
 #include "qxcbscreen.h"
 
-#include <QtGui/QPlatformOpenGLContext>
+#include <qpa/qplatformopenglcontext.h>
 #include <QtGui/QSurfaceFormat>
 
 #include <QtCore/QMutex>
diff --git a/src/plugins/platforms/xcb/qxcbbackingstore.h b/src/plugins/platforms/xcb/qxcbbackingstore.h
index e02c6eb15bba2aefbcea0f5c844cadbfaf8fab0f..b66a27470e47a625763a65f32d14118b2374eb8a 100644
--- a/src/plugins/platforms/xcb/qxcbbackingstore.h
+++ b/src/plugins/platforms/xcb/qxcbbackingstore.h
@@ -42,7 +42,7 @@
 #ifndef QXCBBACKINGSTORE_H
 #define QXCBBACKINGSTORE_H
 
-#include <qplatformbackingstore_qpa.h>
+#include <qpa/qplatformbackingstore.h>
 
 #include <xcb/xcb.h>
 
diff --git a/src/plugins/platforms/xcb/qxcbclipboard.h b/src/plugins/platforms/xcb/qxcbclipboard.h
index a43518e80b6be0cfac5f079feb2499ea406ceb66..1b3f12b2796c836a3c11d68233d561822c568062 100644
--- a/src/plugins/platforms/xcb/qxcbclipboard.h
+++ b/src/plugins/platforms/xcb/qxcbclipboard.h
@@ -42,7 +42,7 @@
 #ifndef QXCBCLIPBOARD_H
 #define QXCBCLIPBOARD_H
 
-#include <QPlatformClipboard>
+#include <qpa/qplatformclipboard.h>
 #include <qxcbobject.h>
 #include <xcb/xcb.h>
 #include <xcb/xfixes.h>
diff --git a/src/plugins/platforms/xcb/qxcbcursor.h b/src/plugins/platforms/xcb/qxcbcursor.h
index da243424d59373b3f981757f97b6727d64915af5..80fb88b39d510749e068d94b1ca465e451b1d14b 100644
--- a/src/plugins/platforms/xcb/qxcbcursor.h
+++ b/src/plugins/platforms/xcb/qxcbcursor.h
@@ -42,7 +42,7 @@
 #ifndef QXCBCURSOR_H
 #define QXCBCURSOR_H
 
-#include <QtGui/QPlatformCursor>
+#include <qpa/qplatformcursor.h>
 #include "qxcbscreen.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/xcb/qxcbdrag.h b/src/plugins/platforms/xcb/qxcbdrag.h
index 710a07a5a4d5419eb26d2ab6463d7a5cb84cc06f..2f74b3eaf7df04524b68fe12ec3b9fae913725f5 100644
--- a/src/plugins/platforms/xcb/qxcbdrag.h
+++ b/src/plugins/platforms/xcb/qxcbdrag.h
@@ -42,7 +42,7 @@
 #ifndef QXCBDRAG_H
 #define QXCBDRAG_H
 
-#include <qplatformdrag_qpa.h>
+#include <qpa/qplatformdrag.h>
 #include <QtPlatformSupport/private/qsimpledrag_p.h>
 #include <qxcbobject.h>
 #include <xcb/xcb.h>
diff --git a/src/plugins/platforms/xcb/qxcbintegration.cpp b/src/plugins/platforms/xcb/qxcbintegration.cpp
index 2d3971de69455a48e8b77cf4227d7c47f86ff722..8dba6e1464a9c0858a3704647b8ac92937542a6f 100644
--- a/src/plugins/platforms/xcb/qxcbintegration.cpp
+++ b/src/plugins/platforms/xcb/qxcbintegration.cpp
@@ -68,9 +68,9 @@
 #include <X11/Xlib.h>
 #endif
 
-#include <private/qplatforminputcontextfactory_qpa_p.h>
+#include <qpa/qplatforminputcontextfactory_p.h>
 #include <private/qgenericunixthemes_p.h>
-#include <qplatforminputcontext_qpa.h>
+#include <qpa/qplatforminputcontext.h>
 
 #if defined(XCB_USE_GLX)
 #include "qglxintegration.h"
@@ -82,7 +82,7 @@
 #include <QtGui/QOpenGLContext>
 #include <QtGui/QScreen>
 #ifndef QT_NO_ACCESSIBILITY
-#include <QtGui/QPlatformAccessibility>
+#include <qpa/qplatformaccessibility.h>
 #endif
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/xcb/qxcbintegration.h b/src/plugins/platforms/xcb/qxcbintegration.h
index 6170232d1e0c14721305f77795c0d185ac427651..b2245e4de02e55a52db2132bcd7297825a6a25c3 100644
--- a/src/plugins/platforms/xcb/qxcbintegration.h
+++ b/src/plugins/platforms/xcb/qxcbintegration.h
@@ -42,8 +42,8 @@
 #ifndef QXCBINTEGRATION_H
 #define QXCBINTEGRATION_H
 
-#include <QtGui/QPlatformIntegration>
-#include <QtGui/QPlatformScreen>
+#include <qpa/qplatformintegration.h>
+#include <qpa/qplatformscreen.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/xcb/qxcbkeyboard.cpp b/src/plugins/platforms/xcb/qxcbkeyboard.cpp
index ef98f82e977782ff4b2b113dda7f4dcaab210751..9bd4c9ccdfa31fe324ac9ac793e6646eb651d00a 100644
--- a/src/plugins/platforms/xcb/qxcbkeyboard.cpp
+++ b/src/plugins/platforms/xcb/qxcbkeyboard.cpp
@@ -49,8 +49,8 @@
 #include <private/qguiapplication_p.h>
 #include <stdio.h>
 
-#include <qplatforminputcontext_qpa.h>
-#include <qplatformintegration_qpa.h>
+#include <qpa/qplatforminputcontext.h>
+#include <qpa/qplatformintegration.h>
 
 #ifndef XK_ISO_Left_Tab
 #define XK_ISO_Left_Tab         0xFE20
diff --git a/src/plugins/platforms/xcb/qxcbnativeinterface.h b/src/plugins/platforms/xcb/qxcbnativeinterface.h
index c6835ff9e031a0a137a49751fe88d1cd4ed9030d..354ef767996f03b2ecec8096fb5f79e19e12da6e 100644
--- a/src/plugins/platforms/xcb/qxcbnativeinterface.h
+++ b/src/plugins/platforms/xcb/qxcbnativeinterface.h
@@ -42,7 +42,7 @@
 #ifndef QXCBNATIVEINTERFACE_H
 #define QXCBNATIVEINTERFACE_H
 
-#include <QtGui/QPlatformNativeInterface>
+#include <qpa/qplatformnativeinterface.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/xcb/qxcbscreen.h b/src/plugins/platforms/xcb/qxcbscreen.h
index ac4ecb1c8defaf11ebb3c1696060bdba81e3f40a..ba3f4aff8d41e91445d996f7a58de192c90fd056 100644
--- a/src/plugins/platforms/xcb/qxcbscreen.h
+++ b/src/plugins/platforms/xcb/qxcbscreen.h
@@ -42,7 +42,7 @@
 #ifndef QXCBSCREEN_H
 #define QXCBSCREEN_H
 
-#include <QtGui/QPlatformScreen>
+#include <qpa/qplatformscreen.h>
 #include <QtCore/QString>
 
 #include <xcb/xcb.h>
diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp
index ffce2f3956d693c705896a113e11211cf0660de3..2355043c567f12b9e56fb6571102b51a74be1a0c 100644
--- a/src/plugins/platforms/xcb/qxcbwindow.cpp
+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp
@@ -50,7 +50,7 @@
 #include "qxcbkeyboard.h"
 #include "qxcbwmsupport.h"
 
-#include <qplatformintegration_qpa.h>
+#include <qpa/qplatformintegration.h>
 
 #ifdef XCB_USE_DRI2
 #include "qdri2context.h"
@@ -87,7 +87,7 @@
 #include <private/qguiapplication_p.h>
 #include <private/qwindow_p.h>
 
-#include <QtGui/QPlatformBackingStore>
+#include <qpa/qplatformbackingstore.h>
 #include <QtGui/QWindowSystemInterface>
 
 #include <stdio.h>
diff --git a/src/plugins/platforms/xcb/qxcbwindow.h b/src/plugins/platforms/xcb/qxcbwindow.h
index 523dd559c1cdc672f019d73d5e687294eb208597..0b82196c27b67892a32eebb78adc108e8890e5a9 100644
--- a/src/plugins/platforms/xcb/qxcbwindow.h
+++ b/src/plugins/platforms/xcb/qxcbwindow.h
@@ -42,7 +42,7 @@
 #ifndef QXCBWINDOW_H
 #define QXCBWINDOW_H
 
-#include <QtGui/QPlatformWindow>
+#include <qpa/qplatformwindow.h>
 #include <QtGui/QSurfaceFormat>
 #include <QtGui/QImage>
 
diff --git a/src/plugins/printsupport/cocoa/cocoa.pro b/src/plugins/printsupport/cocoa/cocoa.pro
index 353094cbae2cadf7d683e1cfc9caa7f93bce0458..477715a8e23be54c59a5bb7edb2fb8c993466b65 100644
--- a/src/plugins/printsupport/cocoa/cocoa.pro
+++ b/src/plugins/printsupport/cocoa/cocoa.pro
@@ -2,7 +2,7 @@ TARGET = cocoaprintersupport
 load(qt_plugin)
 DESTDIR = $$QT.gui.plugins/printsupport
 
-QT += printsupport
+QT += gui-private printsupport-private
 LIBS += -framework Cocoa
 
 SOURCES += main.cpp
diff --git a/src/plugins/printsupport/cocoa/main.cpp b/src/plugins/printsupport/cocoa/main.cpp
index bc8f2e072c84f7620a0da7aa97e90fcebc8290e7..12918974f3764aad232585569780f8165051ea3c 100644
--- a/src/plugins/printsupport/cocoa/main.cpp
+++ b/src/plugins/printsupport/cocoa/main.cpp
@@ -41,8 +41,8 @@
 
 #include <QtCore/QMetaMethod>
 #include <QtGui/QGuiApplication>
-#include <QtGui/QPlatformNativeInterface>
-#include <QtPrintSupport/QPlatformPrinterSupportPlugin>
+#include <qpa/qplatformnativeinterface.h>
+#include <qpa/qplatformprintplugin.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/printsupport/windows/main.cpp b/src/plugins/printsupport/windows/main.cpp
index e29705a8a7e6c6520d2641a0a95ab20d4d46b0c7..7ddb89212b065fbd0ab1641101fb8420d22ac772 100644
--- a/src/plugins/printsupport/windows/main.cpp
+++ b/src/plugins/printsupport/windows/main.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 
-#include <QtPrintSupport/qplatformprintplugin_qpa.h>
+#include <qpa/qplatformprintplugin.h>
 #include <QtCore/QStringList>
 
 #include "qwindowsprintersupport.h"
diff --git a/src/plugins/printsupport/windows/qwindowsprintersupport.h b/src/plugins/printsupport/windows/qwindowsprintersupport.h
index 35d794aaea84c723270eb1cc720ccba5b3b8b909..be8758a1bdb1541ed76fd3546a8e799d2d25c163 100644
--- a/src/plugins/printsupport/windows/qwindowsprintersupport.h
+++ b/src/plugins/printsupport/windows/qwindowsprintersupport.h
@@ -43,7 +43,7 @@
 #define WINDOWSPRINTERSUPPORT_H
 
 #include <QtCore/QList>
-#include <QtPrintSupport/QPlatformPrinterSupport>
+#include <qpa/qplatformprintersupport.h>
 
 QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
diff --git a/src/printsupport/dialogs/qpagesetupdialog_mac.mm b/src/printsupport/dialogs/qpagesetupdialog_mac.mm
index 1dded4f9057b9a93101f385f959349f99ad3f4c9..3e84423fd8dfe647bd8d6e444283bd6102516cb1 100644
--- a/src/printsupport/dialogs/qpagesetupdialog_mac.mm
+++ b/src/printsupport/dialogs/qpagesetupdialog_mac.mm
@@ -46,7 +46,7 @@
 #include "qpagesetupdialog.h"
 #include "qabstractpagesetupdialog_p.h"
 
-#include <QtGui/qplatformnativeinterface_qpa.h>
+#include <qpa/qplatformnativeinterface.h>
 #include <QtPrintSupport/qprintengine.h>
 
 QT_USE_NAMESPACE
diff --git a/src/printsupport/dialogs/qpagesetupdialog_win.cpp b/src/printsupport/dialogs/qpagesetupdialog_win.cpp
index 9d7387edbac6dbfb401840d6d8bca1ad5acd1728..cb69d0400ff72264d2b8abc7289a0c85820342d8 100644
--- a/src/printsupport/dialogs/qpagesetupdialog_win.cpp
+++ b/src/printsupport/dialogs/qpagesetupdialog_win.cpp
@@ -47,7 +47,7 @@
 #include "../kernel/qprintengine_win_p.h"
 #include "qabstractpagesetupdialog_p.h"
 #include "qprinter.h"
-#include <QtGui/qplatformnativeinterface_qpa.h>
+#include <qpa/qplatformnativeinterface.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/printsupport/kernel/kernel.pri b/src/printsupport/kernel/kernel.pri
index d7c9f5654529cb25b715ecabcbdbf018fe2cff8b..10d9f877a0ce6db27ec27420567ba7b1e71c73b8 100644
--- a/src/printsupport/kernel/kernel.pri
+++ b/src/printsupport/kernel/kernel.pri
@@ -6,8 +6,8 @@ HEADERS += \
         $$PWD/qprinter_p.h \
         $$PWD/qprinterinfo.h \
         $$PWD/qprinterinfo_p.h \
-        $$PWD/qplatformprintplugin_qpa.h \
-        $$PWD/qplatformprintersupport_qpa.h
+        $$PWD/qplatformprintplugin.h \
+        $$PWD/qplatformprintersupport.h
 
 SOURCES += \
         $$PWD/qpaintengine_alpha.cpp \
diff --git a/src/printsupport/kernel/qplatformprintersupport_qpa.h b/src/printsupport/kernel/qplatformprintersupport.h
similarity index 100%
rename from src/printsupport/kernel/qplatformprintersupport_qpa.h
rename to src/printsupport/kernel/qplatformprintersupport.h
diff --git a/src/printsupport/kernel/qplatformprintersupport_qpa.cpp b/src/printsupport/kernel/qplatformprintersupport_qpa.cpp
index 1ed28b8090a57c7944b7076a51b889d25955ef3e..9c0c3f131c9e6fa686c32cdce718375e07416ef9 100644
--- a/src/printsupport/kernel/qplatformprintersupport_qpa.cpp
+++ b/src/printsupport/kernel/qplatformprintersupport_qpa.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qplatformprintersupport_qpa.h"
+#include "qplatformprintersupport.h"
 
 #include <QtPrintSupport/qprinterinfo.h>
 
diff --git a/src/printsupport/kernel/qplatformprintplugin.cpp b/src/printsupport/kernel/qplatformprintplugin.cpp
index 2c87fcc5e64a0394ab50d0faa0658b99f8781dfe..ec068d87d1d5953d447eafd3a8a97f8df9ce7f96 100644
--- a/src/printsupport/kernel/qplatformprintplugin.cpp
+++ b/src/printsupport/kernel/qplatformprintplugin.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qplatformprintplugin_qpa.h"
+#include "qplatformprintplugin.h"
 #include "private/qfactoryloader_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/printsupport/kernel/qplatformprintplugin_qpa.h b/src/printsupport/kernel/qplatformprintplugin.h
similarity index 100%
rename from src/printsupport/kernel/qplatformprintplugin_qpa.h
rename to src/printsupport/kernel/qplatformprintplugin.h
diff --git a/src/printsupport/kernel/qprintengine_win.cpp b/src/printsupport/kernel/qprintengine_win.cpp
index 37d2b27d1571ad4e601b556a8f0928f608a3e596..3c079e24f3e223b741131378ab083a6fbc460897 100644
--- a/src/printsupport/kernel/qprintengine_win.cpp
+++ b/src/printsupport/kernel/qprintengine_win.cpp
@@ -54,7 +54,7 @@
 #include <qdebug.h>
 #include <qvector.h>
 #include <qpicture.h>
-#include <qplatformpixmap_qpa.h>
+#include <qpa/qplatformpixmap.h>
 #include <private/qpicture_p.h>
 #include <private/qpixmap_raster_p.h>
 
diff --git a/src/printsupport/kernel/qprinter.cpp b/src/printsupport/kernel/qprinter.cpp
index 66825508497dfd511d58bb344d849669b09338e5..4929b3308e1d850e516da310fdbccafad83cf54f 100644
--- a/src/printsupport/kernel/qprinter.cpp
+++ b/src/printsupport/kernel/qprinter.cpp
@@ -52,8 +52,8 @@
 
 #ifndef QT_NO_PRINTER
 
-#include "qplatformprintplugin_qpa.h"
-#include <QtPrintSupport/QPlatformPrinterSupport>
+#include <qpa/qplatformprintplugin.h>
+#include <qpa/qplatformprintersupport.h>
 #include <private/qpagedpaintdevice_p.h>
 
 #if defined(Q_WS_X11)
diff --git a/src/printsupport/kernel/qprinterinfo.cpp b/src/printsupport/kernel/qprinterinfo.cpp
index 8d498a7e595e7eaef43e85dc80a90ccb9b921223..3d0ba7f31da15ed90cd1b9d4585170b9f6149b20 100644
--- a/src/printsupport/kernel/qprinterinfo.cpp
+++ b/src/printsupport/kernel/qprinterinfo.cpp
@@ -30,8 +30,8 @@
 
 #ifndef QT_NO_PRINTER
 
-#include "qplatformprintplugin_qpa.h"
-#include <QtPrintSupport/QPlatformPrinterSupport>
+#include <qpa/qplatformprintplugin.h>
+#include <qpa/qplatformprintersupport.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/tools/uic/qclass_lib_map.h b/src/tools/uic/qclass_lib_map.h
index 34ce374750e82c9a53eadb97a95c8e73901344fd..825813cc29d255a8f301c00bf0e0c08cebde6899 100644
--- a/src/tools/uic/qclass_lib_map.h
+++ b/src/tools/uic/qclass_lib_map.h
@@ -777,16 +777,6 @@ QT_CLASS_LIB(QWidgetItem, QtWidgets, qlayoutitem.h)
 QT_CLASS_LIB(QWidgetItemV2, QtWidgets, qlayoutitem.h)
 QT_CLASS_LIB(QPalette, QtGui, qpalette.h)
 QT_CLASS_LIB(QColorGroup, QtWidgets, qpalette.h)
-QT_CLASS_LIB(QPlatformCursorImage, QtGui, qplatformcursor_qpa.h)
-QT_CLASS_LIB(QPlatformCursorPrivate, QtGui, qplatformcursor_qpa.h)
-QT_CLASS_LIB(QPlatformCursor, QtGui, qplatformcursor_qpa.h)
-QT_CLASS_LIB(QPlatformOpenGLContext, QtGui, qplatformopenglcontext_qpa.h)
-QT_CLASS_LIB(QPlatformIntegration, QtGui, qplatformintegration_qpa.h)
-QT_CLASS_LIB(QPlatformIntegrationFactoryInterface, QtGui, qplatformintegrationplugin_qpa.h)
-QT_CLASS_LIB(QPlatformIntegrationPlugin, QtGui, qplatformintegrationplugin_qpa.h)
-QT_CLASS_LIB(QPlatformScreen, QtGui, qplatformscreen_qpa.h)
-QT_CLASS_LIB(QPlatformWindow, QtGui, qplatformwindow_qpa.h)
-QT_CLASS_LIB(QPlatformWindowFormat, QtGui, qplatformwindowformat_qpa.h)
 QT_CLASS_LIB(QSessionManager, QtGui, qsessionmanager.h)
 QT_CLASS_LIB(QShortcut, QtWidgets, qshortcut.h)
 QT_CLASS_LIB(QSizePolicy, QtWidgets, qsizepolicy.h)
@@ -915,8 +905,6 @@ QT_CLASS_LIB(QFontInfo, QtGui, qfontinfo.h)
 QT_CLASS_LIB(QFontMetrics, QtGui, qfontmetrics.h)
 QT_CLASS_LIB(QFontMetricsF, QtGui, qfontmetrics.h)
 QT_CLASS_LIB(QGlyphs, QtGui, qglyphs.h)
-QT_CLASS_LIB(QSupportedWritingSystems, QtGui, qplatformfontdatabase_qpa.h)
-QT_CLASS_LIB(QPlatformFontDatabase, QtGui, qplatformfontdatabase_qpa.h)
 QT_CLASS_LIB(QStaticText, QtGui, qstatictext.h)
 QT_CLASS_LIB(QSyntaxHighlighter, QtGui, qsyntaxhighlighter.h)
 QT_CLASS_LIB(QTextCursor, QtGui, qtextcursor.h)
diff --git a/src/widgets/dialogs/qdialog.cpp b/src/widgets/dialogs/qdialog.cpp
index 718d64bd27f4d90cacc3d8e683ced3196af9e6ea..82a7b1a30d77a206cce105bfb34b16e1dab9af38 100644
--- a/src/widgets/dialogs/qdialog.cpp
+++ b/src/widgets/dialogs/qdialog.cpp
@@ -52,10 +52,10 @@
 #include "qwhatsthis.h"
 #include "qmenu.h"
 #include "qcursor.h"
-#include "qplatformtheme_qpa.h"
+#include <qpa/qplatformtheme.h>
 #include "private/qdialog_p.h"
 #include "private/qguiapplication_p.h"
-#include "qplatformtheme_qpa.h"
+#include <qpa/qplatformtheme.h>
 #ifndef QT_NO_ACCESSIBILITY
 #include "qaccessible.h"
 #endif
diff --git a/src/widgets/dialogs/qdialog_p.h b/src/widgets/dialogs/qdialog_p.h
index c40a885f86cee0161dd4d466582b725d4f1056d2..8c53d6a404f738cb7fd53ec0c716ff9917f85c49 100644
--- a/src/widgets/dialogs/qdialog_p.h
+++ b/src/widgets/dialogs/qdialog_p.h
@@ -58,7 +58,7 @@
 #include "QtCore/qpointer.h"
 #include "QtWidgets/qdialog.h"
 #include "QtWidgets/qpushbutton.h"
-#include <QtGui/QPlatformDialogHelper>
+#include <qpa/qplatformdialoghelper.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/widgets/dialogs/qfontdialog_p.h b/src/widgets/dialogs/qfontdialog_p.h
index 75a9045d2b474ac0c5349155a893dd8aa79691fc..e7b0e91340c270678896270ef41d55e14276a9fe 100644
--- a/src/widgets/dialogs/qfontdialog_p.h
+++ b/src/widgets/dialogs/qfontdialog_p.h
@@ -57,7 +57,7 @@
 #include "private/qdialog_p.h"
 #include "qfontdatabase.h"
 #include "qfontdialog.h"
-#include "qplatformdialoghelper_qpa.h"
+#include <qpa/qplatformdialoghelper.h>
 #include "qsharedpointer.h"
 
 #ifndef QT_NO_FONTDIALOG
diff --git a/src/widgets/dialogs/qmessagebox.cpp b/src/widgets/dialogs/qmessagebox.cpp
index 92915b1bb1bedb8577c6a580120689b2fba513c9..784748fe737ab8cba3c4254a60f8ac578ab41058 100644
--- a/src/widgets/dialogs/qmessagebox.cpp
+++ b/src/widgets/dialogs/qmessagebox.cpp
@@ -67,7 +67,7 @@
 
 #ifdef Q_OS_WIN
 #    include <QtCore/qt_windows.h>
-#    include <QtGui/QPlatformNativeInterface>
+#include <qpa/qplatformnativeinterface.h>
 #endif
 
 QT_BEGIN_NAMESPACE
diff --git a/src/widgets/dialogs/qwizard_win.cpp b/src/widgets/dialogs/qwizard_win.cpp
index 49450be75b518738a575d53945f1764341a50b2f..3e0aedcabc2ea4321c3cad042376b4926c0610f3 100644
--- a/src/widgets/dialogs/qwizard_win.cpp
+++ b/src/widgets/dialogs/qwizard_win.cpp
@@ -45,7 +45,7 @@
 #include "qwizard_win_p.h"
 #include <private/qsystemlibrary_p.h>
 #include <private/qapplication_p.h>
-#include "qplatformnativeinterface_qpa.h"
+#include <qpa/qplatformnativeinterface.h>
 #include "qwizard.h"
 #include "qpaintengine.h"
 #include "qapplication.h"
diff --git a/src/widgets/itemviews/qitemdelegate.cpp b/src/widgets/itemviews/qitemdelegate.cpp
index bd9f4510f7a985444ad1c6c6cc0ec47cf4dfadf9..a9bb7271b35a46f343f96d7f42fac7c08a3a3030 100644
--- a/src/widgets/itemviews/qitemdelegate.cpp
+++ b/src/widgets/itemviews/qitemdelegate.cpp
@@ -44,7 +44,7 @@
 #ifndef QT_NO_ITEMVIEWS
 #include <qabstractitemmodel.h>
 #include <qapplication.h>
-#include <qplatformintegration_qpa.h>
+#include <qpa/qplatformintegration.h>
 #include <private/qguiapplication_p.h>
 #include <qbrush.h>
 #include <qlineedit.h>
diff --git a/src/widgets/itemviews/qstyleditemdelegate.cpp b/src/widgets/itemviews/qstyleditemdelegate.cpp
index 119692531fd7087a42f7c08cd3b3ee1f3713c58f..5732f65f32fa7ac9e42878699b63c433d120773e 100644
--- a/src/widgets/itemviews/qstyleditemdelegate.cpp
+++ b/src/widgets/itemviews/qstyleditemdelegate.cpp
@@ -44,7 +44,7 @@
 #ifndef QT_NO_ITEMVIEWS
 #include <qabstractitemmodel.h>
 #include <qapplication.h>
-#include <qplatformintegration_qpa.h>
+#include <qpa/qplatformintegration.h>
 #include <private/qguiapplication_p.h>
 #include <qbrush.h>
 #include <qlineedit.h>
diff --git a/src/widgets/kernel/kernel.pri b/src/widgets/kernel/kernel.pri
index 97430babd34abedfbfe9df774d71251e94b37258..9e3d82ea1229a7c1bff079f7ec3988b4f665afa4 100644
--- a/src/widgets/kernel/kernel.pri
+++ b/src/widgets/kernel/kernel.pri
@@ -42,7 +42,7 @@ HEADERS += \
         kernel/qsoftkeymanager_common_p.h \
         kernel/qdesktopwidget_qpa_p.h \
         kernel/qwidgetwindow_qpa_p.h \
-        kernel/qplatformmenu_qpa.h
+        kernel/qplatformmenu.h
 
 SOURCES += \
 	kernel/qaction.cpp \
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp
index 734c737e84fb7f3d044514b4924457314167d442..369f9b9063a290a5eff11ebd9536fa06ea1b9595 100644
--- a/src/widgets/kernel/qapplication.cpp
+++ b/src/widgets/kernel/qapplication.cpp
@@ -72,7 +72,7 @@
 #include <QtWidgets/qgraphicsproxywidget.h>
 #include <QtGui/qstylehints.h>
 #include <QtGui/qinputmethod.h>
-#include <QtGui/qplatformtheme_qpa.h>
+#include <qpa/qplatformtheme.h>
 
 #include "private/qkeymapper_p.h"
 
@@ -92,7 +92,7 @@
 #include "qgesture.h"
 #include "private/qgesturemanager_p.h"
 #include "private/qguiapplication_p.h"
-#include "qplatformfontdatabase_qpa.h"
+#include <qpa/qplatformfontdatabase.h>
 #ifndef QT_NO_LIBRARY
 #include "qlibrary.h"
 #endif
diff --git a/src/widgets/kernel/qapplication_p.h b/src/widgets/kernel/qapplication_p.h
index b1f510c5a5d51b471221fdbb6ff469138aefab81..9e92a6d1217153c1dd426e559e56882e9e7f1b9d 100644
--- a/src/widgets/kernel/qapplication_p.h
+++ b/src/widgets/kernel/qapplication_p.h
@@ -61,7 +61,7 @@
 #include "QtGui/qregion.h"
 #include "QtGui/qwindow.h"
 #include "qwidget.h"
-#include "QtGui/qplatformnativeinterface_qpa.h"
+#include <qpa/qplatformnativeinterface.h>
 #include "QtCore/qmutex.h"
 #include "QtCore/qtranslator.h"
 #include "QtCore/qbasictimer.h"
@@ -72,7 +72,7 @@
 #include <QTime>
 #include <QWindowSystemInterface>
 #include "private/qwindowsysteminterface_qpa_p.h"
-#include "QtGui/qplatformintegration_qpa.h"
+#include <qpa/qplatformintegration.h>
 #include "private/qguiapplication_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/widgets/kernel/qapplication_qpa.cpp b/src/widgets/kernel/qapplication_qpa.cpp
index 0651d5bf4476380500968a6cdf2ae2e7ffbdfd7f..998f06cd159c49a417846d4a315ab89b9e309032 100644
--- a/src/widgets/kernel/qapplication_qpa.cpp
+++ b/src/widgets/kernel/qapplication_qpa.cpp
@@ -52,15 +52,15 @@
 #include "private/qevent_p.h"
 
 #include "qgenericpluginfactory_qpa.h"
-#include "private/qplatformintegrationfactory_qpa_p.h"
+#include <qpa/qplatformintegrationfactory_p.h>
 #include <qdesktopwidget.h>
-#include <QPlatformCursor>
-#include <QPlatformTheme>
+#include <qpa/qplatformcursor.h>
+#include <qpa/qplatformtheme.h>
 
 #include <qdebug.h>
 #include <QWindowSystemInterface>
 #include "private/qwindowsysteminterface_qpa_p.h"
-#include <QPlatformIntegration>
+#include <qpa/qplatformintegration.h>
 
 #include "qdesktopwidget_qpa_p.h"
 #include "qwidgetwindow_qpa_p.h"
diff --git a/src/widgets/kernel/qiconloader.cpp b/src/widgets/kernel/qiconloader.cpp
index e1828fd1f119dc359c77ab1d6d869d2f21ec9dde..38cee3e51f0d4f173cec45f234b135a4b8386d62 100644
--- a/src/widgets/kernel/qiconloader.cpp
+++ b/src/widgets/kernel/qiconloader.cpp
@@ -48,7 +48,7 @@
 #include <QtWidgets/QApplication>
 #include <QtWidgets/QIconEnginePlugin>
 #include <QtGui/QPixmapCache>
-#include <QtGui/QPlatformTheme>
+#include <qpa/qplatformtheme.h>
 #include <QtWidgets/QIconEngine>
 #include <QtWidgets/QStyleOption>
 #include <QtCore/QList>
diff --git a/src/widgets/kernel/qplatformmenu_qpa.h b/src/widgets/kernel/qplatformmenu.h
similarity index 100%
rename from src/widgets/kernel/qplatformmenu_qpa.h
rename to src/widgets/kernel/qplatformmenu.h
diff --git a/src/widgets/kernel/qplatformmenu_qpa.cpp b/src/widgets/kernel/qplatformmenu_qpa.cpp
index 95a70d9dcd8b1353ae05feb006ea465053bcd52d..f28560e560bf96069299144d97479f0a8273a844 100644
--- a/src/widgets/kernel/qplatformmenu_qpa.cpp
+++ b/src/widgets/kernel/qplatformmenu_qpa.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qplatformmenu_qpa.h"
+#include "qplatformmenu.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/widgets/kernel/qwhatsthis.cpp b/src/widgets/kernel/qwhatsthis.cpp
index 5df69be02078bb14c4f32cf87972ec9fef5f5484..907a29f3fb37c15359c44431d772961341554873 100644
--- a/src/widgets/kernel/qwhatsthis.cpp
+++ b/src/widgets/kernel/qwhatsthis.cpp
@@ -55,7 +55,7 @@
 #include "qcursor.h"
 #include "qbitmap.h"
 #include "qtextdocument.h"
-#include "qplatformtheme_qpa.h"
+#include <qpa/qplatformtheme.h>
 #include "private/qtextdocumentlayout_p.h"
 #include "qtoolbutton.h"
 #include "qdebug.h"
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
index 9abba543902e532793b2da3c34df6260870dedf8..dcd052a94ee0429dd299fd3ddb3e7e6e4b78dde5 100644
--- a/src/widgets/kernel/qwidget.cpp
+++ b/src/widgets/kernel/qwidget.cpp
@@ -67,7 +67,7 @@
 # include "qtoolbar.h"
 # include <private/qmainwindowlayout_p.h>
 #endif
-#include "qplatformwindow_qpa.h"
+#include <qpa/qplatformwindow.h>
 #include "private/qwidgetwindow_qpa_p.h"
 #include "qpainter.h"
 #include "qtooltip.h"
diff --git a/src/widgets/kernel/qwidget_qpa.cpp b/src/widgets/kernel/qwidget_qpa.cpp
index a8175455b2ab3726f0c0e9f3454ce7753ff3611c..97cf9216917e42b116d06a1746fbb916a6d7ffdd 100644
--- a/src/widgets/kernel/qwidget_qpa.cpp
+++ b/src/widgets/kernel/qwidget_qpa.cpp
@@ -47,12 +47,12 @@
 #include "private/qwidgetwindow_qpa_p.h"
 #include "private/qapplication_p.h"
 #include "QtWidgets/qdesktopwidget.h"
-#include "QtGui/qplatformwindow_qpa.h"
+#include <qpa/qplatformwindow.h>
 #include "QtGui/qsurfaceformat.h"
-#include "QtGui/qplatformopenglcontext_qpa.h"
+#include <qpa/qplatformopenglcontext.h>
 #include "QtGui/private/qwindow_p.h"
 
-#include <QtGui/QPlatformCursor>
+#include <qpa/qplatformcursor.h>
 #include <QtGui/QGuiApplication>
 #include <QtGui/QScreen>
 
diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp
index b2b1d3fec59e614bb9595dc055217b04ab4bb164..3de94a8f177245ec494f56f7c95344892f4dc0d7 100644
--- a/src/widgets/styles/qcommonstyle.cpp
+++ b/src/widgets/styles/qcommonstyle.cpp
@@ -45,7 +45,7 @@
 #include <qfile.h>
 #include <qapplication.h>
 #include <private/qguiapplication_p.h>
-#include <qplatformtheme_qpa.h>
+#include <qpa/qplatformtheme.h>
 #include <qbitmap.h>
 #include <qcache.h>
 #include <qdockwidget.h>
diff --git a/src/widgets/styles/qmacstyle_mac.mm b/src/widgets/styles/qmacstyle_mac.mm
index 05bd90abef253e7091d96e5d74a6bb71812ea3fa..662f0e2a6084121bfbcfd3cf03f3f0da1fe1cf32 100644
--- a/src/widgets/styles/qmacstyle_mac.mm
+++ b/src/widgets/styles/qmacstyle_mac.mm
@@ -100,7 +100,7 @@
 #include <QtWidgets/qgraphicsproxywidget.h>
 #include <QtWidgets/qgraphicsview.h>
 #include <private/qstylehelper_p.h>
-#include <QtGui/QPlatformFontDatabase>
+#include <qpa/qplatformfontdatabase.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/widgets/styles/qwindowsvistastyle.cpp b/src/widgets/styles/qwindowsvistastyle.cpp
index 6fce426dd3b777da7056255d338dd57da786fb8d..bcb24db66376437cc0d3f8b62af7efd1d3f01a4d 100644
--- a/src/widgets/styles/qwindowsvistastyle.cpp
+++ b/src/widgets/styles/qwindowsvistastyle.cpp
@@ -46,7 +46,7 @@
 #include <private/qstylehelper_p.h>
 #include <private/qsystemlibrary_p.h>
 #include <private/qapplication_p.h>
-#include <qplatformnativeinterface_qpa.h>
+#include <qpa/qplatformnativeinterface.h>
 
 #if !defined(QT_NO_STYLE_WINDOWSVISTA) || defined(QT_PLUGIN)
 
diff --git a/src/widgets/styles/qwindowsxpstyle.cpp b/src/widgets/styles/qwindowsxpstyle.cpp
index 18f138010b8404063b0dcf57bd7dde31072d2f9b..18a28bc556734c56b8167db80b75665cdc3fd418 100644
--- a/src/widgets/styles/qwindowsxpstyle.cpp
+++ b/src/widgets/styles/qwindowsxpstyle.cpp
@@ -46,7 +46,7 @@
 #include <private/qobject_p.h>
 #include <private/qpaintengine_raster_p.h>
 #include <private/qapplication_p.h>
-#include <qplatformnativeinterface_qpa.h>
+#include <qpa/qplatformnativeinterface.h>
 #include <private/qstylehelper_p.h>
 #include <private/qwidget_p.h>
 #include <private/qsystemlibrary_p.h>
diff --git a/src/widgets/util/qsystemtrayicon_win.cpp b/src/widgets/util/qsystemtrayicon_win.cpp
index fa72e791bad17d21e12872b90d8860327d23aad8..84becf4a706cc9790b16ba30c8c803df46e823b7 100644
--- a/src/widgets/util/qsystemtrayicon_win.cpp
+++ b/src/widgets/util/qsystemtrayicon_win.cpp
@@ -52,7 +52,7 @@
 
 #include <private/qsystemlibrary_p.h>
 #include <private/qguiapplication_p.h>
-#include <QPlatformNativeInterface>
+#include <qpa/qplatformnativeinterface.h>
 #include <QSettings>
 #include <QDebug>
 #include <QHash>
diff --git a/src/widgets/util/qsystemtrayicon_x11.cpp b/src/widgets/util/qsystemtrayicon_x11.cpp
index 174c39d1f6a9656c73d757f5156cde3e918f8357..e58d0d9315aac5df3cafcb356da51c74e0fab8c4 100644
--- a/src/widgets/util/qsystemtrayicon_x11.cpp
+++ b/src/widgets/util/qsystemtrayicon_x11.cpp
@@ -54,7 +54,7 @@
 #include <qguiapplication.h>
 #include <qscreen.h>
 #include <qbackingstore.h>
-#include <qplatformnativeinterface_qpa.h>
+#include <qpa/qplatformnativeinterface.h>
 #include <qdebug.h>
 
 #include <X11/Xlib.h>
diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp
index bea406107617cf5d8533e5d118c1ba692f164c2e..6a8e7b4641a1e724fd7d758dd77c9c7b2a4c667a 100644
--- a/src/widgets/widgets/qcombobox.cpp
+++ b/src/widgets/widgets/qcombobox.cpp
@@ -43,7 +43,7 @@
 
 #ifndef QT_NO_COMBOBOX
 #include <qstylepainter.h>
-#include <qplatformtheme_qpa.h>
+#include <qpa/qplatformtheme.h>
 #include <qlineedit.h>
 #include <qapplication.h>
 #include <qdesktopwidget.h>
diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp
index 2abd4ceef71f62bf4b7c05168634dfc541e39e02..5dc26f6ee85f327d32fcef4dab6b65245cb2175d 100644
--- a/src/widgets/widgets/qmenu.cpp
+++ b/src/widgets/widgets/qmenu.cpp
@@ -49,7 +49,7 @@
 #include "qtimer.h"
 #include "qlayout.h"
 #include "qpainter.h"
-#include "qplatformtheme_qpa.h"
+#include <qpa/qplatformtheme.h>
 #include "qapplication.h"
 #include "qdesktopwidget.h"
 #ifndef QT_NO_ACCESSIBILITY
@@ -71,7 +71,7 @@
 #include <private/qaction_p.h>
 #include <private/qsoftkeymanager_p.h>
 #include <private/qguiapplication_p.h>
-#include <qplatformtheme_qpa.h>
+#include <qpa/qplatformtheme.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/widgets/widgets/qmenu_p.h b/src/widgets/widgets/qmenu_p.h
index d637a9be8fb63d83b0378824eeca777c3e8ca667..692fd19050b4f1c2825f5d4674165b1525ff5056 100644
--- a/src/widgets/widgets/qmenu_p.h
+++ b/src/widgets/widgets/qmenu_p.h
@@ -61,7 +61,7 @@
 #include "QtCore/qbasictimer.h"
 #include "private/qwidget_p.h"
 
-#include <qplatformmenu_qpa.h>
+#include <qpa/qplatformmenu.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/widgets/widgets/qmenubar.cpp b/src/widgets/widgets/qmenubar.cpp
index c9818e056c8e7e8a77c8ff3f46a34555a7c97434..11ae61fb90e8b6456e89af344c3fbc630a0aa756 100644
--- a/src/widgets/widgets/qmenubar.cpp
+++ b/src/widgets/widgets/qmenubar.cpp
@@ -55,7 +55,7 @@
 #include <qtoolbar.h>
 #include <qtoolbutton.h>
 #include <qwhatsthis.h>
-#include <qplatformtheme_qpa.h>
+#include <qpa/qplatformtheme.h>
 #include "private/qguiapplication_p.h"
 
 #ifndef QT_NO_MENUBAR
diff --git a/src/widgets/widgets/qwidgetlinecontrol.cpp b/src/widgets/widgets/qwidgetlinecontrol.cpp
index 017cbee219a7408783ca7a0f49f80ec6887e5bd9..6347593efe006c6bc094ded14fc24f0ed0cea005 100644
--- a/src/widgets/widgets/qwidgetlinecontrol.cpp
+++ b/src/widgets/widgets/qwidgetlinecontrol.cpp
@@ -46,7 +46,7 @@
 #include "qabstractitemview.h"
 #include "qclipboard.h"
 #include <private/qguiapplication_p.h>
-#include <qplatformtheme_qpa.h>
+#include <qpa/qplatformtheme.h>
 #include <qstylehints.h>
 #ifndef QT_NO_ACCESSIBILITY
 #include "qaccessible.h"
diff --git a/sync.profile b/sync.profile
index cc681b0ebecad6fc9637ccaf5e3b596e40ce9558..362118aefae285b306c9a686e69f1723b8934c46 100644
--- a/sync.profile
+++ b/sync.profile
@@ -68,6 +68,82 @@
     "QtConcurrent" => "$basedir/src/modules/qt_concurrent.pri",
     "QtPlatformSupport" => "$basedir/src/modules/qt_platformsupport.pri",
 );
+%deprecatedheaders = (
+    "QtGui" =>  {
+        "qplatformaccessibility_qpa.h" => "qpa/qplatformaccessibility.h",
+        "QPlatformAccessibility" => "qpa/qplatformaccessibility.h",
+        "qplatformbackingstore_qpa.h" => "qpa/qplatformbackingstore.h",
+        "QPlatformBackingStore" => "qpa/qplatformbackingstore.h",
+        "qplatformclipboard_qpa.h" => "qpa/qplatformclipboard.h",
+        "QPlatformClipboard" => "qpa/qplatformclipboard.h",
+        "QPlatformColorDialogHelper" => "qpa/qplatformdialoghelper.h",
+        "qplatformcursor_qpa.h" => "qpa/qplatformcursor.h",
+        "QPlatformCursor" => "qpa/qplatformcursor.h",
+        "QPlatformCursorImage" => "qpa/qplatformcursor.h",
+        "QPlatformCursorPrivate" => "qpa/qplatformcursor.h",
+        "qplatformdrag_qpa.h" => "qpa/qplatformdrag.h",
+        "QPlatformDrag" => "qpa/qplatformdrag.h",
+        "QPlatformDragQtResponse" => "qpa/qplatformdrag.h",
+        "QPlatformDropQtResponse" => "qpa/qplatformdrag.h",
+        "qplatformdialoghelper_qpa.h" => "qpa/qplatformdialoghelper.h",
+        "QPlatformDialogHelper" => "qpa/qplatformdialoghelper.h",
+        "QPlatformFileDialogHelper" => "qpa/qplatformdialoghelper.h",
+        "qplatformfontdatabase_qpa.h" => "qpa/qplatformfontdatabase.h",
+        "QPlatformFontDatabase" => "qpa/qplatformfontdatabase.h",
+        "qplatforminputcontext_qpa.h" => "qpa/qplatforminputcontext.h",
+        "QPlatformInputContext" => "qpa/qplatforminputcontext.h",
+        "qplatforminputcontext_qpa_p.h" => "qpa/qplatforminputcontext_p.h",
+        "qplatformintegration_qpa.h" => "qpa/qplatformintegration.h",
+        "QPlatformIntegration" => "qpa/qplatformintegration.h",
+        "qplatformintegrationfactory_qpa_p.h" => "qpa/qplatformintegrationfactory_p.h",
+        "QPlatformIntegrationFactory" => "qpa/qplatformintegrationfactory_p.h",
+        "qplatformintegrationplugin_qpa.h" => "qpa/qplatformintegrationplugin.h",
+        "QPlatformIntegrationPlugin" => "qpa/qplatformintegrationplugin.h",
+        "qplatformnativeinterface_qpa.h" => "qpa/qplatformnativeinterface.h",
+        "QPlatformNativeInterface" => "qpa/qplatformnativeinterface.h",
+        "qplatformopenglcontext_qpa.h" => "qpa/qplatformopenglcontext.h",
+        "QPlatformOpenGLContext" => "qpa/qplatformopenglcontext.h",
+        "qplatformpixmap_qpa.h" => "qpa/qplatformpixmap.h",
+        "QPlatformPixmap" => "qpa/qplatformpixmap.h",
+        "qplatformscreen_qpa.h" => "qpa/qplatformscreen.h",
+        "QPlatformScreen" => "qpa/qplatformscreen.h",
+        "qplatformscreen_qpa_p.h" => "qpa/qplatformscreen_p.h",
+        "QPlatformScreenBuffer" => "qpa/qplatformscreenpageflipper.h",
+        "qplatformscreenpageflipper_qpa.h" => "qpa/qplatformscreenpageflipper.h",
+        "QPlatformScreenPageFlipper" => "qpa/qplatformscreenpageflipper.h",
+        "qplatformservices_qpa.h" => "qpa/qplatformservices.h",
+        "QPlatformServices" => "qpa/qplatformservices.h",
+        "qplatformsharedgraphicscache_qpa.h" => "qpa/qplatformsharedgraphicscache.h",
+        "QPlatformSharedGraphicsCache" => "qpa/qplatformsharedgraphicscache.h",
+        "qplatformsurface_qpa.h" => "qpa/qplatformsurface.h",
+        "QPlatformSurface" => "qpa/qplatformsurface.h",
+        "qplatformtheme_qpa.h" => "qpa/qplatformtheme.h",
+        "QPlatformTheme" => "qpa/qplatformtheme.h",
+        "qplatformthemefactory_qpa_p.h" => "qpa/qplatformthemefactory_p.h",
+        "qplatformthemeplugin_qpa.h" => "qpa/qplatformthemeplugin.h",
+        "QPlatformThemePlugin" => "qpa/qplatformthemeplugin.h",
+        "qplatformwindow_qpa.h" => "qpa/qplatformwindow.h",
+        "QPlatformWindow" => "qpa/qplatformwindow.h"
+    },
+    "QtWidgets" => {
+        "qplatformmenu_qpa.h" => "qpa/qplatformmenu.h",
+        "QPlatformMenu" => "qpa/qplatformmenu.h",
+        "QPlatformMenuAction" => "qpa/qplatformmenu.h",
+        "QPlatformMenuBar" => "qpa/qplatformmenu.h"
+    },
+    "QtPrintSupport" => {
+        "qplatformprintersupport_qpa.h" => "qpa/qplatformprintersupport.h",
+        "QPlatformPrinterSupport" => "qpa/qplatformprintersupport.h",
+        "QPlatformPrinterSupportPlugin" => "XXXXXXXXXXXXXXXXXXXX",
+        "qplatformprintplugin_qpa.h" => "qpa/qplatformprintplugin.h",
+        "QPlatformPrintPlugin" => "qpa/qplatformprintplugin.h"
+    },
+    "QtPlatformSupport" => {
+        "qplatforminputcontextfactory_qpa_p.h" => "qpa/qplatforminputcontextfactory_p.h",
+        "qplatforminputcontextplugin_qpa_p.h" => "qpa/qplatforminputcontextplugin_p.h",
+        "QPlatformInputContextPlugin" => "qpa/qplatforminputcontextplugin_p.h"
+    }
+);
 %explicitheaders = (
     "QtCore" => {
         "QVariantHash" => "qvariant.h",
diff --git a/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp b/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp
index c7652e445f12212bb9a1bb7aa7a6c4f1b585c727..eeac5646894ee0bdc62c365cf03231fb46544c1f 100644
--- a/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp
+++ b/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp
@@ -50,8 +50,8 @@
 #include <qpaintengine.h>
 #include <qsplashscreen.h>
 
-#include <qplatformpixmap_qpa.h>
-#include <qplatformintegration_qpa.h>
+#include <qpa/qplatformpixmap.h>
+#include <qpa/qplatformintegration.h>
 #include <private/qguiapplication_p.h>
 #include <private/qdrawhelper_p.h>
 
diff --git a/tests/auto/gui/kernel/qinputmethod/tst_qinputmethod.cpp b/tests/auto/gui/kernel/qinputmethod/tst_qinputmethod.cpp
index cfe26d23e74173691b754c6e72e2abe30c511add..5bbd4958da39f7f9d2fc6514211483abb26d54f7 100644
--- a/tests/auto/gui/kernel/qinputmethod/tst_qinputmethod.cpp
+++ b/tests/auto/gui/kernel/qinputmethod/tst_qinputmethod.cpp
@@ -43,7 +43,7 @@
 
 #include <private/qguiapplication_p.h>
 #include <private/qinputmethod_p.h>
-#include <qplatforminputcontext_qpa.h>
+#include <qpa/qplatforminputcontext.h>
 #include "../../../shared/platforminputcontext.h"
 
 class InputItem : public QObject
diff --git a/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp b/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp
index 588584545c123f32300e6c5f39b62680f3624a15..766352f9180dd30bf17bf02472d7a4ba7e2901d7 100644
--- a/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp
+++ b/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp
@@ -42,7 +42,7 @@
 
 #include <QtTest/QtTest>
 #include <qkeysequence.h>
-#include <qplatformtheme_qpa.h>
+#include <qpa/qplatformtheme.h>
 #include <private/qkeysequence_p.h>
 #include <private/qguiapplication_p.h>
 #include <QTranslator>
diff --git a/tests/auto/opengl/qgl/tst_qgl.cpp b/tests/auto/opengl/qgl/tst_qgl.cpp
index 051e26f4af12601424f39e0ade6aa364fbf6a0b3..5da44dfbfa095c0c9be314016fee6989be772314 100644
--- a/tests/auto/opengl/qgl/tst_qgl.cpp
+++ b/tests/auto/opengl/qgl/tst_qgl.cpp
@@ -55,7 +55,7 @@
 #include <QVBoxLayout>
 
 #ifdef QT_BUILD_INTERNAL
-#include <qplatformpixmap_qpa.h>
+#include <qpa/qplatformpixmap.h>
 #include <QtOpenGL/private/qgl_p.h>
 #include <QtGui/private/qimage_p.h>
 #include <QtGui/private/qimagepixmapcleanuphooks_p.h>
diff --git a/tests/auto/other/languagechange/tst_languagechange.cpp b/tests/auto/other/languagechange/tst_languagechange.cpp
index 663f2ef798367dfc0ca309d44ddf670c5e3b449f..38f58fdcdac092d5e962d398a912f5dea5355563 100644
--- a/tests/auto/other/languagechange/tst_languagechange.cpp
+++ b/tests/auto/other/languagechange/tst_languagechange.cpp
@@ -49,7 +49,7 @@
 #include <QtCore/QTranslator>
 #include <QtCore/QTemporaryDir>
 #include <private/qthread_p.h>
-#include <QtGui/QPlatformTheme>
+#include <qpa/qplatformtheme.h>
 #include <QtWidgets/QInputDialog>
 #include <QtWidgets/QColorDialog>
 #include <QtWidgets/QDialogButtonBox>
diff --git a/tests/auto/shared/platforminputcontext.h b/tests/auto/shared/platforminputcontext.h
index 2049ec7d61403b4d0b30cb12db3a4d3d58cb94af..b7f7e2b8269d2e8c739356e0ceaf7c485bd71ecc 100644
--- a/tests/auto/shared/platforminputcontext.h
+++ b/tests/auto/shared/platforminputcontext.h
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <qplatforminputcontext_qpa.h>
+#include <qpa/qplatforminputcontext.h>
 
 class PlatformInputContext : public QPlatformInputContext
 {
diff --git a/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp b/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp
index 1d391a1c092797d88e85751d35330d8c82848dc6..6c91bb7a3599726d0d61673a95a1dc224923e05e 100644
--- a/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp
+++ b/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp
@@ -48,7 +48,7 @@
 #include <QApplication>
 #include <QPushButton>
 #include <QDialogButtonBox>
-#include <QPlatformTheme>
+#include <qpa/qplatformtheme.h>
 #include <private/qguiapplication_p.h>
 #if defined(Q_OS_MAC) && !defined(QT_NO_STYLE_MAC)
 #include <QMacStyle>
diff --git a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
index be649db9d8061d1d08c8c4514821317f928d63af..a6330aac1782167431d78549ae22f0bcc5d64aa1 100644
--- a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
+++ b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
@@ -57,7 +57,7 @@
 #if defined(Q_OS_WIN) || defined(Q_OS_WINCE)
 #  include <windows.h>
 #  include <QtGui/QGuiApplication>
-#  include <QtGui/QPlatformNativeInterface>
+#include <qpa/qplatformnativeinterface.h>
 #endif // Q_OS_WIN
 
 #if defined(Q_OS_WIN) || defined(Q_OS_WINCE)
diff --git a/tests/auto/widgets/kernel/qaction/tst_qaction.cpp b/tests/auto/widgets/kernel/qaction/tst_qaction.cpp
index 51123af9537649d540d130a5d8f8631162d3a135..71f655b1975ed480700c65fbac0149d11e5436cf 100644
--- a/tests/auto/widgets/kernel/qaction/tst_qaction.cpp
+++ b/tests/auto/widgets/kernel/qaction/tst_qaction.cpp
@@ -46,7 +46,7 @@
 #include <qevent.h>
 #include <qaction.h>
 #include <qmenu.h>
-#include <qplatformtheme_qpa.h>
+#include <qpa/qplatformtheme.h>
 #include <private/qguiapplication_p.h>
 
 class tst_QAction : public QObject
diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
index 6e88c6e74ebf453c23b12b24778209d0790a644b..710b81779a52b834eb074f4f64f52a67d1a273ed 100644
--- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
+++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
@@ -83,8 +83,8 @@
 #ifdef Q_OS_WIN
 #  include <QtCore/qt_windows.h>
 #  include <QtGui/private/qguiapplication_p.h>
-#  include <QtGui/QPlatformNativeInterface>
-#  include <QtGui/QPlatformIntegration>
+#include <qpa/qplatformnativeinterface.h>
+#include <qpa/qplatformintegration.h>
 
 static HWND winHandleOf(const QWidget *w)
 {
diff --git a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
index 90b5a88805136b53f75c670472f7cc92a20b4044..18a8666f26e43ae63be2f9edc176e658c0ae401c 100644
--- a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
+++ b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
@@ -44,7 +44,7 @@
 #include "qcombobox.h"
 #include <private/qcombobox_p.h>
 #include <private/qguiapplication_p.h>
-#include <qplatformtheme_qpa.h>
+#include <qpa/qplatformtheme.h>
 
 #include <qfontcombobox.h>
 #include <qdesktopwidget.h>
diff --git a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
index 22e05a8871e3dd5d78baceeb786594babfe33f42..91827eca6df9c31d7d1ec6b085afc867870923a5 100644
--- a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
+++ b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
@@ -48,7 +48,7 @@
 #include "qvalidator.h"
 #include "qcompleter.h"
 #include "qstandarditemmodel.h"
-#include "qplatformtheme_qpa.h"
+#include <qpa/qplatformtheme.h>
 #include "qstylehints.h"
 #include <private/qguiapplication_p.h>