Rework includes to forward declare as much as possible

Should speed up recompilation when headers change

src/analysis/interpolation/Bezier3D.cc

@@ -16,7 +16,8 @@
 
 #include "Bezier3D.h"
 #include "qgslogger.h"
-
+#include "Vector3D.h"
+#include "MathUtils.h"
 
 void Bezier3D::calcFirstDer( float t, Vector3D* v )
 {

src/analysis/interpolation/Bezier3D.h

@@ -18,8 +18,6 @@
 #define BEZIER3D_H
 
 #include "ParametricLine.h"
-#include "Vector3D.h"
-#include "MathUtils.h"
 #include "qgslogger.h"
 
 /** \ingroup analysis

src/analysis/interpolation/CloughTocherInterpolator.cc

@@ -16,7 +16,8 @@
 
 #include "CloughTocherInterpolator.h"
 #include "qgslogger.h"
-
+#include "MathUtils.h"
+#include "NormVecDecorator.h"
 #include <qmath.h>
 
 CloughTocherInterpolator::CloughTocherInterpolator()

src/analysis/interpolation/CloughTocherInterpolator.h

@@ -17,12 +17,10 @@
 #ifndef CLOUGHTOCHERINTERPOLATOR_H
 #define CLOUGHTOCHERINTERPOLATOR_H
 
-#include "NormVecDecorator.h"
 #include "TriangleInterpolator.h"
 #include "Point3D.h"
-#include "Vector3D.h"
-#include "MathUtils.h"
-#include "Bezier3D.h"
+
+class NormVecDecorator;
 
 /** \ingroup analysis
  * This is an implementation of a Clough-Tocher interpolator based on a triangular tessellation. The derivatives orthogonal to the boundary curves are interpolated linearly along a triangle edge.*/

src/analysis/interpolation/DualEdgeTriangulation.cc

@@ -17,6 +17,8 @@
 
 #include "DualEdgeTriangulation.h"
 #include <map>
+#include "Line3D.h"
+#include "MathUtils.h"
 #include "qgsgeometry.h"
 #include "qgslogger.h"
 #include "qgsvectorfilewriter.h"

src/analysis/interpolation/DualEdgeTriangulation.h

@@ -22,8 +22,6 @@
 #include <QVector>
 #include <QList>
 #include <QSet>
-#include "MathUtils.h"
-#include "TriangleInterpolator.h"
 #include <QColor>
 #include <QFile>
 #include <QTextStream>

src/analysis/interpolation/Line3D.h

@@ -17,7 +17,6 @@
 #ifndef LINE3D_H
 #define LINE3D_H
 
-#include "Point3D.h"
 #include "Node.h"
 
 /** \ingroup analysis

src/analysis/interpolation/MathUtils.cc

@@ -16,6 +16,9 @@
 
 #include "MathUtils.h"
 #include "qgslogger.h"
+#include "Point3D.h"
+#include "Vector3D.h"
+
 #include <qmath.h>
 
 bool MathUtils::calcBarycentricCoordinates( double x, double y, Point3D* p1, Point3D* p2, Point3D* p3, Point3D* result )

src/analysis/interpolation/MathUtils.h

@@ -18,9 +18,9 @@
 #define MATHUTILS_H
 
 #include <cmath>
-#include "Vector3D.h"
-#include "Point3D.h"
 
+class Point3D;
+class Vector3D;
 
 namespace MathUtils
 {

src/analysis/interpolation/NormVecDecorator.h

@@ -21,6 +21,7 @@
 #include <TriangleInterpolator.h>
 #include <MathUtils.h>
 #include "qgslogger.h"
+
 class QProgressDialog;
 
 /** \ingroup analysis

src/analysis/interpolation/ParametricLine.h

@@ -18,9 +18,10 @@
 #define PARAMETRICLINE_H
 
 #include "Point3D.h"
-#include "Vector3D.h"
 #include <QVector>
 
+class Vector3D;
+
 /** \ingroup analysis
  * ParametricLine is an Interface for parametric lines. It is possible, that a parametric line is composed of several parametric
  * lines (see the composite pattern in Gamma et al. 'Design Patterns'). Do not build instances of it since it is an abstract class.*/

src/analysis/interpolation/Triangulation.h

@@ -18,11 +18,11 @@
 #define TRIANGULATION_H
 
 #include <QList>
-#include "Line3D.h"
-#include "Vector3D.h"
 #include <qpainter.h>
 #include <TriangleInterpolator.h>
 
+class Line3D;
+
 /** \ingroup analysis
  * Interface for Triangulation classes*/
 class ANALYSIS_EXPORT Triangulation

src/analysis/interpolation/qgsinterpolator.cpp

@@ -16,6 +16,7 @@
  ***************************************************************************/
 
 #include "qgsinterpolator.h"
+#include "qgsfeatureiterator.h"
 #include "qgsvectordataprovider.h"
 #include "qgsvectorlayer.h"
 #include "qgsgeometry.h"

src/analysis/interpolation/qgstininterpolator.cpp

@@ -16,10 +16,12 @@
  ***************************************************************************/
 
 #include "qgstininterpolator.h"
+#include "qgsfeatureiterator.h"
 #include "CloughTocherInterpolator.h"
 #include "DualEdgeTriangulation.h"
 #include "NormVecDecorator.h"
 #include "LinTriangleInterpolator.h"
+#include "Line3D.h"
 #include "Point3D.h"
 #include "qgsfeature.h"
 #include "qgsgeometry.h"

src/analysis/network/qgslinevectorlayerdirector.cpp

@@ -18,6 +18,7 @@
 #include "qgsgraphbuilderintr.h"
 
 // Qgis includes
+#include "qgsfeatureiterator.h"
 #include <qgsvectorlayer.h>
 #include <qgsvectordataprovider.h>
 #include <qgspoint.h>

src/analysis/raster/qgsrastercalcnode.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 #include "qgsrastercalcnode.h"
 #include "qgsrasterblock.h"
+#include "qgsrastermatrix.h"
 #include <cfloat>
 
 QgsRasterCalcNode::QgsRasterCalcNode()

src/analysis/raster/qgsrastercalcnode.h

@@ -19,11 +19,11 @@
 #ifndef QGSRASTERCALCNODE_H
 #define QGSRASTERCALCNODE_H
 
-#include "qgsrastermatrix.h"
 #include <QMap>
 #include <QString>
 
 class QgsRasterBlock;
+class QgsRasterMatrix;
 
 /** \ingroup analysis
  * \class QgsRasterCalcNode

src/analysis/raster/qgsrastercalculator.cpp

@@ -17,8 +17,11 @@
 
 #include "qgsrastercalculator.h"
 #include "qgsrastercalcnode.h"
+#include "qgsrasterdataprovider.h"
+#include "qgsrasterinterface.h"
 #include "qgsrasterlayer.h"
 #include "qgsrastermatrix.h"
+#include "qgsrasterprojector.h"
 
 #include <QProgressDialog>
 #include <QFile>

src/analysis/raster/qgsrastercalculator.h

@@ -18,7 +18,6 @@
 #ifndef QGSRASTERCALCULATOR_H
 #define QGSRASTERCALCULATOR_H
 
-#include "qgsfield.h"
 #include "qgsrectangle.h"
 #include "qgscoordinatereferencesystem.h"
 #include <QString>

src/analysis/vector/qgsgeometryanalyzer.cpp

@@ -20,12 +20,14 @@
 #include "qgsapplication.h"
 #include "qgsfield.h"
 #include "qgsfeature.h"
+#include "qgsfeatureiterator.h"
 #include "qgslogger.h"
 #include "qgscoordinatereferencesystem.h"
 #include "qgsvectorfilewriter.h"
 #include "qgsvectordataprovider.h"
 #include "qgsdistancearea.h"
 #include "qgis.h"
+#include "qgsvectorlayer.h"
 
 #include <QProgressDialog>
 

src/analysis/vector/qgsgeometryanalyzer.h

@@ -18,15 +18,13 @@
 #ifndef QGSGEOMETRYANALYZERH
 #define QGSGEOMETRYANALYZERH
 
-#include "qgsvectorlayer.h"
-#include "qgsfield.h"
 #include "qgsfeature.h"
 #include "qgsgeometry.h"
-#include "qgsdistancearea.h"
 
 class QgsVectorFileWriter;
 class QProgressDialog;
-
+class QgsVectorDataProvider;
+class QgsDistanceArea;
 
 /** \ingroup analysis
  * The QGis class provides vector geometry analysis functions

src/analysis/vector/qgsoverlayanalyzer.cpp

@@ -18,10 +18,13 @@
 #include "qgsoverlayanalyzer.h"
 
 #include "qgsapplication.h"
+#include "qgsfeatureiterator.h"
 #include "qgsfield.h"
 #include "qgsfeature.h"
+#include "qgsgeometry.h"
 #include "qgslogger.h"
 #include "qgscoordinatereferencesystem.h"
+#include "qgsspatialindex.h"
 #include "qgsvectorfilewriter.h"
 #include "qgsvectordataprovider.h"
 #include "qgsdistancearea.h"

src/analysis/vector/qgsoverlayanalyzer.h

@@ -19,15 +19,10 @@
 #define QGSOVERLAYANALYZERH
 
 #include "qgsvectorlayer.h"
-#include "qgsfield.h"
-#include "qgsspatialindex.h"
-#include "qgsfeature.h"
-#include "qgsgeometry.h"
-#include "qgsdistancearea.h"
 
 class QgsVectorFileWriter;
 class QProgressDialog;
-
+class QgsSpatialIndex;
 
 /** \ingroup analysis
  * The QGis class provides vector overlay analysis functions

src/analysis/vector/qgspointsample.cpp

@@ -13,6 +13,7 @@
  *                                                                         *
  ***************************************************************************/
 #include "qgspointsample.h"
+#include "qgsfeatureiterator.h"
 #include "qgsgeometry.h"
 #include "qgsspatialindex.h"
 #include "qgsvectorfilewriter.h"

src/analysis/vector/qgstransectsample.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 #include "qgstransectsample.h"
 #include "qgsdistancearea.h"
+#include "qgsfeatureiterator.h"
 #include "qgsgeometry.h"
 #include "qgsspatialindex.h"
 #include "qgsvectorfilewriter.h"

src/analysis/vector/qgszonalstatistics.cpp

@@ -16,6 +16,7 @@
  ***************************************************************************/
 
 #include "qgszonalstatistics.h"
+#include "qgsfeatureiterator.h"
 #include "qgsgeometry.h"
 #include "qgsvectordataprovider.h"
 #include "qgsvectorlayer.h"

src/analysis/vector/qgszonalstatistics.h

@@ -18,12 +18,15 @@
 #ifndef QGSZONALSTATISTICS_H
 #define QGSZONALSTATISTICS_H
 
-#include "qgsrectangle.h"
 #include <QString>
+#include <QMap>
+#include <limits>
+#include <cfloat>
 
 class QgsGeometry;
 class QgsVectorLayer;
 class QProgressDialog;
+class QgsRectangle;
 
 /** \ingroup analysis
  *  A class that calculates raster statistics (count, sum, mean) for a polygon or multipolygon layer and appends the results as attributes*/

src/app/composer/qgsatlascompositionwidget.cpp

@@ -24,6 +24,7 @@
 #include "qgsmaplayerproxymodel.h"
 #include "qgsexpressionbuilderdialog.h"
 #include "qgscomposermap.h"
+#include "qgsvectorlayer.h"
 
 static QgsExpressionContext _getExpressionContext( const void* context )
 {

src/app/composer/qgsatlascompositionwidget.h

@@ -15,7 +15,6 @@
  ***************************************************************************/
 
 #include "ui_qgsatlascompositionwidgetbase.h"
-#include "qgsvectorlayer.h"
 
 class QgsComposition;
 class QgsMapLayer;

src/app/composer/qgsattributeselectiondialog.cpp

@@ -16,6 +16,7 @@
  ***************************************************************************/
 
 #include "qgsattributeselectiondialog.h"
+#include "qgscomposerattributetable.h"
 #include "qgscomposerattributetablev2.h"
 #include "qgscomposerattributetablemodel.h"
 #include "qgscomposerattributetablemodelv2.h"

src/app/composer/qgscomposer.cpp

@@ -26,6 +26,7 @@
 #include "qgscomposition.h"
 #include "qgscompositionwidget.h"
 #include "qgscomposermodel.h"
+#include "qgsdockwidget.h"
 #include "qgsatlascompositionwidget.h"
 #include "qgscomposerarrow.h"
 #include "qgscomposerpolygon.h"
@@ -65,6 +66,7 @@
 #include "qgspaperitem.h"
 #include "qgsmaplayerregistry.h"
 #include "qgsprevieweffect.h"
+#include "qgsvectorlayer.h"
 #include "qgscomposerimageexportoptionsdialog.h"
 #include "ui_qgssvgexportoptions.h"
 

src/app/composer/qgscomposer.h

@@ -17,9 +17,6 @@
 #ifndef QGSCOMPOSER_H
 #define QGSCOMPOSER_H
 #include "ui_qgscomposerbase.h"
-#include "qgscomposermap.h"
-#include "qgscontexthelp.h"
-#include "qgsdockwidget.h"
 
 class QgisApp;
 class QgsComposerArrow;
@@ -41,10 +38,17 @@ class QgsComposition;
 class QgsMapCanvas;
 class QgsAtlasComposition;
 class QgsMapLayerAction;
+class QgsComposerMap;
+class QgsComposerItem;
+class QgsDockWidget;
+class QgsMapLayer;
+class QgsFeature;
+class QgsVectorLayer;
 
 class QGridLayout;
 class QDomNode;
 class QDomDocument;
+class QDomElement;
 class QMoveEvent;
 class QResizeEvent;
 class QFile;

src/app/composer/qgscomposerattributetablewidget.cpp

@@ -16,6 +16,8 @@
  ***************************************************************************/
 
 #include "qgscomposerattributetablewidget.h"
+#include "qgsatlascomposition.h"
+#include "qgscomposition.h"
 #include "qgscomposerframe.h"
 #include "qgsattributeselectiondialog.h"
 #include "qgscomposeritemwidget.h"

src/app/composer/qgscomposerimageexportoptionsdialog.cpp

@@ -16,6 +16,7 @@
  ***************************************************************************/
 
 #include "qgscomposerimageexportoptionsdialog.h"
+#include "qgis.h"
 #include <QSettings>
 #include <QCheckBox>
 #include <QPushButton>

src/app/composer/qgscomposerimageexportoptionsdialog.h

@@ -20,7 +20,6 @@
 
 #include <QDialog>
 #include "ui_qgscomposerimageexportoptions.h"
-#include "qgscomposertablev2.h"
 
 
 /** A dialog for customising the properties of an exported image file.

src/app/composer/qgscomposerlabelwidget.cpp

@@ -20,6 +20,7 @@
 #include "qgscomposeritemwidget.h"
 #include "qgscomposition.h"
 #include "qgsexpressionbuilderdialog.h"
+#include "qgisgui.h"
 
 #include <QColorDialog>
 #include <QFontDialog>

src/app/composer/qgscomposerlegendlayersdialog.cpp

@@ -15,6 +15,7 @@
 #include "qgscomposerlegendlayersdialog.h"
 
 #include <QStandardItem>
+#include "qgsmaplayer.h"
 
 QgsComposerLegendLayersDialog::QgsComposerLegendLayersDialog( QList<QgsMapLayer*> layers, QWidget* parent ): QDialog( parent )
 {

src/app/composer/qgscomposerlegendlayersdialog.h

@@ -16,7 +16,8 @@
 #define QGSCOMPOSERLEGENDLAYERSDIALOG_H
 
 #include "ui_qgscomposerlegendlayersdialogbase.h"
-#include "qgsmaplayer.h"
+
+class QgsMapLayer;
 
 /** \ingroup app
  * A dialog to add new layers to the legend.

src/app/composer/qgscomposermapwidget.cpp

@@ -18,6 +18,7 @@
 #include "qgisapp.h"
 #include "qgsapplication.h"
 #include "qgsmapcanvas.h"
+#include "qgscomposermap.h"
 #include "qgscomposermapgrid.h"
 #include "qgscomposermapoverview.h"
 #include "qgscomposermapwidget.h"

src/app/composer/qgscomposermapwidget.h

@@ -19,11 +19,11 @@
 #define QGSCOMPOSERMAPWIDGET_H
 
 #include "ui_qgscomposermapwidgetbase.h"
-#include "qgscomposermap.h"
-#include "qgscomposermapgrid.h"
 #include "qgscomposeritemwidget.h"
+#include "qgscomposermapgrid.h"
 
 class QgsMapLayer;
+class QgsComposerMapOverview;
 
 /** \ingroup app
  * Input widget for the configuration of QgsComposerMap

src/app/composer/qgscomposerscalebarwidget.cpp

@@ -19,6 +19,7 @@
 #include "qgscomposermap.h"
 #include "qgscomposerscalebar.h"
 #include "qgscomposition.h"
+#include "qgisgui.h"
 #include <QColorDialog>
 #include <QFontDialog>
 #include <QWidget>

src/app/composer/qgscomposertablewidget.cpp

@@ -21,6 +21,7 @@
 #include "qgscomposerattributetable.h"
 #include "qgscomposertablecolumn.h"
 #include "qgscomposermap.h"
+#include "qgscomposition.h"
 #include "qgsmaplayerregistry.h"
 #include "qgsvectorlayer.h"
 #include "qgsexpressionbuilderdialog.h"

src/app/composer/qgscompositionwidget.h

@@ -15,7 +15,6 @@
  ***************************************************************************/
 
 #include "ui_qgscompositionwidgetbase.h"
-#include "qgscomposeritem.h"
 
 class QgsComposition;
 class QgsComposerMap;

src/app/gps/qgsgpsmarker.cpp

@@ -20,6 +20,7 @@
 #include "qgsmapcanvas.h"
 #include "qgsmaprenderer.h"
 #include "qgscrscache.h"
+#include "qgscsexception.h"
 
 QgsGpsMarker::QgsGpsMarker( QgsMapCanvas* mapCanvas )
     : QgsMapCanvasItem( mapCanvas )

src/app/nodetool/qgsmaptoolnodetool.cpp

@@ -19,6 +19,7 @@
 #include "nodetool/qgsvertexentry.h"
 #include "nodetool/qgsnodeeditor.h"
 
+#include "qgsfeatureiterator.h"
 #include "qgisapp.h"
 #include "qgslayertreeview.h"
 #include "qgslogger.h"

src/app/nodetool/qgsselectedfeature.cpp

@@ -16,6 +16,7 @@
 #include "nodetool/qgsselectedfeature.h"
 #include "nodetool/qgsvertexentry.h"
 
+#include "qgsfeatureiterator.h"
 #include "qgspointv2.h"
 #include <qgslogger.h>
 #include <qgsvertexmarker.h>

src/app/ogr/qgsvectorlayersaveasdialog.h

@@ -21,8 +21,11 @@
 #include <ui_qgsvectorlayersaveasdialogbase.h>
 #include <QDialog>
 #include "qgscontexthelp.h"
+#include "qgsfield.h"
 #include "qgsvectorfilewriter.h"
 
+class QgsVectorLayer;
+
 /**
  *  Class to select destination file, type and CRS for ogr layers
  */

src/app/pluginmanager/qgsapppluginmanagerinterface.cpp

@@ -15,6 +15,7 @@
  ***************************************************************************/
 
 #include "qgsapppluginmanagerinterface.h"
+#include "qgspluginmanager.h"
 #include <qgslogger.h>
 
 

src/app/pluginmanager/qgsapppluginmanagerinterface.h

@@ -18,7 +18,8 @@
 #define QGSPLUGINMANAGERAPPIFACE_H
 
 #include "qgspluginmanagerinterface.h"
-#include "qgspluginmanager.h"
+
+class QgsPluginManager;
 
 /** \ingroup gui
  * QgsPluginManagerInterface

src/app/pluginmanager/qgspluginmanager.cpp

@@ -38,6 +38,7 @@
 #include "qgsconfig.h"
 #include "qgsproviderregistry.h"
 #include "qgspluginregistry.h"
+#include "qgspluginsortfilterproxymodel.h"
 #include "qgspythonrunner.h"
 #include "qgspluginmanager.h"
 #include "qgisplugin.h"

src/app/pluginmanager/qgspluginmanager.h

@@ -27,9 +27,10 @@
 #include "qgsoptionsdialogbase.h"
 #include "qgisgui.h"
 #include "qgscontexthelp.h"
-#include "qgspythonutils.h"
-#include "qgspluginsortfilterproxymodel.h"
 #include "qgsmessagebar.h"
+#include "qgspythonutils.h"
+
+class QgsPluginSortFilterProxyModel;
 
 const int PLUGMAN_TAB_ALL = 0;
 const int PLUGMAN_TAB_INSTALLED = 1;

src/app/qgisapp.cpp

@@ -109,6 +109,7 @@
 #include "qgsapplication.h"
 #include "qgsactionmanager.h"
 #include "qgsattributetabledialog.h"
+#include "qgsattributedialog.h"
 #include "qgsauthmanager.h"
 #include "qgsauthguiutils.h"
 #ifndef QT_NO_OPENSSL
@@ -190,6 +191,7 @@
 #include "qgspluginmanager.h"
 #include "qgspluginregistry.h"
 #include "qgspoint.h"
+#include "qgsruntimeprofiler.h"
 #include "qgshandlebadlayers.h"
 #include "qgsproject.h"
 #include "qgsprojectlayergroupdialog.h"
@@ -206,6 +208,7 @@
 #include "qgsbrightnesscontrastfilter.h"
 #include "qgsrasterrenderer.h"
 #include "qgsrasterlayersaveasdialog.h"
+#include "qgsrasterprojector.h"
 #include "qgsrectangle.h"
 #include "qgsscalevisibilitydialog.h"
 #include "qgsgroupwmsdatadialog.h"

src/app/qgisapp.h

@@ -74,7 +74,14 @@ class QgsUserInputDockWidget;
 class QgsVectorLayer;
 class QgsVectorLayerTools;
 class QgsWelcomePage;
-
+class QgsRasterLayer;
+class QgsPluginLayer;
+class QgsCoordinateReferenceSystem;
+class QgsFeatureStore;
+class QgsAuthManager;
+class QgsPluginManager;
+class QgsRuntimeProfiler;
+class QgsBookmarks;
 
 class QDomDocument;
 class QNetworkReply;
@@ -106,20 +113,15 @@ class QgsDiagramProperties;
 #include <QPointer>
 #include <QSslError>
 #include <QDateTime>
+#include <QStackedWidget>
 
 #include "qgsauthmanager.h"
 #include "qgsconfig.h"
 #include "qgsfeature.h"
-#include "qgsfeaturestore.h"
 #include "qgspoint.h"
-#include "qgsrasterlayer.h"
-#include "qgssnappingdialog.h"
-#include "qgspluginmanager.h"
 #include "qgsmessagebar.h"
-#include "qgsbookmarks.h"
 #include "qgswelcomepageitemsmodel.h"
-#include "qgsruntimeprofiler.h"
-
+#include "qgsraster.h"
 
 #include "ui_qgisapp.h"
 

src/app/qgsaddtaborgroup.cpp

@@ -24,6 +24,7 @@
 #include <QTreeWidgetItem>
 #include <QComboBox>
 #include <QRadioButton>
+#include <QSettings>
 
 QgsAddTabOrGroup::QgsAddTabOrGroup( QgsVectorLayer *lyr, const QList < TabPair >& tabList, QWidget * parent )
     : QDialog( parent )

src/app/qgsattributeactiondialog.cpp

@@ -27,6 +27,7 @@ back to QgsVectorLayer.
 #include "qgisapp.h"
 #include "qgsproject.h"
 #include "qgsmapcanvas.h"
+#include "qgsvectorlayer.h"
 
 #include <QFileDialog>
 #include <QHeaderView>

src/app/qgsattributeactiondialog.h

@@ -24,11 +24,13 @@ back to QgsVectorLayer.
 #define QGSATTRIBUTEACTIONDIALOG_H
 
 #include "ui_qgsattributeactiondialogbase.h"
-#include "qgsactionmanager.h"
-#include "qgsfield.h"
 #include "qgsattributetableconfig.h"
+#include "qgsaction.h"
 #include <QMap>
 
+class QgsActionManager;
+class QgsVectorLayer;
+
 class APP_EXPORT QgsAttributeActionDialog: public QWidget, private Ui::QgsAttributeActionDialogBase
 {
     Q_OBJECT

src/app/qgsattributeactionpropertiesdialog.cpp

@@ -19,6 +19,7 @@
 #include "qgisapp.h"
 #include "qgsmapcanvas.h"
 #include "qgsproject.h"
+#include "qgsvectorlayer.h"
 
 #include <QComboBox>
 #include <QLineEdit>

src/app/qgsattributetabledialog.cpp

@@ -23,6 +23,7 @@
 #include "qgsattributetablefiltermodel.h"
 #include "qgsattributetableview.h"
 
+
 #include "qgsapplication.h"
 #include "qgsvectorlayer.h"
 #include "qgsvectordataprovider.h"
@@ -32,6 +33,7 @@
 #include "qgsaddattrdialog.h"
 #include "qgsdelattrdialog.h"
 #include "qgsdockwidget.h"
+#include "qgsfeatureiterator.h"
 #include "qgssearchquerybuilder.h"
 #include "qgslogger.h"
 #include "qgsmapcanvas.h"

src/app/qgsattributetabledialog.h

@@ -24,10 +24,6 @@
 #include <time.h>
 
 #include "ui_qgsattributetabledialog.h"
-#include "qgscontexthelp.h"
-
-#include "qgsattributedialog.h"
-#include "qgsvectorlayer.h" //QgsFeatureIds
 #include "qgssearchwidgetwrapper.h"
 #include "qgsdockwidget.h"
 

src/app/qgsattributetypedialog.h

@@ -19,9 +19,8 @@
 
 #include "ui_qgsattributetypeedit.h"
 
-#include "qgsvectorlayer.h"
 #include "qgseditorconfigwidget.h"
-
+#include "qgsvectorlayer.h"
 class QDialog;
 class QLayout;
 class QgsField;

src/app/qgsbookmarks.cpp

@@ -34,7 +34,7 @@
 #include <QSqlQuery>
 #include <QModelIndex>
 #include <QAbstractTableModel>
-
+#include <QToolButton>
 
 QgsBookmarks::QgsBookmarks( QWidget *parent )
     : QgsDockWidget( parent )

src/app/qgsbookmarks.h

@@ -21,7 +21,6 @@
 #include <QScopedPointer>
 
 #include "ui_qgsbookmarksbase.h"
-#include "qgscontexthelp.h"
 #include "qgsdockwidget.h"
 
 /*

src/app/qgsclipboard.cpp

@@ -28,6 +28,7 @@
 
 #include "qgsclipboard.h"
 #include "qgsfeature.h"
+#include "qgsfeaturestore.h"
 #include "qgsfield.h"
 #include "qgsgeometry.h"
 #include "qgscoordinatereferencesystem.h"

src/app/qgsclipboard.h

@@ -24,7 +24,6 @@
 
 #include "qgsfield.h"
 #include "qgsfeature.h"
-#include "qgsfeaturestore.h"
 #include "qgscoordinatereferencesystem.h"
 
 /**
@@ -43,6 +42,7 @@
 */
 
 class QgsVectorLayer;
+class QgsFeatureStore;
 
 /*
  * Constants used to describe copy-paste MIME types

src/app/qgsdecorationitem.h

@@ -19,8 +19,7 @@
 #define QGSDECORATIONITEM_H
 
 #include <QObject>
-#include "qgslogger.h"
-#include "qgssymbollayerv2.h"
+#include "qgssymbolv2.h"
 
 class QPainter;
 

src/app/qgsdecorationnortharrow.cpp

@@ -32,6 +32,7 @@ email                : tim@linfiniti.com
 #include "qgsmapcanvas.h"
 #include "qgsmaprenderer.h"
 #include "qgscrscache.h"
+#include "qgscsexception.h"
 
 // qt includes
 #include <QPainter>

src/app/qgsdiagramproperties.cpp

@@ -33,6 +33,8 @@
 #include "qgisgui.h"
 #include "qgssymbolv2selectordialog.h"
 #include "qgsstylev2.h"
+#include "qgsmapcanvas.h"
+#include "qgsexpressionbuilderdialog.h"
 
 #include <QList>
 #include <QMessageBox>

src/app/qgsdisplayangle.cpp

@@ -17,7 +17,7 @@
 #include "qgsmapcanvas.h"
 #include "qgslogger.h"
 #include "qgsunittypes.h"
-
+#include "qgsmaptoolmeasureangle.h"
 #include <QSettings>
 #include <cmath>
 

src/app/qgsdisplayangle.h

@@ -16,9 +16,10 @@
 #ifndef QGSDISPLAYANGLE_H
 #define QGSDISPLAYANGLE_H
 
-#include "qgsmaptoolmeasureangle.h"
 #include "ui_qgsdisplayanglebase.h"
 
+class QgsMapToolMeasureAngle;
+
 /** A class that displays results of angle measurements with the proper unit*/
 class APP_EXPORT QgsDisplayAngle: public QDialog, private Ui::QgsDisplayAngleBase
 {

src/app/qgsdxfexportdialog.h

@@ -19,8 +19,8 @@
 #define QGSDXFEXPORTDIALOG_H
 
 #include "ui_qgsdxfexportdialogbase.h"
-#include "qgsdxfexport.h"
 #include "qgslayertreemodel.h"
+#include "qgsdxfexport.h"
 
 #include <QList>
 #include <QPair>

src/app/qgsfeatureaction.cpp

@@ -26,6 +26,8 @@
 #include "qgsproject.h"
 #include "qgsvectordataprovider.h"
 #include "qgsvectorlayer.h"
+#include "qgsactionmanager.h"
+#include "qgsaction.h"
 
 #include <QPushButton>
 #include <QSettings>

src/app/qgsfeatureaction.h

@@ -18,7 +18,6 @@
 #define QGSFEATUREACTION_H
 
 #include "qgsfeature.h"
-#include "qgsvectorlayertools.h"
 
 #include <QList>
 #include <QPair>

src/app/qgsfieldcalculator.cpp

@@ -17,6 +17,7 @@
 #include "qgsfieldcalculator.h"
 #include "qgsdistancearea.h"
 #include "qgsexpression.h"
+#include "qgsfeatureiterator.h"
 #include "qgsmapcanvas.h"
 #include "qgsproject.h"
 #include "qgsvectordataprovider.h"

src/app/qgsfieldcalculator.h

@@ -18,6 +18,7 @@
 
 #include "ui_qgsfieldcalculatorbase.h"
 #include "qgscontexthelp.h"
+#include "qgsfield.h"
 
 class QgsVectorLayer;
 

src/app/qgsformannotationdialog.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 #include "qgsformannotationdialog.h"
 #include "qgsannotationwidget.h"
+#include "qgsformannotationitem.h"
 #include "qgsvectorlayer.h"
 #include <QFileDialog>
 #include <QFileInfo>

src/app/qgsformannotationdialog.h

@@ -16,9 +16,9 @@
 #define QGSFORMANNOTATIONDIALOG_H
 
 #include "ui_qgsformannotationdialogbase.h"
-#include "qgsformannotationitem.h"
 
 class QgsAnnotationWidget;
+class QgsFormAnnotationItem;
 
 class APP_EXPORT QgsFormAnnotationDialog: public QDialog, private Ui::QgsFormAnnotationDialogBase
 {

src/app/qgshandlebadlayers.cpp

@@ -18,6 +18,7 @@
 #include "qgshandlebadlayers.h"
 #include "qgisapp.h"
 #include "qgsauthconfigselect.h"
+#include "qgsdataprovider.h"
 #include "qgisgui.h"
 #include "qgsdatasourceuri.h"
 #include "qgslogger.h"

src/app/qgshtmlannotationdialog.cpp

@@ -13,6 +13,7 @@
  *                                                                         *
  ***************************************************************************/
 #include "qgshtmlannotationdialog.h"
+#include "qgshtmlannotationitem.h"
 #include "qgsannotationwidget.h"
 #include "qgsvectorlayer.h"
 #include <QFileDialog>

src/app/qgshtmlannotationdialog.h

@@ -16,9 +16,9 @@
 #define QgsHTMLAnnotationDialog_H
 
 #include "ui_qgsformannotationdialogbase.h"
-#include "qgshtmlannotationitem.h"
 
 class QgsAnnotationWidget;
+class QgsHtmlAnnotationItem;
 
 class APP_EXPORT QgsHtmlAnnotationDialog: public QDialog, private Ui::QgsFormAnnotationDialogBase
 {

src/app/qgsidentifyresultsdialog.cpp

@@ -23,6 +23,8 @@
 #include "qgsdockwidget.h"
 #include "qgseditorwidgetregistry.h"
 #include "qgsfeatureaction.h"
+#include "qgsfeatureiterator.h"
+#include "qgsfeaturestore.h"
 #include "qgsgeometry.h"
 #include "qgshighlight.h"
 #include "qgsidentifyresultsdialog.h"
@@ -32,6 +34,7 @@
 #include "qgsmaplayer.h"
 #include "qgsnetworkaccessmanager.h"
 #include "qgsproject.h"
+#include "qgsrasterdataprovider.h"
 #include "qgsrasterlayer.h"
 #include "qgsvectorlayer.h"
 #include "qgsvectordataprovider.h"

src/app/qgsidentifyresultsdialog.h

@@ -19,14 +19,11 @@
 #define QGSIDENTIFYRESULTSDIALOG_H
 
 #include "ui_qgsidentifyresultsbase.h"
-#include "qgsactionmanager.h"
 #include "qgscontexthelp.h"
 #include "qgsfeature.h"
-#include "qgsfeaturestore.h"
 #include "qgsfield.h"
-#include "qgsmaptoolidentify.h"
 #include "qgscoordinatereferencesystem.h"
-#include "qgsmaplayeractionregistry.h"
+#include "qgsmaptoolidentify.h"
 #include "qgswebview.h"
 
 #include <QWidget>
@@ -37,11 +34,13 @@ class QTreeWidgetItem;
 class QAction;
 class QMenu;
 
+class QgsFeatureStore;
 class QgsVectorLayer;
 class QgsRasterLayer;
 class QgsHighlight;
 class QgsMapCanvas;
 class QgsDockWidget;
+class QgsMapLayerAction;
 
 class QwtPlotCurve;
 

src/app/qgslabelinggui.h

@@ -26,8 +26,6 @@ class QgsVectorLayer;
 class QgsMapCanvas;
 class QgsCharacterSelectorDialog;
 
-#include "qgspallabeling.h"
-
 class APP_EXPORT QgsLabelingGui : public QWidget, private Ui::QgsLabelingGuiBase
 {
     Q_OBJECT

src/app/qgslabelingwidget.cpp

@@ -21,6 +21,7 @@
 #include "qgslabelengineconfigdialog.h"
 #include "qgslabelinggui.h"
 #include "qgsrulebasedlabelingwidget.h"
+#include "qgsvectorlayer.h"
 #include "qgsvectorlayerlabeling.h"
 #include "qgisapp.h"
 

src/app/qgslabelpropertydialog.cpp

@@ -19,6 +19,7 @@
 #include <qgsdatadefined.h>
 #include <qgsfontutils.h>
 #include <qgslogger.h>
+#include "qgsfeatureiterator.h"
 #include "qgsmaplayerregistry.h"
 #include "qgsmaprenderer.h"
 #include "qgsvectorlayer.h"

src/app/qgslayerstylingwidget.cpp

@@ -27,6 +27,7 @@
 #include "qgsrendererv2propertiesdialog.h"
 #include "qgsrendererrasterpropertieswidget.h"
 #include "qgsrasterhistogramwidget.h"
+#include "qgsrasterrenderer.h"
 #include "qgsrasterrendererwidget.h"
 #include "qgsmapcanvas.h"
 #include "qgsmaplayer.h"

src/app/qgslayerstylingwidget.h

@@ -24,10 +24,10 @@
 #include <QCheckBox>
 #include <QUndoCommand>
 #include <QDomNode>
+#include <QTime>
 #include <QTimer>
 
 #include "ui_qgsmapstylingwidgetbase.h"
-#include "qgsmaplayerconfigwidget.h"
 #include "qgsmaplayerconfigwidgetfactory.h"
 
 class QgsLabelingWidget;

src/app/qgsloadstylefromdbdialog.h

@@ -18,7 +18,6 @@
 
 #include "ui_qgsloadstylefromdbdialog.h"
 #include "qgisgui.h"
-#include "qgsfield.h"
 
 class APP_EXPORT QgsLoadStyleFromDBDialog : public QDialog, private Ui::QgsLoadStyleFromDBDialogLayout
 {

src/app/qgsmaptooladdfeature.h

@@ -14,7 +14,6 @@
  ***************************************************************************/
 
 #include "qgsmaptoolcapture.h"
-#include "qgsfeature.h"
 
 /** This tool adds new point/line/polygon features to already existing vector layers*/
 class APP_EXPORT QgsMapToolAddFeature : public QgsMapToolCapture

src/app/qgsmaptooladdpart.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgsmaptooladdpart.h"
+#include "qgsadvanceddigitizingdockwidget.h"
 #include "qgscurvepolygonv2.h"
 #include "qgsgeometry.h"
 #include "qgslinestringv2.h"

src/app/qgsmaptooladdpart.h

@@ -14,7 +14,6 @@
  ***************************************************************************/
 
 #include "qgsmaptoolcapture.h"
-#include "qgsmapmouseevent.h"
 
 /** A map tool that adds new parts to multipart features*/
 class APP_EXPORT QgsMapToolAddPart : public QgsMapToolCapture

src/app/qgsmaptooladdring.h

@@ -14,7 +14,6 @@
  ***************************************************************************/
 
 #include "qgsmaptoolcapture.h"
-#include "qgsmapmouseevent.h"
 
 /** A tool to cut holes into polygons and multipolygon features*/
 class APP_EXPORT QgsMapToolAddRing: public QgsMapToolCapture

src/app/qgsmaptooldeletepart.cpp

@@ -15,10 +15,12 @@
 
 #include "qgsmaptooldeletepart.h"
 
+#include "qgsfeatureiterator.h"
 #include "qgsmapcanvas.h"
 #include "qgsvertexmarker.h"
 #include "qgsvectorlayer.h"
 #include "qgsgeometry.h"
+#include "qgsrubberband.h"
 #include "qgssnappingutils.h"
 #include "qgstolerance.h"
 #include "qgisapp.h"

src/app/qgsmaptooldeletepart.h

@@ -17,7 +17,6 @@
 #define QGSMAPTOOLDELETEPART_H
 
 #include "qgsmaptooledit.h"
-#include "qgsrubberband.h"
 
 class QgsVertexMarker;
 

src/app/qgsmaptooldeletering.cpp

@@ -16,9 +16,12 @@
 #include "qgsmaptooldeletering.h"
 
 #include "qgsmapcanvas.h"
+#include "qgsfeatureiterator.h"
+#include "qgsgeometry.h"
 #include "qgsvertexmarker.h"
 #include "qgsvectorlayer.h"
 #include "qgisapp.h"
+#include "qgsrubberband.h"
 
 #include <QMouseEvent>
 #include <limits>

src/app/qgsmaptooldeletering.h

@@ -17,7 +17,6 @@
 #define QGSMAPTOOLDELETERING_H
 
 #include "qgsmaptooledit.h"
-#include "qgsrubberband.h"
 
 class QgsVertexMarker;
 /** Map tool to delete vertices from line/polygon features*/

src/app/qgsmaptoolfeatureaction.cpp

@@ -16,6 +16,7 @@
 #include "qgsmaptoolfeatureaction.h"
 
 #include "qgsfeature.h"
+#include "qgsfeatureiterator.h"
 #include "qgsfield.h"
 #include "qgsgeometry.h"
 #include "qgslogger.h"
@@ -24,6 +25,7 @@
 #include "qgsmessageviewer.h"
 #include "qgsactionmanager.h"
 #include "qgscoordinatereferencesystem.h"
+#include "qgscsexception.h"
 #include "qgsvectordataprovider.h"
 #include "qgsvectorlayer.h"
 #include "qgsproject.h"

src/app/qgsmaptoolfillring.cpp

@@ -16,6 +16,7 @@
 
 #include "qgsmaptoolfillring.h"
 #include "qgsgeometry.h"
+#include "qgsfeatureiterator.h"
 #include "qgsmapcanvas.h"
 #include "qgsvectorlayer.h"
 #include "qgsattributedialog.h"

src/app/qgsmaptoolfillring.h

@@ -15,7 +15,6 @@
  ***************************************************************************/
 
 #include "qgsmaptoolcapture.h"
-#include "qgsmapmouseevent.h"
 
 /** A tool to cut holes into polygon and multipolygon features and fill them
  *  with new feature. Attributes are copied from parent feature.

src/app/qgsmaptoolidentifyaction.cpp

@@ -19,6 +19,7 @@
 #include "qgscursors.h"
 #include "qgsdistancearea.h"
 #include "qgsfeature.h"
+#include "qgsfeaturestore.h"
 #include "qgsfield.h"
 #include "qgsgeometry.h"
 #include "qgslogger.h"

src/app/qgsmaptoolidentifyaction.h

@@ -18,11 +18,6 @@
 
 #include "qgis.h"
 #include "qgsmaptoolidentify.h"
-#include "qgspoint.h"
-#include "qgsfeature.h"
-#include "qgsfeaturestore.h"
-#include "qgsfield.h"
-#include "qgsdistancearea.h"
 
 #include <QObject>
 #include <QPointer>
@@ -31,6 +26,7 @@ class QgsIdentifyResultsDialog;
 class QgsMapLayer;
 class QgsRasterLayer;
 class QgsVectorLayer;
+class QgsFeatureStore;
 
 /**
   \brief Map tool for identifying features layers and showing results