diff --git a/src/Session.cpp b/src/Session.cpp
index 3b537c052..47304bd33 100644
--- a/src/Session.cpp
+++ b/src/Session.cpp
@@ -45,9 +45,10 @@
 #include <KNotification>
 #include <KRun>
 #include <KShell>
+#include <KProcess>
 #include <KStandardDirs>
 #include <KPtyDevice>
-#include <KUrl>
+#include <KConfigGroup>
 
 // Konsole
 #include <config-konsole.h>
@@ -59,6 +60,7 @@
 #include "ShellCommand.h"
 #include "Vt102Emulation.h"
 #include "ZModemDialog.h"
+#include "History.h"
 
 using namespace Konsole;
 
diff --git a/src/Session.h b/src/Session.h
index 665889183..b5acea171 100644
--- a/src/Session.h
+++ b/src/Session.h
@@ -26,18 +26,22 @@
 
 // Qt
 #include <QtCore/QStringList>
+#include <QtCore/QHash>
 #include <QtCore/QByteRef>
 #include <QtCore/QUuid>
+#include <QtCore/QSize>
+#include <QtCore/QProcess>
+#include <QtGui/QColor>
+#include <QtGui/QWidget>
 
 // KDE
-#include <KConfigGroup>
-#include <KProcess>
-#include "konsole_export.h"
+#include <KUrl>
 
 // Konsole
-#include "History.h"
+#include "konsole_export.h"
 
-class KUrl;
+class KConfigGroup;
+class KProcess;
 
 namespace Konsole
 {
@@ -47,6 +51,7 @@ class Pty;
 class ProcessInfo;
 class TerminalDisplay;
 class ZModemDialog;
+class HistoryType;
 
 /**
  * Represents a terminal session consisting of a pseudo-teletype and a terminal emulation.