diff --git a/src/ColorScheme.cpp b/src/ColorScheme.cpp
index d61959fb8..81e681bc3 100644
--- a/src/ColorScheme.cpp
+++ b/src/ColorScheme.cpp
@@ -27,6 +27,7 @@
 #include <QtCore/QFile>
 #include <QtCore/QFileInfo>
 #include <QtGui/QPainter>
+#include <QtCore/QIODevice>
 
 // KDE
 #include <KColorScheme>
diff --git a/src/ColorScheme.h b/src/ColorScheme.h
index 4fdf3e395..e3df9d79c 100644
--- a/src/ColorScheme.h
+++ b/src/ColorScheme.h
@@ -26,7 +26,6 @@
 #include <QtCore/QHash>
 #include <QtCore/QList>
 #include <QtCore/QMetaType>
-#include <QtCore/QIODevice>
 #include <QtCore/QSet>
 
 // KDE
diff --git a/src/EditProfileDialog.h b/src/EditProfileDialog.h
index 6c5f91d47..d5d717f37 100644
--- a/src/EditProfileDialog.h
+++ b/src/EditProfileDialog.h
@@ -22,9 +22,7 @@
 
 // Qt
 #include <QtGui/QAbstractItemDelegate>
-#include <QtCore/QPair>
 #include <QtCore/QHash>
-#include <QtCore/QSet>
 #include <QtCore/QPointer>
 
 // KDE
diff --git a/src/Emulation.h b/src/Emulation.h
index 87b32d497..8390a25cf 100644
--- a/src/Emulation.h
+++ b/src/Emulation.h
@@ -27,14 +27,15 @@
 #include <stdio.h>
 
 // Qt
-#include <QtGui/QKeyEvent>
+#include <QtCore/QSize>
 #include <QtCore/QTextCodec>
-#include <QtCore/QTextStream>
 #include <QtCore/QTimer>
 
 // Konsole
 #include "konsole_export.h"
 
