diff --git a/src/ColorScheme.cpp b/src/ColorScheme.cpp
index 62e1721b8..74d282cfe 100644
--- a/src/ColorScheme.cpp
+++ b/src/ColorScheme.cpp
@@ -31,6 +31,8 @@
 #include <KColorScheme>
 #include <KConfig>
 #include <KLocale>
+#include <KDebug>
+#include <KConfigGroup>
 #include <KStandardDirs>
 
 using namespace Konsole;
diff --git a/src/ColorSchemeEditor.cpp b/src/ColorSchemeEditor.cpp
index 65339e16b..b0a9af7b5 100644
--- a/src/ColorSchemeEditor.cpp
+++ b/src/ColorSchemeEditor.cpp
@@ -29,6 +29,7 @@
 
 // KDE
 #include <KColorDialog>
+#include <KDebug>
 #include <KWindowSystem>
 
 // Konsole
diff --git a/src/KeyBindingEditor.cpp b/src/KeyBindingEditor.cpp
index 673bbba97..ac1571643 100644
--- a/src/KeyBindingEditor.cpp
+++ b/src/KeyBindingEditor.cpp
@@ -24,6 +24,8 @@
 #include <QtGui/QHeaderView>
 #include <QtGui/QKeyEvent>
 
+#include <KDebug>
+
 // Konsole
 #include "ui_KeyBindingEditor.h"
 #include "KeyboardTranslator.h"
diff --git a/src/ManageProfilesDialog.cpp b/src/ManageProfilesDialog.cpp
index 716534e02..0e1fa6269 100644
--- a/src/ManageProfilesDialog.cpp
+++ b/src/ManageProfilesDialog.cpp
@@ -30,6 +30,8 @@
 #include <QtGui/QShowEvent>
 #include <QtGui/QStandardItem>
 
+#include <KDebug>
+
 // Konsole
 #include "EditProfileDialog.h"
 #include "SessionManager.h"
diff --git a/src/Part.cpp b/src/Part.cpp
index 7dce93d41..073f7e150 100644
--- a/src/Part.cpp
+++ b/src/Part.cpp
@@ -25,6 +25,7 @@
 
 // KDE
 #include <KMenuBar>
+#include <KDebug>
 #include <KXMLGUIFactory>
 
 // Konsole
diff --git a/src/Profile.cpp b/src/Profile.cpp
index bc7062318..ae7daf676 100644
--- a/src/Profile.cpp
+++ b/src/Profile.cpp
@@ -33,6 +33,7 @@
 #include <KGlobal>
 #include <KGlobalSettings>
 #include <KLocale>
+#include <KDebug>
 #include <KStandardDirs>
 
 // Konsole
diff --git a/src/SessionController.h b/src/SessionController.h
index 903da80f1..e069907d2 100644
--- a/src/SessionController.h
+++ b/src/SessionController.h
@@ -26,6 +26,7 @@
 #include <QtCore/QPointer>
 #include <QtCore/QString>
 #include <QtCore/QThread>
+#include <QtCore/QHash>
 
 // KDE
 #include <KActionCollection>
diff --git a/src/SessionManager.cpp b/src/SessionManager.cpp
index bb573ff58..7e37c20fd 100644
--- a/src/SessionManager.cpp
+++ b/src/SessionManager.cpp
@@ -35,6 +35,8 @@
 #include <krun.h>
 #include <kshell.h>
 #include <kconfig.h>
+#include <kdebug.h>
+#include <kconfiggroup.h>
 #include <kstandarddirs.h>
 #include <kdesktopfile.h>
 
diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp
index 8d0f36d78..2de0ff0fa 100644
--- a/src/TerminalDisplay.cpp
+++ b/src/TerminalDisplay.cpp
@@ -29,6 +29,7 @@
 #include <QtGui/QClipboard>
 #include <QtGui/QKeyEvent>
 #include <QtCore/QEvent>
+#include <QtCore/QTime>
 #include <QtCore/QFile>
 #include <QtGui/QGridLayout>
 #include <QtGui/QLabel>
diff --git a/src/ViewContainer.cpp b/src/ViewContainer.cpp
index 72ea0e53f..17be79e60 100644
--- a/src/ViewContainer.cpp
+++ b/src/ViewContainer.cpp
@@ -39,6 +39,8 @@
 #include <kcolorscheme.h>
 #include <kcolorutils.h>
 #include <KIconLoader>
+#include <kdebug.h>
+#include <kconfiggroup.h>
 #include <KLocale>
 #include <KMenu>
 #include <KColorCollection>
diff --git a/src/main.cpp b/src/main.cpp
index 425c13264..490bf15e0 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -19,6 +19,7 @@
 
 // Own
 #include "Application.h"
+#include <KDebug>
 
 // X11
 #ifdef Q_WS_X11