9 files changed, 12 insertions, 12 deletions
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp
index 161bb4e23d..ccbd335d61 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 b73b03025b..8422409cb3 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 a1af856992..0a56ca3742 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 c2a3aa9722..d7e5441931 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 bf0cfd1404..dcb0a4f8d1 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
index 08faf8d84f..08faf8d84f 100644
--- a/src/gui/text/qplatformfontdatabase_qpa.h
+++ b/src/gui/text/qplatformfontdatabase.h
diff --git a/src/gui/text/qplatformfontdatabase_qpa.cpp b/src/gui/text/qplatformfontdatabase_qpa.cpp
index 632d2d89d9..3531202eff 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 d037d5902d..7289450e7f 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 6587769712..d0dd0ed129 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