diff --git a/src/plugins/coreplugin/session.cpp b/src/plugins/coreplugin/session.cpp
index bf6d9205b3e..c188f6812c3 100644
--- a/src/plugins/coreplugin/session.cpp
+++ b/src/plugins/coreplugin/session.cpp
@@ -118,8 +118,10 @@ SessionManager::SessionManager()
         d->restoreStartupSession();
     });
 
-    connect(ModeManager::instance(), &ModeManager::currentModeChanged,
-            this, &SessionManager::saveActiveMode);
+    connect(ModeManager::instance(), &ModeManager::currentModeChanged, [](Id mode) {
+        if (mode != Core::Constants::MODE_WELCOME)
+            setValue("ActiveMode", mode.toString());
+    });
 
     connect(ICore::instance(), &ICore::saveSettingsRequested, this, [] {
         if (!SessionManager::isLoadingSession())
@@ -194,12 +196,6 @@ bool SessionManager::isDefaultSession(const QString &session)
     return session == QLatin1String(DEFAULT_SESSION);
 }
 
-void SessionManager::saveActiveMode(Id mode)
-{
-    if (mode != Core::Constants::MODE_WELCOME)
-        setValue("ActiveMode", mode.toString());
-}
-
 bool SessionManager::isLoadingSession()
 {
     return d->m_loadingSession;
diff --git a/src/plugins/coreplugin/session.h b/src/plugins/coreplugin/session.h
index 19209b60414..962db5172b5 100644
--- a/src/plugins/coreplugin/session.h
+++ b/src/plugins/coreplugin/session.h
@@ -5,13 +5,16 @@
 
 #include "core_global.h"
 
-#include <utils/id.h>
-#include <utils/persistentsettings.h>
-
 #include <QDateTime>
+#include <QObject>
 #include <QString>
 #include <QStringList>
 
+namespace Utils {
+class FilePath;
+class Key;
+} // Utils
+
 namespace Core {
 
 class CORE_EXPORT SessionManager : public QObject
@@ -79,9 +82,6 @@ signals:
     void sessionCreated(const QString &name);
     void sessionRenamed(const QString &oldName, const QString &newName);
     void sessionRemoved(const QString &name);
-
-private:
-    static void saveActiveMode(Utils::Id mode);
 };
 
 } // namespace Core
diff --git a/src/plugins/projectexplorer/projectmanager.cpp b/src/plugins/projectexplorer/projectmanager.cpp
index 3f2f9cee749..9706a011ae2 100644
--- a/src/plugins/projectexplorer/projectmanager.cpp
+++ b/src/plugins/projectexplorer/projectmanager.cpp
@@ -3,7 +3,6 @@
 
 #include "projectmanager.h"
 
-
 #include "buildconfiguration.h"
 #include "editorconfiguration.h"
 #include "project.h"
@@ -27,10 +26,9 @@
 #include <texteditor/texteditor.h>
 
 #include <utils/algorithm.h>
-#include <utils/filepath.h>
+#include <utils/persistentsettings.h>
 #include <utils/qtcassert.h>
 #include <utils/stylehelper.h>
-#include <utils/qtcassert.h>
 
 #include <QDebug>
 #include <QMessageBox>