diff --git a/src/BookmarkHandler.cpp b/src/BookmarkHandler.cpp
index b41e9b726..d98eab952 100644
--- a/src/BookmarkHandler.cpp
+++ b/src/BookmarkHandler.cpp
@@ -25,7 +25,7 @@
 #include "BookmarkHandler.h"
 
 // Qt
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE
 #include <kshell.h>
diff --git a/src/BookmarkHandler.h b/src/BookmarkHandler.h
index c53d21ec7..938b9fa0d 100644
--- a/src/BookmarkHandler.h
+++ b/src/BookmarkHandler.h
@@ -23,7 +23,7 @@
 #define KONSOLEBOOKMARKHANDLER_H
 
 // Qt
-#include <QMenu>
+#include <QtGui/QMenu>
 
 // KDE
 #include <KBookmarkManager>
diff --git a/src/ColorScheme.cpp b/src/ColorScheme.cpp
index 29dbb6c8c..e3a18d1c7 100644
--- a/src/ColorScheme.cpp
+++ b/src/ColorScheme.cpp
@@ -23,8 +23,8 @@
 #include "ColorScheme.h"
 
 // Qt
-#include <QFile>
-#include <QFileInfo>
+#include <QtCore/QFile>
+#include <QtCore/QFileInfo>
 
 // KDE
 #include <KConfig>
diff --git a/src/ColorScheme.h b/src/ColorScheme.h
index 757454c85..e11c52434 100644
--- a/src/ColorScheme.h
+++ b/src/ColorScheme.h
@@ -23,11 +23,11 @@
 #define COLORSCHEME_H
 
 // Qt
-#include <QHash>
-#include <QList>
-#include <QMetaType>
-#include <QIODevice>
-#include <QSet>
+#include <QtCore/QHash>
+#include <QtCore/QList>
+#include <QtCore/QMetaType>
+#include <QtCore/QIODevice>
+#include <QtCore/QSet>
 
 // Konsole
 #include "TECommon.h"
diff --git a/src/ColorSchemeEditor.cpp b/src/ColorSchemeEditor.cpp
index 6802a0596..1711dd461 100644
--- a/src/ColorSchemeEditor.cpp
+++ b/src/ColorSchemeEditor.cpp
@@ -21,12 +21,11 @@
 #include "ColorSchemeEditor.h"
 
 // Qt
-#include <QBrush>
-#include <QFontMetrics>
-#include <QHeaderView>
-#include <QItemDelegate>
-#include <QItemEditorCreatorBase>
-#include <QItemEditorFactory>
+#include <QtGui/QBrush>
+#include <QtGui/QFontMetrics>
+#include <QtGui/QHeaderView>
+#include <QtGui/QItemDelegate>
+#include <QtGui/QItemEditorCreator>
 
 // KDE
 #include <KColorDialog>
diff --git a/src/ColorSchemeEditor.h b/src/ColorSchemeEditor.h
index e1b16abdc..6d05a9bb5 100644
--- a/src/ColorSchemeEditor.h
+++ b/src/ColorSchemeEditor.h
@@ -21,7 +21,7 @@
 #define COLORSCHEMEEDITOR_H
 
 // Qt
-#include <QWidget>
+#include <QtGui/QWidget>
 
 // Konsole
 #include "ColorScheme.h"
diff --git a/src/EditProfileDialog.cpp b/src/EditProfileDialog.cpp
index c0400c006..eb6094f0b 100644
--- a/src/EditProfileDialog.cpp
+++ b/src/EditProfileDialog.cpp
@@ -21,11 +21,11 @@
 #include "EditProfileDialog.h"
 
 // Qt
-#include <QHideEvent>
-#include <QLinearGradient>
-#include <QPainter>
-#include <QStandardItemModel>
-#include <QtDebug>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QBrush>
+#include <QtGui/QPainter>
+#include <QtGui/QStandardItem>
+#include <QtCore/QDebug>
 
 // KDE
 #include <KFontDialog>
diff --git a/src/EditProfileDialog.h b/src/EditProfileDialog.h
index 64c0caac3..b75aa8002 100644
--- a/src/EditProfileDialog.h
+++ b/src/EditProfileDialog.h
@@ -21,10 +21,10 @@
 #define EDITSESSIONDIALOG_H
 
 // Qt
-#include <QAbstractItemDelegate>
-#include <QPair>
-#include <QHash>
-#include <QSet>
+#include <QtGui/QAbstractItemDelegate>
+#include <QtCore/QPair>
+#include <QtCore/QHash>
+#include <QtCore/QSet>
 
 // KDE
 #include <KDialog>
diff --git a/src/Emulation.cpp b/src/Emulation.cpp
index 9263b1b9e..582fd9eaa 100644
--- a/src/Emulation.cpp
+++ b/src/Emulation.cpp
@@ -75,13 +75,13 @@
 #include <unistd.h>
 
 // Qt
-#include <QApplication>
-#include <QClipboard>
-#include <QHashIterator>
-#include <QKeyEvent>
-#include <QRegExp>
-#include <QTextStream>
-#include <QThread>
+#include <QtGui/QApplication>
+#include <QtGui/QClipboard>
+#include <QtCore/QHash>
+#include <QtGui/QKeyEvent>
+#include <QtCore/QRegExp>
+#include <QtCore/QTextStream>
+#include <QtCore/QThread>
 
 // KDE
 #include <kdebug.h>
