diff --git a/CMakeLists.txt b/CMakeLists.txt
index ac4539f..63a5af5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -159,6 +159,9 @@ install(FILES ${CMAKE_SOURCE_DIR}/cmake/${QTERMWIDGET_LIBRARY_NAME}_use.cmake DE
 
 # designer plugin
 if (BUILD_DESIGNER_PLUGIN)
+    if (USE_QT5)
+        message(FATAL_ERROR "Building Qt designer plugin is not supported for Qt5 yet. Use -DBUILD_DESIGNER_PLUGIN=0")
+    endif (USE_QT5)
     message(STATUS "Building Qt designer plugin")
 
     include_directories(designer
diff --git a/lib/BlockArray.cpp b/lib/BlockArray.cpp
index 1b4696e..3f36390 100644
--- a/lib/BlockArray.cpp
+++ b/lib/BlockArray.cpp
@@ -21,11 +21,11 @@
 
 */
 
+#include <QtDebug>
+
 // Own
 #include "BlockArray.h"
 
-#include <QtCore>
-
 // System
 #include <assert.h>
 #include <sys/mman.h>
diff --git a/lib/Character.h b/lib/Character.h
index 4088def..ce0f1b3 100644
--- a/lib/Character.h
+++ b/lib/Character.h
@@ -24,7 +24,7 @@
 #define CHARACTER_H
 
 // Qt
-#include <QtCore/QHash>
+#include <QHash>
 
 // Local
 #include "CharacterColor.h"
diff --git a/lib/CharacterColor.h b/lib/CharacterColor.h
index 8e82a66..a17c5ce 100644
--- a/lib/CharacterColor.h
+++ b/lib/CharacterColor.h
@@ -24,7 +24,7 @@
 #define CHARACTERCOLOR_H
 
 // Qt
-#include <QtGui/QColor>
+#include <QColor>
 
 //#include <kdemacros.h>
 #define KDE_NO_EXPORT
diff --git a/lib/ColorScheme.cpp b/lib/ColorScheme.cpp
index 0a84d74..1d4e729 100644
--- a/lib/ColorScheme.cpp
+++ b/lib/ColorScheme.cpp
@@ -24,9 +24,9 @@
 #include "tools.h"
 
 // Qt
-#include <QtGui/QBrush>
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
+#include <QBrush>
+#include <QFile>
+#include <QFileInfo>
 #include <QtDebug>
 #include <QSettings>
 #include <QDir>
diff --git a/lib/ColorScheme.h b/lib/ColorScheme.h
index fa4a88a..dd1830f 100644
--- a/lib/ColorScheme.h
+++ b/lib/ColorScheme.h
@@ -23,11 +23,11 @@
 #define COLORSCHEME_H
 
 // Qt
-#include <QtCore/QHash>
-#include <QtCore/QList>
-#include <QtCore/QMetaType>
-#include <QtCore/QIODevice>
-#include <QtCore/QSet>
+#include <QHash>
+#include <QList>
+#include <QMetaType>
+#include <QIODevice>
+#include <QSet>
 #include <QSettings>
 
 // Konsole
diff --git a/lib/Emulation.cpp b/lib/Emulation.cpp
index e68a930..8cc32ef 100644
--- a/lib/Emulation.cpp
+++ b/lib/Emulation.cpp
@@ -29,15 +29,15 @@
 #include <unistd.h>
 
 // Qt
-#include <QtGui/QApplication>
-#include <QtGui/QClipboard>
-#include <QtCore/QHash>
-#include <QtGui/QKeyEvent>
-#include <QtCore/QRegExp>
-#include <QtCore/QTextStream>
-#include <QtCore/QThread>
+#include <QApplication>
+#include <QClipboard>
+#include <QHash>
+#include <QKeyEvent>
+#include <QRegExp>
+#include <QTextStream>
+#include <QThread>
 
-#include <QtCore/QTime>
+#include <QTime>
 
 // KDE
 //#include <kdebug.h>
diff --git a/lib/Emulation.h b/lib/Emulation.h
index 9c59664..feecdf0 100644
--- a/lib/Emulation.h
+++ b/lib/Emulation.h
@@ -27,11 +27,11 @@
 #include <stdio.h>
 
 // Qt 
-#include <QtGui/QKeyEvent>
+#include <QKeyEvent>
 //#include <QPointer>
-#include <QtCore/QTextCodec>
-#include <QtCore/QTextStream>
-#include <QtCore/QTimer>
+#include <QTextCodec>
+#include <QTextStream>
+#include <QTimer>
 
 // Konsole
 //#include "konsole_export.h"
diff --git a/lib/Filter.cpp b/lib/Filter.cpp
index 9aa2900..0982f48 100644
--- a/lib/Filter.cpp
+++ b/lib/Filter.cpp
@@ -24,13 +24,13 @@
 #include <iostream>
 
 // Qt
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QClipboard>
-#include <QtCore/QString>
-#include <QtCore/QTextStream>
-#include <QtCore/QSharedData>
-#include <QtCore/QFile>
+#include <QAction>
+#include <QApplication>
+#include <QClipboard>
+#include <QString>
+#include <QTextStream>
+#include <QSharedData>
+#include <QFile>
 #include <QDesktopServices>
 #include <QUrl>
 
diff --git a/lib/Filter.h b/lib/Filter.h
index 860208c..e94195d 100644
--- a/lib/Filter.h
+++ b/lib/Filter.h
@@ -21,12 +21,12 @@
 #define FILTER_H
 
 // Qt
-#include <QtGui/QAction>
-#include <QtCore/QList>
-#include <QtCore/QObject>
-#include <QtCore/QStringList>
-#include <QtCore/QHash>
-#include <QtCore/QRegExp>
+#include <QAction>
+#include <QList>
+#include <QObject>
+#include <QStringList>
+#include <QHash>
+#include <QRegExp>
 
 // Local
 #include "Character.h"
diff --git a/lib/History.h b/lib/History.h
index 5bcbfb8..3f2a134 100644
--- a/lib/History.h
+++ b/lib/History.h
@@ -22,9 +22,9 @@
 #define TEHISTORY_H
 
 // Qt
-#include <QtCore/QBitRef>
-#include <QtCore/QHash>
-#include <QtCore/QVector>
+#include <QBitRef>
+#include <QHash>
+#include <QVector>
 #include <QTemporaryFile>
 
 // KDE
diff --git a/lib/KeyboardTranslator.cpp b/lib/KeyboardTranslator.cpp
index fc66a9c..7530421 100644
--- a/lib/KeyboardTranslator.cpp
+++ b/lib/KeyboardTranslator.cpp
@@ -27,11 +27,11 @@
 #include <stdio.h>
 
 // Qt
-#include <QtCore/QBuffer>
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
-#include <QtCore/QTextStream>
-#include <QtGui/QKeySequence>
+#include <QBuffer>
+#include <QFile>
+#include <QFileInfo>
+#include <QTextStream>
+#include <QKeySequence>
 #include <QDir>
 #include <QtDebug>
 
diff --git a/lib/KeyboardTranslator.h b/lib/KeyboardTranslator.h
index 8898c2b..15a2980 100644
--- a/lib/KeyboardTranslator.h
+++ b/lib/KeyboardTranslator.h
@@ -23,11 +23,11 @@
 #define KEYBOARDTRANSLATOR_H
 
 // Qt
-#include <QtCore/QHash>
-#include <QtCore/QList>
-#include <QtGui/QKeySequence>
-#include <QtCore/QMetaType>
-#include <QtCore/QVarLengthArray>
+#include <QHash>
+#include <QList>
+#include <QKeySequence>
+#include <QMetaType>
+#include <QVarLengthArray>
 
 // Konsole
 //#include "konsole_export.h"
diff --git a/lib/Pty.cpp b/lib/Pty.cpp
index 2008fe5..c986d93 100644
--- a/lib/Pty.cpp
+++ b/lib/Pty.cpp
@@ -38,7 +38,8 @@
 #include <signal.h>
 
 // Qt
-#include <QtCore/QStringList>
+#include <QStringList>
+#include <QtDebug>
 
 #include "kpty.h"
 #include "kptydevice.h"
diff --git a/lib/Pty.h b/lib/Pty.h
index c16a1d0..0d28fe7 100644
--- a/lib/Pty.h
+++ b/lib/Pty.h
@@ -32,10 +32,10 @@
 #define PTY_H
 
 // Qt
-#include <QtCore/QStringList>
-#include <QtCore/QVector>
-#include <QtCore/QList>
-#include <QtCore/QSize>
+#include <QStringList>
+#include <QVector>
+#include <QList>
+#include <QSize>
 
 // KDE
 #include "kptyprocess.h"
diff --git a/lib/Screen.cpp b/lib/Screen.cpp
index eb2c187..acc5f81 100644
--- a/lib/Screen.cpp
+++ b/lib/Screen.cpp
@@ -32,8 +32,8 @@
 #include <ctype.h>
 
 // Qt
-#include <QtCore/QTextStream>
-#include <QtCore/QDate>
+#include <QTextStream>
+#include <QDate>
 
 // KDE
 //#include <kdebug.h>
diff --git a/lib/Screen.h b/lib/Screen.h
index 9f5e6b2..b59c4bb 100644
--- a/lib/Screen.h
+++ b/lib/Screen.h
@@ -24,9 +24,9 @@
 #define SCREEN_H
 
 // Qt
-#include <QtCore/QRect>
-#include <QtCore/QTextStream>
-#include <QtCore/QVarLengthArray>
+#include <QRect>
+#include <QTextStream>
+#include <QVarLengthArray>
 
 // Konsole
 #include "Character.h"
diff --git a/lib/ScreenWindow.h b/lib/ScreenWindow.h
index 51adb42..3ef2675 100644
--- a/lib/ScreenWindow.h
+++ b/lib/ScreenWindow.h
@@ -21,9 +21,9 @@
 #define SCREENWINDOW_H
 
 // Qt
-#include <QtCore/QObject>
-#include <QtCore/QPoint>
-#include <QtCore/QRect>
+#include <QObject>
+#include <QPoint>
+#include <QRect>
 
 // Konsole
 #include "Character.h"
diff --git a/lib/Session.cpp b/lib/Session.cpp
index 192a232..9bbddb6 100644
--- a/lib/Session.cpp
+++ b/lib/Session.cpp
@@ -30,14 +30,14 @@
 #include <stdlib.h>
 
 // Qt
-#include <QtGui/QApplication>
-#include <QtCore/QByteRef>
-#include <QtCore/QDir>
-#include <QtCore/QFile>
-#include <QtCore/QRegExp>
-#include <QtCore/QStringList>
-#include <QtCore/QFile>
-#include <QtCore>
+#include <QApplication>
+#include <QByteRef>
+#include <QDir>
+#include <QFile>
+#include <QRegExp>
+#include <QStringList>
+#include <QFile>
+#include <QtDebug>
 
 #include "Pty.h"
 //#include "kptyprocess.h"
@@ -460,7 +460,7 @@ void Session::activityStateSet(int state)
 {
     if (state==NOTIFYBELL) {
         QString s;
-        s.sprintf("Bell in session '%s'",_nameTitle.toAscii().data());
+        s.sprintf("Bell in session '%s'",_nameTitle.toUtf8().data());
 
         emit bellRequest( s );
     } else if (state==NOTIFYACTIVITY) {
@@ -608,16 +608,16 @@ void Session::done(int exitStatus)
 
         if (_shellProcess->exitStatus() == QProcess::NormalExit) {
             message.sprintf("Session '%s' exited with status %d.",
-                          _nameTitle.toAscii().data(), exitStatus);
+                          _nameTitle.toUtf8().data(), exitStatus);
         } else {
             message.sprintf("Session '%s' crashed.",
-                          _nameTitle.toAscii().data());
+                          _nameTitle.toUtf8().data());
         }
     }
 
     if ( !_wantedClose && _shellProcess->exitStatus() != QProcess::NormalExit )
         message.sprintf("Session '%s' exited unexpectedly.",
-                        _nameTitle.toAscii().data());
+                        _nameTitle.toUtf8().data());
     else
         emit finished();
 
