--- qgis-3.2.0/src/core/qgswebpage.h.orig	2018-06-22 09:13:47.112198224 +0100
+++ qgis-3.2.0/src/core/qgswebpage.h	2018-06-22 09:14:15.080198914 +0100
@@ -23,7 +23,7 @@
 #include <QObject>
 
 #ifdef WITH_QTWEBKIT
-#include <QWebPage>
+#include <qwebpage.h>
 #else
 
 #include "qgswebframe.h"
--- qgis-3.2.0/src/core/qgswebframe.h.orig	2018-06-22 09:22:18.428210838 +0100
+++ qgis-3.2.0/src/core/qgswebframe.h	2018-06-22 09:22:43.752211463 +0100
@@ -21,7 +21,7 @@
 #include "qgis_core.h"
 
 #ifdef WITH_QTWEBKIT
-#include <QWebFrame>
+#include <qwebframe.h>
 #else
 
 #include <QObject>
--- qgis-3.2.0/src/core/qgswebview.h.orig	2018-06-22 09:32:42.880226243 +0100
+++ qgis-3.2.0/src/core/qgswebview.h	2018-06-22 09:33:19.564227148 +0100
@@ -22,7 +22,7 @@
 #include <QWidget>
 
 #ifdef WITH_QTWEBKIT
-#include <QWebView>
+#include <qwebview.h>
 #include <QDesktopWidget>
 
 #include "qgis_core.h"
--- qgis-3.2.0/src/gui/qgsexternalresourcewidget.cpp.orig	2018-06-22 09:34:47.640229321 +0100
+++ qgis-3.2.0/src/gui/qgsexternalresourcewidget.cpp	2018-06-22 09:35:11.820229917 +0100
@@ -24,7 +24,7 @@
 #include <QSettings>
 #include <QImageReader>
 #ifdef WITH_QTWEBKIT
-#include <QWebView>
+#include <qwebview.h>
 #endif
 
 
--- qgis-3.2.0/src/gui/qgsmaptip.cpp.orig	2018-06-22 09:37:27.820233272 +0100
+++ qgis-3.2.0/src/gui/qgsmaptip.cpp	2018-06-22 09:37:55.436233954 +0100
@@ -29,7 +29,7 @@
 #include <QLabel>
 #include <QDesktopServices>
 #if WITH_QTWEBKIT
-#include <QWebElement>
+#include <qwebelement.h>
 #endif
 #include <QHBoxLayout>
 
--- qgis-3.2.0/src/3d/qgscameracontroller.h.orig	2018-06-22 10:14:49.604288577 +0100
+++ qgis-3.2.0/src/3d/qgscameracontroller.h	2018-06-22 10:31:32.224313311 +0100
@@ -19,8 +19,8 @@
 #include "qgis_3d.h"
 
 #include <Qt3DCore/QEntity>
-#include <Qt3DInput>
-#include <Qt3DRender>
+#include <Qt3DInput/Qt3DInput>
+#include <Qt3DRender/Qt3DRender>
 
 class QDomDocument;
 class QDomElement;
--- qgis-3.2.0/src/3d/terrain/qgsdemterraintileloader_p.cpp.orig	2018-06-22 16:47:07.248059066 +0100
+++ qgis-3.2.0/src/3d/terrain/qgsdemterraintileloader_p.cpp	2018-06-22 16:48:38.440061315 +0100
@@ -24,6 +24,7 @@
 #include "qgsterraintileentity_p.h"
 
 #include <Qt3DRender/QGeometryRenderer>
+#include <Qt3DCore/QTransform>
 
 ///@cond PRIVATE
 
--- qgis-3.2.0/src/3d/terrain/qgsflatterraingenerator.cpp.orig	2018-06-22 19:23:27.576290476 +0100
+++ qgis-3.2.0/src/3d/terrain/qgsflatterraingenerator.cpp	2018-06-22 19:24:24.784291887 +0100
@@ -15,6 +15,7 @@
 
 #include "qgsflatterraingenerator.h"
 
+#include <Qt3DCore/QTransform>
 #include <Qt3DRender/QGeometryRenderer>
 #include <Qt3DExtras/QPlaneGeometry>
 
--- qgis-3.2.0/src/plugins/grass/qgsgrassmoduleinput.cpp.orig	2018-06-22 19:56:26.976339307 +0100
+++ qgis-3.2.0/src/plugins/grass/qgsgrassmoduleinput.cpp	2018-06-22 19:58:41.072342615 +0100
@@ -14,6 +14,7 @@
  *                                                                         *
  ***************************************************************************/
 
+#include <QHeaderView>
 #include <QCompleter>
 #include <QFileDialog>
 #include <QFileInfo>
--- qgis-3.2.0/src/plugins/grass/qgsgrassregion.cpp.orig	2018-06-22 20:01:54.316347383 +0100
+++ qgis-3.2.0/src/plugins/grass/qgsgrassregion.cpp	2018-06-22 20:04:49.124351695 +0100
@@ -25,6 +25,8 @@
 #include "qgsmaptool.h"
 #include "qgsexception.h"
 
+#include <QDoubleValidator>
+#include <QIntValidator>
 #include <QButtonGroup>
 #include <QColorDialog>
 #include <QMessageBox>