diff --git a/src/Emulation.h b/src/Emulation.h
index b6298963e..440f4dbe9 100644
--- a/src/Emulation.h
+++ b/src/Emulation.h
@@ -25,11 +25,11 @@
 #include <stdio.h>
 
 // Qt 
-#include <QKeyEvent>
+#include <QtGui/QKeyEvent>
 //#include <QPointer>
-#include <QTextCodec>
-#include <QTextStream>
-#include <QTimer>
+#include <QtCore/QTextCodec>
+#include <QtCore/QTextStream>
+#include <QtCore/QTimer>
 
 class KeyTrans;
 
diff --git a/src/Filter.cpp b/src/Filter.cpp
index eeb831512..e09aea625 100644
--- a/src/Filter.cpp
+++ b/src/Filter.cpp
@@ -24,13 +24,13 @@
 #include <iostream>
 
 // Qt
-#include <QAction>
-#include <QApplication>
-#include <QClipboard>
-#include <QString>
-#include <QtDebug>
-#include <QSharedData>
-#include <QFile>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QClipboard>
+#include <QtCore/QString>
+#include <QtCore/QDebug>
+#include <QtCore/QSharedData>
+#include <QtCore/QFile>
 
 // KDE
 #include <KLocale>
diff --git a/src/Filter.h b/src/Filter.h
index 3c177e4b7..8b6b112b3 100644
--- a/src/Filter.h
+++ b/src/Filter.h
@@ -21,12 +21,12 @@
 #define FILTER_H
 
 // Qt
