Plugins: Cleanup header include statements

Change-Id: I988304ba9bfd62a65a7d491a98f178483900ab79
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>

src/controls/plugin.cpp

@@ -39,7 +39,6 @@
 **
 ****************************************************************************/
 
-#include <qqml.h>
 #include "plugin_p.h"
 #include "qtaction_p.h"
 #include "qtexclusivegroup_p.h"
@@ -47,13 +46,13 @@
 #include "qtmenubar_p.h"
 #include "qquicklinearlayout_p.h"
 #include "qpagestatus.h"
-#include <qqmlextensionplugin.h>
 
+#include <qimage.h>
+#include <qqml.h>
 #include <qqmlengine.h>
+#include <qqmlextensionplugin.h>
 #include <qquickimageprovider.h>
-#include <QtWidgets/QApplication>
-#include <QtQuick/QQuickWindow>
-#include <QImage>
+#include <qquickwindow.h>
 
 QT_BEGIN_NAMESPACE
 

src/controls/plugin_p.h

@@ -42,9 +42,8 @@
 #ifndef QSTYLEPLUGIN_P_H
 #define QSTYLEPLUGIN_P_H
 
-#include <QQmlExtensionPlugin>
-#include <QtCore/QTimer>
-#include <QtWidgets/QFileSystemModel>
+#include <QtQml/qqmlextensionplugin.h>
+#include <QtQml/qqmlengine.h>
 
 QT_BEGIN_NAMESPACE
 

src/private/qprivateplugin.cpp

@@ -39,13 +39,14 @@
 **
 ****************************************************************************/
 
-#include <qqml.h>
 #include "qprivateplugin_p.h"
 #include "qrangemodel_p.h"
 #include "qwheelarea_p.h"
 #include "qstyleitem_p.h"
 #include "qquickcomponentsprivate_p.h"
 
+#include <qqml.h>
+
 QT_BEGIN_NAMESPACE
 
 QObject *registerPrivateModule(QQmlEngine *engine, QJSEngine *jsEngine)

src/private/qprivateplugin_p.h

@@ -42,9 +42,7 @@
 #ifndef QSTYLEPLUGIN_P_H
 #define QSTYLEPLUGIN_P_H
 
-#include <QQmlExtensionPlugin>
-#include <QtCore/QTimer>
-#include <QtWidgets/QFileSystemModel>
+#include <QtQml/qqmlextensionplugin.h>
 
 QT_BEGIN_NAMESPACE