diff --git a/src/app/qgslabelpropertydialog.cpp b/src/app/qgslabelpropertydialog.cpp
index cb4b70a26b6..0a9e5a50d1e 100644
--- a/src/app/qgslabelpropertydialog.cpp
+++ b/src/app/qgslabelpropertydialog.cpp
@@ -16,8 +16,8 @@
  ***************************************************************************/
 
 #include "qgslabelpropertydialog.h"
-#include <qgsfontutils.h>
-#include <qgslogger.h>
+#include "qgsfontutils.h"
+#include "qgslogger.h"
 #include "qgsfeatureiterator.h"
 #include "qgsproject.h"
 #include "qgsvectorlayer.h"
diff --git a/src/app/qgsmeasuretool.cpp b/src/app/qgsmeasuretool.cpp
index 6889a5b2d3d..cfe761cdb67 100644
--- a/src/app/qgsmeasuretool.cpp
+++ b/src/app/qgsmeasuretool.cpp
@@ -22,7 +22,6 @@
 #include "qgssnappingutils.h"
 #include "qgstolerance.h"
 #include "qgscsexception.h"
-
 #include "qgsmeasuredialog.h"
 #include "qgsmeasuretool.h"
 #include "qgscursors.h"
diff --git a/src/app/qgsmergeattributesdialog.cpp b/src/app/qgsmergeattributesdialog.cpp
index a6f4857a87e..ff82fcf683b 100644
--- a/src/app/qgsmergeattributesdialog.cpp
+++ b/src/app/qgsmergeattributesdialog.cpp
@@ -15,7 +15,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "qgsmergeattributesdialog.h"
 #include "qgisapp.h"
 #include "qgsapplication.h"
diff --git a/src/app/qgspluginregistry.cpp b/src/app/qgspluginregistry.cpp
index 562b40d4f7c..9e4a53c41e7 100644
--- a/src/app/qgspluginregistry.cpp
+++ b/src/app/qgspluginregistry.cpp
@@ -28,13 +28,14 @@
 #include "qgspluginregistry.h"
 #include "qgspluginmetadata.h"
 #include "qgisplugin.h"
-#ifdef WITH_BINDINGS
-#include "qgspythonutils.h"
-#endif
 #include "qgisapp.h"
 #include "qgslogger.h"
 #include "qgsmessagelog.h"
 
+#ifdef WITH_BINDINGS
+#include "qgspythonutils.h"
+#endif
+
 /* typedefs for plugins */
 typedef QgisPlugin *create_ui( QgisInterface *qI );
 typedef QString name_t();
diff --git a/src/app/qgsprojectlayergroupdialog.cpp b/src/app/qgsprojectlayergroupdialog.cpp
index 6440d7c55f3..520293853f6 100644
--- a/src/app/qgsprojectlayergroupdialog.cpp
+++ b/src/app/qgsprojectlayergroupdialog.cpp
@@ -16,7 +16,6 @@
 #include "qgsproject.h"
 #include "qgisapp.h"
 #include "qgsapplication.h"
-
 #include "qgslayertree.h"
 #include "qgslayertreemodel.h"
 #include "qgslayertreeutils.h"
diff --git a/src/app/qgsrasterlayerproperties.cpp b/src/app/qgsrasterlayerproperties.cpp
index 83249c4fdb3..e6fdb3f969b 100644
--- a/src/app/qgsrasterlayerproperties.cpp
+++ b/src/app/qgsrasterlayerproperties.cpp
@@ -56,7 +56,6 @@
 
 #include <QTableWidgetItem>
 #include <QHeaderView>
-
 #include <QTextStream>
 #include <QFileDialog>
 #include <QMessageBox>
diff --git a/src/core/composer/qgscomposition.cpp b/src/core/composer/qgscomposition.cpp
index bdb866d7471..41024e67c11 100644
--- a/src/core/composer/qgscomposition.cpp
+++ b/src/core/composer/qgscomposition.cpp
@@ -57,6 +57,7 @@
 #include <QDir>
 
 #include <limits>
+
 #include "gdal.h"
 #include "cpl_conv.h"
 