diff --git a/lib/ShellCommand.h b/lib/ShellCommand.h
index bd1ecbb..3a5804a 100644
--- a/lib/ShellCommand.h
+++ b/lib/ShellCommand.h
@@ -23,7 +23,7 @@
 #define SHELLCOMMAND_H
 
 // Qt
-#include <QtCore/QStringList>
+#include <QStringList>
 
 namespace Konsole {
 
diff --git a/lib/TerminalCharacterDecoder.cpp b/lib/TerminalCharacterDecoder.cpp
index 1603847..d5469f6 100644
--- a/lib/TerminalCharacterDecoder.cpp
+++ b/lib/TerminalCharacterDecoder.cpp
@@ -23,7 +23,7 @@
 #include "TerminalCharacterDecoder.h"
 
 // Qt
-#include <QtCore/QTextStream>
+#include <QTextStream>
 
 // KDE
 //#include <kdebug.h>
diff --git a/lib/TerminalDisplay.cpp b/lib/TerminalDisplay.cpp
index 5efbe87..abf71fe 100644
--- a/lib/TerminalDisplay.cpp
+++ b/lib/TerminalDisplay.cpp
@@ -24,24 +24,26 @@
 #include "TerminalDisplay.h"
 
 // Qt
-#include <QtGui/QApplication>
-#include <QtGui/QBoxLayout>
-#include <QtGui/QClipboard>
-#include <QtGui/QKeyEvent>
-#include <QtCore/QEvent>
-#include <QtCore/QTime>
-#include <QtCore/QFile>
-#include <QtGui/QGridLayout>
-#include <QtGui/QLabel>
-#include <QtGui/QLayout>
-#include <QtGui/QPainter>
-#include <QtGui/QPixmap>
-#include <QtGui/QScrollBar>
-#include <QtGui/QStyle>
-#include <QtCore/QTimer>
-#include <QtGui/QToolTip>
+#include <QApplication>
+#include <QBoxLayout>
+#include <QClipboard>
+#include <QKeyEvent>
+#include <QEvent>
+#include <QTime>
+#include <QFile>
+#include <QGridLayout>
+#include <QLabel>
+#include <QLayout>
+#include <QPainter>
+#include <QPixmap>
+#include <QScrollBar>
+#include <QStyle>
+#include <QTimer>
+#include <QToolTip>
 #include <QtDebug>
 #include <QUrl>
+#include <QMimeData>
+#include <QDrag>
 
 // KDE
 //#include <kshell.h>
diff --git a/lib/TerminalDisplay.h b/lib/TerminalDisplay.h
index 4e3f87c..1a8a391 100644
--- a/lib/TerminalDisplay.h
+++ b/lib/TerminalDisplay.h
@@ -22,9 +22,9 @@
 #define TERMINALDISPLAY_H
 
 // Qt
-#include <QtGui/QColor>
-#include <QtCore/QPointer>
-#include <QtGui/QWidget>
+#include <QColor>
+#include <QPointer>
+#include <QWidget>
 
 // Konsole
 #include "Filter.h"
diff --git a/lib/Vt102Emulation.cpp b/lib/Vt102Emulation.cpp
index 2ae3728..d2c5b8b 100644
--- a/lib/Vt102Emulation.cpp
+++ b/lib/Vt102Emulation.cpp
@@ -43,9 +43,9 @@
 #include <assert.h>
 
 // Qt
-#include <QtCore/QEvent>
-#include <QtGui/QKeyEvent>
-#include <QtCore/QByteRef>
+#include <QEvent>
+#include <QKeyEvent>
+#include <QByteRef>
 
 // KDE
 //#include <kdebug.h>
@@ -973,7 +973,7 @@ void Vt102Emulation::sendKeyEvent( QKeyEvent* event )
                                          "into characters to send to the terminal " 
                                          "is missing.");
         reset();
