diff --git a/CMakeLists.txt b/CMakeLists.txt
index ed33fa64274c..de4e48fd4a52 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -581,7 +581,6 @@ ELSE (WIN32)
 
 ENDIF(WIN32)
 
-ADD_DEFINITIONS("-DAPP_EXPORT=${DLLIMPORT}")
 ADD_DEFINITIONS("-DCUSTOMWIDGETS_EXPORT=${DLLIMPORT}")
 ADD_DEFINITIONS("-DSERVER_EXPORT=${DLLIMPORT}")
 
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
index eeb4ce9bc5da..9affa8e6fe29 100644
--- a/src/app/CMakeLists.txt
+++ b/src/app/CMakeLists.txt
@@ -528,6 +528,7 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_BINARY_DIR}/src/gui
   ${CMAKE_BINARY_DIR}/src/python
   ${CMAKE_BINARY_DIR}/src/analysis
+  ${CMAKE_BINARY_DIR}/src/app
 )
 INCLUDE_DIRECTORIES(SYSTEM
   ${QWT_INCLUDE_DIR}
@@ -591,9 +592,6 @@ ELSE (ANDROID)
   ADD_EXECUTABLE(${QGIS_APP_NAME} MACOSX_BUNDLE WIN32 ${QGIS_APPMAIN_SRCS} ${IMAGE_RCC_SRCS} ${TEST_RCC_SRCS})
 ENDIF (ANDROID)
 
-REMOVE_DEFINITIONS("-DAPP_EXPORT=${DLLIMPORT}")
-ADD_DEFINITIONS("\"-DAPP_EXPORT=${DLLEXPORT}\"")
-
 # Putting IMAGE_RCC_SRCS into qgis_app lib is causing problems when the lib is
 # loaded (by plugin for example) in test unit (qgis_composerpicturetest).
 ADD_LIBRARY(qgis_app SHARED ${QGIS_APP_SRCS} ${QGIS_APP_MOC_SRCS} ${QGIS_APP_HDRS} ${QGIS_APP_MOC_HDRS})
@@ -613,6 +611,12 @@ TARGET_LINK_LIBRARIES(qgis_app
   libdxfrw
 )
 
+GENERATE_EXPORT_HEADER(
+   qgis_app
+   BASE_NAME APP
+   EXPORT_FILE_NAME qgis_app.h
+)
+
 IF (NOT ANDROID)
   SET_TARGET_PROPERTIES(qgis_app PROPERTIES
     VERSION ${COMPLETE_VERSION}
diff --git a/src/app/main.cpp b/src/app/main.cpp
index 3075d89b35e8..efb088e3e028 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -99,6 +99,7 @@ typedef SInt32 SRefCon;
 #include "qgsdxfexport.h"
 #include "qgsmapthemes.h"
 #include "qgsvectorlayer.h"
+#include "qgis_app.h"
 
 /** Print usage text
  */
diff --git a/src/app/ogr/qgsvectorlayersaveasdialog.h b/src/app/ogr/qgsvectorlayersaveasdialog.h
index c586e9760208..e01732cc098d 100644
--- a/src/app/ogr/qgsvectorlayersaveasdialog.h
+++ b/src/app/ogr/qgsvectorlayersaveasdialog.h
@@ -23,6 +23,7 @@
 #include "qgscontexthelp.h"
 #include "qgsfields.h"
 #include "qgsvectorfilewriter.h"
+#include "qgis_app.h"
 
 class QgsVectorLayer;
 
diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h
index dd50cc78992a..1b7ff79b08a7 100644
--- a/src/app/qgisapp.h
+++ b/src/app/qgisapp.h
@@ -128,6 +128,7 @@ class QgsDiagramProperties;
 #include "qgsrasterminmaxorigin.h"
 
 #include "ui_qgisapp.h"
+#include "qgis_app.h"
 
 #ifdef HAVE_TOUCH
 #include <QGestureEvent>
diff --git a/src/app/qgisappinterface.h b/src/app/qgisappinterface.h
index 5b37acca34d5..8a5c924cc472 100644
--- a/src/app/qgisappinterface.h
+++ b/src/app/qgisappinterface.h
@@ -20,6 +20,7 @@
 
 #include "qgisinterface.h"
 #include "qgsapppluginmanagerinterface.h"
+#include "qgis_app.h"
 
 class QgisApp;
 
diff --git a/src/app/qgisappstylesheet.h b/src/app/qgisappstylesheet.h
index 71eb83718542..25b406853de6 100644
--- a/src/app/qgisappstylesheet.h
+++ b/src/app/qgisappstylesheet.h
@@ -21,6 +21,7 @@
 #include <QObject>
 #include <QFont>
 #include <QMap>
+#include "qgis_app.h"
 
 /** @class QgisAppStyleSheet
  * @brief Adjustable stylesheet for the Qgis application
diff --git a/src/app/qgsabout.h b/src/app/qgsabout.h
index 162e7547bd18..2912a022e01b 100644
--- a/src/app/qgsabout.h
+++ b/src/app/qgsabout.h
@@ -19,6 +19,7 @@
 
 #include "ui_qgsabout.h"
 #include "qgsoptionsdialogbase.h"
+#include "qgis_app.h"
 
 class APP_EXPORT QgsAbout : public QgsOptionsDialogBase, private Ui::QgsAbout
 {
diff --git a/src/app/qgsaddattrdialog.h b/src/app/qgsaddattrdialog.h
index 5d26b8ca7180..27ab7bedb1ad 100644
--- a/src/app/qgsaddattrdialog.h
+++ b/src/app/qgsaddattrdialog.h
@@ -21,6 +21,7 @@
 #include "ui_qgsaddattrdialogbase.h"
 #include "qgisgui.h"
 #include "qgsfields.h"
+#include "qgis_app.h"
 
 class QgsVectorLayer;
 
diff --git a/src/app/qgsaddtaborgroup.h b/src/app/qgsaddtaborgroup.h
index ebdbd7feb69b..5b51eff9b892 100644
--- a/src/app/qgsaddtaborgroup.h
+++ b/src/app/qgsaddtaborgroup.h
@@ -21,6 +21,7 @@
 
 #include "ui_qgsaddtaborgroupbase.h"
 #include "qgisgui.h"
+#include "qgis_app.h"
 
 class QTreeWidgetItem;
 class QgsVectorLayer;
diff --git a/src/app/qgsannotationwidget.h b/src/app/qgsannotationwidget.h
index 91f7f657a87b..fba5fa01df83 100644
--- a/src/app/qgsannotationwidget.h
+++ b/src/app/qgsannotationwidget.h
@@ -19,6 +19,7 @@
 #define QGSANNOTATIONWIDGET_H
 
 #include "ui_qgsannotationwidgetbase.h"
+#include "qgis_app.h"
 
 class QgsAnnotationItem;
 class QgsMarkerSymbol;
diff --git a/src/app/qgsattributeactiondialog.h b/src/app/qgsattributeactiondialog.h
index 5a28f930a22f..de2d2d3049ed 100644
--- a/src/app/qgsattributeactiondialog.h
+++ b/src/app/qgsattributeactiondialog.h
@@ -27,6 +27,7 @@ back to QgsVectorLayer.
 #include "qgsattributetableconfig.h"
 #include "qgsaction.h"
 #include <QMap>
+#include "qgis_app.h"
 
 class QgsActionManager;
 class QgsVectorLayer;
diff --git a/src/app/qgsattributetabledialog.h b/src/app/qgsattributetabledialog.h
index 0f017741dd0d..b9015eb4f6c0 100644
--- a/src/app/qgsattributetabledialog.h
+++ b/src/app/qgsattributetabledialog.h
@@ -26,6 +26,7 @@
 #include "ui_qgsattributetabledialog.h"
 #include "qgssearchwidgetwrapper.h"
 #include "qgsdockwidget.h"
+#include "qgis_app.h"
 
 class QDialogButtonBox;
 class QPushButton;
diff --git a/src/app/qgsattributetypedialog.h b/src/app/qgsattributetypedialog.h
index b189f88f2869..33173be68428 100644
--- a/src/app/qgsattributetypedialog.h
+++ b/src/app/qgsattributetypedialog.h
@@ -22,6 +22,7 @@
 #include "qgseditorconfigwidget.h"
 #include "qgsfeature.h"
 #include "qgsvectordataprovider.h"
+#include "qgis_app.h"
 
 class QDialog;
 
diff --git a/src/app/qgsbookmarks.h b/src/app/qgsbookmarks.h
index 7e05c7628254..94997f724df1 100644
--- a/src/app/qgsbookmarks.h
+++ b/src/app/qgsbookmarks.h
@@ -22,6 +22,7 @@
 
 #include "ui_qgsbookmarksbase.h"
 #include "qgsdockwidget.h"
+#include "qgis_app.h"
 
 /*
  * Model for project bookmarks
diff --git a/src/app/qgsbrowserdockwidget.h b/src/app/qgsbrowserdockwidget.h
index 05328cedd8c5..40f3e23a680e 100644
--- a/src/app/qgsbrowserdockwidget.h
+++ b/src/app/qgsbrowserdockwidget.h
@@ -24,6 +24,7 @@
 #include "qgsbrowsertreeview.h"
 #include "qgsdockwidget.h"
 #include <QSortFilterProxyModel>
+#include "qgis_app.h"
 
 class QgsBrowserModel;
 class QModelIndex;
diff --git a/src/app/qgsclipboard.h b/src/app/qgsclipboard.h
index 78f3d4405c94..4fd899002919 100644
--- a/src/app/qgsclipboard.h
+++ b/src/app/qgsclipboard.h
@@ -25,6 +25,7 @@
 #include "qgsfields.h"
 #include "qgsfeature.h"
 #include "qgscoordinatereferencesystem.h"
+#include "qgis_app.h"
 
 /**
   \brief QGIS internal clipboard for features.
diff --git a/src/app/qgscustomization.h b/src/app/qgscustomization.h
index a50b640aa1cb..f146c22960ed 100644
--- a/src/app/qgscustomization.h
+++ b/src/app/qgscustomization.h
@@ -25,6 +25,7 @@
 #include <QMouseEvent>
 #include <QSettings>
 #include <QTreeWidgetItem>
+#include "qgis_app.h"
 
 class QString;
 class QWidget;
diff --git a/src/app/qgscustomprojectiondialog.h b/src/app/qgscustomprojectiondialog.h
index 056eb56fc468..45f1bcfb1153 100644
--- a/src/app/qgscustomprojectiondialog.h
+++ b/src/app/qgscustomprojectiondialog.h
@@ -21,6 +21,7 @@
 #include "ui_qgscustomprojectiondialogbase.h"
 #include "qgscontexthelp.h"
 #include "qgscoordinatereferencesystem.h"
+#include "qgis_app.h"
 
 class QDir;
 
diff --git a/src/app/qgsdecorationcopyright.h b/src/app/qgsdecorationcopyright.h
index 09ec8dbf36cc..50093078a1bc 100644
--- a/src/app/qgsdecorationcopyright.h
+++ b/src/app/qgsdecorationcopyright.h
@@ -24,6 +24,7 @@
 #include <QColor>
 #include <QFont>
 #include <QObject>
+#include "qgis_app.h"
 class QAction;
 class QPainter;
 
diff --git a/src/app/qgsdecorationcopyrightdialog.h b/src/app/qgsdecorationcopyrightdialog.h
index f36ceb6f43de..ea8d914598c0 100644
--- a/src/app/qgsdecorationcopyrightdialog.h
+++ b/src/app/qgsdecorationcopyrightdialog.h
@@ -13,6 +13,7 @@
 #define QGSCOPYRIGHTLABELPLUGINGUI_H
 
 #include "ui_qgsdecorationcopyrightdialog.h"
+#include "qgis_app.h"
 
 class QColor;
 class QFont;
diff --git a/src/app/qgsdecorationgrid.h b/src/app/qgsdecorationgrid.h
index 8982a8a06559..4ee188b9e88e 100644
--- a/src/app/qgsdecorationgrid.h
+++ b/src/app/qgsdecorationgrid.h
@@ -28,6 +28,7 @@ class QgsMarkerSymbol;
 #include <QColor>
 #include <QPen>
 #include <QFont>
+#include "qgis_app.h"
 
 class APP_EXPORT QgsDecorationGrid: public QgsDecorationItem
 {
diff --git a/src/app/qgsdecorationgriddialog.h b/src/app/qgsdecorationgriddialog.h
index 6bcbc6028faf..bc5ccda9c19d 100644
--- a/src/app/qgsdecorationgriddialog.h
+++ b/src/app/qgsdecorationgriddialog.h
@@ -20,6 +20,7 @@
 
 #include "ui_qgsdecorationgriddialog.h"
 #include <QDialog>
+#include "qgis_app.h"
 
 class QgsDecorationGrid;
 class QgsLineSymbol;
diff --git a/src/app/qgsdecorationitem.h b/src/app/qgsdecorationitem.h
index 7ef98061eaed..1b526c88dc93 100644
--- a/src/app/qgsdecorationitem.h
+++ b/src/app/qgsdecorationitem.h
@@ -20,6 +20,7 @@
 
 #include <QObject>
 #include "qgsunittypes.h"
+#include "qgis_app.h"
 
 class QPainter;
 
diff --git a/src/app/qgsdecorationnortharrow.h b/src/app/qgsdecorationnortharrow.h
index a52bcc24c606..5e520fe1751e 100644
--- a/src/app/qgsdecorationnortharrow.h
+++ b/src/app/qgsdecorationnortharrow.h
@@ -22,6 +22,7 @@
 #include "qgsdecorationitem.h"
 
 #include <QStringList>
+#include "qgis_app.h"
 
 class QAction;
 class QToolBar;
diff --git a/src/app/qgsdecorationnortharrowdialog.h b/src/app/qgsdecorationnortharrowdialog.h
index b989cc832494..73f1609c0268 100644
--- a/src/app/qgsdecorationnortharrowdialog.h
+++ b/src/app/qgsdecorationnortharrowdialog.h
@@ -13,6 +13,7 @@
 #define QGSNORTHARROWPLUGINGUI_H
 
 #include "ui_qgsdecorationnortharrowdialog.h"
+#include "qgis_app.h"
 
 class QgsDecorationNorthArrow;
 
diff --git a/src/app/qgsdecorationscalebar.h b/src/app/qgsdecorationscalebar.h
index 584dedd1b245..2f1e3573c9a9 100644
--- a/src/app/qgsdecorationscalebar.h
+++ b/src/app/qgsdecorationscalebar.h
@@ -27,6 +27,7 @@ email                : sbr00pwb@users.sourceforge.net
 class QPainter;
 
 #include <QColor>
+#include "qgis_app.h"
 
 class APP_EXPORT QgsDecorationScaleBar: public QgsDecorationItem
 {
diff --git a/src/app/qgsdecorationscalebardialog.h b/src/app/qgsdecorationscalebardialog.h
index c06c01a8427f..7069adac9b8a 100644
--- a/src/app/qgsdecorationscalebardialog.h
+++ b/src/app/qgsdecorationscalebardialog.h
@@ -14,6 +14,7 @@
 
 #include "ui_qgsdecorationscalebardialog.h"
 #include <QDialog>
+#include "qgis_app.h"
 
 class QgsDecorationScaleBar;
 
diff --git a/src/app/qgsdelattrdialog.h b/src/app/qgsdelattrdialog.h
index b6ddf6ecfa89..188a73aed366 100644
--- a/src/app/qgsdelattrdialog.h
+++ b/src/app/qgsdelattrdialog.h
@@ -21,6 +21,7 @@
 #include "ui_qgsdelattrdialogbase.h"
 #include <QDialog>
 #include <list>
+#include "qgis_app.h"
 
 class QgsVectorLayer;
 
diff --git a/src/app/qgsdiagramproperties.h b/src/app/qgsdiagramproperties.h
index 5bc297e0674e..429a3b7c547a 100644
--- a/src/app/qgsdiagramproperties.h
+++ b/src/app/qgsdiagramproperties.h
@@ -21,6 +21,7 @@
 #include <QDialog>
 #include <ui_qgsdiagrampropertiesbase.h>
 #include <QStyledItemDelegate>
+#include "qgis_app.h"
 
 class QgsVectorLayer;
 class QgsMapCanvas;
diff --git a/src/app/qgsdiscoverrelationsdlg.h b/src/app/qgsdiscoverrelationsdlg.h
index b890b524e12c..ce9dbb69f134 100644
--- a/src/app/qgsdiscoverrelationsdlg.h
+++ b/src/app/qgsdiscoverrelationsdlg.h
@@ -18,6 +18,7 @@
 #include <QDialog>
 #include "ui_qgsdiscoverrelationsdlgbase.h"
 #include "qgsrelation.h"
+#include "qgis_app.h"
 
 class QgsRelationManager;
 class QgsVectorLayer;
diff --git a/src/app/qgsdisplayangle.h b/src/app/qgsdisplayangle.h
index f0047a4b5043..66e25bd06041 100644
--- a/src/app/qgsdisplayangle.h
+++ b/src/app/qgsdisplayangle.h
@@ -17,6 +17,7 @@
 #define QGSDISPLAYANGLE_H
 
 #include "ui_qgsdisplayanglebase.h"
+#include "qgis_app.h"
 
 class QgsMapToolMeasureAngle;
 
diff --git a/src/app/qgsfeatureaction.h b/src/app/qgsfeatureaction.h
index 6f9688ad3bb4..606a95a674c4 100644
--- a/src/app/qgsfeatureaction.h
+++ b/src/app/qgsfeatureaction.h
@@ -23,6 +23,7 @@
 #include <QPair>
 #include <QAction>
 #include <QUuid>
+#include "qgis_app.h"
 
 class QgsIdentifyResultsDialog;
 class QgsVectorLayer;
diff --git a/src/app/qgsfieldcalculator.h b/src/app/qgsfieldcalculator.h
index 54936d9d6f3c..7a270f620a83 100644
--- a/src/app/qgsfieldcalculator.h
+++ b/src/app/qgsfieldcalculator.h
@@ -19,6 +19,7 @@
 #include "ui_qgsfieldcalculatorbase.h"
 #include "qgscontexthelp.h"
 #include "qgsfields.h"
+#include "qgis_app.h"
 
 class QgsVectorLayer;
 
diff --git a/src/app/qgsfieldsproperties.h b/src/app/qgsfieldsproperties.h
index 5bcddab6a590..0cb075ee43cd 100644
--- a/src/app/qgsfieldsproperties.h
+++ b/src/app/qgsfieldsproperties.h
@@ -26,6 +26,7 @@
 
 #include "qgsvectorlayer.h"
 #include "ui_qgsfieldspropertiesbase.h"
+#include "qgis_app.h"
 
 class DesignerTree;
 class DragList;
diff --git a/src/app/qgsformannotationdialog.h b/src/app/qgsformannotationdialog.h
index 8f8ff5854b25..114c9389437d 100644
--- a/src/app/qgsformannotationdialog.h
+++ b/src/app/qgsformannotationdialog.h
@@ -16,6 +16,7 @@
 #define QGSFORMANNOTATIONDIALOG_H
 
 #include "ui_qgsformannotationdialogbase.h"
+#include "qgis_app.h"
 
 class QgsAnnotationWidget;
 class QgsFormAnnotationItem;
diff --git a/src/app/qgshandlebadlayers.h b/src/app/qgshandlebadlayers.h
index c2aeaed5643a..f59f37b6365f 100644
--- a/src/app/qgshandlebadlayers.h
+++ b/src/app/qgshandlebadlayers.h
@@ -20,6 +20,7 @@
 #include "ui_qgshandlebadlayersbase.h"
 #include "qgsproject.h"
 #include "qgsprojectbadlayerhandler.h"
+#include "qgis_app.h"
 
 class APP_EXPORT QgsHandleBadLayersHandler
       : public QObject
diff --git a/src/app/qgshtmlannotationdialog.h b/src/app/qgshtmlannotationdialog.h
index d520cf9c2a1d..eabb361335b6 100644
--- a/src/app/qgshtmlannotationdialog.h
+++ b/src/app/qgshtmlannotationdialog.h
@@ -16,6 +16,7 @@
 #define QgsHTMLAnnotationDialog_H
 
 #include "ui_qgsformannotationdialogbase.h"
+#include "qgis_app.h"
 
 class QgsAnnotationWidget;
 class QgsHtmlAnnotationItem;
diff --git a/src/app/qgsidentifyresultsdialog.h b/src/app/qgsidentifyresultsdialog.h
index d000baaa7beb..3ecb79056b4c 100644
--- a/src/app/qgsidentifyresultsdialog.h
+++ b/src/app/qgsidentifyresultsdialog.h
@@ -31,6 +31,7 @@
 #include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QUrl>
+#include "qgis_app.h"
 
 class QCloseEvent;
 class QTreeWidgetItem;
diff --git a/src/app/qgsjoindialog.h b/src/app/qgsjoindialog.h
index b80e3636c5ba..0086535a13bc 100644
--- a/src/app/qgsjoindialog.h
+++ b/src/app/qgsjoindialog.h
@@ -19,6 +19,7 @@
 #define QgsJoinDIALOG_H
 
 #include "ui_qgsjoindialogbase.h"
+#include "qgis_app.h"
 
 class QgsVectorLayer;
 struct QgsVectorJoinInfo;
diff --git a/src/app/qgslabelengineconfigdialog.h b/src/app/qgslabelengineconfigdialog.h
index 79d42a047bad..1705fe8d590c 100644
--- a/src/app/qgslabelengineconfigdialog.h
+++ b/src/app/qgslabelengineconfigdialog.h
@@ -18,6 +18,7 @@
 #include <QDialog>
 
 #include "ui_qgsengineconfigdialog.h"
+#include "qgis_app.h"
 
 
 class APP_EXPORT QgsLabelEngineConfigDialog : public QDialog, private Ui::QgsEngineConfigDialog
diff --git a/src/app/qgslabelinggui.h b/src/app/qgslabelinggui.h
index a4671b1ed212..d5e745e54f3d 100644
--- a/src/app/qgslabelinggui.h
+++ b/src/app/qgslabelinggui.h
@@ -20,6 +20,7 @@
 
 #include "qgspallabeling.h"
 #include "qgstextformatwidget.h"
+#include "qgis_app.h"
 
 class APP_EXPORT QgsLabelingGui : public QgsTextFormatWidget, private QgsExpressionContextGenerator
 {
diff --git a/src/app/qgslabelpropertydialog.h b/src/app/qgslabelpropertydialog.h
index 2aa3279021c2..45d227d570d3 100644
--- a/src/app/qgslabelpropertydialog.h
+++ b/src/app/qgslabelpropertydialog.h
@@ -22,6 +22,7 @@
 #include "qgsfeature.h"
 #include "qgspallabeling.h"
 #include <QDialog>
+#include "qgis_app.h"
 
 
 //! A dialog to enter data defined label attributes
diff --git a/src/app/qgslayerstylingwidget.h b/src/app/qgslayerstylingwidget.h
index b16d2deee28c..3273ae5bbfcd 100644
--- a/src/app/qgslayerstylingwidget.h
+++ b/src/app/qgslayerstylingwidget.h
@@ -29,6 +29,7 @@
 
 #include "ui_qgsmapstylingwidgetbase.h"
 #include "qgsmaplayerconfigwidgetfactory.h"
+#include "qgis_app.h"
 
 class QgsLabelingWidget;
 class QgsMapLayer;
diff --git a/src/app/qgsloadstylefromdbdialog.h b/src/app/qgsloadstylefromdbdialog.h
index f81af253a2e4..e5b20b122314 100644
--- a/src/app/qgsloadstylefromdbdialog.h
+++ b/src/app/qgsloadstylefromdbdialog.h
@@ -18,6 +18,7 @@
 
 #include "ui_qgsloadstylefromdbdialog.h"
 #include "qgisgui.h"
+#include "qgis_app.h"
 
 class APP_EXPORT QgsLoadStyleFromDBDialog : public QDialog, private Ui::QgsLoadStyleFromDBDialogLayout
 {
diff --git a/src/app/qgsmapthemes.h b/src/app/qgsmapthemes.h
index c63ee065fef9..5f0d7203e676 100644
--- a/src/app/qgsmapthemes.h
+++ b/src/app/qgsmapthemes.h
@@ -21,6 +21,7 @@
 #include <QObject>
 #include <QSet>
 #include <QStringList>
+#include "qgis_app.h"
 
 class QAction;
 class QDomDocument;
diff --git a/src/app/qgsmaptooladdfeature.h b/src/app/qgsmaptooladdfeature.h
index 86c944aa329d..ce5035bf987f 100644
--- a/src/app/qgsmaptooladdfeature.h
+++ b/src/app/qgsmaptooladdfeature.h
@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgsmaptoolcapture.h"
+#include "qgis_app.h"
 
 //! This tool adds new point/line/polygon features to already existing vector layers
 class APP_EXPORT QgsMapToolAddFeature : public QgsMapToolCapture
diff --git a/src/app/qgsmaptooladdpart.h b/src/app/qgsmaptooladdpart.h
index c9af2e1923aa..d935d3fb057c 100644
--- a/src/app/qgsmaptooladdpart.h
+++ b/src/app/qgsmaptooladdpart.h
@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgsmaptoolcapture.h"
+#include "qgis_app.h"
 
 //! A map tool that adds new parts to multipart features
 class APP_EXPORT QgsMapToolAddPart : public QgsMapToolCapture
diff --git a/src/app/qgsmaptooladdring.h b/src/app/qgsmaptooladdring.h
index 8a21c8a3e605..295138c110fc 100644
--- a/src/app/qgsmaptooladdring.h
+++ b/src/app/qgsmaptooladdring.h
@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgsmaptoolcapture.h"
+#include "qgis_app.h"
 
 //! A tool to cut holes into polygons and multipolygon features
 class APP_EXPORT QgsMapToolAddRing: public QgsMapToolCapture
diff --git a/src/app/qgsmaptoolannotation.h b/src/app/qgsmaptoolannotation.h
index d94632e86764..0d81dfbba7d7 100644
--- a/src/app/qgsmaptoolannotation.h
+++ b/src/app/qgsmaptoolannotation.h
@@ -20,6 +20,7 @@
 
 #include "qgsmaptool.h"
 #include "qgsannotationitem.h"
+#include "qgis_app.h"
 
 class APP_EXPORT QgsMapToolAnnotation: public QgsMapTool
 {
diff --git a/src/app/qgsmaptoolchangelabelproperties.h b/src/app/qgsmaptoolchangelabelproperties.h
index e46e9a7567a1..c8b1dce6eb7d 100644
--- a/src/app/qgsmaptoolchangelabelproperties.h
+++ b/src/app/qgsmaptoolchangelabelproperties.h
@@ -19,6 +19,7 @@
 #define QGSMAPTOOLCHANGELABELPROPERTIES_H
 
 #include "qgsmaptoollabel.h"
+#include "qgis_app.h"
 
 class APP_EXPORT QgsMapToolChangeLabelProperties: public QgsMapToolLabel
 {
diff --git a/src/app/qgsmaptooldeletepart.h b/src/app/qgsmaptooldeletepart.h
index efbe76412d16..1feee8debc8c 100644
--- a/src/app/qgsmaptooldeletepart.h
+++ b/src/app/qgsmaptooldeletepart.h
@@ -17,6 +17,7 @@
 #define QGSMAPTOOLDELETEPART_H
 
 #include "qgsmaptooledit.h"
+#include "qgis_app.h"
 
 class QgsVertexMarker;
 
diff --git a/src/app/qgsmaptooldeletering.h b/src/app/qgsmaptooldeletering.h
index 9281069b1161..ae2fc0f75129 100644
--- a/src/app/qgsmaptooldeletering.h
+++ b/src/app/qgsmaptooldeletering.h
@@ -17,6 +17,7 @@
 #define QGSMAPTOOLDELETERING_H
 
 #include "qgsmaptooledit.h"
+#include "qgis_app.h"
 
 class QgsVertexMarker;
 //! Map tool to delete vertices from line/polygon features
diff --git a/src/app/qgsmaptoolfeatureaction.h b/src/app/qgsmaptoolfeatureaction.h
index 385e02b2139c..377e486e96ec 100644
--- a/src/app/qgsmaptoolfeatureaction.h
+++ b/src/app/qgsmaptoolfeatureaction.h
@@ -21,6 +21,7 @@
 
 #include <QObject>
 #include <QPointer>
+#include "qgis_app.h"
 
 class QgsVectorLayer;
 
diff --git a/src/app/qgsmaptoolfillring.h b/src/app/qgsmaptoolfillring.h
index afe01c488cea..3cdf9c36d50e 100644
--- a/src/app/qgsmaptoolfillring.h
+++ b/src/app/qgsmaptoolfillring.h
@@ -15,6 +15,7 @@
  ***************************************************************************/
 
 #include "qgsmaptoolcapture.h"
+#include "qgis_app.h"
 
 /** A tool to cut holes into polygon and multipolygon features and fill them
  *  with new feature. Attributes are copied from parent feature.
diff --git a/src/app/qgsmaptoolformannotation.h b/src/app/qgsmaptoolformannotation.h
index f7c4dda6aa70..43934c5bbc51 100644
--- a/src/app/qgsmaptoolformannotation.h
+++ b/src/app/qgsmaptoolformannotation.h
@@ -19,6 +19,7 @@
 #define QGSMAPTOOFORMANNOTATION_H
 
 #include "qgsmaptoolannotation.h"
+#include "qgis_app.h"
 
 class APP_EXPORT QgsMapToolFormAnnotation: public QgsMapToolAnnotation
 {
diff --git a/src/app/qgsmaptoolhtmlannotation.h b/src/app/qgsmaptoolhtmlannotation.h
index 6f2e465c172e..573d53f1c1cb 100644
--- a/src/app/qgsmaptoolhtmlannotation.h
+++ b/src/app/qgsmaptoolhtmlannotation.h
@@ -19,6 +19,7 @@
 #define QGSMAPTOOLHTMLANNOTATION_H
 
 #include "qgsmaptoolannotation.h"
+#include "qgis_app.h"
 
 class APP_EXPORT QgsMapToolHtmlAnnotation: public QgsMapToolAnnotation
 {
diff --git a/src/app/qgsmaptoolidentifyaction.h b/src/app/qgsmaptoolidentifyaction.h
index 8507891f16c6..33bbf4c166bf 100644
--- a/src/app/qgsmaptoolidentifyaction.h
+++ b/src/app/qgsmaptoolidentifyaction.h
@@ -21,6 +21,7 @@
 
 #include <QObject>
 #include <QPointer>
+#include "qgis_app.h"
 
 class QgsIdentifyResultsDialog;
 class QgsMapLayer;
diff --git a/src/app/qgsmaptoollabel.h b/src/app/qgsmaptoollabel.h
index 21921acdf18b..d7998503d699 100644
--- a/src/app/qgsmaptoollabel.h
+++ b/src/app/qgsmaptoollabel.h
@@ -20,6 +20,7 @@
 
 #include "qgsmaptool.h"
 #include "qgspallabeling.h"
+#include "qgis_app.h"
 
 class QgsRubberBand;
 
diff --git a/src/app/qgsmaptoolmeasureangle.h b/src/app/qgsmaptoolmeasureangle.h
index 2b1acd53e404..621872ccc445 100644
--- a/src/app/qgsmaptoolmeasureangle.h
+++ b/src/app/qgsmaptoolmeasureangle.h
@@ -19,6 +19,7 @@
 #include "qgsmaptool.h"
 #include "qgspoint.h"
 #include "qgsdistancearea.h"
+#include "qgis_app.h"
 
 class QgsDisplayAngle;
 class QgsRubberBand;
diff --git a/src/app/qgsmaptoolmovefeature.h b/src/app/qgsmaptoolmovefeature.h
index eda9c22712ef..bc68abd755ce 100644
--- a/src/app/qgsmaptoolmovefeature.h
+++ b/src/app/qgsmaptoolmovefeature.h
@@ -17,6 +17,7 @@
 #define QGSMAPTOOLMOVEFEATURE_H
 
 #include "qgsmaptooladvanceddigitizing.h"
+#include "qgis_app.h"
 
 //! Map tool for translating feature position by mouse drag
 class APP_EXPORT QgsMapToolMoveFeature: public QgsMapToolAdvancedDigitizing
diff --git a/src/app/qgsmaptoolmovelabel.h b/src/app/qgsmaptoolmovelabel.h
index 464eb99c4add..58d072fbedf7 100644
--- a/src/app/qgsmaptoolmovelabel.h
+++ b/src/app/qgsmaptoolmovelabel.h
@@ -19,6 +19,7 @@
 #define QGSMAPTOOLMOVELABEL_H
 
 #include "qgsmaptoollabel.h"
+#include "qgis_app.h"
 
 //! A map tool for dragging label positions
 class APP_EXPORT QgsMapToolMoveLabel: public QgsMapToolLabel
diff --git a/src/app/qgsmaptooloffsetcurve.h b/src/app/qgsmaptooloffsetcurve.h
index d3b685f021ba..29b21215876e 100644
--- a/src/app/qgsmaptooloffsetcurve.h
+++ b/src/app/qgsmaptooloffsetcurve.h
@@ -18,6 +18,7 @@
 
 #include "qgsmaptooledit.h"
 #include "qgsgeometry.h"
+#include "qgis_app.h"
 
 class QgsVertexMarker;
 class QgsDoubleSpinBox;
diff --git a/src/app/qgsmaptooloffsetpointsymbol.h b/src/app/qgsmaptooloffsetpointsymbol.h
index 62dfa8e64923..2cab37b5042e 100644
--- a/src/app/qgsmaptooloffsetpointsymbol.h
+++ b/src/app/qgsmaptooloffsetpointsymbol.h
@@ -18,6 +18,7 @@
 
 #include "qgsmaptoolpointsymbol.h"
 #include "qgssymbol.h"
+#include "qgis_app.h"
 
 class QgsMarkerSymbol;
 class QgsPointMarkerItem;
diff --git a/src/app/qgsmaptoolpinlabels.h b/src/app/qgsmaptoolpinlabels.h
index 3a4e4120a5d9..b0729a87c891 100644
--- a/src/app/qgsmaptoolpinlabels.h
+++ b/src/app/qgsmaptoolpinlabels.h
@@ -19,6 +19,7 @@
 #define QGSMAPTOOLPINLABELS_H
 
 #include "qgsmaptoollabel.h"
+#include "qgis_app.h"
 
 class QgsRubberBand;
 class QgsLabelPosition;
diff --git a/src/app/qgsmaptoolpointsymbol.h b/src/app/qgsmaptoolpointsymbol.h
index 8ac682889656..6c6855d2bbc0 100644
--- a/src/app/qgsmaptoolpointsymbol.h
+++ b/src/app/qgsmaptoolpointsymbol.h
@@ -18,6 +18,7 @@
 
 #include "qgsmaptooledit.h"
 #include "qgsfeature.h"
+#include "qgis_app.h"
 
 class QgsMarkerSymbol;
 
diff --git a/src/app/qgsmaptoolreshape.h b/src/app/qgsmaptoolreshape.h
index e0d0ebc12128..8ea0f309169f 100644
--- a/src/app/qgsmaptoolreshape.h
+++ b/src/app/qgsmaptoolreshape.h
@@ -17,6 +17,7 @@
 #define QGSMAPTOOLRESHAPE_H
 
 #include "qgsmaptoolcapture.h"
+#include "qgis_app.h"
 
 //! A map tool that draws a line and splits the features cut by the line
 class APP_EXPORT QgsMapToolReshape: public QgsMapToolCapture
diff --git a/src/app/qgsmaptoolrotatefeature.h b/src/app/qgsmaptoolrotatefeature.h
index 19c479bb6678..1b99fcfcda1f 100644
--- a/src/app/qgsmaptoolrotatefeature.h
+++ b/src/app/qgsmaptoolrotatefeature.h
@@ -19,6 +19,7 @@
 #include <QWidget>
 
 #include "qgsmaptooledit.h"
+#include "qgis_app.h"
 
 class QgsDoubleSpinBox;
 class QHBoxLayout;
diff --git a/src/app/qgsmaptoolrotatelabel.h b/src/app/qgsmaptoolrotatelabel.h
index 06af32172b46..b61a7506a02a 100644
--- a/src/app/qgsmaptoolrotatelabel.h
+++ b/src/app/qgsmaptoolrotatelabel.h
@@ -19,6 +19,7 @@
 #define QGSMAPTOOLROTATELABEL_H
 
 #include "qgsmaptoollabel.h"
+#include "qgis_app.h"
 class QgsPointRotationItem;
 
 class APP_EXPORT QgsMapToolRotateLabel: public QgsMapToolLabel
diff --git a/src/app/qgsmaptoolrotatepointsymbols.h b/src/app/qgsmaptoolrotatepointsymbols.h
index 087cccc1ca50..dfb0ea6439b3 100644
--- a/src/app/qgsmaptoolrotatepointsymbols.h
+++ b/src/app/qgsmaptoolrotatepointsymbols.h
@@ -17,6 +17,7 @@
 #define QGSMAPTOOLROTATEPOINTSYMBOLS_H
 
 #include "qgsmaptoolpointsymbol.h"
+#include "qgis_app.h"
 
 class QgsPointRotationItem;
 class QgsMarkerSymbol;
diff --git a/src/app/qgsmaptoolselect.h b/src/app/qgsmaptoolselect.h
index e3cb869ff8e1..aad655bf10a7 100644
--- a/src/app/qgsmaptoolselect.h
+++ b/src/app/qgsmaptoolselect.h
@@ -17,6 +17,7 @@
 #define QGSMAPTOOLSELECT_H
 
 #include "qgsmaptool.h"
+#include "qgis_app.h"
 
 class QgsMapCanvas;
 class QMouseEvent;
diff --git a/src/app/qgsmaptoolselectfreehand.h b/src/app/qgsmaptoolselectfreehand.h
index 45776865c753..5cddce45bf8e 100644
--- a/src/app/qgsmaptoolselectfreehand.h
+++ b/src/app/qgsmaptoolselectfreehand.h
@@ -17,6 +17,7 @@
 #define QGSMAPTOOLSELECTFREEHAND_H
 
 #include "qgsmaptool.h"
+#include "qgis_app.h"
 
 class QgsMapCanvas;
 class QgsRubberBand;
diff --git a/src/app/qgsmaptoolselectpolygon.h b/src/app/qgsmaptoolselectpolygon.h
index 0ef804427f4c..d0415fe893f9 100644
--- a/src/app/qgsmaptoolselectpolygon.h
+++ b/src/app/qgsmaptoolselectpolygon.h
@@ -17,6 +17,7 @@ email                : jpalmer at linz dot govt dot nz
 #define QGSMAPTOOLSELECTPOLYGON_H
 
 #include "qgsmaptool.h"
+#include "qgis_app.h"
 
 class QgsMapCanvas;
 class QgsRubberBand;
diff --git a/src/app/qgsmaptoolselectradius.h b/src/app/qgsmaptoolselectradius.h
index fa0fb1f59adf..61f101865c80 100644
--- a/src/app/qgsmaptoolselectradius.h
+++ b/src/app/qgsmaptoolselectradius.h
@@ -19,6 +19,7 @@ email                : jpalmer at linz dot govt dot nz
 
 #include "qgsmaptool.h"
 #include "qgspoint.h"
+#include "qgis_app.h"
 
 class QgsMapCanvas;
 class QgsRubberBand;
diff --git a/src/app/qgsmaptoolselectrectangle.h b/src/app/qgsmaptoolselectrectangle.h
index 269fc4868d98..cfc350961006 100644
--- a/src/app/qgsmaptoolselectrectangle.h
+++ b/src/app/qgsmaptoolselectrectangle.h
@@ -19,6 +19,7 @@
 
 #include <QRect>
 #include "qgsmaptool.h"
+#include "qgis_app.h"
 
 class QPoint;
 class QMouseEvent;
diff --git a/src/app/qgsmaptoolshowhidelabels.h b/src/app/qgsmaptoolshowhidelabels.h
index 25cc468d8a0d..0677d38c04f9 100644
--- a/src/app/qgsmaptoolshowhidelabels.h
+++ b/src/app/qgsmaptoolshowhidelabels.h
@@ -20,6 +20,7 @@
 
 #include "qgsmaptoollabel.h"
 #include "qgsfeature.h"
+#include "qgis_app.h"
 
 
 //! A map tool for showing or hidding a feature's label
diff --git a/src/app/qgsmaptoolsimplify.h b/src/app/qgsmaptoolsimplify.h
index d3b83c6382ae..96ae196699eb 100644
--- a/src/app/qgsmaptoolsimplify.h
+++ b/src/app/qgsmaptoolsimplify.h
@@ -22,6 +22,7 @@
 #include <QVector>
 #include "qgsfeature.h"
 #include "qgstolerance.h"
+#include "qgis_app.h"
 
 class QgsRubberBand;
 class QgsMapToolSimplify;
diff --git a/src/app/qgsmaptoolsplitfeatures.h b/src/app/qgsmaptoolsplitfeatures.h
index 249df5a65620..1d528acd4a5f 100644
--- a/src/app/qgsmaptoolsplitfeatures.h
+++ b/src/app/qgsmaptoolsplitfeatures.h
@@ -17,6 +17,7 @@
 #define QGSMAPTOOLSPLITFEATURES_H
 
 #include "qgsmaptoolcapture.h"
+#include "qgis_app.h"
 
 //! A map tool that draws a line and splits the features cut by the line
 class APP_EXPORT QgsMapToolSplitFeatures: public QgsMapToolCapture
diff --git a/src/app/qgsmaptoolsvgannotation.h b/src/app/qgsmaptoolsvgannotation.h
index 061a72ad2de3..2e5103f44857 100644
--- a/src/app/qgsmaptoolsvgannotation.h
+++ b/src/app/qgsmaptoolsvgannotation.h
@@ -19,6 +19,7 @@
 #define QGSMAPTOOLSVGANNOTATION_H
 
 #include "qgsmaptoolannotation.h"
+#include "qgis_app.h"
 
 class APP_EXPORT QgsMapToolSvgAnnotation: public QgsMapToolAnnotation
 {
diff --git a/src/app/qgsmaptooltextannotation.h b/src/app/qgsmaptooltextannotation.h
index 6f485dc21fd9..27fb66109e99 100644
--- a/src/app/qgsmaptooltextannotation.h
+++ b/src/app/qgsmaptooltextannotation.h
@@ -19,6 +19,7 @@
 #define QGSMAPTOOLTEXTANNOTATION_H
 
 #include "qgsmaptoolannotation.h"
+#include "qgis_app.h"
 
 class APP_EXPORT QgsMapToolTextAnnotation: public QgsMapToolAnnotation
 {
diff --git a/src/app/qgsmeasuredialog.h b/src/app/qgsmeasuredialog.h
index 0cbc2684b083..620aeecc7f93 100644
--- a/src/app/qgsmeasuredialog.h
+++ b/src/app/qgsmeasuredialog.h
@@ -22,6 +22,7 @@
 #include "qgspoint.h"
 #include "qgsdistancearea.h"
 #include "qgscontexthelp.h"
+#include "qgis_app.h"
 
 class QCloseEvent;
 class QgsMeasureTool;
diff --git a/src/app/qgsmeasuretool.h b/src/app/qgsmeasuretool.h
index ca35cb8bd065..4f31922462b3 100644
--- a/src/app/qgsmeasuretool.h
+++ b/src/app/qgsmeasuretool.h
@@ -18,6 +18,7 @@
 #define QGSMEASURETOOL_H
 
 #include "qgsmaptool.h"
+#include "qgis_app.h"
 
 class QgsDistanceArea;
 class QgsMapCanvas;
diff --git a/src/app/qgsmergeattributesdialog.h b/src/app/qgsmergeattributesdialog.h
index ab228068bcdc..7d79d26d3643 100644
--- a/src/app/qgsmergeattributesdialog.h
+++ b/src/app/qgsmergeattributesdialog.h
@@ -23,6 +23,7 @@
 #include "qgsfeature.h"
 #include "qgsstatisticalsummary.h"
 #include "qgsfields.h"
+#include "qgis_app.h"
 
 class QgsMapCanvas;
 class QgsRubberBand;
diff --git a/src/app/qgsnewspatialitelayerdialog.h b/src/app/qgsnewspatialitelayerdialog.h
index d1f6dacf3c04..8417b90aa8b5 100644
--- a/src/app/qgsnewspatialitelayerdialog.h
+++ b/src/app/qgsnewspatialitelayerdialog.h
@@ -27,6 +27,7 @@ extern "C"
 {
 #include <sqlite3.h>
 #include <spatialite.h>
+#include "qgis_app.h"
 }
 
 class APP_EXPORT QgsNewSpatialiteLayerDialog: public QDialog, private Ui::QgsNewSpatialiteLayerDialogBase
diff --git a/src/app/qgsoptions.h b/src/app/qgsoptions.h
index 0e9317169b12..e4b4500b3197 100644
--- a/src/app/qgsoptions.h
+++ b/src/app/qgsoptions.h
@@ -27,6 +27,7 @@
 #include <qgscoordinatereferencesystem.h>
 
 #include <QList>
+#include "qgis_app.h"
 
 class QgsExpressionContext;
 
diff --git a/src/app/qgspluginmetadata.h b/src/app/qgspluginmetadata.h
index 4b133af49645..8de356f43a71 100644
--- a/src/app/qgspluginmetadata.h
+++ b/src/app/qgspluginmetadata.h
@@ -19,6 +19,7 @@
 #ifndef QGSPLUGINMETADATA_H
 #define QGSPLUGINMETADATA_H
 #include <QString>
+#include "qgis_app.h"
 class QgisPlugin;
 
 /**
diff --git a/src/app/qgspluginregistry.h b/src/app/qgspluginregistry.h
index 7403e8b60371..78414b2b9c98 100644
--- a/src/app/qgspluginregistry.h
+++ b/src/app/qgspluginregistry.h
@@ -21,6 +21,7 @@
 
 #include <QMap>
 #include "qgspluginmetadata.h"
+#include "qgis_app.h"
 
 class QgsPythonUtils;
 class QgisPlugin;
diff --git a/src/app/qgspointmarkeritem.h b/src/app/qgspointmarkeritem.h
index f2400486a50b..3c728980c316 100644
--- a/src/app/qgspointmarkeritem.h
+++ b/src/app/qgspointmarkeritem.h
@@ -21,6 +21,7 @@
 #include "effects/qgspainteffect.h"
 #include <QFontMetricsF>
 #include <QPixmap>
+#include "qgis_app.h"
 
 class QgsMarkerSymbol;
 
diff --git a/src/app/qgspointrotationitem.h b/src/app/qgspointrotationitem.h
index d8fa69bdcbd3..71def87c64ea 100644
--- a/src/app/qgspointrotationitem.h
+++ b/src/app/qgspointrotationitem.h
@@ -19,6 +19,7 @@
 #include "qgsmapcanvasitem.h"
 #include <QFontMetricsF>
 #include <QPixmap>
+#include "qgis_app.h"
 
 //! An item that shows a rotated point symbol (e.g. arrow) centered to a map location together with a text displaying the rotation value
 class APP_EXPORT QgsPointRotationItem: public QgsMapCanvasItem
diff --git a/src/app/qgsprojectlayergroupdialog.h b/src/app/qgsprojectlayergroupdialog.h
index 9ca1fc34216b..f5ead903f7b0 100644
--- a/src/app/qgsprojectlayergroupdialog.h
+++ b/src/app/qgsprojectlayergroupdialog.h
@@ -17,6 +17,7 @@
 
 #include "QDialog"
 #include "ui_qgsprojectlayergroupdialogbase.h"
+#include "qgis_app.h"
 
 class QDomElement;
 
diff --git a/src/app/qgsprojectproperties.h b/src/app/qgsprojectproperties.h
index e8f0ebfd37a9..9e9f109c8ada 100644
--- a/src/app/qgsprojectproperties.h
+++ b/src/app/qgsprojectproperties.h
@@ -23,6 +23,7 @@
 #include "qgsunittypes.h"
 #include "qgisgui.h"
 #include "qgscontexthelp.h"
+#include "qgis_app.h"
 
 class QgsMapCanvas;
 class QgsRelationManagerDialog;
diff --git a/src/app/qgsrastercalcdialog.h b/src/app/qgsrastercalcdialog.h
index f2dbfcaa32a5..20e67c356d0a 100644
--- a/src/app/qgsrastercalcdialog.h
+++ b/src/app/qgsrastercalcdialog.h
@@ -20,6 +20,7 @@
 
 #include "ui_qgsrastercalcdialogbase.h"
 #include "qgsrastercalculator.h"
+#include "qgis_app.h"
 
 //! A dialog to enter a raster calculation expression
 class APP_EXPORT QgsRasterCalcDialog: public QDialog, private Ui::QgsRasterCalcDialogBase
diff --git a/src/app/qgsrasterlayerproperties.h b/src/app/qgsrasterlayerproperties.h
index de82da50e643..004504d9ddcd 100644
--- a/src/app/qgsrasterlayerproperties.h
+++ b/src/app/qgsrasterlayerproperties.h
@@ -24,6 +24,7 @@
 #include "qgisgui.h"
 #include "qgscontexthelp.h"
 #include "qgsmaplayerstylemanager.h"
+#include "qgis_app.h"
 
 class QgsPoint;
 class QgsMapLayer;
diff --git a/src/app/qgsrelationadddlg.h b/src/app/qgsrelationadddlg.h
index 696217cbf4a5..3be468c322f9 100644
--- a/src/app/qgsrelationadddlg.h
+++ b/src/app/qgsrelationadddlg.h
@@ -17,6 +17,7 @@
 
 #include <QDialog>
 #include "ui_qgsrelationadddlgbase.h"
+#include "qgis_app.h"
 
 class QgsVectorLayer;
 
diff --git a/src/app/qgsrelationmanagerdialog.h b/src/app/qgsrelationmanagerdialog.h
index 48a0964afe5e..af9ab7f46452 100644
--- a/src/app/qgsrelationmanagerdialog.h
+++ b/src/app/qgsrelationmanagerdialog.h
@@ -18,6 +18,7 @@
 
 #include <QWidget>
 #include "ui_qgsrelationmanagerdialogbase.h"
+#include "qgis_app.h"
 
 class QgsRelation;
 class QgsRelationManager;
diff --git a/src/app/qgsrulebasedlabelingwidget.h b/src/app/qgsrulebasedlabelingwidget.h
index 54f166e06ab1..b1c330824da3 100644
--- a/src/app/qgsrulebasedlabelingwidget.h
+++ b/src/app/qgsrulebasedlabelingwidget.h
@@ -22,6 +22,7 @@
 #include <ui_qgsrulebasedlabelingwidget.h>
 
 #include "qgsrulebasedlabeling.h"
+#include "qgis_app.h"
 
 class QgsMapCanvas;
 class QgsVectorLayer;
diff --git a/src/app/qgssavestyletodbdialog.h b/src/app/qgssavestyletodbdialog.h
index bfc0b5444c99..b0aef4c698dc 100644
--- a/src/app/qgssavestyletodbdialog.h
+++ b/src/app/qgssavestyletodbdialog.h
@@ -18,6 +18,7 @@
 
 #include "ui_qgssavetodbdialog.h"
 #include "qgisgui.h"
+#include "qgis_app.h"
 
 class APP_EXPORT QgsSaveStyleToDbDialog : public QDialog, private Ui::QgsSaveToDBDialog
 {
diff --git a/src/app/qgsselectbyformdialog.h b/src/app/qgsselectbyformdialog.h
index b89745ce4aba..2ce875a1eb4d 100644
--- a/src/app/qgsselectbyformdialog.h
+++ b/src/app/qgsselectbyformdialog.h
@@ -18,6 +18,7 @@
 
 #include <QDialog>
 #include "qgsattributeeditorcontext.h"
+#include "qgis_app.h"
 
 class QgsAttributeForm;
 class QgsMessageBar;
diff --git a/src/app/qgssnappinglayertreemodel.h b/src/app/qgssnappinglayertreemodel.h
index e54890b0516d..da6f1087162b 100644
--- a/src/app/qgssnappinglayertreemodel.h
+++ b/src/app/qgssnappinglayertreemodel.h
@@ -23,6 +23,7 @@
 
 #include "qgslayertreemodel.h"
 #include "qgssnappingconfig.h"
+#include "qgis_app.h"
 
 class QgsMapCanvas;
 class QgsProject;
diff --git a/src/app/qgssnappingwidget.h b/src/app/qgssnappingwidget.h
index 2ba29c397ee4..4f99b96a2537 100644
--- a/src/app/qgssnappingwidget.h
+++ b/src/app/qgssnappingwidget.h
@@ -34,6 +34,7 @@ class QgsProject;
 
 #include <QWidget>
 #include <QSettings>
+#include "qgis_app.h"
 
 /**
   * A widget which lets the user defines settings for snapping on a project
diff --git a/src/app/qgssponsors.h b/src/app/qgssponsors.h
index 8b05b082f533..f238c2fe10b9 100644
--- a/src/app/qgssponsors.h
+++ b/src/app/qgssponsors.h
@@ -18,6 +18,7 @@
 #define QGSSPONSORS_H
 
 #include "ui_qgssponsorsbase.h"
+#include "qgis_app.h"
 
 class APP_EXPORT QgsSponsors : public QDialog, private Ui::QgsSponsorsBase
 {
diff --git a/src/app/qgsstatisticalsummarydockwidget.h b/src/app/qgsstatisticalsummarydockwidget.h
index b8f33f3c5d2d..6e3f22df2893 100644
--- a/src/app/qgsstatisticalsummarydockwidget.h
+++ b/src/app/qgsstatisticalsummarydockwidget.h
@@ -22,6 +22,7 @@
 #include "qgsstringstatisticalsummary.h"
 #include "qgsdatetimestatisticalsummary.h"
 #include "qgsdockwidget.h"
+#include "qgis_app.h"
 
 class QgsBrowserModel;
 class QModelIndex;
diff --git a/src/app/qgsstatusbarcoordinateswidget.h b/src/app/qgsstatusbarcoordinateswidget.h
index 7384fffeb7ba..5cb237a7a96e 100644
--- a/src/app/qgsstatusbarcoordinateswidget.h
+++ b/src/app/qgsstatusbarcoordinateswidget.h
@@ -28,6 +28,7 @@ class QgsMapCanvas;
 class QgsPoint;
 
 #include <QWidget>
+#include "qgis_app.h"
 
 class APP_EXPORT QgsStatusBarCoordinatesWidget : public QWidget
 {
diff --git a/src/app/qgsstatusbarmagnifierwidget.h b/src/app/qgsstatusbarmagnifierwidget.h
index 9a982bf44c05..56c994d2fb98 100644
--- a/src/app/qgsstatusbarmagnifierwidget.h
+++ b/src/app/qgsstatusbarmagnifierwidget.h
@@ -23,6 +23,7 @@ class QHBoxLayout;
 class QgsDoubleSpinBox;
 
 #include <QWidget>
+#include "qgis_app.h"
 
 /**
   * A widget which lets the user select the current level of magnification to
diff --git a/src/app/qgsstatusbarscalewidget.h b/src/app/qgsstatusbarscalewidget.h
index f02ce51f95ff..5cfe26658245 100644
--- a/src/app/qgsstatusbarscalewidget.h
+++ b/src/app/qgsstatusbarscalewidget.h
@@ -28,6 +28,7 @@ class QgsScaleComboBox;
 
 
 #include <QWidget>
+#include "qgis_app.h"
 
 /**
   * Widget to define scale of the map canvas.
diff --git a/src/app/qgssvgannotationdialog.h b/src/app/qgssvgannotationdialog.h
index b15751a42d42..2e2c4b8307ef 100644
--- a/src/app/qgssvgannotationdialog.h
+++ b/src/app/qgssvgannotationdialog.h
@@ -19,6 +19,7 @@
 #define QGSSVGANNOTATIONDIALOG_H
 
 #include "ui_qgsformannotationdialogbase.h"
+#include "qgis_app.h"
 
 class QgsSvgAnnotationItem;
 class QgsAnnotationWidget;
diff --git a/src/app/qgstextannotationdialog.h b/src/app/qgstextannotationdialog.h
index c673dc961ddc..9a784829b6e8 100644
--- a/src/app/qgstextannotationdialog.h
+++ b/src/app/qgstextannotationdialog.h
@@ -19,6 +19,7 @@
 #define QGSTEXTANNOTATIONDIALOG_H
 
 #include "ui_qgstextannotationdialogbase.h"
+#include "qgis_app.h"
 
 class QgsAnnotationWidget;
 class QgsTextAnnotationItem;
diff --git a/src/app/qgstip.h b/src/app/qgstip.h
index c81ddbd8355d..13905755908f 100644
--- a/src/app/qgstip.h
+++ b/src/app/qgstip.h
@@ -17,6 +17,7 @@
 
 #include <QObject>
 #include <QString>
+#include "qgis_app.h"
 
 /** \ingroup app
 * \brief An QgsTip represents a tip generated by the
diff --git a/src/app/qgstipfactory.h b/src/app/qgstipfactory.h
index 100d7aad750f..f79864e19a83 100644
--- a/src/app/qgstipfactory.h
+++ b/src/app/qgstipfactory.h
@@ -18,6 +18,7 @@
 
 #include "qgstip.h"
 #include <QList>
+#include "qgis_app.h"
 
 /** \ingroup app
 * \brief A factory class to serve up tips to the user.
diff --git a/src/app/qgstipgui.h b/src/app/qgstipgui.h
index 506fe62baf9b..454ece926bcb 100644
--- a/src/app/qgstipgui.h
+++ b/src/app/qgstipgui.h
@@ -18,6 +18,7 @@
 #define QGSTIPGUI_H
 
 #include "ui_qgstipguibase.h"
+#include "qgis_app.h"
 class QgsTip;
 
 class APP_EXPORT QgsTipGui : public QDialog, private Ui::QgsTipGuiBase
diff --git a/src/app/qgsundowidget.h b/src/app/qgsundowidget.h
index 5687bd7fc4e4..b5ebfaf218da 100644
--- a/src/app/qgsundowidget.h
+++ b/src/app/qgsundowidget.h
@@ -27,6 +27,7 @@
 #include <QUndoStack>
 
 #include "qgspanelwidget.h"
+#include "qgis_app.h"
 
 class QgsMapCanvas;
 class QgsMapLayer;
diff --git a/src/app/qgsvectorlayerproperties.h b/src/app/qgsvectorlayerproperties.h
index ebfb3018c31e..2be398d73f63 100644
--- a/src/app/qgsvectorlayerproperties.h
+++ b/src/app/qgsvectorlayerproperties.h
@@ -27,6 +27,7 @@
 #include "qgsvectorlayer.h"
 #include "layertree/qgslayertreemodel.h"
 #include "layertree/qgslayertreegroup.h"
+#include "qgis_app.h"
 
 class QgsMapLayer;
 
diff --git a/src/plugins/georeferencer/CMakeLists.txt b/src/plugins/georeferencer/CMakeLists.txt
index 7cedd08e1786..b7e151d84668 100644
--- a/src/plugins/georeferencer/CMakeLists.txt
+++ b/src/plugins/georeferencer/CMakeLists.txt
@@ -83,6 +83,7 @@ INCLUDE_DIRECTORIES(
   ..
   ${CMAKE_BINARY_DIR}/src/core
   ${CMAKE_BINARY_DIR}/src/gui
+  ${CMAKE_BINARY_DIR}/src/app
 )
 INCLUDE_DIRECTORIES(SYSTEM
   ${GSL_INCLUDE_DIR}
diff --git a/tests/src/app/CMakeLists.txt b/tests/src/app/CMakeLists.txt
index 900369b2ee7e..6e50b56ea937 100644
--- a/tests/src/app/CMakeLists.txt
+++ b/tests/src/app/CMakeLists.txt
@@ -24,6 +24,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_BINARY_DIR}/src/core
   ${CMAKE_BINARY_DIR}/src/gui
   ${CMAKE_BINARY_DIR}/src/python
+  ${CMAKE_BINARY_DIR}/src/app
 )
 INCLUDE_DIRECTORIES(SYSTEM
   ${QT_INCLUDE_DIR}