diff --git a/src/core/qgsdataitem.cpp b/src/core/qgsdataitem.cpp
index 0e3afb0e183..52c102002b3 100644
--- a/src/core/qgsdataitem.cpp
+++ b/src/core/qgsdataitem.cpp
@@ -30,7 +30,6 @@
 
 #include "qgis.h"
 #include "qgsdataitem.h"
-
 #include "qgsapplication.h"
 #include "qgsdataitemprovider.h"
 #include "qgsdataitemproviderregistry.h"
diff --git a/src/core/qgsvectorlayerrenderer.cpp b/src/core/qgsvectorlayerrenderer.cpp
index c29e69e8b71..40428f08612 100644
--- a/src/core/qgsvectorlayerrenderer.cpp
+++ b/src/core/qgsvectorlayerrenderer.cpp
@@ -15,8 +15,8 @@
 
 #include "qgsvectorlayerrenderer.h"
 
-//#include "qgsfeatureiterator.h"
 #include "diagram/qgsdiagram.h"
+
 #include "qgsdiagramrenderer.h"
 #include "qgsgeometrycache.h"
 #include "qgsmessagelog.h"
diff --git a/src/gui/qgsconfigureshortcutsdialog.cpp b/src/gui/qgsconfigureshortcutsdialog.cpp
index 4d756ebc8b5..47d75ef4a97 100644
--- a/src/gui/qgsconfigureshortcutsdialog.cpp
+++ b/src/gui/qgsconfigureshortcutsdialog.cpp
@@ -22,7 +22,6 @@
 #include <QKeyEvent>
 #include <QKeySequence>
 #include <QMessageBox>
-
 #include <QShortcut>
 #include <QDomDocument>
 #include <QFileDialog>
diff --git a/src/gui/qgsexpressionbuilderwidget.cpp b/src/gui/qgsexpressionbuilderwidget.cpp
index bff057213b1..46007140353 100644
--- a/src/gui/qgsexpressionbuilderwidget.cpp
+++ b/src/gui/qgsexpressionbuilderwidget.cpp
@@ -35,7 +35,6 @@
 #include <QPropertyAnimation>
 
 
-
 QgsExpressionBuilderWidget::QgsExpressionBuilderWidget( QWidget *parent )
   : QWidget( parent )
   , mAutoSave( true )
diff --git a/src/gui/qgshelp.cpp b/src/gui/qgshelp.cpp
index 5246daed40c..f188d6f76c8 100644
--- a/src/gui/qgshelp.cpp
+++ b/src/gui/qgshelp.cpp
@@ -27,11 +27,9 @@
 #include <QRegularExpression>
 #include <QNetworkProxy>
 #include <QNetworkProxyFactory>
+
 #include <memory>
 