-        receiveData( translatorError.toAscii().constData() , translatorError.count() );
+        receiveData( translatorError.toUtf8().constData() , translatorError.count() );
     }
 }
 
diff --git a/lib/Vt102Emulation.h b/lib/Vt102Emulation.h
index 7f10b16..504d941 100644
--- a/lib/Vt102Emulation.h
+++ b/lib/Vt102Emulation.h
@@ -27,9 +27,9 @@
 #include <stdio.h>
 
 // Qt 
-#include <QtGui/QKeyEvent>
-#include <QtCore/QHash>
-#include <QtCore/QTimer>
+#include <QKeyEvent>
+#include <QHash>
+#include <QTimer>
 
 // Konsole
 #include "Emulation.h"
diff --git a/lib/konsole_wcwidth.cpp b/lib/konsole_wcwidth.cpp
index 1996751..20162ea 100644
--- a/lib/konsole_wcwidth.cpp
+++ b/lib/konsole_wcwidth.cpp
@@ -7,6 +7,8 @@
  * Markus Kuhn -- 2001-01-12 -- public domain
  */
 
+#include <QString>
+
 #include "konsole_wcwidth.h"
 
 struct interval {
diff --git a/lib/konsole_wcwidth.h b/lib/konsole_wcwidth.h
index 6fad21b..30f30ef 100644
--- a/lib/konsole_wcwidth.h
+++ b/lib/konsole_wcwidth.h
@@ -11,8 +11,9 @@
 #define _KONSOLE_WCWIDTH_H_
 
 // Qt
-#include <QtCore/QBool>
-#include <QtCore/QString>
+#include <QtGlobal>
+
+class QString;
 
 int konsole_wcwidth(quint16 ucs);
 #if 0
diff --git a/lib/kprocess.h b/lib/kprocess.h
index 74e3978..2d3bcca 100644
--- a/lib/kprocess.h
+++ b/lib/kprocess.h
@@ -32,7 +32,7 @@
 
 //#include <kdecore_export.h>
 
-#include <QtCore/QProcess>
+#include <QProcess>
 
 class KProcessPrivate;
 
diff --git a/lib/kpty.cpp b/lib/kpty.cpp
index 797a5f6..1039e00 100644
--- a/lib/kpty.cpp
+++ b/lib/kpty.cpp
@@ -24,6 +24,8 @@
 
 #include "kpty_p.h"
 
+#include <QtDebug>
+
 
 #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
 #define HAVE_LOGIN
@@ -138,8 +140,6 @@ extern "C" {
 //#include <kdebug.h>
 //#include <kstandarddirs.h>  // findExe
 
-#include <QtCore>
-
 // not defined on HP-UX for example
 #ifndef CTRL
 # define CTRL(x) ((x) & 037)
@@ -269,8 +269,8 @@ bool KPty::open()
     // Linux device names, FIXME: Trouble on other systems?
     for (const char * s3 = "pqrstuvwxyzabcde"; *s3; s3++) {
         for (const char * s4 = "0123456789abcdef"; *s4; s4++) {
-            ptyName = QString().sprintf("/dev/pty%c%c", *s3, *s4).toAscii();
-            d->ttyName = QString().sprintf("/dev/tty%c%c", *s3, *s4).toAscii();
+            ptyName = QString().sprintf("/dev/pty%c%c", *s3, *s4).toUtf8();
+            d->ttyName = QString().sprintf("/dev/tty%c%c", *s3, *s4).toUtf8();
 
             d->masterFd = ::open(ptyName.data(), O_RDWR);
             if (d->masterFd >= 0) {
diff --git a/lib/kpty.h b/lib/kpty.h
index b0a30c3..24457a5 100644
--- a/lib/kpty.h
+++ b/lib/kpty.h
@@ -23,7 +23,7 @@
 #ifndef kpty_h
 #define kpty_h
 
-#include <QtCore>
+#include <QObject>
 
 struct KPtyPrivate;
 struct termios;
diff --git a/lib/kpty_p.h b/lib/kpty_p.h
index 276419d..3f6bb88 100644
--- a/lib/kpty_p.h
+++ b/lib/kpty_p.h
@@ -25,7 +25,7 @@
 
 #include "kpty.h"
 
-#include <QtCore/QByteArray>
+#include <QByteArray>
 
 struct KPtyPrivate {
 
diff --git a/lib/kptydevice.h b/lib/kptydevice.h
index 05a7787..3ef8d17 100644
--- a/lib/kptydevice.h
+++ b/lib/kptydevice.h
@@ -31,11 +31,12 @@
 
 #include "kpty_p.h"
 
-#include <QtCore/QIODevice>
+#include <QIODevice>
 
 #define KMAXINT ((int)(~0U >> 1))
 
 struct KPtyDevicePrivate;
+class QSocketNotifier;
 
 #define Q_DECLARE_PRIVATE_MI(Class, SuperClass) \
     inline Class##Private* d_func() { return reinterpret_cast<Class##Private *>(SuperClass::d_ptr); } \
@@ -166,8 +167,8 @@ private:
 // Helper. Remove when QRingBuffer becomes public. //
 /////////////////////////////////////////////////////
 
-#include <QtCore/qbytearray.h>
-#include <QtCore/qlinkedlist.h>
+#include <QByteArray>
+#include <QLinkedList>
 
 #define CHUNKSIZE 4096
 
diff --git a/lib/qtermwidget.cpp b/lib/qtermwidget.cpp
index 8532724..8ffdb92 100644
--- a/lib/qtermwidget.cpp
+++ b/lib/qtermwidget.cpp
@@ -17,13 +17,12 @@
 */
 
 #include <QLayout>
-#include <QtGui/qboxlayout.h>
-#include <QtGui/qlayoutitem.h>
-#include <QtGui/qsizepolicy.h>
-#include "SearchBar.h"
-#include "qtermwidget.h"
-#include "ColorTables.h"
+#include <QBoxLayout>
+#include <QtDebug>
+#include <QDir>
+#include <QMessageBox>
 
+#include "ColorTables.h"
 #include "Session.h"
 #include "Screen.h"
 #include "ScreenWindow.h"
@@ -32,6 +31,8 @@
 #include "KeyboardTranslator.h"
 #include "ColorScheme.h"
 #include "SearchBar.h"
+#include "qtermwidget.h"
+
 
 #define STEP_ZOOM 1
 
diff --git a/lib/qtermwidget.h b/lib/qtermwidget.h
index 005b71e..8ce7d60 100644
--- a/lib/qtermwidget.h
+++ b/lib/qtermwidget.h
@@ -20,8 +20,9 @@
 #ifndef _Q_TERM_WIDGET
 #define _Q_TERM_WIDGET
 
-#include <QtGui>
+#include <QWidget>
 
+class QVBoxLayout;
 struct TermWidgetImpl;
 class SearchBar;
 
diff --git a/src/main.cpp b/src/main.cpp
index e539c25..9003faf 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -15,15 +15,13 @@
     the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA 02110-1301, USA.
 */
-						
 
-#include <QtCore>
-#include <QtGui>
+
 #include <QApplication>
 #include <QtDebug>
-
 #include <QIcon>
-#include <QtGui/qicon.h>
+#include <QMainWindow>
+#include <QMenuBar>
 
 #include "qtermwidget.h"
 
@@ -39,6 +37,7 @@ int main(int argc, char *argv[])
     QMenu *actionsMenu = new QMenu("Actions", menuBar);
     menuBar->addMenu(actionsMenu);
     actionsMenu->addAction("Find..", console, SLOT(toggleShowSearchBar()), QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_F));
+    actionsMenu->addAction("About Qt", &app, SLOT(aboutQt()));
     mainWindow->setMenuBar(menuBar);       
     
     QFont font = QApplication::font();