Clean headers in the Direct2D plugin.

Change-Id: Iab85ccdf49ee81214ada87a2e476f650b39a29ce
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

8 files changed, 21 insertions, 13 deletions

diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dbackingstore.cpp b/src/plugins/platforms/direct2d/qwindowsdirect2dbackingstore.cpp
index 272480e25f..9dc94df451 100644
--- a/src/plugins/platforms/direct2d/qwindowsdirect2dbackingstore.cpp
+++ b/src/plugins/platforms/direct2d/qwindowsdirect2dbackingstore.cpp
@@ -32,6 +32,7 @@
 ****************************************************************************/
 
 #include "qwindowsdirect2dbackingstore.h"
+#include "qwindowsdirect2dplatformpixmap.h"
 #include "qwindowsdirect2dintegration.h"
 #include "qwindowsdirect2dcontext.h"
 #include "qwindowsdirect2dpaintdevice.h"
diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dbackingstore.h b/src/plugins/platforms/direct2d/qwindowsdirect2dbackingstore.h
index 3687f47f4d..1c7f65a12d 100644
--- a/src/plugins/platforms/direct2d/qwindowsdirect2dbackingstore.h
+++ b/src/plugins/platforms/direct2d/qwindowsdirect2dbackingstore.h
@@ -34,11 +34,7 @@
 #ifndef QWINDOWSDIRECT2DBACKINGSTORE_H
 #define QWINDOWSDIRECT2DBACKINGSTORE_H
 
-#include "qwindowsdirect2dplatformpixmap.h"
-
-#include <QtCore/QScopedPointer>
 #include <QtGui/qpa/qplatformbackingstore.h>
-#include <QtGui/QPixmap>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dbitmap.h b/src/plugins/platforms/direct2d/qwindowsdirect2dbitmap.h
index 22c81cf658..a6ae6d76d8 100644
--- a/src/plugins/platforms/direct2d/qwindowsdirect2dbitmap.h
+++ b/src/plugins/platforms/direct2d/qwindowsdirect2dbitmap.h
@@ -34,8 +34,9 @@
 #ifndef QWINDOWSDIRECT2DBITMAP_H
 #define QWINDOWSDIRECT2DBITMAP_H
 
+#include <QtCore/qnamespace.h>
+#include <QtCore/QRect>
 #include <QtCore/QScopedPointer>
-#include <QtGui/QImage>
 
 struct ID2D1DeviceContext;
 struct ID2D1Bitmap1;
@@ -44,6 +45,11 @@ QT_BEGIN_NAMESPACE
 
 class QWindowsDirect2DDeviceContext;
 class QWindowsDirect2DBitmapPrivate;
+
+class QImage;
+class QSize;
+class QColor;
+
 class QWindowsDirect2DBitmap
 {
     Q_DECLARE_PRIVATE(QWindowsDirect2DBitmap)
diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2ddevicecontext.h b/src/plugins/platforms/direct2d/qwindowsdirect2ddevicecontext.h
index e7c920cf53..312955b54a 100644
--- a/src/plugins/platforms/direct2d/qwindowsdirect2ddevicecontext.h
+++ b/src/plugins/platforms/direct2d/qwindowsdirect2ddevicecontext.h
@@ -34,8 +34,6 @@
 #ifndef QWINDOWSDIRECT2DDEVICECONTEXT_H
 #define QWINDOWSDIRECT2DDEVICECONTEXT_H
 
-#include "qwindowsdirect2dhelpers.h"
-
 #include <QtCore/QScopedPointer>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.cpp b/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.cpp
index 36cfff43f5..d439196dc1 100644
--- a/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.cpp
+++ b/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.cpp
@@ -51,6 +51,10 @@
 #include <QtGui/private/qfontengine_p.h>
 #include <QtGui/private/qstatictext_p.h>
 
+#include <d2d1_1.h>
+#include <dwrite_1.h>
+#include <wrl.h>
+
 using Microsoft::WRL::ComPtr;
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.h b/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.h
index a75c0b6cc7..5e0f0b4b97 100644
--- a/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.h
+++ b/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.h
@@ -37,9 +37,7 @@
 #include <QtCore/QScopedPointer>
 #include <QtGui/private/qpaintengineex_p.h>
 
-#include <d2d1_1.h>
-#include <dwrite_1.h>
-#include <wrl.h>
+struct ID2D1Geometry;
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dwindow.cpp b/src/plugins/platforms/direct2d/qwindowsdirect2dwindow.cpp
index 414d2fb36e..e762eab711 100644
--- a/src/plugins/platforms/direct2d/qwindowsdirect2dwindow.cpp
+++ b/src/plugins/platforms/direct2d/qwindowsdirect2dwindow.cpp
@@ -32,6 +32,7 @@
 ****************************************************************************/
 
 #include "qwindowsdirect2dcontext.h"
+#include "qwindowsdirect2dbitmap.h"
 #include "qwindowsdirect2dwindow.h"
 #include "qwindowsdirect2ddevicecontext.h"
 #include "qwindowsdirect2dhelpers.h"
@@ -39,6 +40,8 @@
 
 #include <d3d11.h>
 #include <d2d1_1.h>
+#include <dxgi1_2.h>
+
 using Microsoft::WRL::ComPtr;
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dwindow.h b/src/plugins/platforms/direct2d/qwindowsdirect2dwindow.h
index 0c0240b1dc..707305a515 100644
--- a/src/plugins/platforms/direct2d/qwindowsdirect2dwindow.h
+++ b/src/plugins/platforms/direct2d/qwindowsdirect2dwindow.h
@@ -35,13 +35,15 @@
 #define QWINDOWSDIRECT2DWINDOW_H
 
 #include "qwindowswindow.h"
-#include "qwindowsdirect2dbitmap.h"
-
-#include <dxgi1_2.h>
 #include <wrl.h>
 
+struct IDXGISwapChain1;
+struct ID2D1DeviceContext;
+
 QT_BEGIN_NAMESPACE
 
+class QWindowsDirect2DBitmap;
+
 class QWindowsDirect2DWindow : public QWindowsWindow
 {
 public: