diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri
index f2c5334f8cb07e0c28616cb8400e2665a14ea97d..9ceb0ee0827fbae45836b2ba67d6e58edebcb440 100644
--- a/src/gui/kernel/kernel.pri
+++ b/src/gui/kernel/kernel.pri
@@ -6,8 +6,8 @@ PRECOMPILED_HEADER = kernel/qt_gui_pch.h
 
 KERNEL_P= kernel
 HEADERS += \
-        kernel/qgenericpluginfactory_qpa.h \
-        kernel/qgenericplugin_qpa.h \
+        kernel/qgenericpluginfactory.h \
+        kernel/qgenericplugin.h \
         kernel/qwindowsysteminterface.h \
         kernel/qwindowsysteminterface_p.h \
         kernel/qplatformintegration.h \
diff --git a/src/gui/kernel/qgenericplugin.cpp b/src/gui/kernel/qgenericplugin.cpp
index 4cd12d068c2440b08a0fcf526d5ab675fd6447bf..abfae93a0c78c26fd71f8ddabcbb0d01958f4d2c 100644
--- a/src/gui/kernel/qgenericplugin.cpp
+++ b/src/gui/kernel/qgenericplugin.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qgenericplugin_qpa.h"
+#include "qgenericplugin.h"
 
 #ifndef QT_NO_LIBRARY
 
@@ -48,12 +48,9 @@ QT_BEGIN_NAMESPACE
 /*!
     \class QGenericPlugin
     \ingroup plugins
-    \ingroup qpa
 
     \brief The QGenericPlugin class is an abstract base class for
-    window-system related plugins in Qt QPA.
-
-    Note that this class is only available in Qt QPA.
+    plugins.
 
     A mouse plugin can be created by subclassing
     QGenericPlugin and reimplementing the pure virtual create()
diff --git a/src/gui/kernel/qgenericplugin_qpa.h b/src/gui/kernel/qgenericplugin.h
similarity index 96%
rename from src/gui/kernel/qgenericplugin_qpa.h
rename to src/gui/kernel/qgenericplugin.h
index 2724a8c9e6e5bc01e5729ca1ae162979ac68f16d..44dad6ec6fc09313dfbb8d33a89c8bd967ce08dd 100644
--- a/src/gui/kernel/qgenericplugin_qpa.h
+++ b/src/gui/kernel/qgenericplugin.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QGENERICPLUGIN_QPA_H
-#define QGENERICPLUGIN_QPA_H
+#ifndef QGENERICPLUGIN_H
+#define QGENERICPLUGIN_H
 
 #include <QtCore/qplugin.h>
 #include <QtCore/qfactoryinterface.h>
@@ -70,4 +70,4 @@ QT_END_NAMESPACE
 
 QT_END_HEADER
 
-#endif // QGENERICPLUGIN_QPA_H
+#endif // QGENERICPLUGIN_H
diff --git a/src/gui/kernel/qgenericpluginfactory.cpp b/src/gui/kernel/qgenericpluginfactory.cpp
index 663b88e10df31e98fcab05778baa5c8674fa721a..48ab5a7af19e9740a9bd3829a6bb97b8bf08f03c 100644
--- a/src/gui/kernel/qgenericpluginfactory.cpp
+++ b/src/gui/kernel/qgenericpluginfactory.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qgenericpluginfactory_qpa.h"
+#include "qgenericpluginfactory.h"
 
 #include "qguiapplication.h"
 #include "private/qfactoryloader_p.h"
@@ -60,12 +60,9 @@ Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
 
 /*!
     \class QGenericPluginFactory
-    \ingroup qpa
+    \ingroup plugins
 
-    \brief The QGenericPluginFactory class creates window-system
-    related plugin drivers in Qt QPA.
-
-    Note that this class is only available in Qt QPA.
+    \brief The QGenericPluginFactory class creates plugin drivers.
 
     \sa QGenericPlugin
 */
diff --git a/src/gui/kernel/qgenericpluginfactory_qpa.h b/src/gui/kernel/qgenericpluginfactory.h
similarity index 94%
rename from src/gui/kernel/qgenericpluginfactory_qpa.h
rename to src/gui/kernel/qgenericpluginfactory.h
index a7c227f44abf9c28c9abc953320be973c925a299..2704cadbb2e458fc971d1ffb70418bfc2712c6d4 100644
--- a/src/gui/kernel/qgenericpluginfactory_qpa.h
+++ b/src/gui/kernel/qgenericpluginfactory.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QGENERICPLUGINFACTORY_QPA_H
-#define QGENERICPLUGINFACTORY_QPA_H
+#ifndef QGENERICPLUGINFACTORY_H
+#define QGENERICPLUGINFACTORY_H
 
 #include <QtCore/qstringlist.h>
 
@@ -63,4 +63,4 @@ QT_END_NAMESPACE
 
 QT_END_HEADER
 
-#endif // QGENERICPLUGINFACTORY_QPA_H
+#endif // QGENERICPLUGINFACTORY_H
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index 0ec888f6258a5185641df5feafc29516cde1f030..33dd8834720b29940f1929e9234716b508995f2c 100644
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -65,8 +65,8 @@
 #include <private/qscreen_p.h>
 #include <private/qdrawhelper_p.h>
 
+#include <QtGui/qgenericpluginfactory.h>
 #include <qpa/qplatformintegration.h>
