diff --git a/src/app/qgisappinterface.h b/src/app/qgisappinterface.h
index 6c469bb88ca..35e2c9d278f 100644
--- a/src/app/qgisappinterface.h
+++ b/src/app/qgisappinterface.h
@@ -18,9 +18,11 @@
 #ifndef QGISIFACE_H
 #define QGISIFACE_H
 
+#include "qgis_app.h"
 #include "qgisinterface.h"
 #include "qgsapppluginmanagerinterface.h"
-#include "qgis_app.h"
+
+class QTimer;
 
 class QgisApp;
 
diff --git a/src/gui/qgisinterface.h b/src/gui/qgisinterface.h
index b588332325a..b208a3a37e4 100644
--- a/src/gui/qgisinterface.h
+++ b/src/gui/qgisinterface.h
@@ -18,7 +18,17 @@
 #ifndef QGISINTERFACE_H
 #define QGISINTERFACE_H
 
+#include <QObject>
+#include <map>
+
+#include "qgis.h"
+#include "qgis_sip.h"
+#include "qgis_gui.h"
+#include "qgscoordinatereferencesystem.h"
+
 class QAction;
+class QDialog;
+class QFont;
 class QMenu;
 class QToolBar;
 class QDockWidget;
@@ -37,6 +47,7 @@ class QgsMasterLayoutInterface;
 class QgsLayoutDesignerInterface;
 class QgsMapCanvas;
 class QgsMapLayer;
+enum class QgsMapLayerType;
 class QgsMapLayerConfigWidgetFactory;
 class QgsMessageBar;
 class QgsPluginManagerInterface;
@@ -50,15 +61,6 @@ class QgsStatusBar;
 class QgsMeshLayer;
 class QgsBrowserModel;
 
-#include <QObject>
-#include <QFont>
-#include <QPair>
-#include <map>
-
-#include "qgis_sip.h"
-#include "qgsmaplayer.h"
-#include "qgis_gui.h"
-
 
 /**
  * \ingroup gui