-#include "qgis.h"
-#include "qgsapplication.h"
-#include "qgsexpressioncontext.h"
 
 void QgsHelp::openHelp( const QString &key )
 {
diff --git a/src/gui/qgsidentifymenu.cpp b/src/gui/qgsidentifymenu.cpp
index 8c32d8ca86f..3c17ccda228 100644
--- a/src/gui/qgsidentifymenu.cpp
+++ b/src/gui/qgsidentifymenu.cpp
@@ -16,7 +16,6 @@
 #include <QMouseEvent>
 
 #include "qgsidentifymenu.h"
-
 #include "qgsapplication.h"
 #include "qgsactionmanager.h"
 #include "qgshighlight.h"
diff --git a/src/gui/qgsmanageconnectionsdialog.cpp b/src/gui/qgsmanageconnectionsdialog.cpp
index 26aeaecd9bc..287eeea1cc5 100644
--- a/src/gui/qgsmanageconnectionsdialog.cpp
+++ b/src/gui/qgsmanageconnectionsdialog.cpp
@@ -14,7 +14,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include <QCloseEvent>
 #include <QFileDialog>
 #include <QMessageBox>
diff --git a/src/gui/qgsmapcanvassnapper.cpp b/src/gui/qgsmapcanvassnapper.cpp
index fa0a64f9116..c4cb55ecc20 100644
--- a/src/gui/qgsmapcanvassnapper.cpp
+++ b/src/gui/qgsmapcanvassnapper.cpp
@@ -25,6 +25,7 @@
 #include "qgslogger.h"
 #include "qgsgeometry.h"
 
+
 QgsMapCanvasSnapper::QgsMapCanvasSnapper( QgsMapCanvas *canvas )
   : mMapCanvas( canvas )
   , mSnapper( nullptr )
diff --git a/src/gui/qgsmapcanvastracer.cpp b/src/gui/qgsmapcanvastracer.cpp
index db188d2c9e4..c407b0891d6 100644
--- a/src/gui/qgsmapcanvastracer.cpp
+++ b/src/gui/qgsmapcanvastracer.cpp
@@ -26,6 +26,7 @@
 
 #include <QAction>
 
+
 QHash<QgsMapCanvas *, QgsMapCanvasTracer *> QgsMapCanvasTracer::sTracers;
 
 
diff --git a/src/gui/qgsmessageviewer.h b/src/gui/qgsmessageviewer.h
index 49aa381e306..d884b6276e0 100644
--- a/src/gui/qgsmessageviewer.h
+++ b/src/gui/qgsmessageviewer.h
@@ -17,12 +17,12 @@
 #ifndef QGSMESSAGEVIEWER_H
 #define QGSMESSAGEVIEWER_H
 
-#include <ui_qgsmessageviewer.h>
-#include <qgisgui.h>
+#include "ui_qgsmessageviewer.h"
+#include "qgisgui.h"
 #include "qgsmessageoutput.h"
+#include "qgis_gui.h"
 
 #include <QString>
-#include "qgis_gui.h"
 
 
 /** \ingroup gui
diff --git a/src/gui/qgsprojectionselectionwidget.cpp b/src/gui/qgsprojectionselectionwidget.cpp
index 96fa9b22b1c..3ad5060231a 100644
--- a/src/gui/qgsprojectionselectionwidget.cpp
+++ b/src/gui/qgsprojectionselectionwidget.cpp
@@ -15,7 +15,6 @@
 
 #include <QHBoxLayout>
 
-
 #include "qgsprojectionselectionwidget.h"
 #include "qgsapplication.h"
 #include "qgsprojectionselectiondialog.h"
diff --git a/src/plugins/geometry_checker/qgsgeometrycheckfactory.cpp b/src/plugins/geometry_checker/qgsgeometrycheckfactory.cpp
index f0c096a4bdc..10bc38aa65c 100644
--- a/src/plugins/geometry_checker/qgsgeometrycheckfactory.cpp
+++ b/src/plugins/geometry_checker/qgsgeometrycheckfactory.cpp
@@ -30,6 +30,7 @@
 #include "checks/qgsgeometryselfintersectioncheck.h"
 #include "checks/qgsgeometrysliverpolygoncheck.h"
 #include "checks/qgsgeometrytypecheck.h"
+
 #include "utils/qgsfeaturepool.h"
 
 
diff --git a/src/plugins/geometry_checker/ui/qgsgeometrycheckerresulttab.cpp b/src/plugins/geometry_checker/ui/qgsgeometrycheckerresulttab.cpp
index 6103afa03bf..cf1b60bb2a5 100644
--- a/src/plugins/geometry_checker/ui/qgsgeometrycheckerresulttab.cpp
+++ b/src/plugins/geometry_checker/ui/qgsgeometrycheckerresulttab.cpp
@@ -22,9 +22,11 @@
 
 #include "qgsgeometrycheckerresulttab.h"
 #include "qgsgeometrycheckfixdialog.h"
+
 #include "../qgsgeometrychecker.h"
 #include "../checks/qgsgeometrycheck.h"
 #include "../utils/qgsfeaturepool.h"
+
 #include "qgsgeometry.h"
 #include "qgisinterface.h"
 #include "qgsmapcanvas.h"
diff --git a/src/plugins/grass/qgsgrasstools.cpp b/src/plugins/grass/qgsgrasstools.cpp
index 478a2979470..5aa3c0a683a 100644
--- a/src/plugins/grass/qgsgrasstools.cpp
+++ b/src/plugins/grass/qgsgrasstools.cpp
@@ -40,6 +40,7 @@
 //
 #include "qgsdetaileditemdata.h"
 #include "qgsdetaileditemdelegate.h"
+
 #include <QSortFilterProxyModel>
 #include <QStandardItem>
 
diff --git a/src/plugins/spatialquery/qgsspatialquerydialog.cpp b/src/plugins/spatialquery/qgsspatialquerydialog.cpp
index cc49b4d755f..e2e794c075a 100644
--- a/src/plugins/spatialquery/qgsspatialquerydialog.cpp
+++ b/src/plugins/spatialquery/qgsspatialquerydialog.cpp
@@ -25,7 +25,6 @@
 #include "qgsmaplayer.h"
 #include "qgsproject.h"
 #include "qgsvectordataprovider.h"
-
 #include "qgsspatialquerydialog.h"
 #include "qgsspatialquery.h"
 #include "qgsrubberselectid.h"
diff --git a/src/providers/db2/qgsdb2dataitems.cpp b/src/providers/db2/qgsdb2dataitems.cpp
index 4db7080928d..ba73443f895 100644
--- a/src/providers/db2/qgsdb2dataitems.cpp
+++ b/src/providers/db2/qgsdb2dataitems.cpp
@@ -19,8 +19,7 @@
 #include "qgsdb2dataitems.h"
 #include "qgsdb2newconnection.h"
 #include "qgsdb2geometrycolumns.h"
-#include <qgslogger.h>
-//#include <qaction.h>
+#include "qgslogger.h"
 #include "qgsmimedatautils.h"
 #include "qgsvectorlayerimport.h"
 #include "qgsvectorlayer.h"
diff --git a/src/providers/db2/qgsdb2sourceselect.cpp b/src/providers/db2/qgsdb2sourceselect.cpp
index 7d05098778f..9dd4a9453e9 100644
--- a/src/providers/db2/qgsdb2sourceselect.cpp
+++ b/src/providers/db2/qgsdb2sourceselect.cpp
@@ -19,13 +19,13 @@
 
 #include "qgsdb2sourceselect.h"
 #include "qgsdb2dataitems.h"
-#include "qgslogger.h"
-#include "qgsapplication.h"
-#include "qgscontexthelp.h"
 #include "qgsdb2provider.h"
 #include "qgsdb2newconnection.h"
 #include "qgsdb2geometrycolumns.h"
 
+#include "qgslogger.h"
+#include "qgsapplication.h"
+#include "qgscontexthelp.h"
 #include "qgsmanageconnectionsdialog.h"
 #include "qgsquerybuilder.h"
 #include "qgsdatasourceuri.h"
diff --git a/src/providers/gdal/qgsgdalprovider.cpp b/src/providers/gdal/qgsgdalprovider.cpp
index 56e5ed4c82f..4b8da47521b 100644
--- a/src/providers/gdal/qgsgdalprovider.cpp
+++ b/src/providers/gdal/qgsgdalprovider.cpp
@@ -47,10 +47,10 @@
 #include <QTextDocument>
 #include <QDebug>
 
-#include "gdalwarper.h"
-#include "ogr_spatialref.h"
-#include "cpl_conv.h"
-#include "cpl_string.h"
+#include <gdalwarper.h>
+#include <ogr_spatialref.h>
+#include <cpl_conv.h>
+#include <cpl_string.h>
 
 #define ERRMSG(message) QGS_ERROR_MESSAGE(message,"GDAL provider")
 #define ERR(message) QgsError(message,"GDAL provider")
diff --git a/src/providers/gdal/qgsgdalproviderbase.cpp b/src/providers/gdal/qgsgdalproviderbase.cpp
index 522b23fef50..a621bfbe056 100644
--- a/src/providers/gdal/qgsgdalproviderbase.cpp
+++ b/src/providers/gdal/qgsgdalproviderbase.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 #define CPL_SUPRESS_CPLUSPLUS  //#spellok
-#include "cpl_conv.h"
+#include <cpl_conv.h>
 
 #include "qgsapplication.h"
 #include "qgslogger.h"
diff --git a/src/providers/grass/qgsgrass.cpp b/src/providers/grass/qgsgrass.cpp
index 876b483c690..35567990711 100644
--- a/src/providers/grass/qgsgrass.cpp
+++ b/src/providers/grass/qgsgrass.cpp
@@ -48,7 +48,6 @@
 #include <QTextStream>
 #include <QTemporaryFile>
 #include <QHash>
-
 #include <QTextCodec>
 
 extern "C"
diff --git a/src/providers/mssql/qgsmssqldataitems.cpp b/src/providers/mssql/qgsmssqldataitems.cpp
index 3d9b558603a..1c4754147d2 100644
--- a/src/providers/mssql/qgsmssqldataitems.cpp
+++ b/src/providers/mssql/qgsmssqldataitems.cpp
@@ -15,8 +15,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
-
 #include "qgsmssqldataitems.h"
 
 #include "qgsmssqlsourceselect.h"
diff --git a/src/providers/mssql/qgsmssqlsourceselect.cpp b/src/providers/mssql/qgsmssqlsourceselect.cpp
index c9821b06354..2df7c926dd6 100644
--- a/src/providers/mssql/qgsmssqlsourceselect.cpp
+++ b/src/providers/mssql/qgsmssqlsourceselect.cpp
@@ -35,8 +35,8 @@
 #include <QTextStream>
 #include <QHeaderView>
 #include <QStringList>
-#include <QtSql/QSqlDatabase>
-#include <QtSql/QSqlError>
+#include <QSqlDatabase>
+#include <QSqlError>
 
 //! Used to create an editor for when the user tries to change the contents of a cell
 QWidget *QgsMssqlSourceSelectDelegate::createEditor( QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index ) const
diff --git a/tests/src/app/testqgisappclipboard.cpp b/tests/src/app/testqgisappclipboard.cpp
index d71479026f6..38220b58d30 100644
--- a/tests/src/app/testqgisappclipboard.cpp
+++ b/tests/src/app/testqgisappclipboard.cpp
@@ -12,6 +12,8 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
+#include "qgstest.h"
+
 #include <QApplication>
 #include <QObject>
 #include <QSplashScreen>
diff --git a/tests/src/app/testqgsmaptoolidentifyaction.cpp b/tests/src/app/testqgsmaptoolidentifyaction.cpp
index d004eab43ef..a46224d4d4b 100644
--- a/tests/src/app/testqgsmaptoolidentifyaction.cpp
+++ b/tests/src/app/testqgsmaptoolidentifyaction.cpp
@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgstest.h"
+
 #include "qgsapplication.h"
 #include "qgsvectorlayer.h"
 #include "qgsrasterlayer.h"
diff --git a/tests/src/core/testqgsdataitem.cpp b/tests/src/core/testqgsdataitem.cpp
index 7c7429b48be..603b5a391f6 100644
--- a/tests/src/core/testqgsdataitem.cpp
+++ b/tests/src/core/testqgsdataitem.cpp
@@ -13,6 +13,7 @@
  *                                                                         *
  ***************************************************************************/
 #include "qgstest.h"
+
 #include <QObject>
 #include <QString>
 #include <QStringList>
diff --git a/tests/src/core/testqgsfield.cpp b/tests/src/core/testqgsfield.cpp
index 8c91b09d7e8..37fb2ee94aa 100644
--- a/tests/src/core/testqgsfield.cpp
+++ b/tests/src/core/testqgsfield.cpp
@@ -13,6 +13,7 @@
  *                                                                         *
  ***************************************************************************/
 #include "qgstest.h"
+
 #include <QObject>
 #include <QString>
 #include <QStringList>
diff --git a/tests/src/core/testziplayer.cpp b/tests/src/core/testziplayer.cpp
index e9bc9aa1c21..6fc507537d6 100644
--- a/tests/src/core/testziplayer.cpp
+++ b/tests/src/core/testziplayer.cpp
@@ -13,6 +13,7 @@
  *                                                                         *
  ***************************************************************************/
 #include "qgstest.h"
+
 #include <QObject>
 #include <QString>
 #include <QApplication>