+class QKeyEvent;
+
 namespace Konsole
 {
 
diff --git a/src/Filter.h b/src/Filter.h
index 6ab917f6d..6850726d2 100644
--- a/src/Filter.h
+++ b/src/Filter.h
@@ -21,16 +21,16 @@
 #define FILTER_H
 
 // Qt
-#include <QtGui/QAction>
 #include <QtCore/QList>
 #include <QtCore/QObject>
 #include <QtCore/QStringList>
-#include <QtCore/QHash>
 #include <QtCore/QRegExp>
 
 // Konsole
 #include "Character.h"
 
+class QAction;
+
 namespace Konsole
 {
 
diff --git a/src/History.h b/src/History.h
index 404d0b2a1..13378e944 100644
--- a/src/History.h
+++ b/src/History.h
@@ -25,8 +25,7 @@
 #include <sys/mman.h>
 
 // Qt
-#include <QtCore/QBitRef>
-#include <QtCore/QHash>
+#include <QtCore/QList>
 #include <QtCore/QVector>
 #include <QtCore/QTemporaryFile>
 
diff --git a/src/IncrementalSearchBar.h b/src/IncrementalSearchBar.h
index 25ce4c9e9..f78548988 100644
--- a/src/IncrementalSearchBar.h
+++ b/src/IncrementalSearchBar.h
@@ -24,6 +24,7 @@
 #include <QtGui/QWidget>
 #include <QtCore/QBitArray>
 
+class QAction;
 class QLabel;
 class QTimer;
 class KLineEdit;
diff --git a/src/KeyboardTranslator.h b/src/KeyboardTranslator.h
index 6e9c13803..4c61c9ced 100644
--- a/src/KeyboardTranslator.h
+++ b/src/KeyboardTranslator.h
@@ -25,9 +25,8 @@
 // Qt
 #include <QtCore/QHash>
 #include <QtCore/QList>
-#include <QtGui/QKeySequence>
+//#include <QtGui/QKeySequence>
 #include <QtCore/QMetaType>
-#include <QtCore/QVarLengthArray>
 
 // Konsole
 #include "konsole_export.h"
diff --git a/src/Part.cpp b/src/Part.cpp
index b3f61426d..52b6b55fb 100644
--- a/src/Part.cpp
+++ b/src/Part.cpp
@@ -23,6 +23,7 @@
 // Qt
 #include <QtCore/QStringList>
 #include <QtCore/QDir>
+#include <QtGui/QKeyEvent>
 
 // KDE
 #include <KAction>
diff --git a/src/Pty.h b/src/Pty.h
index d5cba7b29..9357b5280 100644
--- a/src/Pty.h
+++ b/src/Pty.h
@@ -25,8 +25,6 @@
 
 // Qt
 #include <QtCore/QStringList>
-#include <QtCore/QVector>
-#include <QtCore/QList>
 #include <QtCore/QSize>
 
 // KDE
diff --git a/src/Screen.h b/src/Screen.h
index 330f0875f..53acf9b6b 100644
--- a/src/Screen.h
+++ b/src/Screen.h
@@ -28,7 +28,6 @@
 #include <QtCore/QSet>
 #include <QtCore/QVector>
 #include <QtCore/QBitArray>
-#include <QtCore/QTextStream>
 #include <QtCore/QVarLengthArray>
 
 // Konsole
diff --git a/src/Session.cpp b/src/Session.cpp
index b6c38826c..091259606 100644
--- a/src/Session.cpp
+++ b/src/Session.cpp
@@ -30,6 +30,7 @@
 
 // Qt
 #include <QtGui/QApplication>
+#include <QtGui/QColor>
 #include <QtCore/QDir>
 #include <QtCore/QFile>
 #include <QtCore/QStringList>
diff --git a/src/Session.h b/src/Session.h
index 62960c7f7..500fe7bca 100644
--- a/src/Session.h
+++ b/src/Session.h
@@ -27,11 +27,10 @@
 // Qt
 #include <QtCore/QStringList>
 #include <QtCore/QHash>
-#include <QtCore/QByteRef>
+//#include <QtCore/QByteRef>
 #include <QtCore/QUuid>
 #include <QtCore/QSize>
 #include <QtCore/QProcess>
-#include <QtGui/QColor>
 #include <QtGui/QWidget>
 
 // KDE
@@ -40,6 +39,8 @@
 // Konsole
 #include "konsole_export.h"
 
+class QColor;
+
 class KConfigGroup;
 class KProcess;
 
diff --git a/src/SessionController.h b/src/SessionController.h
index 238202350..7de6b20b0 100644
--- a/src/SessionController.h
+++ b/src/SessionController.h
@@ -22,12 +22,10 @@
 #define SESSIONCONTROLLER_H
 
 // Qt
-#include <QtGui/QIcon>
 #include <QtCore/QList>
 #include <QtCore/QSet>
 #include <QtCore/QPointer>
 #include <QtCore/QString>
-#include <QtCore/QThread>
 #include <QtCore/QHash>
 
 // KDE
diff --git a/src/SessionManager.h b/src/SessionManager.h
index f8e8124d7..7050ba9c9 100644
--- a/src/SessionManager.h
+++ b/src/SessionManager.h
@@ -23,15 +23,12 @@
 #define SESSIONMANAGER_H
 
 // Qt
-#include <QtGui/QFont>
 #include <QtGui/QKeySequence>
 #include <QtCore/QAbstractListModel>
 #include <QtCore/QHash>
 #include <QtCore/QList>
 #include <QtCore/QSet>
 #include <QtCore/QStringList>
-#include <QtCore/QPair>
-#include <QtCore/QPointer>
 #include <QtCore/QVariant>
 #include <QtCore/QStack>
 
diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp
index d5686f78b..69263a245 100644
--- a/src/TerminalDisplay.cpp
+++ b/src/TerminalDisplay.cpp
@@ -30,6 +30,7 @@
 #include <QtCore/QEvent>
 #include <QtCore/QFileInfo>
 #include <QtGui/QGridLayout>
+#include <QtGui/QAction>
 #include <QtGui/QLabel>
 #include <QtGui/QPainter>
 #include <QtGui/QPixmap>
diff --git a/src/TerminalDisplay.h b/src/TerminalDisplay.h
index a150aca04..735499117 100644
--- a/src/TerminalDisplay.h
+++ b/src/TerminalDisplay.h
@@ -44,7 +44,6 @@ class QScrollBar;
 class QShowEvent;
 class QHideEvent;
 class QTimerEvent;
-class QWidget;
 
 class KMenu;
 
diff --git a/src/Vt102Emulation.cpp b/src/Vt102Emulation.cpp
index 5921bd493..8251d1a4a 100644
--- a/src/Vt102Emulation.cpp
+++ b/src/Vt102Emulation.cpp
@@ -43,6 +43,7 @@ void scrolllock_set_on();
 
 // Qt
 #include <QtCore/QEvent>
+#include <QtCore/QTimer>
 #include <QtGui/QKeyEvent>
 
 // KDE
diff --git a/src/Vt102Emulation.h b/src/Vt102Emulation.h
index c7b78770c..1311cdd2d 100644
--- a/src/Vt102Emulation.h
+++ b/src/Vt102Emulation.h
@@ -24,14 +24,15 @@
 #define VT102EMULATION_H
 
 // Qt
-#include <QtGui/QKeyEvent>
 #include <QtCore/QHash>
-#include <QtCore/QTimer>
 
 // Konsole
 #include "Emulation.h"
 #include "Screen.h"
 
+class QTimer;
+class QKeyEvent;
+
 #define MODE_AppScreen       (MODES_SCREEN+0)   // Mode #1
 #define MODE_AppCuKeys       (MODES_SCREEN+1)   // Application cursor keys (DECCKM)
 #define MODE_AppKeyPad       (MODES_SCREEN+2)   //