-#include <QAction>
-#include <QList>
-#include <QObject>
-#include <QStringList>
-#include <QMultiHash>
-#include <QRegExp>
+#include <QtGui/QAction>
+#include <QtCore/QList>
+#include <QtCore/QObject>
+#include <QtCore/QStringList>
+#include <QtCore/QHash>
+#include <QtCore/QRegExp>
 
 namespace Konsole
 {
@@ -297,7 +297,7 @@ class FilterObject : public QObject
 {
 Q_OBJECT
 public:
-    FilterObject(Filter::HotSpot* filter) : _filter(filter) {};
+    FilterObject(Filter::HotSpot* filter) : _filter(filter) {}
 private slots:
     void activated();
 private:
diff --git a/src/History.h b/src/History.h
index 6dc660431..f7904b603 100644
--- a/src/History.h
+++ b/src/History.h
@@ -22,9 +22,9 @@
 #define TEHISTORY_H
 
 // Qt
-#include <QBitArray>
-#include <QHash>
-#include <QVector>
+#include <QtCore/QBitRef>
+#include <QtCore/QHash>
+#include <QtCore/QVector>
 
 // KDE
 #include <ktemporaryfile.h>
diff --git a/src/HistorySizeDialog.cpp b/src/HistorySizeDialog.cpp
index d6633cd25..f820d0d68 100644
--- a/src/HistorySizeDialog.cpp
+++ b/src/HistorySizeDialog.cpp
@@ -21,13 +21,12 @@
 #include "HistorySizeDialog.h"
 
 // Qt
-#include <QButtonGroup>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QRadioButton>
-#include <QSpinBox>
-#include <QVBoxLayout>
-#include <QWidget>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QBoxLayout>
+#include <QtGui/QLabel>
+#include <QtGui/QRadioButton>
+#include <QtGui/QSpinBox>
+#include <QtGui/QWidget>
 
 // KDE
 #include <KLocalizedString>
diff --git a/src/IncrementalSearchBar.cpp b/src/IncrementalSearchBar.cpp
index 61f0a4b9e..23187afe1 100644
--- a/src/IncrementalSearchBar.cpp
+++ b/src/IncrementalSearchBar.cpp
@@ -21,14 +21,14 @@
 #include "IncrementalSearchBar.h"
 
 // Qt
-#include <QCheckBox>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QLineEdit>
-#include <QProgressBar>
-#include <QShowEvent>
-#include <QTimer>
-#include <QToolButton>
+#include <QtGui/QCheckBox>
+#include <QtGui/QBoxLayout>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
+#include <QtGui/QProgressBar>
+#include <QtGui/QKeyEvent>
+#include <QtCore/QTimer>
+#include <QtGui/QToolButton>
 
 // KDE
 #include <KLocale>
diff --git a/src/IncrementalSearchBar.h b/src/IncrementalSearchBar.h
index be41432d7..ee3b2d9d9 100644
--- a/src/IncrementalSearchBar.h
+++ b/src/IncrementalSearchBar.h
@@ -21,7 +21,7 @@
 #define INCREMENTALSEARCHBAR_H
 
 // Qt
-#include <QWidget>
+#include <QtGui/QWidget>
 
 class QCheckBox;
 class QLabel;
diff --git a/src/KeyBindingEditor.cpp b/src/KeyBindingEditor.cpp
index 0fafce412..4d4980259 100644
--- a/src/KeyBindingEditor.cpp
+++ b/src/KeyBindingEditor.cpp
@@ -21,7 +21,7 @@
 #include "KeyBindingEditor.h"
 
 // Qt
-#include <QHeaderView>
+#include <QtGui/QHeaderView>
 
 // Konsole
 #include "ui_KeyBindingEditor.h"
diff --git a/src/KeyBindingEditor.h b/src/KeyBindingEditor.h
index 0907881e1..751185bf9 100644
--- a/src/KeyBindingEditor.h
+++ b/src/KeyBindingEditor.h
@@ -21,7 +21,7 @@
 #define KEYBINDINGEDITOR_H
 
 // Qt
-#include <QWidget>
+#include <QtGui/QWidget>
 
 namespace Ui
 {
diff --git a/src/KeyTrans.cpp b/src/KeyTrans.cpp
index 491843bce..cbb6c2231 100644
--- a/src/KeyTrans.cpp
+++ b/src/KeyTrans.cpp
@@ -33,10 +33,10 @@
 #include <stddef.h>
 
 // Qt
-#include <QBuffer>
-#include <QHash>
-#include <QObject>
-#include <QFile>
+#include <QtCore/QBuffer>
+#include <QtCore/QHash>
+#include <QtCore/QObject>
+#include <QtCore/QFile>
 
 // KDE
 #include <kstandarddirs.h>
@@ -811,7 +811,6 @@ void test()
   // Opening sequence
 
   QCString txt =
-#include "default.keytab.h"
   ;
   QBuffer buf(txt);
   if (0) TestTokenizer(buf);
diff --git a/src/KeyTrans.h b/src/KeyTrans.h
index 529e69d94..d1a0039c4 100644
--- a/src/KeyTrans.h
+++ b/src/KeyTrans.h
@@ -21,9 +21,9 @@
 #ifndef KEYTRANS_H
 #define KEYTRANS_H
 
-#include <QList>
-#include <QString>
-#include <QIODevice>
+#include <QtCore/QList>
+#include <QtCore/QString>
+#include <QtCore/QIODevice>
 
 #define BITS_NewLine    0
 #define BITS_BsHack     1
diff --git a/src/KeyboardTranslator.cpp b/src/KeyboardTranslator.cpp
index 6371efffd..0837e07cc 100644
--- a/src/KeyboardTranslator.cpp
+++ b/src/KeyboardTranslator.cpp
@@ -26,11 +26,11 @@
 #include <stdio.h>
 
 // Qt
-#include <QFile>
-#include <QFileInfo>
-#include <QKeySequence>
-#include <QTextStream>
-#include <QtDebug>
+#include <QtCore/QFile>
+#include <QtCore/QFileInfo>
+#include <QtGui/QKeySequence>
+#include <QtCore/QTextStream>
+#include <QtCore/QDebug>
 
 // KDE
 #include <KStandardDirs>
diff --git a/src/KeyboardTranslator.h b/src/KeyboardTranslator.h
index ce2a4078f..0ffaa913a 100644
--- a/src/KeyboardTranslator.h
+++ b/src/KeyboardTranslator.h
@@ -23,11 +23,11 @@
 #define KEYBOARDTRANSLATOR_H
 
 // Qt
-#include <QMultiHash>
-#include <QList>
-#include <QKeySequence>
-#include <QMetaType>
-#include <QVarLengthArray>
+#include <QtCore/QHash>
+#include <QtCore/QList>
+#include <QtGui/QKeySequence>
+#include <QtCore/QMetaType>
+#include <QtCore/QVarLengthArray>
 
 class QIODevice;
 
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 7258dabb0..c4603fe20 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -21,8 +21,8 @@
 #include "MainWindow.h"
 
 // Qt
-#include <QApplication>
-#include <QVBoxLayout>
+#include <QtGui/QApplication>
+#include <QtGui/QBoxLayout>
 
 // KDE
 #include <KAction>
diff --git a/src/MainWindow.h b/src/MainWindow.h
index d8f1e10ac..8d90c406d 100644
--- a/src/MainWindow.h
+++ b/src/MainWindow.h
@@ -21,7 +21,7 @@
 #define KONSOLEMAINWINDOW_H
 
 // Qt
-#include <QPointer>
+#include <QtCore/QPointer>
 
 // KDE
 #include <KXmlGuiWindow>
diff --git a/src/ManageProfilesDialog.cpp b/src/ManageProfilesDialog.cpp
index 3a6722dfb..ec30b07bb 100644
--- a/src/ManageProfilesDialog.cpp
+++ b/src/ManageProfilesDialog.cpp
@@ -21,14 +21,13 @@
 #include "ManageProfilesDialog.h"
 
 // Qt
-#include <QCheckBox>
-#include <QHeaderView>
-#include <QItemDelegate>
-#include <QItemEditorFactory>
-#include <QMetaProperty>
-#include <QStandardItemEditorCreator>
-#include <QScrollBar>
-#include <QStandardItemModel>
+#include <QtGui/QCheckBox>
+#include <QtGui/QHeaderView>
+#include <QtGui/QItemDelegate>
+#include <QtGui/QItemEditorCreator>
+#include <QtCore/QMetaEnum>
+#include <QtGui/QScrollBar>
+#include <QtGui/QStandardItem>
 
 // Konsole
 #include "EditProfileDialog.h"
diff --git a/src/ManageProfilesDialog.h b/src/ManageProfilesDialog.h
index 06a404e67..9db7e769a 100644
--- a/src/ManageProfilesDialog.h
+++ b/src/ManageProfilesDialog.h
@@ -21,7 +21,7 @@
 #define SESSIONTYPEDIALOG_H
 
 // Qt
-#include <QItemDelegate>
+#include <QtGui/QItemDelegate>
 
 // KDE
 #include <KDialog>
diff --git a/src/OverlayFrame.cpp b/src/OverlayFrame.cpp
index fce02d813..ebf7cebaa 100644
--- a/src/OverlayFrame.cpp
+++ b/src/OverlayFrame.cpp
@@ -22,8 +22,8 @@
 #include "OverlayFrame.h"
 
 // Qt
-#include <QApplication>
-#include <QPainter>
+#include <QtGui/QApplication>
+#include <QtGui/QPainter>
 
 using namespace Konsole;
 
diff --git a/src/OverlayFrame.h b/src/OverlayFrame.h
index 75e5738bf..2ab05c028 100644
--- a/src/OverlayFrame.h
+++ b/src/OverlayFrame.h
@@ -21,8 +21,8 @@
 #ifndef OVERLAY_FRAME_H
 #define OVERLAY_FRAME_H
 
-#include <QFrame>
-#include <QTimer>
+#include <QtGui/QFrame>
+#include <QtCore/QTimer>
 
 namespace Konsole
 {
diff --git a/src/Part.cpp b/src/Part.cpp
index b8b4e02f8..e00508b89 100644
--- a/src/Part.cpp
+++ b/src/Part.cpp
@@ -21,7 +21,7 @@
 #include "Part.h"
 
 // Qt
-#include <QStringList>
+#include <QtCore/QStringList>
 
 // KDE
 #include <KMenuBar>
diff --git a/src/PrintSettings.cpp b/src/PrintSettings.cpp
index c5fa2b50c..863483e6e 100644
--- a/src/PrintSettings.cpp
+++ b/src/PrintSettings.cpp
@@ -22,9 +22,9 @@
 #include "PrintSettings.h"
 
 // Qt
-#include <QCheckBox>
-#include <QLayout>
-#include <QVBoxLayout>
+#include <QtGui/QCheckBox>
+#include <QtGui/QLayout>
+#include <QtGui/QBoxLayout>
 
 // KDE
 #include <klocale.h>
diff --git a/src/ProcessInfo.cpp b/src/ProcessInfo.cpp
index 39fc71f88..67384534b 100644
--- a/src/ProcessInfo.cpp
+++ b/src/ProcessInfo.cpp
@@ -21,12 +21,12 @@
 #include "ProcessInfo.h"
 
 // Qt
-#include <QDebug>
-#include <QFile>
-#include <QFileInfo>
-#include <QRegExp>
-#include <QTextStream>
-#include <QStringList>
+#include <QtCore/QDebug>
+#include <QtCore/QFile>
+#include <QtCore/QFileInfo>
+#include <QtCore/QRegExp>
+#include <QtCore/QTextStream>
+#include <QtCore/QStringList>
 
 using namespace Konsole;
 
diff --git a/src/ProcessInfo.h b/src/ProcessInfo.h
index 835a15185..d3e995a38 100644
--- a/src/ProcessInfo.h
+++ b/src/ProcessInfo.h
@@ -21,9 +21,9 @@
 #define PROCESSINFO_H
 
 // Qt
-#include <QMap>
-#include <QString>
-#include <QVector>
+#include <QtCore/QMap>
+#include <QtCore/QString>
+#include <QtCore/QVector>
 
 namespace Konsole
 {
@@ -98,7 +98,7 @@ public:
      * a suitable ProcessInfo instance for the current platform.
      */ 
     explicit ProcessInfo(int pid , bool readEnvironment = false);
-    virtual ~ProcessInfo() {};
+    virtual ~ProcessInfo() {}
 
     /** 
      * Updates the information about the process.  This must
diff --git a/src/ProfileList.cpp b/src/ProfileList.cpp
index ede939f19..963f5ee45 100644
--- a/src/ProfileList.cpp
+++ b/src/ProfileList.cpp
@@ -21,9 +21,9 @@
 #include "ProfileList.h"
 
 // Qt
-#include <QAction>
-#include <QActionGroup>
-#include <QtDebug>
+#include <QtGui/QAction>
+#include <QtGui/QActionGroup>
+#include <QtCore/QDebug>
 
 // KDE
 #include <KIcon>
diff --git a/src/ProfileList.h b/src/ProfileList.h
index bb855e017..0cb8f19c7 100644
--- a/src/ProfileList.h
+++ b/src/ProfileList.h
@@ -20,8 +20,8 @@
 #ifndef SESSIONLIST_H
 #define SESSIONLIST_H
 
-#include <QList>
-#include <QObject>
+#include <QtCore/QList>
+#include <QtCore/QObject>
 
 class QAction;
 class QActionGroup;
diff --git a/src/ProfileListWidget.cpp b/src/ProfileListWidget.cpp
index ff77167f1..03ea7c788 100644
--- a/src/ProfileListWidget.cpp
+++ b/src/ProfileListWidget.cpp
@@ -21,11 +21,10 @@
 #include "ProfileListWidget.h"
 
 // Qt
-#include <QtDebug>
-#include <QDrag>
-#include <QDragEnterEvent>
-#include <QDropEvent>
-#include <QMimeData>
+#include <QtCore/QDebug>
+#include <QtGui/QDrag>
+#include <QtGui/QKeyEvent>
+#include <QtCore/QMimeData>
 
 static const char* konsoleSessionMimeFormat = "konsole/session";
 
diff --git a/src/ProfileListWidget.h b/src/ProfileListWidget.h
index ccd8116dd..97418c038 100644
--- a/src/ProfileListWidget.h
+++ b/src/ProfileListWidget.h
@@ -21,7 +21,7 @@
 #define SESSIONLISTWIDGET_H
 
 // Qt
-#include <QListWidget>
+#include <QtGui/QListWidget>
 
 class ProfileListWidget : public QListWidget
 {
diff --git a/src/Pty.cpp b/src/Pty.cpp
index 33d00a841..684a75f47 100644
--- a/src/Pty.cpp
+++ b/src/Pty.cpp
@@ -82,7 +82,7 @@
 #include <termios.h>
 
 // Qt
-#include <QStringList>
+#include <QtCore/QStringList>
 
 // KDE
 #include <KStandardDirs>
diff --git a/src/Pty.h b/src/Pty.h
index 5d86e113c..158d3c279 100644
--- a/src/Pty.h
+++ b/src/Pty.h
@@ -22,10 +22,10 @@
 #define TE_PTY_H
 
 // Qt
-#include <QSocketNotifier>
-#include <QStringList>
-#include <QVector>
-#include <QList>
+#include <QtCore/QSocketNotifier>
+#include <QtCore/QStringList>
+#include <QtCore/QVector>
+#include <QtCore/QList>
 
 // KDE
 #include <K3Process>
diff --git a/src/RemoteConnectionDialog.cpp b/src/RemoteConnectionDialog.cpp
index f1c6c46de..998dcc37c 100644
--- a/src/RemoteConnectionDialog.cpp
+++ b/src/RemoteConnectionDialog.cpp
@@ -21,7 +21,7 @@
 #include "RemoteConnectionDialog.h"
 
 // Qt
-#include <QtDebug>
+#include <QtCore/QDebug>
 
 // KDE
 #include <KLocale>
diff --git a/src/Screen.cpp b/src/Screen.cpp
index eca2057f8..2fe8e2270 100644
--- a/src/Screen.cpp
+++ b/src/Screen.cpp
@@ -30,8 +30,8 @@
 #include <ctype.h>
 
 // Qt
-#include <QTextStream>
-#include <QTime>
+#include <QtCore/QTextStream>
+#include <QtCore/QDate>
 
 // KDE
 #include <kdebug.h>
diff --git a/src/Screen.h b/src/Screen.h
index 0ef0769eb..1ebdb11cf 100644
--- a/src/Screen.h
+++ b/src/Screen.h
@@ -22,8 +22,8 @@
 #define TESCREEN_H
 
 // Qt
-#include <QTextStream>
-#include <QVarLengthArray>
+#include <QtCore/QTextStream>
+#include <QtCore/QVarLengthArray>
 
 // Konsole
 #include "TECommon.h"
diff --git a/src/ScreenWindow.cpp b/src/ScreenWindow.cpp
index 0ca8bf948..ad0ac5f6c 100644
--- a/src/ScreenWindow.cpp
+++ b/src/ScreenWindow.cpp
@@ -21,7 +21,7 @@
 #include "ScreenWindow.h"
 
 // Qt
-#include <QtDebug>
+#include <QtCore/QDebug>
 
 // Konsole
 #include "Screen.h"
diff --git a/src/ScreenWindow.h b/src/ScreenWindow.h
index cf8801210..d299958d9 100644
--- a/src/ScreenWindow.h
+++ b/src/ScreenWindow.h
@@ -21,7 +21,7 @@
 #define SCREENWINDOW_H
 
 // Qt
-#include <QObject>
+#include <QtCore/QObject>
 
 // Konsole
 #include "TECommon.h"
diff --git a/src/Session.cpp b/src/Session.cpp
index 40602d9e7..7fc0c8a02 100644
--- a/src/Session.cpp
+++ b/src/Session.cpp
@@ -28,14 +28,14 @@
 #include <stdlib.h>
 
 // Qt
-#include <QApplication>
-#include <QByteArray>
-#include <QDir>
-#include <QFile>
-#include <QRegExp>
-#include <QStringList>
+#include <QtGui/QApplication>
+#include <QtCore/QByteRef>
+#include <QtCore/QDir>
+#include <QtCore/QFile>
+#include <QtCore/QRegExp>
+#include <QtCore/QStringList>
 #include <QtDBus/QtDBus>
-#include <QTime>
+#include <QtCore/QDate>
 
 // KDE
 #include <KDebug>
diff --git a/src/Session.h b/src/Session.h
index 6c4b28d73..10864f1a0 100644
--- a/src/Session.h
+++ b/src/Session.h
@@ -22,8 +22,8 @@
 #define SESSION_H
 
 // Qt
-#include <QStringList>
-#include <QByteArray>
+#include <QtCore/QStringList>
+#include <QtCore/QByteRef>
 
 // KDE
 #include <KApplication>
diff --git a/src/SessionController.h b/src/SessionController.h
index fdb85c737..9fa7dd220 100644
--- a/src/SessionController.h
+++ b/src/SessionController.h
@@ -21,11 +21,11 @@
 #define SESSIONCONTROLLER_H
 
 // Qt
-#include <QIcon>
-#include <QList>
-#include <QPointer>
-#include <QString>
-#include <QThread>
+#include <QtGui/QIcon>
+#include <QtCore/QList>
+#include <QtCore/QPointer>
+#include <QtCore/QString>
+#include <QtCore/QThread>
 
 // KDE
 #include <KActionCollection>
diff --git a/src/SessionManager.cpp b/src/SessionManager.cpp
index 506129242..331295aeb 100644
--- a/src/SessionManager.cpp
+++ b/src/SessionManager.cpp
@@ -23,9 +23,9 @@
 #include "SessionManager.h"
 
 // Qt
-#include <QFileInfo>
-#include <QList>
-#include <QString>
+#include <QtCore/QFileInfo>
+#include <QtCore/QList>
+#include <QtCore/QString>
 
 // KDE
 #include <klocale.h>
diff --git a/src/SessionManager.h b/src/SessionManager.h
index dd8291143..69be42321 100644
--- a/src/SessionManager.h
+++ b/src/SessionManager.h
@@ -23,14 +23,14 @@
 #define SESSIONMANAGER_H
 
 // Qt
-#include <QFont>
-#include <QHash>
-#include <QList>
-#include <QSet>
-#include <QStringList>
-#include <QPair>
-#include <QPointer>
-#include <QVariant>
+#include <QtGui/QFont>
+#include <QtCore/QHash>
+#include <QtCore/QList>
+#include <QtCore/QSet>
+#include <QtCore/QStringList>
+#include <QtCore/QPair>
+#include <QtCore/QPointer>
+#include <QtCore/QVariant>
 
 class KConfigGroup;
 class KDesktopFile;
diff --git a/src/ShellCommand.cpp b/src/ShellCommand.cpp
index 3acf8ccf2..3ee5720c5 100644
--- a/src/ShellCommand.cpp
+++ b/src/ShellCommand.cpp
@@ -21,7 +21,7 @@
 #include "ShellCommand.h"
 
 // Qt
-#include <QtDebug>
+#include <QtCore/QDebug>
 
 using namespace Konsole;
 
diff --git a/src/ShellCommand.h b/src/ShellCommand.h
index 67138df15..9b7e42d1d 100644
--- a/src/ShellCommand.h
+++ b/src/ShellCommand.h
@@ -21,7 +21,7 @@
 #define SHELLCOMMAND_H
 
 // Qt
-#include <QStringList>
+#include <QtCore/QStringList>
 
 namespace Konsole
 {
diff --git a/src/TECommon.h b/src/TECommon.h
index f4ddcfbf9..419e63891 100644
--- a/src/TECommon.h
+++ b/src/TECommon.h
@@ -26,8 +26,8 @@
 #define TECOMMON_H
 
 // Qt
-#include <QColor>
-#include <QHash>
+#include <QtGui/QColor>
+#include <QtCore/QHash>
 
 namespace Konsole
 {
diff --git a/src/TerminalCharacterDecoder.cpp b/src/TerminalCharacterDecoder.cpp
index a479ec5a5..0fe087855 100644
--- a/src/TerminalCharacterDecoder.cpp
+++ b/src/TerminalCharacterDecoder.cpp
@@ -23,7 +23,7 @@
 #include "TerminalCharacterDecoder.h"
 
 // Qt
-#include <QTextStream>
+#include <QtCore/QTextStream>
 
 // KDE
 #include <kdebug.h>
diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp
index ed8e95424..e99b51e35 100644
--- a/src/TerminalDisplay.cpp
+++ b/src/TerminalDisplay.cpp
@@ -54,31 +54,23 @@
 #include <unistd.h>
 
 // Qt
-#include <QApplication>
-#include <QBoxLayout>
-#include <QClipboard>
-#include <QDragEnterEvent>
-#include <QDropEvent>
-#include <QEvent>
-#include <QFile>
-#include <QFocusEvent>
-#include <QFrame>
-#include <QGridLayout>
-#include <QKeyEvent>
-#include <QLabel>
-#include <QLayout>
-#include <QMouseEvent>
-#include <QPaintEvent>
-#include <QPainter>
-#include <QPixmap>
-#include <QRegExp>
-#include <QResizeEvent>
-#include <QSpacerItem>
-#include <QStyle>
-#include <QTimer>
-#include <QToolTip>
-#include <QVBoxLayout>
-#include <QWheelEvent>
+#include <QtGui/QApplication>
+#include <QtGui/QBoxLayout>
+#include <QtGui/QClipboard>
+#include <QtGui/QKeyEvent>
+#include <QtCore/QEvent>
+#include <QtCore/QFile>
+#include <QtGui/QFrame>
+#include <QtGui/QGridLayout>
+#include <QtGui/QLabel>
+#include <QtGui/QLayout>
+#include <QtGui/QPainter>
+#include <QtGui/QPixmap>
+#include <QtCore/QRegExp>
+#include <QtGui/QLayoutItem>
+#include <QtGui/QStyle>
+#include <QtCore/QTimer>
+#include <QtGui/QToolTip>
 
 // KDE
 #include <KRun>
diff --git a/src/TerminalDisplay.h b/src/TerminalDisplay.h
index a6de3e897..e5eecb98c 100644
--- a/src/TerminalDisplay.h
+++ b/src/TerminalDisplay.h
@@ -22,24 +22,16 @@
 #define TERMINALDISPLAY_H
 
 // Qt
-#include <QBitArray>
-#include <QWidget>
-#include <QColor>
-#include <qnamespace.h>
-#include <qscrollbar.h>
-#include <QFrame>
-#include <QInputMethodEvent>
-#include <QWheelEvent>
-#include <QFocusEvent>
-#include <QPaintEvent>
-#include <QKeyEvent>
-#include <QEvent>
-#include <QDropEvent>
-#include <QLabel>
-#include <QResizeEvent>
-#include <QDragEnterEvent>
-#include <QMouseEvent>
-#include <QDrag>
+#include <QtCore/QBitRef>
+#include <QtGui/QWidget>
+#include <QtGui/QColor>
+#include <QtCore/QInternal>
+#include <QtGui/QScrollBar>
+#include <QtGui/QFrame>
+#include <QtGui/QKeyEvent>
+#include <QtCore/QEvent>
+#include <QtGui/QLabel>
+#include <QtGui/QDrag>
 
 // KDE
 #include <kmenu.h>
diff --git a/src/ViewContainer.cpp b/src/ViewContainer.cpp
index 361c253c8..43fd0f183 100644
--- a/src/ViewContainer.cpp
+++ b/src/ViewContainer.cpp
@@ -23,17 +23,17 @@
 #include "ViewContainer.h"
 
 // Qt
-#include <QHash>
-#include <QLineEdit>
-#include <QLinearGradient>
-#include <QListWidget>
-#include <QPushButton>
-#include <QSplitter>
-#include <QStackedWidget>
-#include <QTabBar>
-#include <QToolButton>
-#include <QVBoxLayout>
-#include <QWidgetAction>
+#include <QtCore/QHash>
+#include <QtGui/QLineEdit>
+#include <QtGui/QBrush>
+#include <QtGui/QListWidget>
+#include <QtGui/QPushButton>
+#include <QtGui/QSplitter>
+#include <QtGui/QStackedWidget>
+#include <QtGui/QTabBar>
+#include <QtGui/QToolButton>
+#include <QtGui/QBoxLayout>
+#include <QtGui/QWidgetAction>
 
 // KDE 
 #include <KColorDialog>
diff --git a/src/ViewContainer.h b/src/ViewContainer.h
index 554106314..d7483f508 100644
--- a/src/ViewContainer.h
+++ b/src/ViewContainer.h
@@ -23,10 +23,10 @@
 #define VIEWCONTAINER_H
 
 // Qt
-#include <QObject>
-#include <QHash>
-#include <QList>
-#include <QTabBar>
+#include <QtCore/QObject>
+#include <QtCore/QHash>
+#include <QtCore/QList>
+#include <QtGui/QTabBar>
 
 class QSpacerItem;
 class QStackedWidget;
@@ -168,7 +168,7 @@ protected:
      * Called when the navigation display mode changes.
      * See setNavigationDisplayMode
      */
-    virtual void navigationDisplayModeChanged(NavigationDisplayMode) {};
+    virtual void navigationDisplayModeChanged(NavigationDisplayMode) {}
 
     /** Returns the widgets which are associated with a particular navigation item */
     QList<QWidget*> widgetsForItem( ViewProperties* item ) const;
diff --git a/src/ViewManager.cpp b/src/ViewManager.cpp
index 911fbf1cc..5d9b9e431 100644
--- a/src/ViewManager.cpp
+++ b/src/ViewManager.cpp
@@ -24,7 +24,7 @@
 #include <assert.h>
 
 // Qt
-#include <QSignalMapper>
+#include <QtCore/QSignalMapper>
 
 // KDE
 #include <kdebug.h>
diff --git a/src/ViewManager.h b/src/ViewManager.h
index af70f8192..60b6efbb1 100644
--- a/src/ViewManager.h
+++ b/src/ViewManager.h
@@ -21,9 +21,9 @@
 #define VIEWMANAGER_H
 
 // Qt
-#include <QHash>
-#include <QObject>
-#include <QPointer>
+#include <QtCore/QHash>
+#include <QtCore/QObject>
+#include <QtCore/QPointer>
 
 class QSignalMapper;
 
diff --git a/src/ViewProperties.h b/src/ViewProperties.h
index b8911dd72..f863669d4 100644
--- a/src/ViewProperties.h
+++ b/src/ViewProperties.h
@@ -21,8 +21,8 @@
 #define VIEWPROPERTIES_H
 
 // Qt
-#include <QIcon>
-#include <QObject>
+#include <QtGui/QIcon>
+#include <QtCore/QObject>
 
 // KDE
 #include <KUrl>
diff --git a/src/ViewSplitter.cpp b/src/ViewSplitter.cpp
index 4911ae6e8..4bb77cbd2 100644
--- a/src/ViewSplitter.cpp
+++ b/src/ViewSplitter.cpp
@@ -23,7 +23,7 @@
 #include "ViewSplitter.h"
 
 // Qt
-#include <QFocusEvent>
+#include <QtGui/QKeyEvent>
 
 // KDE
 #include "kdebug.h"
diff --git a/src/ViewSplitter.h b/src/ViewSplitter.h
index 3f12a0fa1..334877213 100644
--- a/src/ViewSplitter.h
+++ b/src/ViewSplitter.h
@@ -22,8 +22,8 @@
 #ifndef VIEWSPLITTER_H
 #define VIEWSPLITTER_H
 
-#include <QList>
-#include <QSplitter>
+#include <QtCore/QList>
+#include <QtGui/QSplitter>
 
 class QFocusEvent;
 
diff --git a/src/Vt102Emulation.cpp b/src/Vt102Emulation.cpp
index c9e58ed5b..1879c9573 100644
--- a/src/Vt102Emulation.cpp
+++ b/src/Vt102Emulation.cpp
@@ -47,9 +47,9 @@
 #include <assert.h>
 
 // Qt
-#include <QEvent>
-#include <QKeyEvent>
-#include <QByteArray>
+#include <QtCore/QEvent>
+#include <QtGui/QKeyEvent>
+#include <QtCore/QByteRef>
 
 // KDE
 #include <kdebug.h>
diff --git a/src/Vt102Emulation.h b/src/Vt102Emulation.h
index c5f9794e6..e3fa5407e 100644
--- a/src/Vt102Emulation.h
+++ b/src/Vt102Emulation.h
@@ -25,9 +25,9 @@
 #include <stdio.h>
 
 // Qt 
-#include <QKeyEvent>
-#include <QHash>
-#include <QTimer>
+#include <QtGui/QKeyEvent>
+#include <QtCore/QHash>
+#include <QtCore/QTimer>
 
 // Konsole
 #include "Emulation.h"
diff --git a/src/XKB.cpp b/src/XKB.cpp
index 64d2a1176..6a166f03a 100644
--- a/src/XKB.cpp
+++ b/src/XKB.cpp
@@ -26,7 +26,7 @@ DEALINGS IN THE SOFTWARE.
 
 ****************************************************************************/
 
-#include <QX11Info>
+#include <QtGui/QX11Info>
 
 #include "config-konsole.h"
 
diff --git a/src/ZModemDialog.cpp b/src/ZModemDialog.cpp
index f580f55e9..1ecba2840 100644
--- a/src/ZModemDialog.cpp
+++ b/src/ZModemDialog.cpp
@@ -20,7 +20,7 @@
 #include "ZModemDialog.h"
 
 // Qt
-#include <QTextEdit>
+#include <QtGui/QTextEdit>
 
 // KDE
 #include <KLocale>
diff --git a/src/fontembedder.cpp b/src/fontembedder.cpp
index d7ee97263..3ab56dc5e 100644
--- a/src/fontembedder.cpp
+++ b/src/fontembedder.cpp
@@ -18,8 +18,8 @@
     02110-1301  USA.
 */
 
-#include <QFile>
-#include <QTextStream>
+#include <QtCore/QFile>
+#include <QtCore/QTextStream>
 #include <stdlib.h>
 #include <iostream>
 #include <iomanip>
diff --git a/src/konsole_wcwidth.h b/src/konsole_wcwidth.h
index c3a44e4b2..79063b4fb 100644
--- a/src/konsole_wcwidth.h
+++ b/src/konsole_wcwidth.h
@@ -7,8 +7,8 @@
 #define	_KONSOLE_WCWIDTH_H_
 
 // Qt
-#include <qglobal.h>
-#include <QString>
+#include <QtCore/QBool>
+#include <QtCore/QString>
 
 int konsole_wcwidth(quint16 ucs);
 #if 0
diff --git a/src/kwrited.cpp b/src/kwrited.cpp
index 27f7a5a78..546933cd9 100644
--- a/src/kwrited.cpp
+++ b/src/kwrited.cpp
@@ -21,8 +21,8 @@
 // Own
 #include "kwrited.h"
 
-#include <QSocketNotifier>
-#include <QContextMenuEvent>
+#include <QtCore/QSocketNotifier>
+#include <QtGui/QKeyEvent>
 
 #include <kuniqueapplication.h>
 #include <kcmdlineargs.h>
diff --git a/src/kwrited.h b/src/kwrited.h
index d175d770a..797340427 100644
--- a/src/kwrited.h
+++ b/src/kwrited.h
@@ -22,8 +22,8 @@
 #define KWRITED_H
 
 #include <kdedmodule.h>
-#include <QTextEdit>
-#include <QMenu>
+#include <QtGui/QTextEdit>
+#include <QtGui/QMenu>
 
 class KPty;