-#include <QtGui/QGenericPluginFactory>
 #include <QtGui/qstylehints.h>
 #include <QtGui/qinputpanel.h>
 #include <QtGui/qpixmapcache.h>
diff --git a/src/plugins/generic/evdevkeyboard/main.cpp b/src/plugins/generic/evdevkeyboard/main.cpp
index a169eee96b37f45b4e5fd40b242f305522aef0ba..1aaa573be70d4423fda6a85a79bbdfd93b5106dd 100644
--- a/src/plugins/generic/evdevkeyboard/main.cpp
+++ b/src/plugins/generic/evdevkeyboard/main.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <qgenericplugin_qpa.h>
+#include <QtGui/qgenericplugin.h>
 #include <QtPlatformSupport/private/qevdevkeyboardmanager_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/generic/evdevmouse/main.cpp b/src/plugins/generic/evdevmouse/main.cpp
index 6e98cf4a5e572fa8e413ef9fc368231ce43b47de..34a75ebbb9eda57c099bd47cedc040fcc634a610 100644
--- a/src/plugins/generic/evdevmouse/main.cpp
+++ b/src/plugins/generic/evdevmouse/main.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <qgenericplugin_qpa.h>
+#include <QtGui/qgenericplugin.h>
 #include <QtPlatformSupport/private/qevdevmousemanager_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/generic/evdevtablet/main.cpp b/src/plugins/generic/evdevtablet/main.cpp
index 9863defad0a7ee6e0b8fef996aca562cd32c1909..fdeecb4bace9ac5f2de744d5765db729fe122743 100644
--- a/src/plugins/generic/evdevtablet/main.cpp
+++ b/src/plugins/generic/evdevtablet/main.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <qgenericplugin_qpa.h>
+#include <QtGui/qgenericplugin.h>
 #include <QtPlatformSupport/private/qevdevtablet_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/generic/evdevtouch/main.cpp b/src/plugins/generic/evdevtouch/main.cpp
index 33af3eddd8b64e2cdde97363a5921eac112ca42d..01ce9e49f9b9049a0f7f87ecbd17045bab8ee8b1 100644
--- a/src/plugins/generic/evdevtouch/main.cpp
+++ b/src/plugins/generic/evdevtouch/main.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <qgenericplugin_qpa.h>
+#include <QtGui/qgenericplugin.h>
 #include <QtPlatformSupport/private/qevdevtouch_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/generic/meego/main.cpp b/src/plugins/generic/meego/main.cpp
index 6a82bd857b3a1af045fb005f4d0ff376e164d418..efc2c8705749da427ed62c06ec294ca975b9ec4c 100644
--- a/src/plugins/generic/meego/main.cpp
+++ b/src/plugins/generic/meego/main.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <qgenericplugin_qpa.h>
+#include <QtGui/qgenericplugin.h>
 #include "qmeegointegration.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/generic/tslib/main.cpp b/src/plugins/generic/tslib/main.cpp
index f212626dffa65b24e30cc7cba438164305db6a28..5cf05b27d2c23a5ea1bb509d0d559ba412267bdc 100644
--- a/src/plugins/generic/tslib/main.cpp
+++ b/src/plugins/generic/tslib/main.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <qgenericplugin_qpa.h>
+#include <QtGui/qgenericplugin.h>
 #include "qtslib.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/widgets/kernel/qapplication_qpa.cpp b/src/widgets/kernel/qapplication_qpa.cpp
index a4c483871702d935edcf83b5efcf426041020c87..7ccf14d49f7e278d0bce81e0fed2deedbb60326f 100644
--- a/src/widgets/kernel/qapplication_qpa.cpp
+++ b/src/widgets/kernel/qapplication_qpa.cpp
@@ -51,7 +51,6 @@
 #include "private/qwidget_p.h"
 #include "private/qevent_p.h"
 
-#include "qgenericpluginfactory_qpa.h"
 #include <qpa/qplatformintegrationfactory_p.h>
 #include <qdesktopwidget.h>
 #include <qpa/qplatformcursor.h>
diff --git a/sync.profile b/sync.profile
index d5c897ac723c2b20f32767e4420c243c016cbac8..7d2d4628f0c0df5241d905dbf4e4cb0f70fe3966 100644
--- a/sync.profile
+++ b/sync.profile
@@ -90,7 +90,11 @@
         "QPlatformWindow" => "qpa/qplatformwindow.h",
         "qwindowsysteminterface_qpa.h" => "qpa/qwindowsysteminterface.h",
         "QWindowSystemInterface" => "qpa/qwindowsysteminterface.h",
-        "qwindowsysteminterface_qpa_p.h" => "qpa/qwindowsysteminterface_p.h"
+        "qwindowsysteminterface_qpa_p.h" => "qpa/qwindowsysteminterface_p.h",
+        "qgenericpluginfactory_qpa.h" => "QtGui/qgenericpluginfactory.h",
+        "qgenericplugin_qpa.h" => "QtGui/qgenericplugin.h",
+        "QGenericPlugin" => "QtGui/QGenericPlugin",
+        "QGenericPluginFactory" => "QtGui/QGenericPluginFactory"
     },
     "QtWidgets" => {
         "qplatformmenu_qpa.h" => "qpa/qplatformmenu.h",