From 09374f37a4b77ed29855661976ed7d19d2891a52 Mon Sep 17 00:00:00 2001
From: "craig.p.drummond"
 <craig.p.drummond@b1e49159-3266-923f-9c3e-04f16369770a>
Date: Mon, 28 Jan 2013 19:33:42 +0000
Subject: [PATCH] Remove Qt module prefix from includes - will make Qt5 port a
 little easier!

---
 application.cpp                               | 10 ++--
 application.h                                 |  4 +-
 dbus/gnomemediakeys.cpp                       | 10 ++--
 dbus/gnomemediakeys.h                         |  2 +-
 dbus/mpris.h                                  |  8 ++--
 dbus/notify.cpp                               | 10 ++--
 dbus/notify.h                                 |  4 +-
 devices/actiondialog.cpp                      |  2 +-
 devices/device.cpp                            |  6 +--
 devices/device.h                              |  2 +-
 devices/deviceoptions.cpp                     |  4 +-
 devices/deviceoptions.h                       |  2 +-
 devices/devicepropertieswidget.cpp            |  4 +-
 devices/devicespage.cpp                       |  4 +-
 devices/encoders.cpp                          |  6 +--
 devices/encoders.h                            |  6 +--
 devices/filejob.cpp                           |  8 ++--
 devices/filejob.h                             |  4 +-
 devices/filetyperesolver.cpp                  |  4 +-
 devices/freespaceinfo.h                       |  2 +-
 devices/fsdevice.cpp                          | 10 ++--
 devices/fsdevice.h                            |  4 +-
 devices/mounter/main.cpp                      |  2 +-
 devices/mounter/mounter.cpp                   | 14 +++---
 devices/mounter/mounter.h                     |  6 +--
 devices/mountpoints.cpp                       |  6 +--
 devices/mountpoints.h                         |  6 +--
 devices/mtpdevice.cpp                         | 10 ++--
 devices/remotedevicepropertiesdialog.cpp      |  4 +-
 devices/remotedevicepropertieswidget.cpp      |  4 +-
 devices/remotefsdevice.cpp                    | 10 ++--
 devices/remotefsdevice.h                      |  2 +-
 devices/synccollectionwidget.cpp              |  6 +--
 devices/synccollectionwidget.h                |  2 +-
 devices/syncdialog.cpp                        |  2 +-
 devices/tags.cpp                              | 12 ++---
 devices/tags.h                                |  2 +-
 devices/trackorganiser.cpp                    |  6 +--
 devices/transcodingjob.cpp                    |  2 +-
 devices/transcodingjob.h                      |  2 +-
 devices/umsdevice.cpp                         |  8 ++--
 devices/valueslider.cpp                       |  2 +-
 devices/valueslider.h                         |  4 +-
 dynamic/dynamic.cpp                           | 12 ++---
 dynamic/dynamic.h                             | 12 ++---
 dynamic/dynamicpage.cpp                       |  4 +-
 dynamic/dynamicrulesdialog.cpp                |  8 ++--
 gui/albumspage.cpp                            |  4 +-
 gui/cachesettings.cpp                         | 16 +++----
 gui/cachesettings.h                           |  8 ++--
 gui/coverdialog.cpp                           | 48 +++++++++----------
 gui/coverdialog.h                             |  4 +-
 gui/covers.cpp                                | 36 +++++++-------
 gui/covers.h                                  | 10 ++--
 gui/folderpage.cpp                            |  6 +--
 gui/infopage.cpp                              | 30 ++++++------
 gui/infopage.h                                |  2 +-
 gui/initialsettingswizard.cpp                 |  2 +-
 gui/initialsettingswizard.h                   |  2 +-
 gui/interfacesettings.cpp                     |  4 +-
 gui/librarypage.cpp                           |  4 +-
 gui/mainwindow.cpp                            | 16 +++----
 gui/mainwindow.h                              | 16 +++----
 gui/playbacksettings.h                        |  2 +-
 gui/playlistspage.cpp                         |  4 +-
 gui/serverplaybacksettings.cpp                |  2 +-
 gui/serverplaybacksettings.h                  |  2 +-
 gui/serversettings.cpp                        |  8 ++--
 gui/settings.cpp                              | 10 ++--
 gui/settings.h                                |  2 +-
 gui/streamcategorydialog.cpp                  |  6 +--
 gui/streamcategorydialog.h                    |  2 +-
 gui/streamdialog.cpp                          |  6 +--
 gui/streamdialog.h                            |  2 +-
 gui/streamspage.cpp                           | 12 ++---
 gui/tageditor.cpp                             | 10 ++--
 gui/tageditor.h                               |  4 +-
 gui/trayitem.cpp                              |  2 +-
 gui/trayitem.h                                |  4 +-
 http/httpserver.cpp                           |  4 +-
 http/httpserver.h                             |  4 +-
 http/httpsocket.cpp                           | 14 +++---
 http/httpsocket.h                             |  2 +-
 lyrics/lyricsdialog.cpp                       |  4 +-
 lyrics/lyricsettings.h                        |  6 +--
 lyrics/lyricspage.cpp                         | 16 +++----
 lyrics/lyricspage.h                           |  2 +-
 lyrics/songinfoprovider.h                     |  4 +-
 lyrics/ultimatelyricsprovider.cpp             |  4 +-
 lyrics/ultimatelyricsprovider.h               |  8 ++--
 lyrics/ultimatelyricsreader.cpp               |  6 +--
 lyrics/ultimatelyricsreader.h                 |  4 +-
 main.cpp                                      |  8 ++--
 models/albumsmodel.cpp                        | 10 ++--
 models/albumsmodel.h                          |  8 ++--
 models/devicesmodel.cpp                       |  8 ++--
 models/devicesmodel.h                         |  4 +-
 models/dirviewitem.h                          |  8 ++--
 models/dirviewitemdir.cpp                     |  2 +-
 models/dirviewmodel.cpp                       |  8 ++--
 models/dirviewmodel.h                         |  6 +--
 models/musiclibraryitem.h                     |  6 +--
 models/musiclibraryitemalbum.cpp              |  6 +--
 models/musiclibraryitemalbum.h                |  6 +--
 models/musiclibraryitemartist.h               |  6 +--
 models/musiclibraryitemroot.cpp               |  6 +--
 models/musiclibraryitemroot.h                 | 10 ++--
 models/musiclibraryitemsong.h                 |  4 +-
 models/musiclibrarymodel.cpp                  | 16 +++----
 models/musiclibrarymodel.h                    |  6 +--
 models/onlineservicesmodel.cpp                | 10 ++--
 models/onlineservicesmodel.h                  |  4 +-
 models/playlistsmodel.cpp                     |  6 +--
 models/playlistsmodel.h                       |  6 +--
 models/playqueuemodel.cpp                     | 14 +++---
 models/playqueuemodel.h                       |  8 ++--
 models/playqueueproxymodel.cpp                |  2 +-
 models/proxymodel.h                           |  4 +-
 models/streamfetcher.cpp                      |  8 ++--
 models/streamfetcher.h                        |  8 ++--
 models/streamsmodel.cpp                       | 24 +++++-----
 models/streamsmodel.h                         | 10 ++--
 mpd/mpdconnection.cpp                         | 10 ++--
 mpd/mpdconnection.h                           |  8 ++--
 mpd/mpdparseutils.cpp                         |  8 ++--
 mpd/mpdparseutils.h                           |  2 +-
 mpd/mpdstats.h                                |  4 +-
 mpd/mpdstatus.h                               |  2 +-
 mpd/output.h                                  |  2 +-
 mpd/playlist.h                                |  4 +-
 mpd/song.cpp                                  |  4 +-
 mpd/song.h                                    |  6 +--
 network/networkaccessmanager.cpp              |  2 +-
 network/networkaccessmanager.h                |  6 +--
 network/networkproxyfactory.cpp               |  6 +--
 network/networkproxyfactory.h                 |  6 +--
 network/proxysettings.cpp                     |  2 +-
 network/proxysettings.h                       |  2 +-
 online/jamendoservice.cpp                     |  2 +-
 online/jamendoservice.h                       |  2 +-
 online/jamendosettingsdialog.cpp              |  2 +-
 online/jamendosettingsdialog.h                |  2 +-
 online/magnatuneservice.cpp                   |  2 +-
 online/magnatuneservice.h                     |  2 +-
 online/magnatunesettingsdialog.cpp            |  2 +-
 online/magnatunesettingsdialog.h              |  2 +-
 online/onlinedevice.cpp                       |  2 +-
 online/onlineservice.cpp                      |  4 +-
 online/onlineservice.h                        |  6 +--
 online/onlineservicespage.cpp                 |  4 +-
 qtiocompressor/qtiocompressor.cpp             |  2 +-
 qtiocompressor/qtiocompressor.h               |  2 +-
 qtsingleapplication/qtlocalpeer.cpp           |  8 ++--
 qtsingleapplication/qtlocalpeer.h             |  6 +--
 qtsingleapplication/qtlockedfile.h            |  4 +-
 qtsingleapplication/qtlockedfile_win.cpp      |  2 +-
 qtsingleapplication/qtsingleapplication.cpp   |  2 +-
 qtsingleapplication/qtsingleapplication.h     |  2 +-
 qtsingleapplication/qtsinglecoreapplication.h |  2 +-
 replaygain/ffmpeginput.cpp                    | 10 ++--
 replaygain/jobcontroller.h                    |  2 +-
 replaygain/mpg123input.cpp                    |  6 +--
 replaygain/rgdialog.cpp                       | 16 +++----
 solid-lite/backends/hal/haldevice.cpp         | 14 +++---
 solid-lite/backends/hal/haldeviceinterface.h  |  4 +-
 solid-lite/backends/hal/halfstabhandling.cpp  | 12 ++---
 solid-lite/backends/hal/halfstabhandling.h    |  2 +-
 solid-lite/backends/hal/halmanager.cpp        |  8 ++--
 solid-lite/backends/hal/halmanager.h          |  4 +-
 .../backends/hal/halportablemediaplayer.h     |  2 +-
 solid-lite/backends/hal/halstorageaccess.cpp  | 20 ++++----
 solid-lite/backends/hal/halstorageaccess.h    |  8 ++--
 solid-lite/backends/iokit/cfhelper.cpp        | 12 ++---
 solid-lite/backends/iokit/iokitdevice.cpp     |  2 +-
 .../backends/iokit/iokitdeviceinterface.h     |  4 +-
 solid-lite/backends/iokit/iokitmanager.cpp    |  2 +-
 solid-lite/backends/iokit/iokitmanager.h      |  4 +-
 solid-lite/backends/shared/rootdevice.cpp     |  2 +-
 solid-lite/backends/shared/rootdevice.h       |  2 +-
 solid-lite/backends/shared/udevqt.h           | 12 ++---
 solid-lite/backends/shared/udevqtclient.cpp   |  2 +-
 solid-lite/backends/shared/udevqtdevice.cpp   |  2 +-
 solid-lite/backends/udev/udevdevice.h         |  2 +-
 .../backends/udev/udevdeviceinterface.h       |  4 +-
 solid-lite/backends/udev/udevmanager.cpp      |  6 +--
 .../backends/udev/udevportablemediaplayer.cpp |  8 ++--
 .../backends/udev/udevportablemediaplayer.h   |  2 +-
 solid-lite/backends/udisks/udisksdevice.cpp   | 10 ++--
 solid-lite/backends/udisks/udisksdevice.h     |  4 +-
 .../backends/udisks/udisksdeviceinterface.h   |  4 +-
 solid-lite/backends/udisks/udisksmanager.cpp  |  8 ++--
 solid-lite/backends/udisks/udisksmanager.h    |  4 +-
 .../backends/udisks/udisksstorageaccess.cpp   |  8 ++--
 .../backends/udisks/udisksstorageaccess.h     |  4 +-
 .../backends/udisks/udisksstoragedrive.cpp    |  2 +-
 solid-lite/backends/wmi/wmidevice.cpp         |  2 +-
 solid-lite/backends/wmi/wmideviceinterface.h  |  4 +-
 solid-lite/backends/wmi/wmimanager.cpp        |  2 +-
 solid-lite/backends/wmi/wmimanager.h          |  4 +-
 .../backends/wmi/wmiportablemediaplayer.h     |  2 +-
 solid-lite/backends/wmi/wmiquery.cpp          | 10 ++--
 solid-lite/backends/wmi/wmiquery.h            | 10 ++--
 solid-lite/backends/wmi/wmistorageaccess.cpp  |  6 +--
 solid-lite/backends/wmi/wmistorageaccess.h    |  2 +-
 solid-lite/device.h                           |  8 ++--
 solid-lite/device_p.h                         |  8 ++--
 solid-lite/deviceinterface.cpp                |  2 +-
 solid-lite/deviceinterface.h                  |  4 +-
 solid-lite/deviceinterface_p.h                |  2 +-
 solid-lite/devicemanager_p.h                  |  8 ++--
 solid-lite/devicenotifier.h                   |  4 +-
 solid-lite/genericinterface.h                 |  4 +-
 solid-lite/ifaces/device.cpp                  |  4 +-
 solid-lite/ifaces/device.h                    |  6 +--
 solid-lite/ifaces/deviceinterface.h           |  4 +-
 solid-lite/ifaces/devicemanager.h             |  4 +-
 solid-lite/ifaces/genericinterface.h          |  8 ++--
 solid-lite/managerbase_p.h                    |  4 +-
 solid-lite/portablemediaplayer.h              |  4 +-
 solid-lite/predicate.cpp                      |  4 +-
 solid-lite/predicate.h                        |  4 +-
 solid-lite/predicateparse.cpp                 |  4 +-
 solid-lite/soliddefs_p.h                      |  2 +-
 solid-lite/solidnamespace.h                   |  2 +-
 solid-lite/storageaccess.h                    |  2 +-
 solid-lite/xdgbasedirs.cpp                    |  4 +-
 support/action.cpp                            |  2 +-
 support/action.h                              |  4 +-
 support/actioncollection.cpp                  |  4 +-
 support/actioncollection.h                    |  8 ++--
 support/buddylabel.h                          |  6 +--
 support/capacitybar.h                         |  2 +-
 support/dialog.cpp                            |  6 +--
 support/dialog.h                              |  4 +-
 support/dirrequester.cpp                      |  4 +-
 support/dirrequester.h                        |  2 +-
 support/fancytabwidget.cpp                    | 34 ++++++-------
 support/fancytabwidget.h                      | 14 +++---
 support/gtkstyle.cpp                          | 10 ++--
 support/icon.cpp                              |  4 +-
 support/icon.h                                |  2 +-
 support/inputdialog.h                         |  2 +-
 support/keysequencewidget.cpp                 | 10 ++--
 support/keysequencewidget.h                   |  6 +--
 support/kmessagewidget.cpp                    | 20 ++++----
 support/kmessagewidget.h                      |  2 +-
 support/lineedit.cpp                          |  4 +-
 support/lineedit.h                            |  4 +-
 support/localize.h                            |  2 +-
 support/messagebox.cpp                        |  2 +-
 support/messagebox.h                          |  2 +-
 support/onoffbutton.cpp                       |  8 ++--
 support/onoffbutton.h                         |  2 +-
 support/pagewidget.cpp                        |  8 ++--
 support/shortcutssettingspage.cpp             |  2 +-
 support/shortcutssettingspage.h               |  2 +-
 support/spinbox.cpp                           | 24 +++++-----
 support/spinbox.h                             |  4 +-
 support/spinner.cpp                           |  8 ++--
 support/spinner.h                             |  2 +-
 support/squeezedtextlabel.h                   |  4 +-
 support/urllabel.h                            |  4 +-
 support/utils.cpp                             | 14 +++---
 support/utils.h                               |  4 +-
 widgets/actionitemdelegate.cpp                | 12 ++---
 widgets/actionitemdelegate.h                  |  2 +-
 widgets/actionlabel.cpp                       | 10 ++--
 widgets/actionlabel.h                         |  2 +-
 widgets/autohidingsplitter.cpp                | 12 ++---
 widgets/autohidingsplitter.h                  | 12 ++---
 widgets/completioncombo.h                     |  6 +--
 widgets/coverwidget.cpp                       | 14 +++---
 widgets/coverwidget.h                         |  4 +-
 widgets/genrecombo.h                          |  4 +-
 widgets/groupedview.cpp                       | 14 +++---
 widgets/groupedview.h                         |  2 +-
 widgets/icons.cpp                             | 12 ++---
 widgets/itemview.cpp                          | 12 ++---
 widgets/itemview.h                            |  2 +-
 widgets/listview.cpp                          |  8 ++--
 widgets/listview.h                            |  2 +-
 widgets/playqueueview.cpp                     |  8 ++--
 widgets/playqueueview.h                       |  6 +--
 widgets/textbrowser.cpp                       |  2 +-
 widgets/textbrowser.h                         |  6 +--
 widgets/timeslider.cpp                        |  2 +-
 widgets/timeslider.h                          |  4 +-
 widgets/treeview.cpp                          | 12 ++---
 widgets/treeview.h                            |  2 +-
 widgets/volumecontrol.cpp                     | 10 ++--
 widgets/volumecontrol.h                       |  2 +-
 291 files changed, 891 insertions(+), 891 deletions(-)

diff --git a/application.cpp b/application.cpp
index 469b4222e..113a4a8c3 100644
--- a/application.cpp
+++ b/application.cpp
@@ -29,9 +29,9 @@
 #include <KDE/Solid/PowerManagement>
 #include "initialsettingswizard.h"
 #else
-#include <QtGui/QIcon>
+#include <QIcon>
 #ifdef Q_OS_WIN
-#include <QtCore/QDir>
+#include <QDir>
 #include <windows.h>
 #endif
 #endif
@@ -222,9 +222,9 @@ void Application::load(const QStringList &files)
 #endif // TAGLIB_FOUND
 
 #else // Q_OS_WIN
-#include <QtDBus/QDBusConnection>
-#include <QtDBus/QDBusMessage>
-#include <QtCore/QDir>
+#include <QDBusConnection>
+#include <QDBusMessage>
+#include <QDir>
 #include "upowerinterface.h"
 
 Application::Application(int &argc, char **argv)
diff --git a/application.h b/application.h
index 9867b8b9e..2fbc49e3f 100644
--- a/application.h
+++ b/application.h
@@ -25,7 +25,7 @@
 #define APPLICATION_H
 
 #include "config.h"
-#include <QtCore/qglobal.h>
+#include <qglobal.h>
 #ifdef ENABLE_KDE_SUPPORT
 #include <KDE/KUniqueApplication>
 class MainWindow;
@@ -76,7 +76,7 @@ Q_SIGNALS:
     void reconnect();
 };
 #else
-#include <QtGui/QApplication>
+#include <QApplication>
 class Application : public QApplication
 {
 public:
diff --git a/dbus/gnomemediakeys.cpp b/dbus/gnomemediakeys.cpp
index c14e7c8b0..781462079 100644
--- a/dbus/gnomemediakeys.cpp
+++ b/dbus/gnomemediakeys.cpp
@@ -24,11 +24,11 @@
 #include "gnomemediakeys.h"
 #include "mainwindow.h"
 #include "mediakeysinterface.h"
-#include <QtDBus/QDBusConnection>
-#include <QtDBus/QDBusConnectionInterface>
-#include <QtDBus/QDBusPendingReply>
-#include <QtDBus/QDBusPendingCallWatcher>
-#include <QtCore/QCoreApplication>
+#include <QDBusConnection>
+#include <QDBusConnectionInterface>
+#include <QDBusPendingReply>
+#include <QDBusPendingCallWatcher>
+#include <QCoreApplication>
 
 static const char * constService = "org.gnome.SettingsDaemon";
 static const char * constPath = "/org/gnome/SettingsDaemon/MediaKeys";
diff --git a/dbus/gnomemediakeys.h b/dbus/gnomemediakeys.h
index d9eda6112..7fac837f9 100644
--- a/dbus/gnomemediakeys.h
+++ b/dbus/gnomemediakeys.h
@@ -24,7 +24,7 @@
 #ifndef GNOME_MEDIA_KEYS_H
 #define GNOME_MEDIA_KEYS_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 class OrgGnomeSettingsDaemonMediaKeysInterface;
 class QDBusPendingCallWatcher;
diff --git a/dbus/mpris.h b/dbus/mpris.h
index cca6eba3c..f282304ae 100644
--- a/dbus/mpris.h
+++ b/dbus/mpris.h
@@ -24,10 +24,10 @@
 #ifndef MPRIS_H
 #define MPRIS_H
 
-#include <QtCore/QObject>
-#include <QtCore/QStringList>
-#include <QtCore/QVariantMap>
-#include <QtGui/QApplication>
+#include <QObject>
+#include <QStringList>
+#include <QVariantMap>
+#include <QApplication>
 
 #include "song.h"
 #include "mpdstatus.h"
diff --git a/dbus/notify.cpp b/dbus/notify.cpp
index 6ef677d44..db5b29f4c 100644
--- a/dbus/notify.cpp
+++ b/dbus/notify.cpp
@@ -23,11 +23,11 @@
 
 #include "notify.h"
 #include "notificationsinterface.h"
-#include <QtDBus/QDBusPendingReply>
-#include <QtDBus/QDBusPendingCallWatcher>
-#include <QtCore/QCoreApplication>
-#include <QtGui/QPixmap>
-#include <QtGui/QImage>
+#include <QDBusPendingReply>
+#include <QDBusPendingCallWatcher>
+#include <QCoreApplication>
+#include <QPixmap>
+#include <QImage>
 
 QDBusArgument& operator<< (QDBusArgument &arg, const QImage &image)
 {
diff --git a/dbus/notify.h b/dbus/notify.h
index 6aa1a4b0a..afff40fbf 100644
--- a/dbus/notify.h
+++ b/dbus/notify.h
@@ -24,8 +24,8 @@
 #ifndef NOTIFY_H
 #define NOTIFY_H
 
-#include <QtCore/QObject>
-#include <QtCore/QDateTime>
+#include <QObject>
+#include <QDateTime>
 
 class QImage;
 class QDBusPendingCallWatcher;
diff --git a/devices/actiondialog.cpp b/devices/actiondialog.cpp
index 92df83ff0..f91483f23 100644
--- a/devices/actiondialog.cpp
+++ b/devices/actiondialog.cpp
@@ -40,7 +40,7 @@
 #include "freespaceinfo.h"
 #include "icons.h"
 #include "onlineservicesmodel.h"
-#include <QtCore/QFile>
+#include <QFile>
 
 static int iCount=0;
 
diff --git a/devices/device.cpp b/devices/device.cpp
index 50a497ab7..5b6be514a 100644
--- a/devices/device.cpp
+++ b/devices/device.cpp
@@ -25,9 +25,9 @@
 #include "device.h"
 #include "covers.h"
 #include "utils.h"
-#include <QtCore/QBuffer>
-#include <QtCore/QDir>
-#include <QtCore/QTemporaryFile>
+#include <QBuffer>
+#include <QDir>
+#include <QTemporaryFile>
 #ifndef Q_OS_WIN
 #include "devicesmodel.h"
 #include "umsdevice.h"
diff --git a/devices/device.h b/devices/device.h
index bdeb1f2c8..9a7e6f4a8 100644
--- a/devices/device.h
+++ b/devices/device.h
@@ -36,7 +36,7 @@ namespace Device
 #include "song.h"
 #include "encoders.h"
 #include "deviceoptions.h"
-#include <QtCore/QObject>
+#include <QObject>
 #ifdef ENABLE_KDE_SUPPORT
 #include <solid/device.h>
 #else
diff --git a/devices/deviceoptions.cpp b/devices/deviceoptions.cpp
index 7f729cdbf..30faf94cb 100644
--- a/devices/deviceoptions.cpp
+++ b/devices/deviceoptions.cpp
@@ -25,8 +25,8 @@
 #include "song.h"
 #include "localize.h"
 #include "settings.h"
-#include <QtCore/QDir>
-#include <QtCore/QUrl>
+#include <QDir>
+#include <QUrl>
 #include <unistd.h>
 
 static QString cleanPath(const QString &path)
diff --git a/devices/deviceoptions.h b/devices/deviceoptions.h
index 0f115a3b6..2ea82b41e 100644
--- a/devices/deviceoptions.h
+++ b/devices/deviceoptions.h
@@ -24,7 +24,7 @@
 #ifndef DEVICE_OPTIONS_H
 #define DEVICE_OPTIONS_H
 
-#include <QtCore/QString>
+#include <QString>
 #include "config.h"
 #ifdef ENABLE_DEVICES_SUPPORT
 #include "encoders.h"
diff --git a/devices/devicepropertieswidget.cpp b/devices/devicepropertieswidget.cpp
index 133586394..c1318147f 100644
--- a/devices/devicepropertieswidget.cpp
+++ b/devices/devicepropertieswidget.cpp
@@ -26,8 +26,8 @@
 #include "covers.h"
 #include "localize.h"
 #include "icons.h"
-#include <QtGui/QValidator>
-#include <QtGui/QTabWidget>
+#include <QValidator>
+#include <QTabWidget>
 
 class CoverNameValidator : public QValidator
 {
diff --git a/devices/devicespage.cpp b/devices/devicespage.cpp
index 0d69bd025..c92470af4 100644
--- a/devices/devicespage.cpp
+++ b/devices/devicespage.cpp
@@ -35,8 +35,8 @@
 #include "mainwindow.h"
 #include "action.h"
 #include "actioncollection.h"
-#include <QtGui/QIcon>
-#include <QtGui/QToolButton>
+#include <QIcon>
+#include <QToolButton>
 #ifdef ENABLE_KDE_SUPPORT
 #include <KDE/KGlobalSettings>
 #endif
diff --git a/devices/encoders.cpp b/devices/encoders.cpp
index 408a9f2c9..3b4079c15 100644
--- a/devices/encoders.cpp
+++ b/devices/encoders.cpp
@@ -25,9 +25,9 @@
 #include "encoders.h"
 #include "utils.h"
 #include "localize.h"
-#include <QtCore/QRegExp>
-#include <QtCore/QProcess>
-#include <QtCore/QDebug>
+#include <QRegExp>
+#include <QProcess>
+#include <QDebug>
 
 namespace Encoders
 {
diff --git a/devices/encoders.h b/devices/encoders.h
index 8105d1010..6fcf2b3a3 100644
--- a/devices/encoders.h
+++ b/devices/encoders.h
@@ -24,9 +24,9 @@
 #ifndef ENCODERS_H
 #define ENCODERS_H
 
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QList>
+#include <QString>
+#include <QStringList>
+#include <QList>
 
 namespace Encoders
 {
diff --git a/devices/filejob.cpp b/devices/filejob.cpp
index f69952245..f77a74954 100644
--- a/devices/filejob.cpp
+++ b/devices/filejob.cpp
@@ -26,10 +26,10 @@
 #include "device.h"
 #include "lyricspage.h"
 #include "covers.h"
-#include <QtCore/QFile>
-#include <QtCore/QThread>
-#include <QtCore/QTimer>
-#include <QtCore/QTemporaryFile>
+#include <QFile>
+#include <QThread>
+#include <QTimer>
+#include <QTemporaryFile>
 
 #ifdef ENABLE_KDE_SUPPORT
 #include <KDE/KGlobal>
diff --git a/devices/filejob.h b/devices/filejob.h
index b9ab9be03..494c2d63d 100644
--- a/devices/filejob.h
+++ b/devices/filejob.h
@@ -24,8 +24,8 @@
 #ifndef FILE_JOB_H
 #define FILE_JOB_H
 
-#include <QtCore/QObject>
-#include <QtCore/QSet>
+#include <QObject>
+#include <QSet>
 #include "song.h"
 #include "deviceoptions.h"
 
diff --git a/devices/filetyperesolver.cpp b/devices/filetyperesolver.cpp
index 132fb6000..4e18b5f38 100644
--- a/devices/filetyperesolver.cpp
+++ b/devices/filetyperesolver.cpp
@@ -23,8 +23,8 @@
 
 #include "filetyperesolver.h"
 
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
+#include <QFile>
+#include <QFileInfo>
 #ifdef ENABLE_KDE_SUPPORT
 #include <KDE/KMimeType>
 #endif
diff --git a/devices/freespaceinfo.h b/devices/freespaceinfo.h
index 1af535084..73917497d 100644
--- a/devices/freespaceinfo.h
+++ b/devices/freespaceinfo.h
@@ -24,7 +24,7 @@
 #ifndef FREESPACEINFO_H
 #define FREESPACEINFO_H
 
-#include <QtCore/QString>
+#include <QString>
 
 class FreeSpaceInfo
 {
diff --git a/devices/fsdevice.cpp b/devices/fsdevice.cpp
index c6d220911..fa3530c41 100644
--- a/devices/fsdevice.cpp
+++ b/devices/fsdevice.cpp
@@ -38,11 +38,11 @@
 #include "actiondialog.h"
 #include "localize.h"
 #include "covers.h"
-#include <QtCore/QDir>
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
-#include <QtCore/QTextStream>
-#include <QtCore/QTimer>
+#include <QDir>
+#include <QFile>
+#include <QFileInfo>
+#include <QTextStream>
+#include <QTimer>
 #include <time.h>
 
 const QLatin1String FsDevice::constCantataCacheFile("/.cache");
diff --git a/devices/fsdevice.h b/devices/fsdevice.h
index 9884a1c0c..e26982e73 100644
--- a/devices/fsdevice.h
+++ b/devices/fsdevice.h
@@ -28,8 +28,8 @@
 #include "song.h"
 #include "utils.h"
 #include "freespaceinfo.h"
-#include <QtCore/QThread>
-#include <QtCore/QStringList>
+#include <QThread>
+#include <QStringList>
 
 class MusicLibraryItemRoot;
 class KJob;
diff --git a/devices/mounter/main.cpp b/devices/mounter/main.cpp
index 9ec78bc1c..fb9350f16 100644
--- a/devices/mounter/main.cpp
+++ b/devices/mounter/main.cpp
@@ -22,7 +22,7 @@
  */
 
 #include "mounter.h"
-#include <QtCore/QCoreApplication>
+#include <QCoreApplication>
 
 int main(int argc, char *argv[])
 {
diff --git a/devices/mounter/mounter.cpp b/devices/mounter/mounter.cpp
index 8d1ef2f16..9d7bee45f 100644
--- a/devices/mounter/mounter.cpp
+++ b/devices/mounter/mounter.cpp
@@ -25,13 +25,13 @@
 #include "mounteradaptor.h"
 #include "config.h"
 #include <stdlib.h>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QUrl>
-#include <QtCore/QProcess>
-#include <QtCore/QTemporaryFile>
-#include <QtCore/QTextStream>
-#include <QtCore/QTimer>
-#include <QtCore/QDebug>
+#include <QCoreApplication>
+#include <QUrl>
+#include <QProcess>
+#include <QTemporaryFile>
+#include <QTextStream>
+#include <QTimer>
+#include <QDebug>
 #include <sys/types.h>
 #include <signal.h>
 
diff --git a/devices/mounter/mounter.h b/devices/mounter/mounter.h
index 2e4682ea0..9d326ef0c 100644
--- a/devices/mounter/mounter.h
+++ b/devices/mounter/mounter.h
@@ -24,9 +24,9 @@
 #ifndef MOUNTER_H
 #define MOUNTER_H
 
-#include <QtCore/QObject>
-#include <QtCore/QMap>
-#include <QtCore/QSet>
+#include <QObject>
+#include <QMap>
+#include <QSet>
 #include <QtDBus>
 
 class QTimer;
diff --git a/devices/mountpoints.cpp b/devices/mountpoints.cpp
index e3532bd5f..5517a67c6 100644
--- a/devices/mountpoints.cpp
+++ b/devices/mountpoints.cpp
@@ -22,9 +22,9 @@
  */
 
 #include "mountpoints.h"
-#include <QtCore/QSocketNotifier>
-#include <QtCore/QFile>
-#include <QtCore/QStringList>
+#include <QSocketNotifier>
+#include <QFile>
+#include <QStringList>
 #ifdef ENABLE_KDE_SUPPORT
 #include <KDE/KGlobal>
 K_GLOBAL_STATIC(MountPoints, instance)
diff --git a/devices/mountpoints.h b/devices/mountpoints.h
index ebf52822e..d4ba7beeb 100644
--- a/devices/mountpoints.h
+++ b/devices/mountpoints.h
@@ -24,9 +24,9 @@
 #ifndef MOUNTPOINTS_H
 #define MOUNTPOINTS_H
 
-#include <QtCore/QObject>
-#include <QtCore/QSet>
-#include <QtCore/QString>
+#include <QObject>
+#include <QSet>
+#include <QString>
 
 class QFile;
 
diff --git a/devices/mtpdevice.cpp b/devices/mtpdevice.cpp
index 3c23c8aa2..42a1f91b1 100644
--- a/devices/mtpdevice.cpp
+++ b/devices/mtpdevice.cpp
@@ -39,10 +39,10 @@
 #include "localize.h"
 #include "filejob.h"
 #include "settings.h"
-#include <QtCore/QThread>
-#include <QtCore/QTimer>
-#include <QtCore/QDir>
-#include <QtCore/QTemporaryFile>
+#include <QThread>
+#include <QTimer>
+#include <QDir>
+#include <QTemporaryFile>
 #ifdef ENABLE_KDE_SUPPORT
 #include <KDE/KMimeType>
 #include <solid/genericinterface.h>
@@ -52,7 +52,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <QtCore/QDebug>
+#include <QDebug>
 
 
 static int progressMonitor(uint64_t const processed, uint64_t const total, void const * const data)
diff --git a/devices/remotedevicepropertiesdialog.cpp b/devices/remotedevicepropertiesdialog.cpp
index d4c57dfb6..2de894864 100644
--- a/devices/remotedevicepropertiesdialog.cpp
+++ b/devices/remotedevicepropertiesdialog.cpp
@@ -28,8 +28,8 @@
 #include "localize.h"
 #include "messagebox.h"
 #include "icon.h"
-#include <QtGui/QTabWidget>
-#include <QtGui/QIcon>
+#include <QTabWidget>
+#include <QIcon>
 
 RemoteDevicePropertiesDialog::RemoteDevicePropertiesDialog(QWidget *parent)
     : Dialog(parent)
diff --git a/devices/remotedevicepropertieswidget.cpp b/devices/remotedevicepropertieswidget.cpp
index 895fad77f..96e561c87 100644
--- a/devices/remotedevicepropertieswidget.cpp
+++ b/devices/remotedevicepropertieswidget.cpp
@@ -25,8 +25,8 @@
 #include "filenameschemedialog.h"
 #include "covers.h"
 #include "localize.h"
-#include <QtGui/QTabWidget>
-#include <QtGui/QIcon>
+#include <QTabWidget>
+#include <QIcon>
 #include "lineedit.h"
 #include "config.h"
 
diff --git a/devices/remotefsdevice.cpp b/devices/remotefsdevice.cpp
index 94dc9f2ef..dfe3838f8 100644
--- a/devices/remotefsdevice.cpp
+++ b/devices/remotefsdevice.cpp
@@ -34,12 +34,12 @@
 #include "mountpoints.h"
 #ifdef ENABLE_MOUNTER
 #include "mounterinterface.h"
-#include <QtDBus/QDBusConnection>
+#include <QDBusConnection>
 #endif
-#include <QtCore/QTimer>
-#include <QtCore/QProcess>
-#include <QtCore/QDir>
-#include <QtCore/QFile>
+#include <QTimer>
+#include <QProcess>
+#include <QDir>
+#include <QFile>
 #ifdef ENABLE_KDE_SUPPORT
 #include <kmountpoint.h>
 #include <kde_file.h>
diff --git a/devices/remotefsdevice.h b/devices/remotefsdevice.h
index 7a8aae286..0dcf1d1a4 100644
--- a/devices/remotefsdevice.h
+++ b/devices/remotefsdevice.h
@@ -26,7 +26,7 @@
 
 #include "fsdevice.h"
 #include "config.h"
-#include <QtCore/QUrl>
+#include <QUrl>
 
 class ComGooglecodeCantataMounterInterface;
 class QProcess;
diff --git a/devices/synccollectionwidget.cpp b/devices/synccollectionwidget.cpp
index 32bcebc8f..c24b7c63c 100644
--- a/devices/synccollectionwidget.cpp
+++ b/devices/synccollectionwidget.cpp
@@ -27,9 +27,9 @@
 #include "icon.h"
 #include "localize.h"
 #include "actioncollection.h"
-#include <QtCore/QTimer>
-#include <QtGui/QAction>
-#include <QtCore/QDebug>
+#include <QTimer>
+#include <QAction>
+#include <QDebug>
 
 SyncCollectionWidget::SyncCollectionWidget(QWidget *parent, const QString &title, const QString &action, bool showCovers)
     : QWidget(parent)
diff --git a/devices/synccollectionwidget.h b/devices/synccollectionwidget.h
index ceee57d9d..1c8090792 100644
--- a/devices/synccollectionwidget.h
+++ b/devices/synccollectionwidget.h
@@ -27,7 +27,7 @@
 #include "ui_synccollectionwidget.h"
 #include "song.h"
 #include "musiclibrarymodel.h"
-#include <QtCore/QSet>
+#include <QSet>
 
 class QTimer;
 class MusicLibraryProxyModel;
diff --git a/devices/syncdialog.cpp b/devices/syncdialog.cpp
index 23d7841dc..5072d575c 100644
--- a/devices/syncdialog.cpp
+++ b/devices/syncdialog.cpp
@@ -29,7 +29,7 @@
 #include "devicesmodel.h"
 #include "localize.h"
 #include "messagebox.h"
-#include <QtGui/QSplitter>
+#include <QSplitter>
 
 struct SyncSong : public Song
 {
diff --git a/devices/tags.cpp b/devices/tags.cpp
index 3134abfcd..bb68c8f95 100644
--- a/devices/tags.cpp
+++ b/devices/tags.cpp
@@ -31,12 +31,12 @@
 #include <cstring>
 #include <sstream>
 #include <ios>
-#include <QtCore/QFile>
-#include <QtCore/QMutex>
-#include <QtCore/QMutexLocker>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QTextCodec>
+#include <QFile>
+#include <QMutex>
+#include <QMutexLocker>
+#include <QString>
+#include <QStringList>
+#include <QTextCodec>
 #include <taglib/fileref.h>
 #include <taglib/aifffile.h>
 #ifdef TAGLIB_ASF_FOUND
diff --git a/devices/tags.h b/devices/tags.h
index 1434b6350..a2c2831e2 100644
--- a/devices/tags.h
+++ b/devices/tags.h
@@ -25,7 +25,7 @@
 #define TAGS_H
 
 #include "song.h"
-#include <QtGui/QImage>
+#include <QImage>
 
 namespace Tags
 {
diff --git a/devices/trackorganiser.cpp b/devices/trackorganiser.cpp
index 5dfc8d09b..0cc71e4a6 100644
--- a/devices/trackorganiser.cpp
+++ b/devices/trackorganiser.cpp
@@ -36,9 +36,9 @@
 #include "localize.h"
 #include "messagebox.h"
 #include "icons.h"
-#include <QtCore/QTimer>
-#include <QtCore/QFile>
-#include <QtCore/QDir>
+#include <QTimer>
+#include <QFile>
+#include <QDir>
 
 static int iCount=0;
 
diff --git a/devices/transcodingjob.cpp b/devices/transcodingjob.cpp
index 517cbe977..b3765c3c5 100644
--- a/devices/transcodingjob.cpp
+++ b/devices/transcodingjob.cpp
@@ -22,7 +22,7 @@
 
 #include "transcodingjob.h"
 #include "device.h"
-#include <QtCore/QStringList>
+#include <QStringList>
 
 TranscodingJob::TranscodingJob(const Encoders::Encoder &enc, int val, const QString &src, const QString &dest, const DeviceOptions &d, int co, const Song &s)
     : CopyJob(src, dest, d, co, s)
diff --git a/devices/transcodingjob.h b/devices/transcodingjob.h
index f8debea89..15873484d 100644
--- a/devices/transcodingjob.h
+++ b/devices/transcodingjob.h
@@ -24,7 +24,7 @@
 
 #include "filejob.h"
 #include "encoders.h"
-#include <QtCore/QProcess>
+#include <QProcess>
 
 class TranscodingJob : public CopyJob
 {
diff --git a/devices/umsdevice.cpp b/devices/umsdevice.cpp
index 43f1f2647..0f049dedd 100644
--- a/devices/umsdevice.cpp
+++ b/devices/umsdevice.cpp
@@ -27,10 +27,10 @@
 #include "devicepropertieswidget.h"
 #include "actiondialog.h"
 #include "localize.h"
-#include <QtCore/QDir>
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
-#include <QtCore/QTextStream>
+#include <QDir>
+#include <QFile>
+#include <QFileInfo>
+#include <QTextStream>
 
 static const QLatin1String constSettingsFile("/.is_audio_player");
 static const QLatin1String constMusicFolderKey("audio_folder");
diff --git a/devices/valueslider.cpp b/devices/valueslider.cpp
index 2ff5992d4..55d7151c5 100644
--- a/devices/valueslider.cpp
+++ b/devices/valueslider.cpp
@@ -22,7 +22,7 @@
 
 #include "valueslider.h"
 #include "localize.h"
-#include <QtGui/QGridLayout>
+#include <QGridLayout>
 
 ValueSlider::ValueSlider(QWidget *parent)
     : QWidget(parent)
diff --git a/devices/valueslider.h b/devices/valueslider.h
index cde76cdcf..bf27c0302 100644
--- a/devices/valueslider.h
+++ b/devices/valueslider.h
@@ -23,8 +23,8 @@
 #ifndef VALUESLIDER_H
 #define VALUESLIDER_H
 
-#include <QtGui/QLabel>
-#include <QtGui/QSlider>
+#include <QLabel>
+#include <QSlider>
 #include "encoders.h"
 
 class ValueSlider : public QWidget
diff --git a/dynamic/dynamic.cpp b/dynamic/dynamic.cpp
index 442a9a76c..f842cbc13 100644
--- a/dynamic/dynamic.cpp
+++ b/dynamic/dynamic.cpp
@@ -34,12 +34,12 @@
 #include <KDE/KGlobal>
 K_GLOBAL_STATIC(Dynamic, instance)
 #endif
-#include <QtCore/QDir>
-#include <QtCore/QFile>
-#include <QtCore/QTextStream>
-#include <QtCore/QProcess>
-#include <QtCore/QTimer>
-#include <QtGui/QIcon>
+#include <QDir>
+#include <QFile>
+#include <QTextStream>
+#include <QProcess>
+#include <QTimer>
+#include <QIcon>
 #include <signal.h>
 
 static const QString constDir=QLatin1String("dynamic");
diff --git a/dynamic/dynamic.h b/dynamic/dynamic.h
index 8f0917390..5aea956de 100644
--- a/dynamic/dynamic.h
+++ b/dynamic/dynamic.h
@@ -24,12 +24,12 @@
 #ifndef DYNAMIC_H
 #define DYNAMIC_H
 
-#include <QtGui/QIcon>
-#include <QtCore/QAbstractItemModel>
-#include <QtCore/QList>
-#include <QtCore/QMap>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
+#include <QIcon>
+#include <QAbstractItemModel>
+#include <QList>
+#include <QMap>
+#include <QString>
+#include <QStringList>
 
 class QTimer;
 class QNetworkReply;
diff --git a/dynamic/dynamicpage.cpp b/dynamic/dynamicpage.cpp
index 1d4cb12ec..0c3458485 100644
--- a/dynamic/dynamicpage.cpp
+++ b/dynamic/dynamicpage.cpp
@@ -29,8 +29,8 @@
 #include "mainwindow.h"
 #include "action.h"
 #include "actioncollection.h"
-#include <QtGui/QIcon>
-#include <QtGui/QToolButton>
+#include <QIcon>
+#include <QToolButton>
 
 DynamicPage::DynamicPage(MainWindow *p)
     : QWidget(p)
diff --git a/dynamic/dynamicrulesdialog.cpp b/dynamic/dynamicrulesdialog.cpp
index 41e1f36d1..79522f32a 100644
--- a/dynamic/dynamicrulesdialog.cpp
+++ b/dynamic/dynamicrulesdialog.cpp
@@ -27,10 +27,10 @@
 #include "messagebox.h"
 #include "localize.h"
 #include "icons.h"
-#include <QtGui/QIcon>
-#include <QtGui/QStandardItem>
-#include <QtGui/QStandardItemModel>
-#include <QtGui/QSortFilterProxyModel>
+#include <QIcon>
+#include <QStandardItem>
+#include <QStandardItemModel>
+#include <QSortFilterProxyModel>
 
 class RulesSort : public QSortFilterProxyModel
 {
diff --git a/gui/albumspage.cpp b/gui/albumspage.cpp
index c4260590c..ba44d87cb 100644
--- a/gui/albumspage.cpp
+++ b/gui/albumspage.cpp
@@ -33,8 +33,8 @@
 #include "icon.h"
 #include "mainwindow.h"
 #include "action.h"
-#include <QtGui/QIcon>
-#include <QtGui/QToolButton>
+#include <QIcon>
+#include <QToolButton>
 
 AlbumsPage::AlbumsPage(MainWindow *p)
     : QWidget(p)
diff --git a/gui/cachesettings.cpp b/gui/cachesettings.cpp
index 2adb8a9e0..ccd206e81 100644
--- a/gui/cachesettings.cpp
+++ b/gui/cachesettings.cpp
@@ -28,14 +28,14 @@
 #include "musiclibrarymodel.h"
 #include "utils.h"
 #include "messagebox.h"
-#include <QtGui/QFormLayout>
-#include <QtGui/QLabel>
-#include <QtGui/QPushButton>
-#include <QtGui/QStyle>
-#include <QtGui/QGridLayout>
-#include <QtCore/QThread>
-#include <QtCore/QFileInfo>
-#include <QtCore/QDir>
+#include <QFormLayout>
+#include <QLabel>
+#include <QPushButton>
+#include <QStyle>
+#include <QGridLayout>
+#include <QThread>
+#include <QFileInfo>
+#include <QDir>
 
 static const int constMaxRecurseLevel=4;
 
diff --git a/gui/cachesettings.h b/gui/cachesettings.h
index 4697bc757..01d21e131 100644
--- a/gui/cachesettings.h
+++ b/gui/cachesettings.h
@@ -24,10 +24,10 @@
 #ifndef CACHESETTINGS_H
 #define CACHESETTINGS_H
 
-#include <QtGui/QWidget>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtGui/QGroupBox>
+#include <QWidget>
+#include <QString>
+#include <QStringList>
+#include <QGroupBox>
 
 class QThread;
 class CacheItemCounter : public QObject
diff --git a/gui/coverdialog.cpp b/gui/coverdialog.cpp
index 8197eb484..0448ffb9d 100644
--- a/gui/coverdialog.cpp
+++ b/gui/coverdialog.cpp
@@ -32,34 +32,34 @@
 #include "utils.h"
 #include "spinner.h"
 #include "icon.h"
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QLabel>
-#include <QtGui/QListWidget>
-#include <QtGui/QPixmap>
-#include <QtGui/QFont>
-#include <QtGui/QFontMetrics>
-#include <QtGui/QPainter>
-#include <QtGui/QStyle>
-#include <QtGui/QApplication>
-#include <QtGui/QProgressBar>
-#include <QtGui/QScrollArea>
-#include <QtGui/QDesktopWidget>
-#include <QtGui/QWheelEvent>
-#include <QtGui/QScrollBar>
-#include <QtGui/QMenu>
-#include <QtGui/QAction>
+#include <QVBoxLayout>
+#include <QLabel>
+#include <QListWidget>
+#include <QPixmap>
+#include <QFont>
+#include <QFontMetrics>
+#include <QPainter>
+#include <QStyle>
+#include <QApplication>
+#include <QProgressBar>
+#include <QScrollArea>
+#include <QDesktopWidget>
+#include <QWheelEvent>
+#include <QScrollBar>
+#include <QMenu>
+#include <QAction>
 #ifdef ENABLE_KDE_SUPPORT
 #include <KDE/KFileDialog>
 #else
-#include <QtGui/QFileDialog>
+#include <QFileDialog>
 #endif
-#include <QtCore/QFileInfo>
-#include <QtCore/QUrl>
-#include <QtCore/QTemporaryFile>
-#include <QtCore/QDir>
-#include <QtXml/QXmlStreamReader>
-#include <QtXml/QDomDocument>
-#include <QtXml/QDomElement>
+#include <QFileInfo>
+#include <QUrl>
+#include <QTemporaryFile>
+#include <QDir>
+#include <QXmlStreamReader>
+#include <QDomDocument>
+#include <QDomElement>
 
 static int iCount=0;
 static const int constMaxTempFiles=20;
diff --git a/gui/coverdialog.h b/gui/coverdialog.h
index 2c57ad308..9405b14c5 100644
--- a/gui/coverdialog.h
+++ b/gui/coverdialog.h
@@ -28,8 +28,8 @@
 #include "dialog.h"
 #include "song.h"
 #include "ui_coverdialog.h"
-#include <QtCore/QSet>
-#include <QtCore/QList>
+#include <QSet>
+#include <QList>
 
 class QNetworkReply;
 class QUrl;
diff --git a/gui/covers.cpp b/gui/covers.cpp
index d3c1690bf..c9a034b16 100644
--- a/gui/covers.cpp
+++ b/gui/covers.cpp
@@ -31,30 +31,30 @@
 #ifdef TAGLIB_FOUND
 #include "tags.h"
 #endif
-#include <QtCore/QFile>
-#include <QtCore/QDir>
-#include <QtCore/QCryptographicHash>
-#include <QtCore/QThread>
-#include <QtCore/QMutex>
-#include <QtCore/QUrl>
-#include <QtCore/QTextStream>
-#include <QtCore/qglobal.h>
-#include <QtNetwork/QNetworkReply>
-#include <QtGui/QIcon>
-#include <QtGui/QImage>
-#include <QtGui/QPixmap>
-#include <QtGui/QPainter>
-#include <QtGui/QFont>
-#include <QtXml/QXmlStreamReader>
-#include <QtXml/QDomDocument>
-#include <QtXml/QDomElement>
+#include <QFile>
+#include <QDir>
+#include <QCryptographicHash>
+#include <QThread>
+#include <QMutex>
+#include <QUrl>
+#include <QTextStream>
+#include <qglobal.h>
+#include <QNetworkReply>
+#include <QIcon>
+#include <QImage>
+#include <QPixmap>
+#include <QPainter>
+#include <QFont>
+#include <QXmlStreamReader>
+#include <QDomDocument>
+#include <QDomElement>
 
 #ifdef ENABLE_KDE_SUPPORT
 #include <KDE/KStandardDirs>
 #include <KDE/KGlobal>
 #include <KDE/KTemporaryFile>
 #include <KDE/KIO/NetAccess>
-#include <QtGui/QApplication>
+#include <QApplication>
 K_GLOBAL_STATIC(Covers, instance)
 #endif
 
diff --git a/gui/covers.h b/gui/covers.h
index 174ed2013..4058e5865 100644
--- a/gui/covers.h
+++ b/gui/covers.h
@@ -24,11 +24,11 @@
 #ifndef COVERS_H
 #define COVERS_H
 
-#include <QtCore/QObject>
-#include <QtCore/QHash>
-#include <QtCore/QCache>
-#include <QtGui/QImage>
-#include <QtGui/QPixmap>
+#include <QObject>
+#include <QHash>
+#include <QCache>
+#include <QImage>
+#include <QPixmap>
 #include "song.h"
 #include "config.h"
 
diff --git a/gui/folderpage.cpp b/gui/folderpage.cpp
index dde94f5a9..031ed97eb 100644
--- a/gui/folderpage.cpp
+++ b/gui/folderpage.cpp
@@ -31,9 +31,9 @@
 #include "mainwindow.h"
 #include "action.h"
 #include "actioncollection.h"
-#include <QtGui/QIcon>
-#include <QtGui/QToolButton>
-#include <QtCore/QDir>
+#include <QIcon>
+#include <QToolButton>
+#include <QDir>
 #ifdef ENABLE_KDE_SUPPORT
 #include <KDE/KRun>
 #endif
diff --git a/gui/infopage.cpp b/gui/infopage.cpp
index dc1892344..45f2a76b3 100644
--- a/gui/infopage.cpp
+++ b/gui/infopage.cpp
@@ -21,26 +21,26 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <QtGui/QGridLayout>
-#include <QtGui/QBoxLayout>
-#include <QtGui/QComboBox>
-#include <QtGui/QToolButton>
-#include <QtGui/QContextMenuEvent>
-#include <QtGui/QMenu>
-#include <QtGui/QAction>
-#include <QtGui/QFrame>
-#include <QtCore/QDir>
-#include <QtNetwork/QNetworkAccessManager>
-#include <QtNetwork/QNetworkReply>
-#include <QtNetwork/QNetworkRequest>
-#include <QtWebKit/QWebSettings>
+#include <QGridLayout>
+#include <QBoxLayout>
+#include <QComboBox>
+#include <QToolButton>
+#include <QContextMenuEvent>
+#include <QMenu>
+#include <QAction>
+#include <QFrame>
+#include <QDir>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+#include <QNetworkRequest>
+#include <QWebSettings>
 #ifdef ENABLE_KDE_SUPPORT
 #include <KDE/KWebView>
 #include <KDE/KFileDialog>
 #include <KDE/KGlobalSettings>
 #else
-#include <QtGui/QFileDialog>
-#include <QtWebKit/QWebView>
+#include <QFileDialog>
+#include <QWebView>
 #endif
 #include "localize.h"
 #include "infopage.h"
diff --git a/gui/infopage.h b/gui/infopage.h
index 6a0b83587..2256bacf6 100644
--- a/gui/infopage.h
+++ b/gui/infopage.h
@@ -24,7 +24,7 @@
 #ifndef INFOPAGE_H
 #define INFOPAGE_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 #include "song.h"
 
 class QComboBox;
diff --git a/gui/initialsettingswizard.cpp b/gui/initialsettingswizard.cpp
index 408cb383e..6c9d200c8 100644
--- a/gui/initialsettingswizard.cpp
+++ b/gui/initialsettingswizard.cpp
@@ -26,7 +26,7 @@
 #include "settings.h"
 #include "utils.h"
 #include "icon.h"
-#include <QtCore/QDir>
+#include <QDir>
 
 static const int constIconSize=48;
 
diff --git a/gui/initialsettingswizard.h b/gui/initialsettingswizard.h
index 26bf41e6f..28ca304ec 100644
--- a/gui/initialsettingswizard.h
+++ b/gui/initialsettingswizard.h
@@ -26,7 +26,7 @@
 
 #include "ui_initialsettingswizard.h"
 #include "mpdconnection.h"
-#include <QtGui/QWizard>
+#include <QWizard>
 
 class InitialSettingsWizard : public QWizard, public Ui::InitialSettingsWizard
 {
diff --git a/gui/interfacesettings.cpp b/gui/interfacesettings.cpp
index 23ab1a9a1..99abc6f71 100644
--- a/gui/interfacesettings.cpp
+++ b/gui/interfacesettings.cpp
@@ -27,8 +27,8 @@
 #include "localize.h"
 #include "musiclibraryitemalbum.h"
 #include "onoffbutton.h"
-#include <QtGui/QComboBox>
-#include <QtCore/qglobal.h>
+#include <QComboBox>
+#include <qglobal.h>
 
 static void addImageSizes(QComboBox *box)
 {
diff --git a/gui/librarypage.cpp b/gui/librarypage.cpp
index 42015e3a0..d91322898 100644
--- a/gui/librarypage.cpp
+++ b/gui/librarypage.cpp
@@ -36,8 +36,8 @@
 #include "icon.h"
 #include "mainwindow.h"
 #include "action.h"
-#include <QtGui/QIcon>
-#include <QtGui/QToolButton>
+#include <QIcon>
+#include <QToolButton>
 #ifdef ENABLE_KDE_SUPPORT
 #include <KDE/KLocale>
 #include <KDE/KGlobalSettings>
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index 71a89b146..7bd05e8b6 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -24,12 +24,12 @@
  * along with QtMPC.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QtCore/QSet>
-#include <QtCore/QString>
-#include <QtCore/QTimer>
-#include <QtCore/QThread>
-#include <QtGui/QClipboard>
-#include <QtGui/QProxyStyle>
+#include <QSet>
+#include <QString>
+#include <QTimer>
+#include <QThread>
+#include <QClipboard>
+#include <QProxyStyle>
 #include <cstdlib>
 #ifdef ENABLE_KDE_SUPPORT
 #include <kdeversion.h>
@@ -41,7 +41,7 @@
 #include <KDE/KMenu>
 #include <KDE/KShortcutsDialog>
 #else
-#include <QtGui/QMenuBar>
+#include <QMenuBar>
 #include "networkproxyfactory.h"
 #endif
 #include "localize.h"
@@ -2960,7 +2960,7 @@ QString MainWindow::coverFile() const
 }
 
 #ifndef Q_OS_WIN
-#include <QtGui/QX11Info>
+#include <QX11Info>
 #include <X11/Xlib.h>
 #endif
 
diff --git a/gui/mainwindow.h b/gui/mainwindow.h
index 266747c69..9fadf7781 100644
--- a/gui/mainwindow.h
+++ b/gui/mainwindow.h
@@ -27,18 +27,18 @@
 #ifndef MAIN_WINDOW_H
 #define MAIN_WINDOW_H
 
-#include <QtCore/qglobal.h>
+#include <qglobal.h>
 #ifdef ENABLE_KDE_SUPPORT
 #include <KDE/KXmlGuiWindow>
 #else
-#include <QtGui/QMainWindow>
+#include <QMainWindow>
 #endif
-#include <QtGui/QMenu>
-#include <QtGui/QProxyStyle>
-#include <QtGui/QPixmap>
-#include <QtGui/QMoveEvent>
-#include <QtGui/QToolButton>
-#include <QtCore/QStringList>
+#include <QMenu>
+#include <QProxyStyle>
+#include <QPixmap>
+#include <QMoveEvent>
+#include <QToolButton>
+#include <QStringList>
 #include "ui_mainwindow.h"
 #include "playqueuemodel.h"
 #include "playqueueproxymodel.h"
diff --git a/gui/playbacksettings.h b/gui/playbacksettings.h
index b1c002804..7d7807f48 100644
--- a/gui/playbacksettings.h
+++ b/gui/playbacksettings.h
@@ -26,7 +26,7 @@
 
 #include "ui_playbacksettings.h"
 #include "output.h"
-#include <QtCore/QList>
+#include <QList>
 
 class PlaybackSettings : public QWidget, private Ui::PlaybackSettings
 {
diff --git a/gui/playlistspage.cpp b/gui/playlistspage.cpp
index 56be08a18..11045bf5b 100644
--- a/gui/playlistspage.cpp
+++ b/gui/playlistspage.cpp
@@ -31,9 +31,9 @@
 #include "mainwindow.h"
 #include "action.h"
 #include "actioncollection.h"
-#include <QtGui/QToolButton>
+#include <QToolButton>
 #ifndef ENABLE_KDE_SUPPORT
-#include <QtGui/QStyle>
+#include <QStyle>
 #endif
 
 PlaylistsPage::PlaylistsPage(MainWindow *p)
diff --git a/gui/serverplaybacksettings.cpp b/gui/serverplaybacksettings.cpp
index 2f53b12de..cc1954671 100644
--- a/gui/serverplaybacksettings.cpp
+++ b/gui/serverplaybacksettings.cpp
@@ -26,7 +26,7 @@
 #include "localize.h"
 #include "settings.h"
 #include "icon.h"
-#include <QtGui/QListWidget>
+#include <QListWidget>
 
 static const int constIconSize=48;
 
diff --git a/gui/serverplaybacksettings.h b/gui/serverplaybacksettings.h
index 754f5244b..4471dd3ff 100644
--- a/gui/serverplaybacksettings.h
+++ b/gui/serverplaybacksettings.h
@@ -26,7 +26,7 @@
 
 #include "ui_serverplaybacksettings.h"
 #include "output.h"
-#include <QtCore/QList>
+#include <QList>
 
 class ServerPlaybackSettings : public QWidget, private Ui::ServerPlaybackSettings
 {
diff --git a/gui/serversettings.cpp b/gui/serversettings.cpp
index 06a1edb27..258facebd 100644
--- a/gui/serversettings.cpp
+++ b/gui/serversettings.cpp
@@ -28,10 +28,10 @@
 #include "messagebox.h"
 #include "icons.h"
 #include "musiclibrarymodel.h"
-#include <QtCore/QDir>
-#include <QtGui/QComboBox>
-#include <QtGui/QPushButton>
-#include <QtGui/QValidator>
+#include <QDir>
+#include <QComboBox>
+#include <QPushButton>
+#include <QValidator>
 
 class CoverNameValidator : public QValidator
 {
diff --git a/gui/settings.cpp b/gui/settings.cpp
index 88749e781..fb3fd82dc 100644
--- a/gui/settings.cpp
+++ b/gui/settings.cpp
@@ -33,14 +33,14 @@
 #include <KDE/KGlobal>
 #include <KDE/KConfig>
 #include "kwallet.h"
-#include <QtGui/QApplication>
-#include <QtGui/QWidget>
-#include <QtCore/QTimer>
+#include <QApplication>
+#include <QWidget>
+#include <QTimer>
 
 K_GLOBAL_STATIC(Settings, instance)
 #endif
-#include <QtCore/QFile>
-#include <QtCore/QDir>
+#include <QFile>
+#include <QDir>
 
 Settings * Settings::self()
 {
diff --git a/gui/settings.h b/gui/settings.h
index ba3d25f85..5148938ab 100644
--- a/gui/settings.h
+++ b/gui/settings.h
@@ -32,7 +32,7 @@ namespace KWallet {
 class Wallet;
 }
 #else
-#include <QtCore/QSettings>
+#include <QSettings>
 #endif
 #include "config.h"
 #include "mpdconnection.h"
diff --git a/gui/streamcategorydialog.cpp b/gui/streamcategorydialog.cpp
index c6fc26746..a05ebafe1 100644
--- a/gui/streamcategorydialog.cpp
+++ b/gui/streamcategorydialog.cpp
@@ -21,8 +21,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <QtGui/QFormLayout>
-#include <QtGui/QIcon>
+#include <QFormLayout>
+#include <QIcon>
 #include "streamcategorydialog.h"
 #include "mainwindow.h"
 #include "settings.h"
@@ -32,7 +32,7 @@
 #include "buddylabel.h"
 //#ifdef ENABLE_KDE_SUPPORT
 //#include <KDE/KIconDialog>
-//#include <QtGui/QPushButton>
+//#include <QPushButton>
 //#endif
 
 StreamCategoryDialog::StreamCategoryDialog(const QStringList &categories, QWidget *parent)
diff --git a/gui/streamcategorydialog.h b/gui/streamcategorydialog.h
index 8d71322d0..0f40f721e 100644
--- a/gui/streamcategorydialog.h
+++ b/gui/streamcategorydialog.h
@@ -26,7 +26,7 @@
 
 #include "dialog.h"
 #include "lineedit.h"
-#include <QtCore/QSet>
+#include <QSet>
 
 //#ifdef ENABLE_KDE_SUPPORT
 //class QPushButton;
diff --git a/gui/streamdialog.cpp b/gui/streamdialog.cpp
index c00f53be7..1f44a9786 100644
--- a/gui/streamdialog.cpp
+++ b/gui/streamdialog.cpp
@@ -21,8 +21,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <QtGui/QFormLayout>
-#include <QtGui/QIcon>
+#include <QFormLayout>
+#include <QIcon>
 #include "streamdialog.h"
 #include "mainwindow.h"
 #include "settings.h"
@@ -33,7 +33,7 @@
 #include "buddylabel.h"
 #ifdef ENABLE_KDE_SUPPORT
 #include <KDE/KIconDialog>
-#include <QtGui/QPushButton>
+#include <QPushButton>
 #endif
 
 StreamDialog::StreamDialog(const QStringList &categories, const QStringList &genres, QWidget *parent, bool addToPlayQueue)
diff --git a/gui/streamdialog.h b/gui/streamdialog.h
index 1627b89bb..a12e8b204 100644
--- a/gui/streamdialog.h
+++ b/gui/streamdialog.h
@@ -24,7 +24,7 @@
 #ifndef STREAMDIALOG_H
 #define STREAMDIALOG_H
 
-#include <QtCore/QSet>
+#include <QSet>
 #include "dialog.h"
 #include "lineedit.h"
 #include "completioncombo.h"
diff --git a/gui/streamspage.cpp b/gui/streamspage.cpp
index 891221eed..28f2b99ba 100644
--- a/gui/streamspage.cpp
+++ b/gui/streamspage.cpp
@@ -32,16 +32,16 @@
 #include "action.h"
 #include "actioncollection.h"
 #include "networkaccessmanager.h"
-#include <QtGui/QToolButton>
+#include <QToolButton>
 #ifdef ENABLE_KDE_SUPPORT
 #include <KDE/KFileDialog>
 #else
-#include <QtGui/QFileDialog>
-#include <QtCore/QDir>
+#include <QFileDialog>
+#include <QDir>
 #endif
-#include <QtGui/QAction>
-#include <QtGui/QMenu>
-#include <QtXml/QXmlStreamReader>
+#include <QAction>
+#include <QMenu>
+#include <QXmlStreamReader>
 
 static QString webStreamName(StreamsPage::WebStream type)
 {
diff --git a/gui/tageditor.cpp b/gui/tageditor.cpp
index 0ce5aaed8..3a126c91e 100644
--- a/gui/tageditor.cpp
+++ b/gui/tageditor.cpp
@@ -36,11 +36,11 @@
 #include "devicesmodel.h"
 #include "device.h"
 #endif
-#include <QtGui/QMenu>
-#include <QtGui/QCloseEvent>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QEventLoop>
-#include <QtCore/QDir>
+#include <QMenu>
+#include <QCloseEvent>
+#include <QCoreApplication>
+#include <QEventLoop>
+#include <QDir>
 
 static bool equalTags(const Song &a, const Song &b, bool compareCommon)
 {
diff --git a/gui/tageditor.h b/gui/tageditor.h
index d5400ae24..34a33a299 100644
--- a/gui/tageditor.h
+++ b/gui/tageditor.h
@@ -28,8 +28,8 @@
 #include "dialog.h"
 #include "ui_tageditor.h"
 #include "song.h"
-#include <QtCore/QSet>
-#include <QtCore/QList>
+#include <QSet>
+#include <QList>
 
 #ifdef ENABLE_DEVICES_SUPPORT
 class Device;
diff --git a/gui/trayitem.cpp b/gui/trayitem.cpp
index b6b912e61..67683cf93 100644
--- a/gui/trayitem.cpp
+++ b/gui/trayitem.cpp
@@ -25,7 +25,7 @@
 #ifdef ENABLE_KDE_SUPPORT
 #include <KDE/KMenu>
 #include <KDE/KNotification>
-#include <QtGui/QPixmap>
+#include <QPixmap>
 #else
 #include "notify.h"
 #endif
diff --git a/gui/trayitem.h b/gui/trayitem.h
index b8dace342..302183eaa 100644
--- a/gui/trayitem.h
+++ b/gui/trayitem.h
@@ -24,14 +24,14 @@
 #ifndef TRAYITEM_H
 #define TRAYITEM_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 #ifdef ENABLE_KDE_SUPPORT
 #include <KDE/KStatusNotifierItem>
 class KMenu;
 class KNotification;
 #else
-#include <QtGui/QSystemTrayIcon>
+#include <QSystemTrayIcon>
 #include "icon.h"
 class QMenu;
 class Notify;
diff --git a/http/httpserver.cpp b/http/httpserver.cpp
index c68fc23ce..b4b8e7355 100644
--- a/http/httpserver.cpp
+++ b/http/httpserver.cpp
@@ -26,8 +26,8 @@
 #include "utils.h"
 #include "tags.h"
 #include "settings.h"
-#include <QtCore/QUrl>
-#include <QtCore/QThread>
+#include <QUrl>
+#include <QThread>
 #ifdef ENABLE_KDE_SUPPORT
 #include <KDE/KGlobal>
 K_GLOBAL_STATIC(HttpServer, instance)
diff --git a/http/httpserver.h b/http/httpserver.h
index e6fd2d648..a907d0770 100644
--- a/http/httpserver.h
+++ b/http/httpserver.h
@@ -24,8 +24,8 @@
 #ifndef _HTTP_SERVER_H
 #define _HTTP_SERVER_H
 
-#include <QtCore/qglobal.h>
-#include <QtCore/QByteArray>
+#include <qglobal.h>
+#include <QByteArray>
 #include "song.h"
 
 class HttpSocket;
diff --git a/http/httpsocket.cpp b/http/httpsocket.cpp
index 4c2d8890f..e118a516d 100644
--- a/http/httpsocket.cpp
+++ b/http/httpsocket.cpp
@@ -23,16 +23,16 @@
 
 #include "config.h"
 #include "httpsocket.h"
-#include <QtNetwork/QTcpSocket>
-#include <QtNetwork/QNetworkInterface>
-#include <QtCore/QStringList>
-#include <QtCore/QTextStream>
-#include <QtCore/QFile>
-#include <QtCore/QUrl>
+#include <QTcpSocket>
+#include <QNetworkInterface>
+#include <QStringList>
+#include <QTextStream>
+#include <QFile>
+#include <QUrl>
 #ifdef ENABLE_KDE_SUPPORT
 #include <KDE/KMimeType>
 #endif
-#include <QtCore/QFileInfo>
+#include <QFileInfo>
 #ifdef TAGLIB_FOUND
 #include <taglib/oggflacfile.h>
 #include <taglib/trueaudiofile.h>
diff --git a/http/httpsocket.h b/http/httpsocket.h
index 87a5faa4d..ee9597cb2 100644
--- a/http/httpsocket.h
+++ b/http/httpsocket.h
@@ -24,7 +24,7 @@
 #ifndef _HTTP_SOCKET_H_
 #define _HTTP_SOCKET_H_
 
-#include <QtNetwork/QTcpServer>
+#include <QTcpServer>
 
 class HttpSocket : public QTcpServer
 {
diff --git a/lyrics/lyricsdialog.cpp b/lyrics/lyricsdialog.cpp
index 7bd0024d3..0f87eea00 100644
--- a/lyrics/lyricsdialog.cpp
+++ b/lyrics/lyricsdialog.cpp
@@ -21,8 +21,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <QtGui/QFormLayout>
-#include <QtGui/QLabel>
+#include <QFormLayout>
+#include <QLabel>
 #include "icon.h"
 #include "lyricsdialog.h"
 #include "localize.h"
diff --git a/lyrics/lyricsettings.h b/lyrics/lyricsettings.h
index 5aed8e6b2..123add664 100644
--- a/lyrics/lyricsettings.h
+++ b/lyrics/lyricsettings.h
@@ -24,9 +24,9 @@
 #ifndef LYRICSETTINGS_H
 #define LYRICSETTINGS_H
 
-#include <QtGui/QWidget>
-#include <QtCore/QStringList>
-#include <QtCore/QList>
+#include <QWidget>
+#include <QStringList>
+#include <QList>
 
 class Ui_LyricSettings;
 class QListWidgetItem;
diff --git a/lyrics/lyricspage.cpp b/lyrics/lyricspage.cpp
index 6fb1f6c1b..8e2829d9f 100644
--- a/lyrics/lyricspage.cpp
+++ b/lyrics/lyricspage.cpp
@@ -38,15 +38,15 @@
 #include "utils.h"
 #include "action.h"
 #include "actioncollection.h"
-#include <QtCore/QFuture>
-#include <QtCore/QFutureWatcher>
-#include <QtCore/QSettings>
-#include <QtCore/QtConcurrentRun>
+#include <QFuture>
+#include <QFutureWatcher>
+#include <QSettings>
+#include <QtConcurrentRun>
 #include <QTextBrowser>
-#include <QtCore/QFile>
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
-#include <QtGui/QToolButton>
+#include <QFile>
+#include <QDir>
+#include <QFileInfo>
+#include <QToolButton>
 
 const QLatin1String LyricsPage::constLyricsDir("lyrics/");
 const QLatin1String LyricsPage::constExtension(".lyrics");
diff --git a/lyrics/lyricspage.h b/lyrics/lyricspage.h
index 7854065c4..d58591fe8 100644
--- a/lyrics/lyricspage.h
+++ b/lyrics/lyricspage.h
@@ -25,7 +25,7 @@
 #define LYRICSPAGE_H
 
 #include <QWidget>
-// #include <QtCore/QScopedPointer>
+// #include <QScopedPointer>
 #include "song.h"
 #include "ui_lyricspage.h"
 #include "textbrowser.h"
diff --git a/lyrics/songinfoprovider.h b/lyrics/songinfoprovider.h
index ced42b85d..7009e1f40 100644
--- a/lyrics/songinfoprovider.h
+++ b/lyrics/songinfoprovider.h
@@ -24,8 +24,8 @@
 #ifndef SONGINFOPROVIDER_H
 #define SONGINFOPROVIDER_H
 
-#include <QtCore/QObject>
-#include <QtCore/QUrl>
+#include <QObject>
+#include <QUrl>
 
 //#include "collapsibleinfopane.h"
 //#include "core/song.h"
diff --git a/lyrics/ultimatelyricsprovider.cpp b/lyrics/ultimatelyricsprovider.cpp
index d105b7aed..5516b8e17 100644
--- a/lyrics/ultimatelyricsprovider.cpp
+++ b/lyrics/ultimatelyricsprovider.cpp
@@ -26,8 +26,8 @@
 #include "networkaccessmanager.h"
 //#include "core/network.h"
 #include "song.h"
-#include <QtNetwork/QNetworkReply>
-#include <QtCore/QTextCodec>
+#include <QNetworkReply>
+#include <QTextCodec>
 //#include <boost/scoped_ptr.hpp>
 
 const int UltimateLyricsProvider::kRedirectLimit = 5;
diff --git a/lyrics/ultimatelyricsprovider.h b/lyrics/ultimatelyricsprovider.h
index e13bc054f..0b69ebd06 100644
--- a/lyrics/ultimatelyricsprovider.h
+++ b/lyrics/ultimatelyricsprovider.h
@@ -24,10 +24,10 @@
 #ifndef ULTIMATELYRICSPROVIDER_H
 #define ULTIMATELYRICSPROVIDER_H
 
-#include <QtCore/QObject>
-#include <QtCore/QPair>
-#include <QtCore/QStringList>
-#include <QtCore/QHash>
+#include <QObject>
+#include <QPair>
+#include <QStringList>
+#include <QHash>
 #include "songinfoprovider.h"
 
 class Song;
diff --git a/lyrics/ultimatelyricsreader.cpp b/lyrics/ultimatelyricsreader.cpp
index 745efe1ac..5178cb0e7 100644
--- a/lyrics/ultimatelyricsreader.cpp
+++ b/lyrics/ultimatelyricsreader.cpp
@@ -24,9 +24,9 @@
 #include "ultimatelyricsprovider.h"
 #include "ultimatelyricsreader.h"
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QFile>
-#include <QtXml/QXmlStreamReader>
+#include <QCoreApplication>
+#include <QFile>
+#include <QXmlStreamReader>
 
 UltimateLyricsReader::UltimateLyricsReader(/*QObject* parent*/)
 //   : QObject(parent)
diff --git a/lyrics/ultimatelyricsreader.h b/lyrics/ultimatelyricsreader.h
index 9a942c7a0..ec00d80ad 100644
--- a/lyrics/ultimatelyricsreader.h
+++ b/lyrics/ultimatelyricsreader.h
@@ -26,8 +26,8 @@
 
 #include "ultimatelyricsprovider.h"
 
-// #include <QtCore/QObject>
-#include <QtXml/QXmlStreamReader>
+// #include <QObject>
+#include <QXmlStreamReader>
 
 class QIODevice;
 
diff --git a/main.cpp b/main.cpp
index ff0d6a747..2ae839685 100644
--- a/main.cpp
+++ b/main.cpp
@@ -28,10 +28,10 @@
 #include <KDE/KCmdLineArgs>
 #include <KDE/KStartupInfo>
 #else
-#include <QtCore/QTranslator>
-#include <QtCore/QTextCodec>
-#include <QtCore/QLibraryInfo>
-#include <QtCore/QDir>
+#include <QTranslator>
+#include <QTextCodec>
+#include <QLibraryInfo>
+#include <QDir>
 #endif
 #include "utils.h"
 #include "config.h"
diff --git a/models/albumsmodel.cpp b/models/albumsmodel.cpp
index 5dae3015d..a60c757f0 100644
--- a/models/albumsmodel.cpp
+++ b/models/albumsmodel.cpp
@@ -21,11 +21,11 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <QtCore/QModelIndex>
-#include <QtCore/QDataStream>
-#include <QtCore/QMimeData>
-#include <QtCore/QStringList>
-#include <QtGui/QPainter>
+#include <QModelIndex>
+#include <QDataStream>
+#include <QMimeData>
+#include <QStringList>
+#include <QPainter>
 #include "localize.h"
 #ifdef ENABLE_KDE_SUPPORT
 #include <KDE/KGlobal>
diff --git a/models/albumsmodel.h b/models/albumsmodel.h
index 49e603bf0..c0e54dc95 100644
--- a/models/albumsmodel.h
+++ b/models/albumsmodel.h
@@ -23,10 +23,10 @@
 #ifndef ALBUMSMODEL_H
 #define ALBUMSMODEL_H
 
-#include <QtCore/QAbstractItemModel>
-#include <QtCore/QList>
-#include <QtCore/QSet>
-#include <QtCore/QStringList>
+#include <QAbstractItemModel>
+#include <QList>
+#include <QSet>
+#include <QStringList>
 #include "song.h"
 #include "musiclibraryitemalbum.h"
 
diff --git a/models/devicesmodel.cpp b/models/devicesmodel.cpp
index 51ee9083a..6b6b178ca 100644
--- a/models/devicesmodel.cpp
+++ b/models/devicesmodel.cpp
@@ -36,9 +36,9 @@
 #include "localize.h"
 #include "icons.h"
 #include "mountpoints.h"
-#include <QtGui/QMenu>
-#include <QtCore/QStringList>
-#include <QtCore/QMimeData>
+#include <QMenu>
+#include <QStringList>
+#include <QMimeData>
 #ifdef ENABLE_KDE_SUPPORT
 #include <KDE/KIcon>
 #include <KDE/KGlobal>
@@ -60,7 +60,7 @@ K_GLOBAL_STATIC(DevicesModel, instance)
 #include "solid-lite/storagevolume.h"
 #endif
 
-#include <QtCore/QDebug>
+#include <QDebug>
 #define DBUG qDebug()
 
 DevicesModel * DevicesModel::self()
diff --git a/models/devicesmodel.h b/models/devicesmodel.h
index 14c3e446a..305586c66 100644
--- a/models/devicesmodel.h
+++ b/models/devicesmodel.h
@@ -23,8 +23,8 @@
 #ifndef DEVICES_MODEL_H
 #define DEVICES_MODEL_H
 
-#include <QtCore/QAbstractItemModel>
-#include <QtCore/QSet>
+#include <QAbstractItemModel>
+#include <QSet>
 #include "song.h"
 #include "config.h"
 #include "remotefsdevice.h"
diff --git a/models/dirviewitem.h b/models/dirviewitem.h
index 9de13d578..d10d7f73c 100644
--- a/models/dirviewitem.h
+++ b/models/dirviewitem.h
@@ -26,10 +26,10 @@
 #ifndef DIRVIEWITEM_H
 #define DIRVIEWITEM_H
 
-#include <QtCore/QString>
-#include <QtCore/QList>
-#include <QtCore/QVariant>
-#include <QtCore/QSet>
+#include <QString>
+#include <QList>
+#include <QVariant>
+#include <QSet>
 
 class DirViewItem
 {
diff --git a/models/dirviewitemdir.cpp b/models/dirviewitemdir.cpp
index c448a10bf..4fb22df64 100644
--- a/models/dirviewitemdir.cpp
+++ b/models/dirviewitemdir.cpp
@@ -26,7 +26,7 @@
 
 #include "dirviewitemdir.h"
 #include "dirviewitemfile.h"
-#include <QtCore/QStringList>
+#include <QStringList>
 
 DirViewItem * DirViewItemDir::createDirectory(const QString &dirName)
 {
diff --git a/models/dirviewmodel.cpp b/models/dirviewmodel.cpp
index c670654ce..57e8b08ce 100644
--- a/models/dirviewmodel.cpp
+++ b/models/dirviewmodel.cpp
@@ -24,10 +24,10 @@
  * along with QtMPC.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QtCore/QModelIndex>
-#include <QtCore/QString>
-#include <QtCore/QVariant>
-#include <QtCore/QMimeData>
+#include <QModelIndex>
+#include <QString>
+#include <QVariant>
+#include <QMimeData>
 #include "localize.h"
 #include "dirviewmodel.h"
 #include "dirviewitem.h"
diff --git a/models/dirviewmodel.h b/models/dirviewmodel.h
index 91b6f91c9..8a71f941f 100644
--- a/models/dirviewmodel.h
+++ b/models/dirviewmodel.h
@@ -26,9 +26,9 @@
 #ifndef DIRVIEWMODEL_H
 #define DIRVIEWMODEL_H
 
-#include <QtCore/QAbstractItemModel>
-#include <QtCore/QList>
-#include <QtCore/QModelIndex>
+#include <QAbstractItemModel>
+#include <QList>
+#include <QModelIndex>
 #include "dirviewitemroot.h"
 
 class DirViewModel : public QAbstractItemModel
diff --git a/models/musiclibraryitem.h b/models/musiclibraryitem.h
index 9ee65f32b..e6a62c042 100644
--- a/models/musiclibraryitem.h
+++ b/models/musiclibraryitem.h
@@ -27,9 +27,9 @@
 #ifndef MUSIC_LIBRARY_ITEM_H
 #define MUSIC_LIBRARY_ITEM_H
 
-#include <QtCore/QList>
-#include <QtCore/QVariant>
-#include <QtCore/QSet>
+#include <QList>
+#include <QVariant>
+#include <QSet>
 
 class MusicLibraryItemContainer;
 class MusicLibraryItem : public QObject
diff --git a/models/musiclibraryitemalbum.cpp b/models/musiclibraryitemalbum.cpp
index edb5717f4..3a4dcdefc 100644
--- a/models/musiclibraryitemalbum.cpp
+++ b/models/musiclibraryitemalbum.cpp
@@ -37,9 +37,9 @@
 #include "utils.h"
 #endif
 #include "onlineservice.h"
-#include <QtGui/QPixmap>
-#include <QtGui/QApplication>
-#include <QtGui/QFontMetrics>
+#include <QPixmap>
+#include <QApplication>
+#include <QFontMetrics>
 
 static MusicLibraryItemAlbum::CoverSize coverSize=MusicLibraryItemAlbum::CoverNone;
 static QPixmap *theDefaultIcon=0;
diff --git a/models/musiclibraryitemalbum.h b/models/musiclibraryitemalbum.h
index 76f159eb4..639afcba9 100644
--- a/models/musiclibraryitemalbum.h
+++ b/models/musiclibraryitemalbum.h
@@ -27,9 +27,9 @@
 #ifndef MUSIC_LIBRARY_ITEM_ALBUM_H
 #define MUSIC_LIBRARY_ITEM_ALBUM_H
 
-#include <QtCore/QList>
-#include <QtCore/QVariant>
-#include <QtGui/QPixmap>
+#include <QList>
+#include <QVariant>
+#include <QPixmap>
 #include "musiclibraryitem.h"
 #include "song.h"
 
diff --git a/models/musiclibraryitemartist.h b/models/musiclibraryitemartist.h
index d7c5f30ae..8299661ad 100644
--- a/models/musiclibraryitemartist.h
+++ b/models/musiclibraryitemartist.h
@@ -27,9 +27,9 @@
 #ifndef MUSIC_LIBRARY_ITEM_ARTIST_H
 #define MUSIC_LIBRARY_ITEM_ARTIST_H
 
-#include <QtCore/QList>
-#include <QtCore/QVariant>
-#include <QtCore/QHash>
+#include <QList>
+#include <QVariant>
+#include <QHash>
 #include "musiclibraryitem.h"
 
 class MusicLibraryItemRoot;
diff --git a/models/musiclibraryitemroot.cpp b/models/musiclibraryitemroot.cpp
index 0c8a2da67..0afa5687d 100644
--- a/models/musiclibraryitemroot.cpp
+++ b/models/musiclibraryitemroot.cpp
@@ -33,9 +33,9 @@
 #include "song.h"
 #include "localize.h"
 #include "qtiocompressor/qtiocompressor.h"
-#include <QtXml/QXmlStreamReader>
-#include <QtXml/QXmlStreamWriter>
-#include <QtCore/QFile>
+#include <QXmlStreamReader>
+#include <QXmlStreamWriter>
+#include <QFile>
 
 MusicLibraryItemArtist * MusicLibraryItemRoot::artist(const Song &s, bool create)
 {
diff --git a/models/musiclibraryitemroot.h b/models/musiclibraryitemroot.h
index 08645850e..c9e597de2 100644
--- a/models/musiclibraryitemroot.h
+++ b/models/musiclibraryitemroot.h
@@ -27,11 +27,11 @@
 #ifndef MUSIC_LIBRARY_ITEM_ROOT_H
 #define MUSIC_LIBRARY_ITEM_ROOT_H
 
-#include <QtCore/QList>
-#include <QtCore/QVariant>
-#include <QtCore/QHash>
-#include <QtCore/QSet>
-#include <QtCore/QDateTime>
+#include <QList>
+#include <QVariant>
+#include <QHash>
+#include <QSet>
+#include <QDateTime>
 #include "musiclibraryitem.h"
 #include "song.h"
 
diff --git a/models/musiclibraryitemsong.h b/models/musiclibraryitemsong.h
index 57ac9d046..b4bf19fff 100644
--- a/models/musiclibraryitemsong.h
+++ b/models/musiclibraryitemsong.h
@@ -27,8 +27,8 @@
 #ifndef MUSIC_LIBRARY_ITEM_SONG_H
 #define MUSIC_LIBRARY_ITEM_SONG_H
 
-#include <QtCore/QList>
-#include <QtCore/QVariant>
+#include <QList>
+#include <QVariant>
 #include "musiclibraryitem.h"
 #include "song.h"
 
diff --git a/models/musiclibrarymodel.cpp b/models/musiclibrarymodel.cpp
index 94036b8b4..0f2fad292 100644
--- a/models/musiclibrarymodel.cpp
+++ b/models/musiclibrarymodel.cpp
@@ -41,14 +41,14 @@
 #include "utils.h"
 #include "icons.h"
 #include "qtiocompressor/qtiocompressor.h"
-#include <QtGui/QCommonStyle>
-#include <QtCore/QFile>
-#include <QtCore/QTimer>
-#include <QtCore/QStringRef>
-#include <QtCore/QDateTime>
-#include <QtCore/QDir>
-#include <QtCore/QMimeData>
-#include <QtCore/QStringList>
+#include <QCommonStyle>
+#include <QFile>
+#include <QTimer>
+#include <QStringRef>
+#include <QDateTime>
+#include <QDir>
+#include <QMimeData>
+#include <QStringList>
 #ifdef ENABLE_KDE_SUPPORT
 #include <KDE/KGlobal>
 #endif
diff --git a/models/musiclibrarymodel.h b/models/musiclibrarymodel.h
index 169a91b53..37fb00fad 100644
--- a/models/musiclibrarymodel.h
+++ b/models/musiclibrarymodel.h
@@ -27,9 +27,9 @@
 #ifndef MUSIC_LIBRARY_MODEL_H
 #define MUSIC_LIBRARY_MODEL_H
 
-#include <QtCore/QAbstractItemModel>
-#include <QtCore/QDateTime>
-#include <QtCore/QSet>
+#include <QAbstractItemModel>
+#include <QDateTime>
+#include <QSet>
 #include "musiclibraryitemroot.h"
 #include "musiclibraryitemalbum.h"
 #include "song.h"
diff --git a/models/onlineservicesmodel.cpp b/models/onlineservicesmodel.cpp
index fe16c4041..700e1de7f 100644
--- a/models/onlineservicesmodel.cpp
+++ b/models/onlineservicesmodel.cpp
@@ -41,11 +41,11 @@
 #include "filejob.h"
 #include "utils.h"
 #include "covers.h"
-#include <QtGui/QMenu>
-#include <QtCore/QStringList>
-#include <QtCore/QMimeData>
-#include <QtCore/QFile>
-#include <QtCore/QDir>
+#include <QMenu>
+#include <QStringList>
+#include <QMimeData>
+#include <QFile>
+#include <QDir>
 #ifdef ENABLE_KDE_SUPPORT
 #include <KDE/KGlobal>
 K_GLOBAL_STATIC(OnlineServicesModel, instance)
diff --git a/models/onlineservicesmodel.h b/models/onlineservicesmodel.h
index e9034c59c..0470c66a6 100644
--- a/models/onlineservicesmodel.h
+++ b/models/onlineservicesmodel.h
@@ -23,8 +23,8 @@
 #ifndef ONLINE_SERVICES_MODEL_H
 #define ONLINE_SERVICES_MODEL_H
 
-#include <QtCore/QAbstractItemModel>
-#include <QtCore/QSet>
+#include <QAbstractItemModel>
+#include <QSet>
 #include "song.h"
 #include "config.h"
 
diff --git a/models/playlistsmodel.cpp b/models/playlistsmodel.cpp
index 03cb6cfbe..f13039d5b 100644
--- a/models/playlistsmodel.cpp
+++ b/models/playlistsmodel.cpp
@@ -24,9 +24,9 @@
  * along with QtMPC.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QtCore/QModelIndex>
-#include <QtCore/QMimeData>
-#include <QtGui/QMenu>
+#include <QModelIndex>
+#include <QMimeData>
+#include <QMenu>
 #include "playlistsmodel.h"
 #include "playlistsproxymodel.h"
 #include "itemview.h"
diff --git a/models/playlistsmodel.h b/models/playlistsmodel.h
index 99a16db72..874e50ba0 100644
--- a/models/playlistsmodel.h
+++ b/models/playlistsmodel.h
@@ -27,9 +27,9 @@
 #ifndef PLAYLISTS_MODEL_H
 #define PLAYLISTS_MODEL_H
 
-#include <QtGui/QIcon>
-#include <QtCore/QAbstractItemModel>
-#include <QtCore/QList>
+#include <QIcon>
+#include <QAbstractItemModel>
+#include <QList>
 #include "playlist.h"
 #include "song.h"
 
diff --git a/models/playqueuemodel.cpp b/models/playqueuemodel.cpp
index e18d8bcbe..46ecd1bf2 100644
--- a/models/playqueuemodel.cpp
+++ b/models/playqueuemodel.cpp
@@ -24,13 +24,13 @@
  * along with QtMPC.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QtGui/QPalette>
-#include <QtGui/QFont>
-#include <QtCore/QModelIndex>
-#include <QtCore/QMimeData>
-#include <QtCore/QTextStream>
-#include <QtCore/QSet>
-#include <QtCore/QUrl>
+#include <QPalette>
+#include <QFont>
+#include <QModelIndex>
+#include <QMimeData>
+#include <QTextStream>
+#include <QSet>
+#include <QUrl>
 #include "localize.h"
 #include "playqueuemodel.h"
 #include "groupedview.h"
diff --git a/models/playqueuemodel.h b/models/playqueuemodel.h
index dd28175fe..515128ea7 100644
--- a/models/playqueuemodel.h
+++ b/models/playqueuemodel.h
@@ -27,10 +27,10 @@
 #ifndef PLAYQUEUEMODEL_H
 #define PLAYQUEUEMODEL_H
 
-#include <QtCore/QAbstractItemModel>
-#include <QtCore/QList>
-#include <QtCore/QStringList>
-#include <QtCore/QSet>
+#include <QAbstractItemModel>
+#include <QList>
+#include <QStringList>
+#include <QSet>
 #include "song.h"
 #include "mpdstatus.h"
 #include "config.h"
diff --git a/models/playqueueproxymodel.cpp b/models/playqueueproxymodel.cpp
index c95184b64..4ab063ba9 100644
--- a/models/playqueueproxymodel.cpp
+++ b/models/playqueueproxymodel.cpp
@@ -24,7 +24,7 @@
  * along with QtMPC.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QtCore/QByteArray>
+#include <QByteArray>
 #include "playqueueproxymodel.h"
 #include "playqueuemodel.h"
 #include "song.h"
diff --git a/models/proxymodel.h b/models/proxymodel.h
index 56947e5a4..8d6b06c0b 100644
--- a/models/proxymodel.h
+++ b/models/proxymodel.h
@@ -24,8 +24,8 @@
 #ifndef PROXYMODEL_H
 #define PROXYMODEL_H
 
-#include <QtGui/QSortFilterProxyModel>
-#include <QtCore/QStringList>
+#include <QSortFilterProxyModel>
+#include <QStringList>
 #include "song.h"
 
 class ProxyModel : public QSortFilterProxyModel
diff --git a/models/streamfetcher.cpp b/models/streamfetcher.cpp
index dddf47f65..e0280b5be 100644
--- a/models/streamfetcher.cpp
+++ b/models/streamfetcher.cpp
@@ -24,10 +24,10 @@
 #include "streamfetcher.h"
 #include "networkaccessmanager.h"
 #include "mpdconnection.h"
-#include <QtCore/QRegExp>
-#include <QtCore/QUrl>
-#include <QtXml/QDomDocument>
-#include <QtXml/QDomElement>
+#include <QRegExp>
+#include <QUrl>
+#include <QDomDocument>
+#include <QDomElement>
 
 static const int constMaxRedirects = 3;
 static const int constMaxData = 12 * 1024;
diff --git a/models/streamfetcher.h b/models/streamfetcher.h
index 9077ae1f9..f77843dcf 100644
--- a/models/streamfetcher.h
+++ b/models/streamfetcher.h
@@ -24,10 +24,10 @@
 #ifndef STREAMFETCHER_H
 #define STREAMFETCHER_H
 
-#include <QtCore/QObject>
-#include <QtCore/QList>
-#include <QtCore/QByteArray>
-#include <QtCore/QStringList>
+#include <QObject>
+#include <QList>
+#include <QByteArray>
+#include <QStringList>
 
 class QNetworkReply;
 
diff --git a/models/streamsmodel.cpp b/models/streamsmodel.cpp
index 9e20c40f3..389446482 100644
--- a/models/streamsmodel.cpp
+++ b/models/streamsmodel.cpp
@@ -21,21 +21,21 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <QtCore/QModelIndex>
-#include <QtCore/QDataStream>
-#include <QtCore/QTextStream>
-#include <QtCore/QMimeData>
-#include <QtCore/QStringList>
-#include <QtCore/QTimer>
-#include <QtCore/QDir>
-#include <QtCore/QFile>
-#include <QtCore/qglobal.h>
-#include <QtXml/QXmlStreamReader>
-#include <QtXml/QXmlStreamWriter>
+#include <QModelIndex>
+#include <QDataStream>
+#include <QTextStream>
+#include <QMimeData>
+#include <QStringList>
+#include <QTimer>
+#include <QDir>
+#include <QFile>
+#include <qglobal.h>
+#include <QXmlStreamReader>
+#include <QXmlStreamWriter>
 #include "config.h"
 #include "settings.h"
 #if defined Q_OS_WIN
-#include <QtGui/QDesktopServices>
+#include <QDesktopServices>
 #endif
 #include "localize.h"
 #include "itemview.h"
diff --git a/models/streamsmodel.h b/models/streamsmodel.h
index bc1d6908e..3e81bcdfe 100644
--- a/models/streamsmodel.h
+++ b/models/streamsmodel.h
@@ -23,11 +23,11 @@
 #ifndef STREAMSMODEL_H
 #define STREAMSMODEL_H
 
-#include <QtCore/QAbstractItemModel>
-#include <QtCore/QList>
-#include <QtCore/QUrl>
-#include <QtCore/QHash>
-#include <QtCore/QSet>
+#include <QAbstractItemModel>
+#include <QList>
+#include <QUrl>
+#include <QHash>
+#include <QSet>
 
 class QTimer;
 
diff --git a/mpd/mpdconnection.cpp b/mpd/mpdconnection.cpp
index fb4b95630..209381658 100644
--- a/mpd/mpdconnection.cpp
+++ b/mpd/mpdconnection.cpp
@@ -31,11 +31,11 @@
 #ifdef ENABLE_KDE_SUPPORT
 #include <KDE/KGlobal>
 #endif
-#include <QtGui/QApplication>
-#include <QtCore/QDebug>
-#include <QtCore/QThread>
-#include <QtCore/QStringList>
-#include <QtCore/QTimer>
+#include <QApplication>
+#include <QDebug>
+#include <QThread>
+#include <QStringList>
+#include <QTimer>
 #include "settings.h"
 
 // #define DBUG qWarning() << "MPDConnection" << QThread::currentThreadId()
diff --git a/mpd/mpdconnection.h b/mpd/mpdconnection.h
index 0b176a35d..85a23e245 100644
--- a/mpd/mpdconnection.h
+++ b/mpd/mpdconnection.h
@@ -27,10 +27,10 @@
 #ifndef MPDCONNECTION_H
 #define MPDCONNECTION_H
 
-#include <QtNetwork/QTcpSocket>
-#include <QtNetwork/QLocalSocket>
-#include <QtCore/QDateTime>
-#include <QtCore/QStringList>
+#include <QTcpSocket>
+#include <QLocalSocket>
+#include <QDateTime>
+#include <QStringList>
 #include "mpdstats.h"
 #include "mpdstatus.h"
 #include "song.h"
diff --git a/mpd/mpdparseutils.cpp b/mpd/mpdparseutils.cpp
index 82677c328..a2bfc7191 100644
--- a/mpd/mpdparseutils.cpp
+++ b/mpd/mpdparseutils.cpp
@@ -24,10 +24,10 @@
  * along with QtMPC.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QtCore/QList>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QUrl>
+#include <QList>
+#include <QString>
+#include <QStringList>
+#include <QUrl>
 #include "localize.h"
 #include "dirviewitemroot.h"
 #include "dirviewitemdir.h"
diff --git a/mpd/mpdparseutils.h b/mpd/mpdparseutils.h
index 3fda2b3ea..5b4b4ca58 100644
--- a/mpd/mpdparseutils.h
+++ b/mpd/mpdparseutils.h
@@ -27,7 +27,7 @@
 #ifndef MPD_PARSE_UTILS_H
 #define MPD_PARSE_UTILS_H
 
-#include <QtCore/QString>
+#include <QString>
 
 class Song;
 class Playlist;
diff --git a/mpd/mpdstats.h b/mpd/mpdstats.h
index 61761358e..6ec4562c6 100644
--- a/mpd/mpdstats.h
+++ b/mpd/mpdstats.h
@@ -27,8 +27,8 @@
 #ifndef MPD_STATS_H
 #define MPD_STATS_H
 
-#include <QtCore/QDateTime>
-#include <QtCore/QObject>
+#include <QDateTime>
+#include <QObject>
 
 struct MPDStatsValues
 {
diff --git a/mpd/mpdstatus.h b/mpd/mpdstatus.h
index 65e15237b..055e86b60 100644
--- a/mpd/mpdstatus.h
+++ b/mpd/mpdstatus.h
@@ -27,7 +27,7 @@
 #ifndef MPD_STATUS_H
 #define MPD_STATUS_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 enum MPDState {
     MPDState_Inactive,
diff --git a/mpd/output.h b/mpd/output.h
index 07b0e27aa..20a168673 100644
--- a/mpd/output.h
+++ b/mpd/output.h
@@ -27,7 +27,7 @@
 #ifndef OUTPUT_H
 #define OUTPUT_H
 
-#include <QtCore/QString>
+#include <QString>
 
 struct Output
 {
diff --git a/mpd/playlist.h b/mpd/playlist.h
index 3dd26b13d..458c665b9 100644
--- a/mpd/playlist.h
+++ b/mpd/playlist.h
@@ -27,8 +27,8 @@
 #ifndef PLAYLIST_H
 #define PLAYLIST_H
 
-#include <QtCore/QDateTime>
-#include <QtCore/QString>
+#include <QDateTime>
+#include <QString>
 
 struct Playlist
 {
diff --git a/mpd/song.cpp b/mpd/song.cpp
index 9518bbdc5..bd825625c 100644
--- a/mpd/song.cpp
+++ b/mpd/song.cpp
@@ -33,8 +33,8 @@
 #include "httpserver.h"
 #endif
 #include "localize.h"
-#include <QtCore/QFileInfo>
-#include <QtCore/QStringList>
+#include <QFileInfo>
+#include <QStringList>
 
 // When displaying albums, we use the 1st track's year as the year of the album.
 // The map below stores the mapping from artist+album to year.
diff --git a/mpd/song.h b/mpd/song.h
index 56861b46b..742d5c5ac 100644
--- a/mpd/song.h
+++ b/mpd/song.h
@@ -28,9 +28,9 @@
 #ifndef SONG_H
 #define SONG_H
 
-#include <QtCore/QString>
-#include <QtCore/QSet>
-#include <QtCore/QMetaType>
+#include <QString>
+#include <QSet>
+#include <QMetaType>
 
 struct Song
 {
diff --git a/network/networkaccessmanager.cpp b/network/networkaccessmanager.cpp
index f50697061..76803e8ec 100644
--- a/network/networkaccessmanager.cpp
+++ b/network/networkaccessmanager.cpp
@@ -1,5 +1,5 @@
 #include "networkaccessmanager.h"
-#include <QtCore/QTimerEvent>
+#include <QTimerEvent>
 
 /*
  * Cantata
diff --git a/network/networkaccessmanager.h b/network/networkaccessmanager.h
index 8e7135cd6..1ee1528c2 100644
--- a/network/networkaccessmanager.h
+++ b/network/networkaccessmanager.h
@@ -28,11 +28,11 @@
 #include <KDE/KIO/AccessManager>
 #define BASE_NETWORK_ACCESS_MANAGER KIO::Integration::AccessManager
 #else
-#include <QtNetwork/QNetworkAccessManager>
+#include <QNetworkAccessManager>
 #define BASE_NETWORK_ACCESS_MANAGER QNetworkAccessManager
 #endif
-#include <QtNetwork/QNetworkReply>
-#include <QtCore/QMap>
+#include <QNetworkReply>
+#include <QMap>
 
 class QTimerEvent;
 
diff --git a/network/networkproxyfactory.cpp b/network/networkproxyfactory.cpp
index d367d4243..a9f405d20 100644
--- a/network/networkproxyfactory.cpp
+++ b/network/networkproxyfactory.cpp
@@ -22,9 +22,9 @@
  */
 
 #include "networkproxyfactory.h"
-#include <QtCore/QMutexLocker>
-#include <QtCore/QSettings>
-#include <QtCore/QStringList>
+#include <QMutexLocker>
+#include <QSettings>
+#include <QStringList>
 #include <stdlib.h>
 
 const char* NetworkProxyFactory::constSettingsGroup = "Proxy";
diff --git a/network/networkproxyfactory.h b/network/networkproxyfactory.h
index 65e15cc6b..f6e06019b 100644
--- a/network/networkproxyfactory.h
+++ b/network/networkproxyfactory.h
@@ -24,9 +24,9 @@
 #ifndef NETWORKPROXYFACTORY_H
 #define NETWORKPROXYFACTORY_H
 
-#include <QtCore/QMutex>
-#include <QtNetwork/QNetworkProxyFactory>
-#include <QtCore/QUrl>
+#include <QMutex>
+#include <QNetworkProxyFactory>
+#include <QUrl>
 
 class NetworkProxyFactory : public QNetworkProxyFactory
 {
diff --git a/network/proxysettings.cpp b/network/proxysettings.cpp
index 6a76201eb..c5fdd634c 100644
--- a/network/proxysettings.cpp
+++ b/network/proxysettings.cpp
@@ -23,7 +23,7 @@
 
 #include "proxysettings.h"
 #include "networkproxyfactory.h"
-#include <QtCore/QSettings>
+#include <QSettings>
 
 ProxySettings::ProxySettings(QWidget *parent)
     : QWidget(parent)
diff --git a/network/proxysettings.h b/network/proxysettings.h
index f28bee15e..d029a789e 100644
--- a/network/proxysettings.h
+++ b/network/proxysettings.h
@@ -24,7 +24,7 @@
 #ifndef PROXYSETTINGS_H
 #define PROXYSETTINGS_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 #include "ui_proxysettings.h"
 
 class ProxySettings : public QWidget, public Ui::ProxySettings
diff --git a/online/jamendoservice.cpp b/online/jamendoservice.cpp
index b46ba57df..199d75f02 100644
--- a/online/jamendoservice.cpp
+++ b/online/jamendoservice.cpp
@@ -28,7 +28,7 @@
 #include "musiclibraryitemsong.h"
 #include "song.h"
 #include "settings.h"
-#include <QtXml/QXmlStreamReader>
+#include <QXmlStreamReader>
 
 static QString id3Genre(int id)
 {
diff --git a/online/jamendoservice.h b/online/jamendoservice.h
index 25babb468..13456df98 100644
--- a/online/jamendoservice.h
+++ b/online/jamendoservice.h
@@ -25,7 +25,7 @@
 #define JAMENDO_SERVICE_H
 
 #include "onlineservice.h"
-#include <QtCore/QLatin1String>
+#include <QLatin1String>
 
 class MusicLibraryItemArtist;
 class MusicLibraryItemAlbum;
diff --git a/online/jamendosettingsdialog.cpp b/online/jamendosettingsdialog.cpp
index 2508134af..3c697961e 100644
--- a/online/jamendosettingsdialog.cpp
+++ b/online/jamendosettingsdialog.cpp
@@ -24,7 +24,7 @@
 #include "jamendosettingsdialog.h"
 #include "localize.h"
 #include "buddylabel.h"
-#include <QtGui/QFormLayout>
+#include <QFormLayout>
 
 JamendoSettingsDialog::JamendoSettingsDialog(QWidget *parent)
     : Dialog(parent)
diff --git a/online/jamendosettingsdialog.h b/online/jamendosettingsdialog.h
index 959b7e45b..f0e47a826 100644
--- a/online/jamendosettingsdialog.h
+++ b/online/jamendosettingsdialog.h
@@ -25,7 +25,7 @@
 #define JAMENDO_SETTINGS_DIALOG_H
 
 #include "dialog.h"
-#include <QtGui/QComboBox>
+#include <QComboBox>
 
 class JamendoSettingsDialog : public Dialog
 {
diff --git a/online/magnatuneservice.cpp b/online/magnatuneservice.cpp
index b522dcc74..fabf70bc4 100644
--- a/online/magnatuneservice.cpp
+++ b/online/magnatuneservice.cpp
@@ -29,7 +29,7 @@
 #include "song.h"
 #include "settings.h"
 #include "localize.h"
-#include <QtXml/QXmlStreamReader>
+#include <QXmlStreamReader>
 
 MagnatuneMusicLoader::MagnatuneMusicLoader(const QUrl &src)
     : OnlineMusicLoader(src)
diff --git a/online/magnatuneservice.h b/online/magnatuneservice.h
index 136b83a7e..0a9cc4dc2 100644
--- a/online/magnatuneservice.h
+++ b/online/magnatuneservice.h
@@ -25,7 +25,7 @@
 #define MAGNATUNE_SERVICE_H
 
 #include "onlineservice.h"
-#include <QtCore/QLatin1String>
+#include <QLatin1String>
 
 class MagnatuneMusicLoader : public OnlineMusicLoader
 {
diff --git a/online/magnatunesettingsdialog.cpp b/online/magnatunesettingsdialog.cpp
index 98b30857b..6728a3863 100644
--- a/online/magnatunesettingsdialog.cpp
+++ b/online/magnatunesettingsdialog.cpp
@@ -25,7 +25,7 @@
 #include "magnatuneservice.h"
 #include "localize.h"
 #include "buddylabel.h"
-#include <QtGui/QFormLayout>
+#include <QFormLayout>
 
 MagnatuneSettingsDialog::MagnatuneSettingsDialog(QWidget *parent)
     : Dialog(parent)
diff --git a/online/magnatunesettingsdialog.h b/online/magnatunesettingsdialog.h
index 8b11c6ef6..bfa1ca2eb 100644
--- a/online/magnatunesettingsdialog.h
+++ b/online/magnatunesettingsdialog.h
@@ -26,7 +26,7 @@
 
 #include "dialog.h"
 #include "lineedit.h"
-#include <QtGui/QComboBox>
+#include <QComboBox>
 
 class MagnatuneSettingsDialog : public Dialog
 {
diff --git a/online/onlinedevice.cpp b/online/onlinedevice.cpp
index 27b5a89f4..c5b7cc6e7 100644
--- a/online/onlinedevice.cpp
+++ b/online/onlinedevice.cpp
@@ -25,7 +25,7 @@
 #include "musiclibrarymodel.h"
 #include "utils.h"
 #include "networkaccessmanager.h"
-#include <QtCore/QDir>
+#include <QDir>
 
 static const int constMaxRedirects=5;
 
diff --git a/online/onlineservice.cpp b/online/onlineservice.cpp
index 9a25d2048..668e998fc 100644
--- a/online/onlineservice.cpp
+++ b/online/onlineservice.cpp
@@ -29,8 +29,8 @@
 #include "mpdparseutils.h"
 #include "covers.h"
 #include "qtiocompressor/qtiocompressor.h"
-#include <QtCore/QFile>
-#include <QtXml/QXmlStreamReader>
+#include <QFile>
+#include <QXmlStreamReader>
 
 static QString cacheFileName(OnlineService *srv, bool create=false)
 {
diff --git a/online/onlineservice.h b/online/onlineservice.h
index a38bf7656..60d09151e 100644
--- a/online/onlineservice.h
+++ b/online/onlineservice.h
@@ -28,9 +28,9 @@
 #include "song.h"
 #include "icons.h"
 #include "localize.h"
-#include <QtCore/QObject>
-#include <QtCore/QUrl>
-#include <QtCore/QThread>
+#include <QObject>
+#include <QUrl>
+#include <QThread>
 
 class NetworkAccessManager;
 class OnlineServicesModel;
diff --git a/online/onlineservicespage.cpp b/online/onlineservicespage.cpp
index 495e54bbc..da5059168 100644
--- a/online/onlineservicespage.cpp
+++ b/online/onlineservicespage.cpp
@@ -37,8 +37,8 @@
 #include "mainwindow.h"
 #include "action.h"
 #include "actioncollection.h"
-#include <QtGui/QIcon>
-#include <QtGui/QToolButton>
+#include <QIcon>
+#include <QToolButton>
 #ifdef ENABLE_KDE_SUPPORT
 #include <KDE/KGlobalSettings>
 #endif
diff --git a/qtiocompressor/qtiocompressor.cpp b/qtiocompressor/qtiocompressor.cpp
index fc962c06a..868c97749 100644
--- a/qtiocompressor/qtiocompressor.cpp
+++ b/qtiocompressor/qtiocompressor.cpp
@@ -46,7 +46,7 @@
 
 #include "qtiocompressor.h"
 #include "zlib.h"
-#include <QtCore/QDebug>
+#include <QDebug>
 
 typedef Bytef ZlibByte;
 typedef uInt ZlibSize;
diff --git a/qtiocompressor/qtiocompressor.h b/qtiocompressor/qtiocompressor.h
index 61284a5dc..ccb8f5119 100644
--- a/qtiocompressor/qtiocompressor.h
+++ b/qtiocompressor/qtiocompressor.h
@@ -47,7 +47,7 @@
 #ifndef QTIOCOMPRESSOR_H
 #define QTIOCOMPRESSOR_H
 
-#include <QtCore/QIODevice>
+#include <QIODevice>
 
 #if defined(Q_WS_WIN)
 #  if !defined(QT_QTIOCOMPRESSOR_EXPORT) && !defined(QT_QTIOCOMPRESSOR_IMPORT)
diff --git a/qtsingleapplication/qtlocalpeer.cpp b/qtsingleapplication/qtlocalpeer.cpp
index ee335d98e..073b56b00 100644
--- a/qtsingleapplication/qtlocalpeer.cpp
+++ b/qtsingleapplication/qtlocalpeer.cpp
@@ -46,13 +46,13 @@
 
 
 #include "qtlocalpeer.h"
-#include <QtCore/QCoreApplication>
-#include <QtCore/QTime>
+#include <QCoreApplication>
+#include <QTime>
 #include <QtDebug>
 
 #if defined(Q_OS_WIN)
-#include <QtCore/QLibrary>
-#include <QtCore/qt_windows.h>
+#include <QLibrary>
+#include <qt_windows.h>
 typedef BOOL(WINAPI*PProcessIdToSessionId)(DWORD,DWORD*);
 static PProcessIdToSessionId pProcessIdToSessionId = 0;
 #endif
diff --git a/qtsingleapplication/qtlocalpeer.h b/qtsingleapplication/qtlocalpeer.h
index dc3ca2253..546a8d5a5 100644
--- a/qtsingleapplication/qtlocalpeer.h
+++ b/qtsingleapplication/qtlocalpeer.h
@@ -45,9 +45,9 @@
 ****************************************************************************/
 
 
-#include <QtNetwork/QLocalServer>
-#include <QtNetwork/QLocalSocket>
-#include <QtCore/QDir>
+#include <QLocalServer>
+#include <QLocalSocket>
+#include <QDir>
 
 #include "qtlockedfile.h"
 
diff --git a/qtsingleapplication/qtlockedfile.h b/qtsingleapplication/qtlockedfile.h
index 969f4be22..2d1ef735f 100644
--- a/qtsingleapplication/qtlockedfile.h
+++ b/qtsingleapplication/qtlockedfile.h
@@ -47,9 +47,9 @@
 #ifndef QTLOCKEDFILE_H
 #define QTLOCKEDFILE_H
 
-#include <QtCore/QFile>
+#include <QFile>
 #ifdef Q_OS_WIN
-#include <QtCore/QVector>
+#include <QVector>
 #endif
 
 #if defined(Q_OS_WIN)
diff --git a/qtsingleapplication/qtlockedfile_win.cpp b/qtsingleapplication/qtlockedfile_win.cpp
index f41bb67d8..433e2e3fb 100644
--- a/qtsingleapplication/qtlockedfile_win.cpp
+++ b/qtsingleapplication/qtlockedfile_win.cpp
@@ -46,7 +46,7 @@
 
 #include "qtlockedfile.h"
 #include <qt_windows.h>
-#include <QtCore/QFileInfo>
+#include <QFileInfo>
 
 #define MUTEX_PREFIX "QtLockedFile mutex "
 // Maximum number of concurrent read locks. Must not be greater than MAXIMUM_WAIT_OBJECTS
diff --git a/qtsingleapplication/qtsingleapplication.cpp b/qtsingleapplication/qtsingleapplication.cpp
index 7fe264096..360d2af41 100644
--- a/qtsingleapplication/qtsingleapplication.cpp
+++ b/qtsingleapplication/qtsingleapplication.cpp
@@ -47,7 +47,7 @@
 
 #include "qtsingleapplication.h"
 #include "qtlocalpeer.h"
-#include <QtGui/QWidget>
+#include <QWidget>
 
 
 /*!
diff --git a/qtsingleapplication/qtsingleapplication.h b/qtsingleapplication/qtsingleapplication.h
index c0e0dd7fb..d44124baf 100644
--- a/qtsingleapplication/qtsingleapplication.h
+++ b/qtsingleapplication/qtsingleapplication.h
@@ -45,7 +45,7 @@
 ****************************************************************************/
 
 
-#include <QtGui/QApplication>
+#include <QApplication>
 
 class QtLocalPeer;
 
diff --git a/qtsingleapplication/qtsinglecoreapplication.h b/qtsingleapplication/qtsinglecoreapplication.h
index f80946da5..61e49d362 100644
--- a/qtsingleapplication/qtsinglecoreapplication.h
+++ b/qtsingleapplication/qtsinglecoreapplication.h
@@ -45,7 +45,7 @@
 ****************************************************************************/
 
 
-#include <QtCore/QCoreApplication>
+#include <QCoreApplication>
 
 class QtLocalPeer;
 
diff --git a/replaygain/ffmpeginput.cpp b/replaygain/ffmpeginput.cpp
index 5458d7ef8..ae511e286 100644
--- a/replaygain/ffmpeginput.cpp
+++ b/replaygain/ffmpeginput.cpp
@@ -27,11 +27,11 @@ extern "C" {
 #ifdef __cplusplus
 }
 #endif
-#include <QtCore/QMutex>
-#include <QtCore/QFile>
-#include <QtCore/QString>
-#include <QtCore/QList>
-#include <QtCore/QByteArray>
+#include <QMutex>
+#include <QFile>
+#include <QString>
+#include <QList>
+#include <QByteArray>
 #include "ebur128.h"
 #include "ffmpeginput.h"
 
diff --git a/replaygain/jobcontroller.h b/replaygain/jobcontroller.h
index 480c6d4f9..63d28eb36 100644
--- a/replaygain/jobcontroller.h
+++ b/replaygain/jobcontroller.h
@@ -24,7 +24,7 @@
 #ifndef JOB_CONTROLLER
 #define JOB_CONTROLLER
 
-#include <QtCore/QThread>
+#include <QThread>
 
 class Job : public QThread
 {
diff --git a/replaygain/mpg123input.cpp b/replaygain/mpg123input.cpp
index 3097096ab..55bad186f 100644
--- a/replaygain/mpg123input.cpp
+++ b/replaygain/mpg123input.cpp
@@ -16,9 +16,9 @@ extern "C" {
 #ifdef __cplusplus
 }
 #endif
-#include <QtCore/QFile>
-#include <QtCore/QString>
-#include <QtCore/QByteArray>
+#include <QFile>
+#include <QString>
+#include <QByteArray>
 #include "ebur128.h"
 #include "mpg123input.h"
 
diff --git a/replaygain/rgdialog.cpp b/replaygain/rgdialog.cpp
index e54cfd422..309a2fc7e 100644
--- a/replaygain/rgdialog.cpp
+++ b/replaygain/rgdialog.cpp
@@ -33,14 +33,14 @@
 #include "localize.h"
 #include "messagebox.h"
 #include "jobcontroller.h"
-#include <QtGui/QTreeWidget>
-#include <QtGui/QLabel>
-#include <QtGui/QProgressBar>
-#include <QtGui/QBoxLayout>
-#include <QtGui/QHeaderView>
-#include <QtGui/QCloseEvent>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QEventLoop>
+#include <QTreeWidget>
+#include <QLabel>
+#include <QProgressBar>
+#include <QBoxLayout>
+#include <QHeaderView>
+#include <QCloseEvent>
+#include <QCoreApplication>
+#include <QEventLoop>
 #ifdef ENABLE_KDE_SUPPORT
 #include <KDE/KLocale>
 #endif
diff --git a/solid-lite/backends/hal/haldevice.cpp b/solid-lite/backends/hal/haldevice.cpp
index 731cddf52..d406fd401 100644
--- a/solid-lite/backends/hal/haldevice.cpp
+++ b/solid-lite/backends/hal/haldevice.cpp
@@ -20,13 +20,13 @@
 
 #include "haldevice.h"
 
-#include <QtCore/QDebug>
-#include <QtDBus/QDBusConnection>
-#include <QtDBus/QDBusInterface>
-#include <QtDBus/QDBusReply>
-#include <QtDBus/QDBusArgument>
-#include <QtDBus/QDBusMetaType>
-#include <QtDBus/QDBusVariant>
+#include <QDebug>
+#include <QDBusConnection>
+#include <QDBusInterface>
+#include <QDBusReply>
+#include <QDBusArgument>
+#include <QDBusMetaType>
+#include <QDBusVariant>
 
 #include <solid-lite/genericinterface.h>
 
diff --git a/solid-lite/backends/hal/haldeviceinterface.h b/solid-lite/backends/hal/haldeviceinterface.h
index 1853c5a92..a0d4ab2b3 100644
--- a/solid-lite/backends/hal/haldeviceinterface.h
+++ b/solid-lite/backends/hal/haldeviceinterface.h
@@ -24,8 +24,8 @@
 #include <solid-lite/ifaces/deviceinterface.h>
 #include "haldevice.h"
 
-#include <QtCore/QObject>
-#include <QtCore/QStringList>
+#include <QObject>
+#include <QStringList>
 
 namespace Solid
 {
diff --git a/solid-lite/backends/hal/halfstabhandling.cpp b/solid-lite/backends/hal/halfstabhandling.cpp
index 1774e11e9..55ff40f11 100644
--- a/solid-lite/backends/hal/halfstabhandling.cpp
+++ b/solid-lite/backends/hal/halfstabhandling.cpp
@@ -20,12 +20,12 @@
 
 #include "halfstabhandling.h"
 
-#include <QtCore/QFile>
-#include <QtCore/QMultiHash>
-#include <QtCore/QObject>
-#include <QtCore/QProcess>
-#include <QtCore/QTextStream>
-#include <QtCore/QTime>
+#include <QFile>
+#include <QMultiHash>
+#include <QObject>
+#include <QProcess>
+#include <QTextStream>
+#include <QTime>
 
 #include <solid-lite/soliddefs_p.h>
 
diff --git a/solid-lite/backends/hal/halfstabhandling.h b/solid-lite/backends/hal/halfstabhandling.h
index bd20729aa..223a9ae92 100644
--- a/solid-lite/backends/hal/halfstabhandling.h
+++ b/solid-lite/backends/hal/halfstabhandling.h
@@ -21,7 +21,7 @@
 #ifndef SOLID_BACKENDS_HAL_FSTABHANDLING_H
 #define SOLID_BACKENDS_HAL_FSTABHANDLING_H
 
-#include <QtCore/QString>
+#include <QString>
 
 class QProcess;
 class QObject;
diff --git a/solid-lite/backends/hal/halmanager.cpp b/solid-lite/backends/hal/halmanager.cpp
index 1bd32fef5..912db1ec0 100644
--- a/solid-lite/backends/hal/halmanager.cpp
+++ b/solid-lite/backends/hal/halmanager.cpp
@@ -22,10 +22,10 @@
 #include "haldevice.h"
 #include "haldeviceinterface.h"
 
-#include <QtCore/QDebug>
-#include <QtDBus/QDBusConnection>
-#include <QtDBus/QDBusInterface>
-#include <QtDBus/QDBusReply>
+#include <QDebug>
+#include <QDBusConnection>
+#include <QDBusInterface>
+#include <QDBusReply>
 
 using namespace Solid::Backends::Hal;
 
diff --git a/solid-lite/backends/hal/halmanager.h b/solid-lite/backends/hal/halmanager.h
index f10a7aad5..ef22969d5 100644
--- a/solid-lite/backends/hal/halmanager.h
+++ b/solid-lite/backends/hal/halmanager.h
@@ -24,8 +24,8 @@
 #include <solid-lite/ifaces/devicemanager.h>
 #include <solid-lite/deviceinterface.h>
 
-#include <QtCore/QVariant>
-#include <QtCore/QStringList>
+#include <QVariant>
+#include <QStringList>
 
 namespace Solid
 {
diff --git a/solid-lite/backends/hal/halportablemediaplayer.h b/solid-lite/backends/hal/halportablemediaplayer.h
index 2614276a1..31d64391f 100644
--- a/solid-lite/backends/hal/halportablemediaplayer.h
+++ b/solid-lite/backends/hal/halportablemediaplayer.h
@@ -25,7 +25,7 @@
 #include <solid-lite/ifaces/portablemediaplayer.h>
 #include "haldeviceinterface.h"
 
-#include <QtCore/QStringList>
+#include <QStringList>
 
 namespace Solid
 {
diff --git a/solid-lite/backends/hal/halstorageaccess.cpp b/solid-lite/backends/hal/halstorageaccess.cpp
index 2c22318d5..5a7034c21 100644
--- a/solid-lite/backends/hal/halstorageaccess.cpp
+++ b/solid-lite/backends/hal/halstorageaccess.cpp
@@ -23,16 +23,16 @@
 #include "halfstabhandling.h"
 #include "../../genericinterface.h"
 
-#include <QtCore/QLocale>
-#include <QtCore/QDebug>
-#include <QtCore/QProcess>
-#include <QtCore/QTimer>
-#include <QtDBus/QDBusConnection>
-#include <QtDBus/QDBusInterface>
-#include <QtDBus/QDBusReply>
-#include <QtDBus/QDBusVariant>
-#include <QtGui/QApplication>
-#include <QtGui/QWidget>
+#include <QLocale>
+#include <QDebug>
+#include <QProcess>
+#include <QTimer>
+#include <QDBusConnection>
+#include <QDBusInterface>
+#include <QDBusReply>
+#include <QDBusVariant>
+#include <QApplication>
+#include <QWidget>
 
 #include <unistd.h>
 #include <stdlib.h>
diff --git a/solid-lite/backends/hal/halstorageaccess.h b/solid-lite/backends/hal/halstorageaccess.h
index 6a2e00aed..90ade69ab 100644
--- a/solid-lite/backends/hal/halstorageaccess.h
+++ b/solid-lite/backends/hal/halstorageaccess.h
@@ -24,10 +24,10 @@
 #include <solid-lite/ifaces/storageaccess.h>
 #include "haldeviceinterface.h"
 
-#include <QtCore/QProcess>
-#include <QtDBus/QDBusMessage>
-#include <QtDBus/QDBusError>
-#include <QtDBus/QDBusVariant>
+#include <QProcess>
+#include <QDBusMessage>
+#include <QDBusError>
+#include <QDBusVariant>
 
 namespace Solid
 {
diff --git a/solid-lite/backends/iokit/cfhelper.cpp b/solid-lite/backends/iokit/cfhelper.cpp
index c3c40ee60..62c5c3757 100644
--- a/solid-lite/backends/iokit/cfhelper.cpp
+++ b/solid-lite/backends/iokit/cfhelper.cpp
@@ -18,12 +18,12 @@
     License along with this library. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <QtCore/qvarlengtharray.h>
-#include <QtCore/qstring.h>
-#include <QtCore/qstringlist.h>
-#include <QtCore/qvariant.h>
-#include <QtCore/qdatetime.h>
-#include <QtCore/qdebug.h>
+#include <qvarlengtharray.h>
+#include <qstring.h>
+#include <qstringlist.h>
+#include <qvariant.h>
+#include <qdatetime.h>
+#include <qdebug.h>
 
 #include <CoreFoundation/CoreFoundation.h>
 
diff --git a/solid-lite/backends/iokit/iokitdevice.cpp b/solid-lite/backends/iokit/iokitdevice.cpp
index 1dee412ed..08981467b 100644
--- a/solid-lite/backends/iokit/iokitdevice.cpp
+++ b/solid-lite/backends/iokit/iokitdevice.cpp
@@ -26,7 +26,7 @@
 //#include "iokitnetworkinterface.h"
 //#include "iokitserialinterface.h"
 
-#include <QtCore/qdebug.h>
+#include <qdebug.h>
 
 #include <IOKit/IOKitLib.h>
 #include <IOKit/usb/IOUSBLib.h>
diff --git a/solid-lite/backends/iokit/iokitdeviceinterface.h b/solid-lite/backends/iokit/iokitdeviceinterface.h
index d5cff9d95..d59bb5c37 100644
--- a/solid-lite/backends/iokit/iokitdeviceinterface.h
+++ b/solid-lite/backends/iokit/iokitdeviceinterface.h
@@ -24,8 +24,8 @@
 #include <solid-lite/ifaces/deviceinterface.h>
 #include "iokitdevice.h"
 
-#include <QtCore/QObject>
-#include <QtCore/QStringList>
+#include <QObject>
+#include <QStringList>
 
 namespace Solid
 {
diff --git a/solid-lite/backends/iokit/iokitmanager.cpp b/solid-lite/backends/iokit/iokitmanager.cpp
index fcd748ef1..0fb1aab02 100644
--- a/solid-lite/backends/iokit/iokitmanager.cpp
+++ b/solid-lite/backends/iokit/iokitmanager.cpp
@@ -21,7 +21,7 @@
 #include "iokitmanager.h"
 #include "iokitdevice.h"
 
-#include <QtCore/qdebug.h>
+#include <qdebug.h>
 
 #include <IOKit/IOKitLib.h>
 #include <IOKit/usb/IOUSBLib.h>
diff --git a/solid-lite/backends/iokit/iokitmanager.h b/solid-lite/backends/iokit/iokitmanager.h
index d11b47090..445c1022c 100644
--- a/solid-lite/backends/iokit/iokitmanager.h
+++ b/solid-lite/backends/iokit/iokitmanager.h
@@ -24,8 +24,8 @@
 #include <solid-lite/ifaces/devicemanager.h>
 #include <solid-lite/deviceinterface.h>
 
-#include <QtCore/QVariant>
-#include <QtCore/QStringList>
+#include <QVariant>
+#include <QStringList>
 
 namespace Solid
 {
diff --git a/solid-lite/backends/shared/rootdevice.cpp b/solid-lite/backends/shared/rootdevice.cpp
index 713664fa2..c510b1c42 100644
--- a/solid-lite/backends/shared/rootdevice.cpp
+++ b/solid-lite/backends/shared/rootdevice.cpp
@@ -19,7 +19,7 @@
 */
 
 #include "rootdevice.h"
-#include <QtCore/QStringList>
+#include <QStringList>
 
 using namespace Solid::Backends::Shared;
 
diff --git a/solid-lite/backends/shared/rootdevice.h b/solid-lite/backends/shared/rootdevice.h
index 9d8935c17..2b7f25077 100644
--- a/solid-lite/backends/shared/rootdevice.h
+++ b/solid-lite/backends/shared/rootdevice.h
@@ -23,7 +23,7 @@
 
 #include <solid-lite/ifaces/device.h>
 
-#include <QtCore/QStringList>
+#include <QStringList>
 
 namespace Solid
 {
diff --git a/solid-lite/backends/shared/udevqt.h b/solid-lite/backends/shared/udevqt.h
index 40b7bbe93..38415a490 100644
--- a/solid-lite/backends/shared/udevqt.h
+++ b/solid-lite/backends/shared/udevqt.h
@@ -21,13 +21,13 @@
 #ifndef UDEVQT_H
 #define UDEVQT_H
 
-#include <QtCore/QObject>
-#include <QtCore/QList>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QVariant>
+#include <QObject>
+#include <QList>
+#include <QString>
+#include <QStringList>
+#include <QVariant>
 
-#include <QtCore/QSocketNotifier>
+#include <QSocketNotifier>
 #include <libudev.h>
 
 namespace UdevQt
diff --git a/solid-lite/backends/shared/udevqtclient.cpp b/solid-lite/backends/shared/udevqtclient.cpp
index 81d4100cf..caa382ba9 100644
--- a/solid-lite/backends/shared/udevqtclient.cpp
+++ b/solid-lite/backends/shared/udevqtclient.cpp
@@ -22,7 +22,7 @@
 // #include "udevqt_p.h"
 
 #include <sys/stat.h>
-#include <QtCore/QSocketNotifier>
+#include <QSocketNotifier>
 
 namespace UdevQt {
 
diff --git a/solid-lite/backends/shared/udevqtdevice.cpp b/solid-lite/backends/shared/udevqtdevice.cpp
index 8873e82cb..d27327dde 100644
--- a/solid-lite/backends/shared/udevqtdevice.cpp
+++ b/solid-lite/backends/shared/udevqtdevice.cpp
@@ -21,7 +21,7 @@
 #include "udevqt.h"
 // #include "udevqt_p.h"
 
-#include <QtCore/QByteArray>
+#include <QByteArray>
 
 namespace UdevQt {
 
diff --git a/solid-lite/backends/udev/udevdevice.h b/solid-lite/backends/udev/udevdevice.h
index 9f93fc5e1..12c4d12f3 100644
--- a/solid-lite/backends/udev/udevdevice.h
+++ b/solid-lite/backends/udev/udevdevice.h
@@ -24,7 +24,7 @@
 #include "udev.h"
 
 #include <solid-lite/ifaces/device.h>
-#include <QtCore/QStringList>
+#include <QStringList>
 
 namespace Solid
 {
diff --git a/solid-lite/backends/udev/udevdeviceinterface.h b/solid-lite/backends/udev/udevdeviceinterface.h
index 96245c119..501f9da9b 100644
--- a/solid-lite/backends/udev/udevdeviceinterface.h
+++ b/solid-lite/backends/udev/udevdeviceinterface.h
@@ -24,8 +24,8 @@
 #include <solid-lite/ifaces/deviceinterface.h>
 #include "udevdevice.h"
 
-#include <QtCore/QObject>
-#include <QtCore/QStringList>
+#include <QObject>
+#include <QStringList>
 
 namespace Solid
 {
diff --git a/solid-lite/backends/udev/udevmanager.cpp b/solid-lite/backends/udev/udevmanager.cpp
index 50ca10331..d28b63d4e 100644
--- a/solid-lite/backends/udev/udevmanager.cpp
+++ b/solid-lite/backends/udev/udevmanager.cpp
@@ -24,9 +24,9 @@
 #include "udevdevice.h"
 #include "../shared/rootdevice.h"
 
-#include <QtCore/QSet>
-#include <QtCore/QFile>
-#include <QtCore/QDebug>
+#include <QSet>
+#include <QFile>
+#include <QDebug>
 
 #define DETAILED_OUTPUT 0
 
diff --git a/solid-lite/backends/udev/udevportablemediaplayer.cpp b/solid-lite/backends/udev/udevportablemediaplayer.cpp
index da28b8001..1342c943f 100644
--- a/solid-lite/backends/udev/udevportablemediaplayer.cpp
+++ b/solid-lite/backends/udev/udevportablemediaplayer.cpp
@@ -24,10 +24,10 @@
 
 #include "solid-lite/xdgbasedirs_p.h"
 
-#include <QtCore/QChar>
-#include <QtCore/QDebug>
-#include <QtCore/QFile>
-#include <QtCore/QTextStream>
+#include <QChar>
+#include <QDebug>
+#include <QFile>
+#include <QTextStream>
 
 using namespace Solid::Backends::UDev;
 
diff --git a/solid-lite/backends/udev/udevportablemediaplayer.h b/solid-lite/backends/udev/udevportablemediaplayer.h
index ff1aee8c8..15c403d7b 100644
--- a/solid-lite/backends/udev/udevportablemediaplayer.h
+++ b/solid-lite/backends/udev/udevportablemediaplayer.h
@@ -24,7 +24,7 @@
 #include <solid-lite/ifaces/portablemediaplayer.h>
 #include "udevdeviceinterface.h"
 
-#include <QtCore/QStringList>
+#include <QStringList>
 
 namespace Solid
 {
diff --git a/solid-lite/backends/udisks/udisksdevice.cpp b/solid-lite/backends/udisks/udisksdevice.cpp
index 10b4698e8..ef4f023b0 100644
--- a/solid-lite/backends/udisks/udisksdevice.cpp
+++ b/solid-lite/backends/udisks/udisksdevice.cpp
@@ -33,12 +33,12 @@
 #include <solid-lite/deviceinterface.h>
 #include <solid-lite/device.h>
 
-#include <QtCore/QStringList>
-#include <QtCore/QDebug>
+#include <QStringList>
+#include <QDebug>
 
-#include <QtDBus/QDBusMessage>
-#include <QtDBus/QDBusMetaType>
-#include <QtDBus/QDBusPendingReply>
+#include <QDBusMessage>
+#include <QDBusMetaType>
+#include <QDBusPendingReply>
 
 using namespace Solid::Backends::UDisks;
 
diff --git a/solid-lite/backends/udisks/udisksdevice.h b/solid-lite/backends/udisks/udisksdevice.h
index 85ac16eee..a15c1edef 100644
--- a/solid-lite/backends/udisks/udisksdevice.h
+++ b/solid-lite/backends/udisks/udisksdevice.h
@@ -26,8 +26,8 @@
 #include <solid-lite/deviceinterface.h>
 #include <solid-lite/solidnamespace.h>
 
-#include <QtDBus/QDBusInterface>
-#include <QtCore/QSet>
+#include <QDBusInterface>
+#include <QSet>
 
 namespace Solid
 {
diff --git a/solid-lite/backends/udisks/udisksdeviceinterface.h b/solid-lite/backends/udisks/udisksdeviceinterface.h
index fe5cfa811..39d8038a3 100644
--- a/solid-lite/backends/udisks/udisksdeviceinterface.h
+++ b/solid-lite/backends/udisks/udisksdeviceinterface.h
@@ -24,8 +24,8 @@
 #include <ifaces/deviceinterface.h>
 #include "udisksdevice.h"
 
-#include <QtCore/QObject>
-#include <QtCore/QStringList>
+#include <QObject>
+#include <QStringList>
 
 namespace Solid
 {
diff --git a/solid-lite/backends/udisks/udisksmanager.cpp b/solid-lite/backends/udisks/udisksmanager.cpp
index 11454ceab..6edfb9d98 100644
--- a/solid-lite/backends/udisks/udisksmanager.cpp
+++ b/solid-lite/backends/udisks/udisksmanager.cpp
@@ -22,10 +22,10 @@
 #include "udisksmanager.h"
 #include "udisks.h"
 
-#include <QtDBus/QDBusReply>
-#include <QtCore/QDebug>
-#include <QtDBus/QDBusMetaType>
-#include <QtDBus/QDBusConnectionInterface>
+#include <QDBusReply>
+#include <QDebug>
+#include <QDBusMetaType>
+#include <QDBusConnectionInterface>
 
 #include "../shared/rootdevice.h"
 
diff --git a/solid-lite/backends/udisks/udisksmanager.h b/solid-lite/backends/udisks/udisksmanager.h
index 4b9d45f86..979ed9868 100644
--- a/solid-lite/backends/udisks/udisksmanager.h
+++ b/solid-lite/backends/udisks/udisksmanager.h
@@ -26,8 +26,8 @@
 
 #include "solid-lite/ifaces/devicemanager.h"
 
-#include <QtDBus/QDBusInterface>
-#include <QtCore/QSet>
+#include <QDBusInterface>
+#include <QSet>
 
 namespace Solid
 {
diff --git a/solid-lite/backends/udisks/udisksstorageaccess.cpp b/solid-lite/backends/udisks/udisksstorageaccess.cpp
index 49ace5b44..0aa714bd0 100644
--- a/solid-lite/backends/udisks/udisksstorageaccess.cpp
+++ b/solid-lite/backends/udisks/udisksstorageaccess.cpp
@@ -22,10 +22,10 @@
 #include "udisksstorageaccess.h"
 #include "udisks.h"
 
-#include <QtCore/QProcess>
-#include <QtDBus/QtDBus>
-#include <QtGui/QApplication>
-#include <QtGui/QWidget>
+#include <QProcess>
+#include <QtDBus>
+#include <QApplication>
+#include <QWidget>
 
 using namespace Solid::Backends::UDisks;
 
diff --git a/solid-lite/backends/udisks/udisksstorageaccess.h b/solid-lite/backends/udisks/udisksstorageaccess.h
index 57db63ea7..a56b80c85 100644
--- a/solid-lite/backends/udisks/udisksstorageaccess.h
+++ b/solid-lite/backends/udisks/udisksstorageaccess.h
@@ -25,8 +25,8 @@
 #include <solid-lite/ifaces/storageaccess.h>
 #include "udisksdeviceinterface.h"
 
-#include <QtDBus/QDBusMessage>
-#include <QtDBus/QDBusError>
+#include <QDBusMessage>
+#include <QDBusError>
 
 namespace Solid
 {
diff --git a/solid-lite/backends/udisks/udisksstoragedrive.cpp b/solid-lite/backends/udisks/udisksstoragedrive.cpp
index ad3b8884b..2425cccef 100644
--- a/solid-lite/backends/udisks/udisksstoragedrive.cpp
+++ b/solid-lite/backends/udisks/udisksstoragedrive.cpp
@@ -21,7 +21,7 @@
 
 #include "udisksstoragedrive.h"
 
-#include <QtCore/QDebug>
+#include <QDebug>
 
 using namespace Solid::Backends::UDisks;
 
diff --git a/solid-lite/backends/wmi/wmidevice.cpp b/solid-lite/backends/wmi/wmidevice.cpp
index 08f62669b..2befc438c 100644
--- a/solid-lite/backends/wmi/wmidevice.cpp
+++ b/solid-lite/backends/wmi/wmidevice.cpp
@@ -44,7 +44,7 @@
 //#include "wmidvbinterface.h"
 //#include "wmivideo.h"
 
-#include <QtCore/QDebug>
+#include <QDebug>
 
 using namespace Solid::Backends::Wmi;
 
diff --git a/solid-lite/backends/wmi/wmideviceinterface.h b/solid-lite/backends/wmi/wmideviceinterface.h
index faac80d56..ead6b365d 100644
--- a/solid-lite/backends/wmi/wmideviceinterface.h
+++ b/solid-lite/backends/wmi/wmideviceinterface.h
@@ -24,8 +24,8 @@
 #include <solid-lite/ifaces/deviceinterface.h>
 #include "wmidevice.h"
 
-#include <QtCore/QObject>
-#include <QtCore/QStringList>
+#include <QObject>
+#include <QStringList>
 
 namespace Solid
 {
diff --git a/solid-lite/backends/wmi/wmimanager.cpp b/solid-lite/backends/wmi/wmimanager.cpp
index 3b161042c..754684e5d 100644
--- a/solid-lite/backends/wmi/wmimanager.cpp
+++ b/solid-lite/backends/wmi/wmimanager.cpp
@@ -21,7 +21,7 @@
 
 #include "wmimanager.h"
 
-#include <QtCore/QDebug>
+#include <QDebug>
 
 #include "wmidevice.h"
 #include "wmideviceinterface.h"
diff --git a/solid-lite/backends/wmi/wmimanager.h b/solid-lite/backends/wmi/wmimanager.h
index a1d0436a8..bad33ee85 100644
--- a/solid-lite/backends/wmi/wmimanager.h
+++ b/solid-lite/backends/wmi/wmimanager.h
@@ -25,8 +25,8 @@
 #include <solid-lite/ifaces/devicemanager.h>
 #include <solid-lite/deviceinterface.h>
 
-#include <QtCore/QVariant>
-#include <QtCore/QStringList>
+#include <QVariant>
+#include <QStringList>
 
 #include <Wbemidl.h>
 
diff --git a/solid-lite/backends/wmi/wmiportablemediaplayer.h b/solid-lite/backends/wmi/wmiportablemediaplayer.h
index c5f1fa2c9..beed042f5 100644
--- a/solid-lite/backends/wmi/wmiportablemediaplayer.h
+++ b/solid-lite/backends/wmi/wmiportablemediaplayer.h
@@ -25,7 +25,7 @@
 #include <solid-lite/ifaces/portablemediaplayer.h>
 #include "wmideviceinterface.h"
 
-#include <QtCore/QStringList>
+#include <QStringList>
 
 namespace Solid
 {
diff --git a/solid-lite/backends/wmi/wmiquery.cpp b/solid-lite/backends/wmi/wmiquery.cpp
index a88a1647a..4695975fd 100644
--- a/solid-lite/backends/wmi/wmiquery.cpp
+++ b/solid-lite/backends/wmi/wmiquery.cpp
@@ -39,11 +39,11 @@
 
 # pragma comment(lib, "wbemuuid.lib")
 
-#include <QtCore/QDebug>
-#include <QtCore/QVariant>
-#include <QtCore/QList>
-#include <QtCore/QStringList>
-#include <QtCore/QCoreApplication>
+#include <QDebug>
+#include <QVariant>
+#include <QList>
+#include <QStringList>
+#include <QCoreApplication>
 
 //needed for mingw
 inline OLECHAR* SysAllocString(const QString &s){
diff --git a/solid-lite/backends/wmi/wmiquery.h b/solid-lite/backends/wmi/wmiquery.h
index a6ff48a75..659d8d348 100644
--- a/solid-lite/backends/wmi/wmiquery.h
+++ b/solid-lite/backends/wmi/wmiquery.h
@@ -22,11 +22,11 @@
 #ifndef SOLID_BACKENDS_WMI_WMIQUERY_H
 #define SOLID_BACKENDS_WMI_WMIQUERY_H
 
-#include <QtCore/QDebug>
-#include <QtCore/QVariant>
-#include <QtCore/QList>
-#include <QtCore/QAtomicInt>
-#include <QtCore/QSharedPointer>
+#include <QDebug>
+#include <QVariant>
+#include <QList>
+#include <QAtomicInt>
+#include <QSharedPointer>
 
 #include <solid-lite/solid_export.h>
 
diff --git a/solid-lite/backends/wmi/wmistorageaccess.cpp b/solid-lite/backends/wmi/wmistorageaccess.cpp
index 36aaa422b..638386ecc 100644
--- a/solid-lite/backends/wmi/wmistorageaccess.cpp
+++ b/solid-lite/backends/wmi/wmistorageaccess.cpp
@@ -21,9 +21,9 @@
 
 #include "wmistorageaccess.h"
 
-#include <QtCore/QDebug>
-#include <QtGui/QApplication>
-#include <QtGui/QWidget>
+#include <QDebug>
+#include <QApplication>
+#include <QWidget>
 
 #include <unistd.h>
 
diff --git a/solid-lite/backends/wmi/wmistorageaccess.h b/solid-lite/backends/wmi/wmistorageaccess.h
index d5825cd00..528e67f8b 100644
--- a/solid-lite/backends/wmi/wmistorageaccess.h
+++ b/solid-lite/backends/wmi/wmistorageaccess.h
@@ -25,7 +25,7 @@
 #include <solid-lite/ifaces/storageaccess.h>
 #include "wmideviceinterface.h"
 
-#include <QtCore/QProcess>
+#include <QProcess>
 
 namespace Solid
 {
diff --git a/solid-lite/device.h b/solid-lite/device.h
index 06c31875f..0461ec885 100644
--- a/solid-lite/device.h
+++ b/solid-lite/device.h
@@ -21,11 +21,11 @@
 #ifndef SOLID_DEVICE_H
 #define SOLID_DEVICE_H
 
-#include <QtCore/QVariant>
+#include <QVariant>
 
-#include <QtCore/QMap>
-#include <QtCore/QList>
-#include <QtCore/QSharedData>
+#include <QMap>
+#include <QList>
+#include <QSharedData>
 
 #include <solid-lite/solid_export.h>
 
diff --git a/solid-lite/device_p.h b/solid-lite/device_p.h
index 53ea8d820..d2a42498e 100644
--- a/solid-lite/device_p.h
+++ b/solid-lite/device_p.h
@@ -21,11 +21,11 @@
 #ifndef SOLID_DEVICE_P_H
 #define SOLID_DEVICE_P_H
 
-#include <QtCore/QObject>
-#include <QtCore/QSharedData>
-#include <QtCore/QWeakPointer>
+#include <QObject>
+#include <QSharedData>
+#include <QWeakPointer>
 
-#include <QtCore/QMap>
+#include <QMap>
 #include "deviceinterface.h"
 
 namespace Solid
diff --git a/solid-lite/deviceinterface.cpp b/solid-lite/deviceinterface.cpp
index e9a54a7c0..3a8b7542c 100644
--- a/solid-lite/deviceinterface.cpp
+++ b/solid-lite/deviceinterface.cpp
@@ -23,7 +23,7 @@
 
 #include <solid-lite/ifaces/deviceinterface.h>
 
-#include <QtCore/QMetaEnum>
+#include <QMetaEnum>
 
 
 Solid::DeviceInterface::DeviceInterface(DeviceInterfacePrivate &dd, QObject *backendObject)
diff --git a/solid-lite/deviceinterface.h b/solid-lite/deviceinterface.h
index 6e4357f26..4bf143fc9 100644
--- a/solid-lite/deviceinterface.h
+++ b/solid-lite/deviceinterface.h
@@ -21,8 +21,8 @@
 #ifndef SOLID_DEVICEINTERFACE_H
 #define SOLID_DEVICEINTERFACE_H
 
-#include <QtCore/QObject>
-#include <QtCore/QBool>
+#include <QObject>
+#include <QBool>
 
 #include <solid-lite/solid_export.h>
 
diff --git a/solid-lite/deviceinterface_p.h b/solid-lite/deviceinterface_p.h
index 822e8249c..6163f3128 100644
--- a/solid-lite/deviceinterface_p.h
+++ b/solid-lite/deviceinterface_p.h
@@ -21,7 +21,7 @@
 #ifndef SOLID_DEVICEINTERFACE_P_H
 #define SOLID_DEVICEINTERFACE_P_H
 
-#include <QtCore/QWeakPointer>
+#include <QWeakPointer>
 
 namespace Solid
 {
diff --git a/solid-lite/devicemanager_p.h b/solid-lite/devicemanager_p.h
index 0d8bd8e77..6e7dcde7d 100644
--- a/solid-lite/devicemanager_p.h
+++ b/solid-lite/devicemanager_p.h
@@ -25,10 +25,10 @@
 
 #include "devicenotifier.h"
 
-#include <QtCore/QMap>
-#include <QtCore/QWeakPointer>
-#include <QtCore/QSharedData>
-#include <QtCore/QThreadStorage>
+#include <QMap>
+#include <QWeakPointer>
+#include <QSharedData>
+#include <QThreadStorage>
 
 namespace Solid
 {
diff --git a/solid-lite/devicenotifier.h b/solid-lite/devicenotifier.h
index e382529f8..24b747895 100644
--- a/solid-lite/devicenotifier.h
+++ b/solid-lite/devicenotifier.h
@@ -21,8 +21,8 @@
 #ifndef SOLID_DEVICENOTIFIER_H
 #define SOLID_DEVICENOTIFIER_H
 
-#include <QtCore/QObject>
-#include <QtCore/QList>
+#include <QObject>
+#include <QList>
 
 #include <solid-lite/solid_export.h>
 
diff --git a/solid-lite/genericinterface.h b/solid-lite/genericinterface.h
index 1b442314b..79b8d4b5e 100644
--- a/solid-lite/genericinterface.h
+++ b/solid-lite/genericinterface.h
@@ -21,8 +21,8 @@
 #ifndef SOLID_GENERICINTERFACE_H
 #define SOLID_GENERICINTERFACE_H
 
-#include <QtCore/QMap>
-#include <QtCore/QVariant>
+#include <QMap>
+#include <QVariant>
 
 #include <solid-lite/solid_export.h>
 #include <solid-lite/deviceinterface.h>
diff --git a/solid-lite/ifaces/device.cpp b/solid-lite/ifaces/device.cpp
index 29e185902..6fde454c1 100644
--- a/solid-lite/ifaces/device.cpp
+++ b/solid-lite/ifaces/device.cpp
@@ -20,8 +20,8 @@
 
 #include "ifaces/device.h"
 
-#include <QtDBus/QDBusConnection>
-#include <QtDBus/QDBusMessage>
+#include <QDBusConnection>
+#include <QDBusMessage>
 
 Solid::Ifaces::Device::Device(QObject *parent)
     : QObject(parent)
diff --git a/solid-lite/ifaces/device.h b/solid-lite/ifaces/device.h
index 18581b952..d8d4f8260 100644
--- a/solid-lite/ifaces/device.h
+++ b/solid-lite/ifaces/device.h
@@ -21,10 +21,10 @@
 #ifndef SOLID_IFACES_DEVICE_H
 #define SOLID_IFACES_DEVICE_H
 
-#include <QtCore/QObject>
-#include <QtCore/QVariant>
+#include <QObject>
+#include <QVariant>
 
-#include <QtCore/QMap>
+#include <QMap>
 
 #include <solid-lite/deviceinterface.h>
 #include <solid-lite/device.h>
diff --git a/solid-lite/ifaces/deviceinterface.h b/solid-lite/ifaces/deviceinterface.h
index 7cde0d85c..f5b09c883 100644
--- a/solid-lite/ifaces/deviceinterface.h
+++ b/solid-lite/ifaces/deviceinterface.h
@@ -21,8 +21,8 @@
 #ifndef SOLID_IFACES_DEVICEINTERFACE_H
 #define SOLID_IFACES_DEVICEINTERFACE_H
 
-#include <QtCore/QObject>
-#include <QtCore/QBool>
+#include <QObject>
+#include <QBool>
 
 namespace Solid
 {
diff --git a/solid-lite/ifaces/devicemanager.h b/solid-lite/ifaces/devicemanager.h
index ef0609faa..1e6a42e16 100644
--- a/solid-lite/ifaces/devicemanager.h
+++ b/solid-lite/ifaces/devicemanager.h
@@ -21,9 +21,9 @@
 #ifndef SOLID_IFACES_DEVICEMANAGER_H
 #define SOLID_IFACES_DEVICEMANAGER_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
-#include <QtCore/QStringList>
+#include <QStringList>
 
 #include <solid-lite/deviceinterface.h>
 
diff --git a/solid-lite/ifaces/genericinterface.h b/solid-lite/ifaces/genericinterface.h
index d4959bb5b..00274b3ac 100644
--- a/solid-lite/ifaces/genericinterface.h
+++ b/solid-lite/ifaces/genericinterface.h
@@ -21,10 +21,10 @@
 #ifndef SOLID_IFACES_GENERICINTERFACE_H
 #define SOLID_IFACES_GENERICINTERFACE_H
 
-#include <QtCore/QObject>
-#include <QtCore/QBool>
-#include <QtCore/QMap>
-#include <QtCore/QVariant>
+#include <QObject>
+#include <QBool>
+#include <QMap>
+#include <QVariant>
 
 namespace Solid
 {
diff --git a/solid-lite/managerbase_p.h b/solid-lite/managerbase_p.h
index 740e3e260..abbe6804b 100644
--- a/solid-lite/managerbase_p.h
+++ b/solid-lite/managerbase_p.h
@@ -21,8 +21,8 @@
 #ifndef SOLID_MANAGERBASE_P_H
 #define SOLID_MANAGERBASE_P_H
 
-#include <QtCore/QObject>
-#include <QtCore/QString>
+#include <QObject>
+#include <QString>
 
 #include "solid-lite/solid_export.h"
 
diff --git a/solid-lite/portablemediaplayer.h b/solid-lite/portablemediaplayer.h
index 360dee48b..8c5bfb091 100644
--- a/solid-lite/portablemediaplayer.h
+++ b/solid-lite/portablemediaplayer.h
@@ -23,8 +23,8 @@
 #ifndef SOLID_PORTABLEMEDIAPLAYER_H
 #define SOLID_PORTABLEMEDIAPLAYER_H
 
-#include <QtCore/QStringList>
-#include <QtCore/QVariant>
+#include <QStringList>
+#include <QVariant>
 
 #include <solid-lite/solid_export.h>
 
diff --git a/solid-lite/predicate.cpp b/solid-lite/predicate.cpp
index 050acd157..813afd2dc 100644
--- a/solid-lite/predicate.cpp
+++ b/solid-lite/predicate.cpp
@@ -22,8 +22,8 @@
 
 #include <solid-lite/device.h>
 #include <solid-lite/deviceinterface.h>
-#include <QtCore/QStringList>
-#include <QtCore/QMetaEnum>
+#include <QStringList>
+#include <QMetaEnum>
 
 namespace Solid
 {
diff --git a/solid-lite/predicate.h b/solid-lite/predicate.h
index 2d5ff535c..e9e075f20 100644
--- a/solid-lite/predicate.h
+++ b/solid-lite/predicate.h
@@ -21,8 +21,8 @@
 #ifndef SOLID_PREDICATE_H
 #define SOLID_PREDICATE_H
 
-#include <QtCore/QVariant>
-#include <QtCore/QSet>
+#include <QVariant>
+#include <QSet>
 
 #include <solid-lite/solid_export.h>
 
diff --git a/solid-lite/predicateparse.cpp b/solid-lite/predicateparse.cpp
index d51c2ff5a..7447813a7 100644
--- a/solid-lite/predicateparse.cpp
+++ b/solid-lite/predicateparse.cpp
@@ -30,8 +30,8 @@ void PredicateParse_mainParse(const char *_code);
 
 #include <stdlib.h>
 
-#include <QtCore/QStringList>
-#include <QtCore/QThreadStorage>
+#include <QStringList>
+#include <QThreadStorage>
 
 namespace Solid
 {
diff --git a/solid-lite/soliddefs_p.h b/solid-lite/soliddefs_p.h
index aee75a2ed..51d28e089 100644
--- a/solid-lite/soliddefs_p.h
+++ b/solid-lite/soliddefs_p.h
@@ -21,7 +21,7 @@
 #ifndef SOLID_SOLIDDEFS_P_H
 #define SOLID_SOLIDDEFS_P_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 #define return_SOLID_CALL(Type, Object, Default, Method) \
     Type t = qobject_cast<Type>(Object); \
diff --git a/solid-lite/solidnamespace.h b/solid-lite/solidnamespace.h
index f40b5cf9e..11dc093b2 100644
--- a/solid-lite/solidnamespace.h
+++ b/solid-lite/solidnamespace.h
@@ -35,7 +35,7 @@ namespace Solid
     };
 }
 
-#include <QtCore/QMetaType>
+#include <QMetaType>
 
 Q_DECLARE_METATYPE(Solid::ErrorType)
 
diff --git a/solid-lite/storageaccess.h b/solid-lite/storageaccess.h
index 447c55622..2a9b5ce0e 100644
--- a/solid-lite/storageaccess.h
+++ b/solid-lite/storageaccess.h
@@ -25,7 +25,7 @@
 
 #include <solid-lite/solidnamespace.h>
 #include <solid-lite/deviceinterface.h>
-#include <QtCore/QVariant>
+#include <QVariant>
 
 namespace Solid
 {
diff --git a/solid-lite/xdgbasedirs.cpp b/solid-lite/xdgbasedirs.cpp
index 4c9cad9c9..4a2c814ee 100644
--- a/solid-lite/xdgbasedirs.cpp
+++ b/solid-lite/xdgbasedirs.cpp
@@ -24,8 +24,8 @@
 
 #include "xdgbasedirs_p.h"
 
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
+#include <QDir>
+#include <QFileInfo>
 
 static QStringList splitPathList( const QString &pathList )
 {
diff --git a/support/action.cpp b/support/action.cpp
index 5d9d67ec2..41ecc5e9b 100644
--- a/support/action.cpp
+++ b/support/action.cpp
@@ -21,7 +21,7 @@
  ***************************************************************************/
 
 #include "action.h"
-#include <QtGui/QApplication>
+#include <QApplication>
 
 Action::Action(QObject *parent)
 #ifdef ENABLE_KDE_SUPPORT
diff --git a/support/action.h b/support/action.h
index 8d1b36f68..bc09f58f7 100644
--- a/support/action.h
+++ b/support/action.h
@@ -34,8 +34,8 @@ class Action : public KAction {
     Action(const QIcon &icon, const QString &text, QObject *parent, const QObject *receiver = 0, const char *slot = 0, const QKeySequence &shortcut = 0);
 };
 #else
-#include <QtGui/QShortcut>
-#include <QtGui/QAction>
+#include <QShortcut>
+#include <QAction>
 
 /// A specialized QWidgetAction, enhanced by some KDE features
 /** This declares/implements a subset of KAction's API (notably we've left out global shortcuts
diff --git a/support/actioncollection.cpp b/support/actioncollection.cpp
index 4e13f1363..da0960548 100644
--- a/support/actioncollection.cpp
+++ b/support/actioncollection.cpp
@@ -23,7 +23,7 @@
 #include "actioncollection.h"
 #include "action.h"
 #include "icon.h"
-#include <QtCore/QCoreApplication>
+#include <QCoreApplication>
 
 static const char *constProp="Category";
 static ActionCollection *coll=0;
@@ -78,7 +78,7 @@ Action * ActionCollection::createAction(const QString &name, const QString &text
 
 #ifndef ENABLE_KDE_SUPPORT
 
-#include <QtCore/QSettings>
+#include <QSettings>
 
 ActionCollection::ActionCollection(QObject *parent) : QObject(parent) {
   _connectTriggered = _connectHovered = false;
diff --git a/support/actioncollection.h b/support/actioncollection.h
index 7b5b5b9cc..9868f1bb5 100644
--- a/support/actioncollection.h
+++ b/support/actioncollection.h
@@ -43,10 +43,10 @@ class ActionCollection : public KActionCollection {
 
 #else
 
-#include <QtCore/QList>
-#include <QtCore/QMap>
-#include <QtCore/QObject>
-#include <QtCore/QString>
+#include <QList>
+#include <QMap>
+#include <QObject>
+#include <QString>
 
 class QWidget;
 class QAction;
diff --git a/support/buddylabel.h b/support/buddylabel.h
index d2d6b0f31..8ceeb43ca 100644
--- a/support/buddylabel.h
+++ b/support/buddylabel.h
@@ -24,9 +24,9 @@
 #ifndef BUDDYLABEL_H
 #define BUDDYLABEL_H
 
-#include <QtGui/QLabel>
-#include <QtGui/QCheckBox>
-#include <QtGui/QComboBox>
+#include <QLabel>
+#include <QCheckBox>
+#include <QComboBox>
 #include "spinbox.h"
 #ifndef ENABLE_KDE_SUPPORT
 #include "dirrequester.h"
diff --git a/support/capacitybar.h b/support/capacitybar.h
index 4002762e6..c6afcb0c4 100644
--- a/support/capacitybar.h
+++ b/support/capacitybar.h
@@ -42,7 +42,7 @@ public:
 };
 
 #else
-#include <QtGui/QProgressBar>
+#include <QProgressBar>
 class CapacityBar : public QProgressBar
 {
 public:
diff --git a/support/dialog.cpp b/support/dialog.cpp
index 4659ba081..ffe91a811 100644
--- a/support/dialog.cpp
+++ b/support/dialog.cpp
@@ -23,9 +23,9 @@
 
 #include "dialog.h"
 #include "icon.h"
-#include <QtGui/QDialogButtonBox>
-#include <QtGui/QPushButton>
-#include <QtGui/QBoxLayout>
+#include <QDialogButtonBox>
+#include <QPushButton>
+#include <QBoxLayout>
 
 static QDialogButtonBox::StandardButton mapType(int btn) {
     switch (btn) {
diff --git a/support/dialog.h b/support/dialog.h
index 0703c9b07..04dfe9ca0 100644
--- a/support/dialog.h
+++ b/support/dialog.h
@@ -29,8 +29,8 @@
 typedef KDialog Dialog;
 typedef KGuiItem GuiItem;
 #else
-#include <QtGui/QDialog>
-#include <QtCore/QMap>
+#include <QDialog>
+#include <QMap>
 
 struct GuiItem {
     GuiItem(const QString &t=QString(), const QString &i=QString())
diff --git a/support/dirrequester.cpp b/support/dirrequester.cpp
index a64edccbe..207beae4d 100644
--- a/support/dirrequester.cpp
+++ b/support/dirrequester.cpp
@@ -25,8 +25,8 @@
 #include "icon.h"
 #include "localize.h"
 #include "utils.h"
-#include <QtGui/QFileDialog>
-#include <QtGui/QHBoxLayout>
+#include <QFileDialog>
+#include <QHBoxLayout>
 
 DirRequester::DirRequester(QWidget *parent)
     : QWidget(parent)
diff --git a/support/dirrequester.h b/support/dirrequester.h
index 20471aae3..e15473e24 100644
--- a/support/dirrequester.h
+++ b/support/dirrequester.h
@@ -41,7 +41,7 @@ public:
 
 #else
 #include "lineedit.h"
-#include <QtGui/QToolButton>
+#include <QToolButton>
 class DirRequester : public QWidget
 {
     Q_OBJECT
diff --git a/support/fancytabwidget.cpp b/support/fancytabwidget.cpp
index 45ece9167..8f1c707c1 100644
--- a/support/fancytabwidget.cpp
+++ b/support/fancytabwidget.cpp
@@ -39,23 +39,23 @@
 #include "gtkstyle.h"
 // #include "stylehelper.h"
 
-// #include <QtGui/QColorDialog>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QMenu>
-#include <QtGui/QMouseEvent>
-#include <QtGui/QPainter>
-#include <QtGui/QSplitter>
-#include <QtGui/QStackedLayout>
-#include <QtGui/QStyleOptionTabV3>
-#include <QtGui/QStyleOptionViewItemV4>
-#include <QtGui/QToolButton>
-#include <QtGui/QToolTip>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QWindowsStyle>
-#include <QtGui/QApplication>
-#include <QtCore/QAnimationGroup>
-#include <QtCore/QPropertyAnimation>
-#include <QtCore/QSignalMapper>
+// #include <QColorDialog>
+#include <QHBoxLayout>
+#include <QMenu>
+#include <QMouseEvent>
+#include <QPainter>
+#include <QSplitter>
+#include <QStackedLayout>
+#include <QStyleOptionTabV3>
+#include <QStyleOptionViewItemV4>
+#include <QToolButton>
+#include <QToolTip>
+#include <QVBoxLayout>
+#include <QWindowsStyle>
+#include <QApplication>
+#include <QAnimationGroup>
+#include <QPropertyAnimation>
+#include <QSignalMapper>
 
 static inline Qt::TextElideMode elideMode()
 {
diff --git a/support/fancytabwidget.h b/support/fancytabwidget.h
index 5bc2b08da..f2ddd7706 100644
--- a/support/fancytabwidget.h
+++ b/support/fancytabwidget.h
@@ -36,13 +36,13 @@
 #ifndef FANCYTABWIDGET_H
 #define FANCYTABWIDGET_H
 
-#include <QtGui/QIcon>
-#include <QtGui/QProxyStyle>
-#include <QtGui/QTabBar>
-#include <QtGui/QWidget>
-#include <QtCore/QPropertyAnimation>
-#include <QtCore/QTimer>
-#include <QtCore/QScopedPointer>
+#include <QIcon>
+#include <QProxyStyle>
+#include <QTabBar>
+#include <QWidget>
+#include <QPropertyAnimation>
+#include <QTimer>
+#include <QScopedPointer>
 
 //#include <boost/scoped_ptr.hpp>
 
diff --git a/support/gtkstyle.cpp b/support/gtkstyle.cpp
index b978ac487..50f7c5122 100644
--- a/support/gtkstyle.cpp
+++ b/support/gtkstyle.cpp
@@ -22,11 +22,11 @@
  */
 
 #include "gtkstyle.h"
-#include <QtGui/QPainter>
-#include <QtGui/QStyleOptionViewItemV4>
-#include <QtGui/QApplication>
-#include <QtCore/QCache>
-#include <QtCore/qglobal.h>
+#include <QPainter>
+#include <QStyleOptionViewItemV4>
+#include <QApplication>
+#include <QCache>
+#include <qglobal.h>
 
 static bool usingGtkStyle=false;
 static bool useFullGtkStyle=false;
diff --git a/support/icon.cpp b/support/icon.cpp
index 7fed17f9b..ec4304f23 100644
--- a/support/icon.cpp
+++ b/support/icon.cpp
@@ -22,8 +22,8 @@
  */
 
 #include "icon.h"
-#include <QtGui/QApplication>
-#include <QtGui/QToolButton>
+#include <QApplication>
+#include <QToolButton>
 
 int Icon::stdSize(int v)
 {
diff --git a/support/icon.h b/support/icon.h
index c3933242a..f99361d98 100644
--- a/support/icon.h
+++ b/support/icon.h
@@ -27,7 +27,7 @@
 #ifdef ENABLE_KDE_SUPPORT
 #include <KDE/KIcon>
 #else
-#include <QtGui/QIcon>
+#include <QIcon>
 #endif
 
 class QToolButton;
diff --git a/support/inputdialog.h b/support/inputdialog.h
index 8df8eacb8..b72c06c94 100644
--- a/support/inputdialog.h
+++ b/support/inputdialog.h
@@ -24,7 +24,7 @@
 #ifndef INPUT_DIALOG_H
 #define INPUT_DIALOG_H
 
-#include <QtGui/QInputDialog>
+#include <QInputDialog>
 #ifdef ENABLE_KDE_SUPPORT
 #include <KDE/KInputDialog>
 #endif
diff --git a/support/keysequencewidget.cpp b/support/keysequencewidget.cpp
index 953760484..998da9250 100644
--- a/support/keysequencewidget.cpp
+++ b/support/keysequencewidget.cpp
@@ -25,11 +25,11 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include <QtGui/QApplication>
-#include <QtGui/QKeyEvent>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QMessageBox>
-#include <QtGui/QToolButton>
+#include <QApplication>
+#include <QKeyEvent>
+#include <QHBoxLayout>
+#include <QMessageBox>
+#include <QToolButton>
 
 // This defines the unicode symbols for special keys (kCommandUnicode and friends)
 #ifdef Q_WS_MAC
diff --git a/support/keysequencewidget.h b/support/keysequencewidget.h
index 39935ebc0..fd841f178 100644
--- a/support/keysequencewidget.h
+++ b/support/keysequencewidget.h
@@ -28,9 +28,9 @@
 #ifndef KEYSEQUENCEWIDGET_H
 #define KEYSEQUENCEWIDGET_H
 
-#include <QtGui/QKeySequence>
-#include <QtGui/QPushButton>
-#include <QtCore/QSet>
+#include <QKeySequence>
+#include <QPushButton>
+#include <QSet>
 #include "shortcutsmodel.h"
 
 class Action;
diff --git a/support/kmessagewidget.cpp b/support/kmessagewidget.cpp
index f53115109..11b50d10c 100644
--- a/support/kmessagewidget.cpp
+++ b/support/kmessagewidget.cpp
@@ -30,16 +30,16 @@
 #endif
 
 #include "icon.h"
-#include <QtCore/QEvent>
-#include <QtGui/QGridLayout>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QLabel>
-#include <QtGui/QPainter>
-#include <QtGui/QShowEvent>
-#include <QtCore/QTimeLine>
-#include <QtGui/QToolButton>
-#include <QtGui/QStyle>
-#include <QtGui/QAction>
+#include <QEvent>
+#include <QGridLayout>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QPainter>
+#include <QShowEvent>
+#include <QTimeLine>
+#include <QToolButton>
+#include <QStyle>
+#include <QAction>
 
 //---------------------------------------------------------------------
 // KMsgWidgetPrivate
diff --git a/support/kmessagewidget.h b/support/kmessagewidget.h
index bb9e8d90e..a6bfc7d60 100644
--- a/support/kmessagewidget.h
+++ b/support/kmessagewidget.h
@@ -20,7 +20,7 @@
 #ifndef KMESSAGEWIDGET_H
 #define KMESSAGEWIDGET_H
 
-#include <QtGui/QFrame>
+#include <QFrame>
 
 class KMsgWidgetPrivate;
 
diff --git a/support/lineedit.cpp b/support/lineedit.cpp
index b6081e0ee..34ad6b860 100644
--- a/support/lineedit.cpp
+++ b/support/lineedit.cpp
@@ -33,8 +33,8 @@
 #include "lineedit.h"
 #include "icon.h"
 #include "config.h"
-#include <QtGui/QToolButton>
-#include <QtGui/QStyle>
+#include <QToolButton>
+#include <QStyle>
 
 LineEdit::LineEdit(QWidget *parent)
     : QLineEdit(parent)
diff --git a/support/lineedit.h b/support/lineedit.h
index 4f8b36c24..494bcf43e 100644
--- a/support/lineedit.h
+++ b/support/lineedit.h
@@ -33,7 +33,7 @@
 #ifndef LINEEDIT_H
 #define LINEEDIT_H
 
-#include <QtGui/QApplication>
+#include <QApplication>
 #ifdef ENABLE_KDE_SUPPORT
 #include <KDE/KLineEdit>
 class LineEdit : public KLineEdit
@@ -57,7 +57,7 @@ public:
 };
 
 #else
-#include <QtGui/QLineEdit>
+#include <QLineEdit>
 
 class QToolButton;
 
diff --git a/support/localize.h b/support/localize.h
index 1ca3067c8..4d211db07 100644
--- a/support/localize.h
+++ b/support/localize.h
@@ -27,7 +27,7 @@
 #ifdef ENABLE_KDE_SUPPORT
 #include <KDE/KLocalizedString>
 #else
-#include <QtCore/QObject>
+#include <QObject>
 #include "qtplural.h"
 #define i18n QObject::tr
 #define i18nc(A, B) QObject::tr(B, A)
diff --git a/support/messagebox.cpp b/support/messagebox.cpp
index 69d33cc00..34237cf99 100644
--- a/support/messagebox.cpp
+++ b/support/messagebox.cpp
@@ -23,7 +23,7 @@
 
 #include "messagebox.h"
 #include "icon.h"
-#include <QtGui/QAbstractButton>
+#include <QAbstractButton>
 
 MessageBox::ButtonCode map(QMessageBox::StandardButton c)
 {
diff --git a/support/messagebox.h b/support/messagebox.h
index 0187e9daa..4614a09d4 100644
--- a/support/messagebox.h
+++ b/support/messagebox.h
@@ -29,7 +29,7 @@
 #include <KDE/KMessageBox>
 typedef KMessageBox MessageBox;
 #else
-#include <QtGui/QMessageBox>
+#include <QMessageBox>
 #include "localize.h"
 
 namespace MessageBox {
diff --git a/support/onoffbutton.cpp b/support/onoffbutton.cpp
index 6c2e514ce..38ce713ec 100644
--- a/support/onoffbutton.cpp
+++ b/support/onoffbutton.cpp
@@ -26,10 +26,10 @@
 #include "onoffbutton.h"
 #include "localize.h"
 #include "gtkstyle.h"
-#include <QtGui/QFontMetrics>
-#include <QtGui/QPainter>
-#include <QtGui/QPainterPath>
-#include <QtGui/QLinearGradient>
+#include <QFontMetrics>
+#include <QPainter>
+#include <QPainterPath>
+#include <QLinearGradient>
 
 static QString onText;
 static QString offText;
diff --git a/support/onoffbutton.h b/support/onoffbutton.h
index 367a80f6f..5aa1e0d4e 100644
--- a/support/onoffbutton.h
+++ b/support/onoffbutton.h
@@ -24,7 +24,7 @@
 #ifndef ONOFF_BUTTON_H
 #define ONOFF_BUTTON_H
 
-#include <QtGui/QCheckBox>
+#include <QCheckBox>
 
 #ifdef Q_OS_WIN
 typedef QCheckBox OnOffButton;
diff --git a/support/pagewidget.cpp b/support/pagewidget.cpp
index 30add6a32..341ea7d53 100644
--- a/support/pagewidget.cpp
+++ b/support/pagewidget.cpp
@@ -23,10 +23,10 @@
 
 #include "pagewidget.h"
 #include "icon.h"
-#include <QtGui/QBoxLayout>
-#include <QtGui/QLabel>
-#include <QtGui/QSizePolicy>
-#include <QtGui/QApplication>
+#include <QBoxLayout>
+#include <QLabel>
+#include <QSizePolicy>
+#include <QApplication>
 
 PageWidgetItem::PageWidgetItem(QWidget *p, const QString &header, const Icon &icon, QWidget *cfg)
     : QWidget(p) {
diff --git a/support/shortcutssettingspage.cpp b/support/shortcutssettingspage.cpp
index 85e84b252..1b90468fd 100644
--- a/support/shortcutssettingspage.cpp
+++ b/support/shortcutssettingspage.cpp
@@ -19,7 +19,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include <QtCore/QTimer>
+#include <QTimer>
 
 #include "shortcutssettingspage.h"
 #include "action.h"
diff --git a/support/shortcutssettingspage.h b/support/shortcutssettingspage.h
index 202a5b1de..fea65d292 100644
--- a/support/shortcutssettingspage.h
+++ b/support/shortcutssettingspage.h
@@ -21,7 +21,7 @@
 #ifndef SHORTCUTSSETTINGSPAGE_H
 #define SHORTCUTSSETTINGSPAGE_H
 
-#include <QtGui/QSortFilterProxyModel>
+#include <QSortFilterProxyModel>
 #include "ui_shortcutssettingspage.h"
 
 class ActionCollection;
diff --git a/support/spinbox.cpp b/support/spinbox.cpp
index 02160d0e5..37626a8c7 100644
--- a/support/spinbox.cpp
+++ b/support/spinbox.cpp
@@ -24,18 +24,18 @@
 #include "spinbox.h"
 #include "icon.h"
 #include "gtkstyle.h"
-#include <QtGui/QToolButton>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QSpacerItem>
-#include <QtGui/QApplication>
-#include <QtGui/QWheelEvent>
-#include <QtGui/QApplication>
-#include <QtGui/QPixmap>
-#include <QtGui/QFont>
-#include <QtGui/QPainter>
-#include <QtGui/QPalette>
-#include <QtGui/QStyle>
-#include <QtGui/QStyleOption>
+#include <QToolButton>
+#include <QHBoxLayout>
+#include <QSpacerItem>
+#include <QApplication>
+#include <QWheelEvent>
+#include <QApplication>
+#include <QPixmap>
+#include <QFont>
+#include <QPainter>
+#include <QPalette>
+#include <QStyle>
+#include <QStyleOption>
 
 static Icon incIcon;
 static Icon decIcon;
diff --git a/support/spinbox.h b/support/spinbox.h
index 09cae3640..f8db3201c 100644
--- a/support/spinbox.h
+++ b/support/spinbox.h
@@ -24,8 +24,8 @@
 #ifndef SPINBOX_H
 #define SPINBOX_H
 
-#include <QtGui/QSpinBox>
-#include <QtGui/QFontMetrics>
+#include <QSpinBox>
+#include <QFontMetrics>
 
 class EmptySpinBox : public QSpinBox
 {
diff --git a/support/spinner.cpp b/support/spinner.cpp
index da69702d8..c919c12fe 100644
--- a/support/spinner.cpp
+++ b/support/spinner.cpp
@@ -24,7 +24,7 @@
 #include "spinner.h"
 
 #ifdef ENABLE_KDE_SUPPORT
-#include <QtGui/QApplication>
+#include <QApplication>
 
 Spinner::Spinner(QObject *p)
     : KPixmapSequenceOverlayPainter(p)
@@ -47,9 +47,9 @@ void Spinner::stop()
 }
 
 #else
-#include <QtGui/QPainter>
-#include <QtGui/QPaintEvent>
-#include <QtCore/QTimer>
+#include <QPainter>
+#include <QPaintEvent>
+#include <QTimer>
 
 Spinner::Spinner(QObject *p)
     : QWidget(0)
diff --git a/support/spinner.h b/support/spinner.h
index b9a5ba7c9..a7a9ac659 100644
--- a/support/spinner.h
+++ b/support/spinner.h
@@ -37,7 +37,7 @@ private:
     bool active;
 };
 #else
-#include <QtGui/QWidget>
+#include <QWidget>
 class QTimer;
 class Spinner : public QWidget
 {
diff --git a/support/squeezedtextlabel.h b/support/squeezedtextlabel.h
index f48e35f75..2d7177102 100644
--- a/support/squeezedtextlabel.h
+++ b/support/squeezedtextlabel.h
@@ -37,8 +37,8 @@ public:
     }
 };
 #else
-#include <QtGui/QLabel>
-#include <QtGui/QFontMetrics>
+#include <QLabel>
+#include <QFontMetrics>
 class QResizeEvent;
 
 class SqueezedTextLabel : public QLabel
diff --git a/support/urllabel.h b/support/urllabel.h
index 7c15cf041..d1838015e 100644
--- a/support/urllabel.h
+++ b/support/urllabel.h
@@ -28,8 +28,8 @@
 #include <KDE/KUrlLabel>
 typedef KUrlLabel UrlLabel;
 #else
-#include <QtGui/QLabel>
-#include <QtGui/QFont>
+#include <QLabel>
+#include <QFont>
 class QResizeEvent;
 
 class UrlLabel : public QLabel
diff --git a/support/utils.cpp b/support/utils.cpp
index e97bdbab6..fe978b36a 100644
--- a/support/utils.cpp
+++ b/support/utils.cpp
@@ -26,11 +26,11 @@
 #include "mpdparseutils.h"
 #include "covers.h"
 #include "localize.h"
-#include <QtCore/QFile>
-#include <QtCore/QDir>
-#include <QtCore/QSet>
-#include <QtCore/QThread>
-#include <QtCore/QCoreApplication>
+#include <QFile>
+#include <QDir>
+#include <QSet>
+#include <QThread>
+#include <QCoreApplication>
 #ifdef ENABLE_KDE_SUPPORT
 #include <KDE/KStandardDirs>
 #endif
@@ -38,7 +38,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #ifdef Q_OS_WIN
-#include <QtGui/QDesktopServices>
+#include <QDesktopServices>
 #endif
 #ifndef Q_OS_WIN
 #include <grp.h>
@@ -236,7 +236,7 @@ void Utils::stopThread(QThread *thread)
 
 #ifndef ENABLE_KDE_SUPPORT
 // Copied from KDE... START
-#include <QtCore/QLocale>
+#include <QLocale>
 
 QString Utils::formatByteSize(double size)
 {
diff --git a/support/utils.h b/support/utils.h
index 686f9a5c1..34da194d9 100644
--- a/support/utils.h
+++ b/support/utils.h
@@ -26,8 +26,8 @@
 
 #include <math.h>
 #include <sys/types.h>
-#include <QtCore/qglobal.h>
-#include <QtCore/QString>
+#include <qglobal.h>
+#include <QString>
 #ifdef ENABLE_KDE_SUPPORT
 #include <KDE/KGlobal>
 #include <KDE/KLocale>
diff --git a/widgets/actionitemdelegate.cpp b/widgets/actionitemdelegate.cpp
index 94871a59c..e8bfe7158 100644
--- a/widgets/actionitemdelegate.cpp
+++ b/widgets/actionitemdelegate.cpp
@@ -26,12 +26,12 @@
 #include "icon.h"
 #include "config.h"
 #include "groupedview.h"
-#include <QtGui/QPainter>
-#include <QtGui/QAction>
-#include <QtGui/QPixmap>
-#include <QtGui/QListView>
-#include <QtGui/QHelpEvent>
-#include <QtGui/QToolTip>
+#include <QPainter>
+#include <QAction>
+#include <QPixmap>
+#include <QListView>
+#include <QHelpEvent>
+#include <QToolTip>
 
 int ActionItemDelegate::constBorder = 1;
 int ActionItemDelegate::constActionBorder = 4;
diff --git a/widgets/actionitemdelegate.h b/widgets/actionitemdelegate.h
index a1a8c85b3..874553cea 100644
--- a/widgets/actionitemdelegate.h
+++ b/widgets/actionitemdelegate.h
@@ -24,7 +24,7 @@
 #ifndef ACTIONITEMDELEGATE_H
 #define ACTIONITEMDELEGATE_H
 
-#include <QtGui/QStyledItemDelegate>
+#include <QStyledItemDelegate>
 
 class QAction;
 
diff --git a/widgets/actionlabel.cpp b/widgets/actionlabel.cpp
index 20447fed5..ebeec7030 100644
--- a/widgets/actionlabel.cpp
+++ b/widgets/actionlabel.cpp
@@ -25,12 +25,12 @@
 #ifdef ENABLE_KDE_SUPPORT
 #include <KDE/KIconLoader>
 #else
-#include <QtGui/QIcon>
+#include <QIcon>
 #endif
-#include <QtGui/QLabel>
-#include <QtCore/QTimer>
-#include <QtGui/QPixmap>
-#include <QtGui/QMatrix>
+#include <QLabel>
+#include <QTimer>
+#include <QPixmap>
+#include <QMatrix>
 
 // Borrowed from kolourpaint...
 static QMatrix matrixWithZeroOrigin(const QMatrix &matrix, int width, int height)
diff --git a/widgets/actionlabel.h b/widgets/actionlabel.h
index dfbae3ec9..af175f1e1 100644
--- a/widgets/actionlabel.h
+++ b/widgets/actionlabel.h
@@ -24,7 +24,7 @@
 #ifndef __ACTION_LABEL_H__
 #define __ACTION_LABEL_H__
 
-#include <QtGui/QLabel>
+#include <QLabel>
 
 class QTimer;
 class QLabel;
diff --git a/widgets/autohidingsplitter.cpp b/widgets/autohidingsplitter.cpp
index d985c72f5..07dedddac 100644
--- a/widgets/autohidingsplitter.cpp
+++ b/widgets/autohidingsplitter.cpp
@@ -23,12 +23,12 @@
  */
 
 #include "autohidingsplitter.h"
-#include <QtGui/QSplitterHandle>
-#include <QtCore/QTimer>
-#include <QtCore/QChildEvent>
-#include <QtGui/QResizeEvent>
-#include <QtGui/QComboBox>
-#include <QtGui/QMenu>
+#include <QSplitterHandle>
+#include <QTimer>
+#include <QChildEvent>
+#include <QResizeEvent>
+#include <QComboBox>
+#include <QMenu>
 
 class SplitterSizeAnimation:public QVariantAnimation
 {
diff --git a/widgets/autohidingsplitter.h b/widgets/autohidingsplitter.h
index e7a7d9935..020f1cb3c 100644
--- a/widgets/autohidingsplitter.h
+++ b/widgets/autohidingsplitter.h
@@ -26,13 +26,13 @@
 #define AUTOHIDINGSPLITTER_H
 
 #include "config.h"
-#include <QtGui/QSplitter>
+#include <QSplitter>
 
-#include <QtCore/QList>
-#include <QtCore/QQueue>
-#include <QtCore/QVariantAnimation>
-#include <QtCore/QSet>
-#include <QtGui/QAbstractItemView>
+#include <QList>
+#include <QQueue>
+#include <QVariantAnimation>
+#include <QSet>
+#include <QAbstractItemView>
 
 Q_DECLARE_METATYPE(QList<int>)
 
diff --git a/widgets/completioncombo.h b/widgets/completioncombo.h
index cf3bcfb6d..265709c11 100644
--- a/widgets/completioncombo.h
+++ b/widgets/completioncombo.h
@@ -28,7 +28,7 @@
 #include <KDE/KComboBox>
 #include <KDE/KLineEdit>
 #include <KDE/KGlobalSettings>
-#include <QtGui/QAbstractItemView>
+#include <QAbstractItemView>
 
 class CompletionCombo : public KComboBox
 {
@@ -67,8 +67,8 @@ public:
     }
 };
 #else
-#include <QtGui/QComboBox>
-#include <QtGui/QLineEdit>
+#include <QComboBox>
+#include <QLineEdit>
 
 class CompletionCombo : public QComboBox
 {
diff --git a/widgets/coverwidget.cpp b/widgets/coverwidget.cpp
index e9dd8d945..2f2629f55 100644
--- a/widgets/coverwidget.cpp
+++ b/widgets/coverwidget.cpp
@@ -26,13 +26,13 @@
 #include "config.h"
 #include "localize.h"
 #include "icons.h"
-#include <QtGui/QPixmap>
-#include <QtGui/QPainter>
-#include <QtCore/QBuffer>
-#include <QtCore/QEvent>
-#include <QtCore/QFile>
-#include <QtCore/QTimer>
-#include <QtCore/QVariant>
+#include <QPixmap>
+#include <QPainter>
+#include <QBuffer>
+#include <QEvent>
+#include <QFile>
+#include <QTimer>
+#include <QVariant>
 
 static QString encode(const QImage &img)
 {
diff --git a/widgets/coverwidget.h b/widgets/coverwidget.h
index de77213e8..27fd9bf0c 100644
--- a/widgets/coverwidget.h
+++ b/widgets/coverwidget.h
@@ -24,8 +24,8 @@
 #ifndef COVERWIDGET_H
 #define COVERWIDGET_H
 
-#include <QtGui/QLabel>
-#include <QtGui/QImage>
+#include <QLabel>
+#include <QImage>
 #include "song.h"
 
 class QPixmap;
diff --git a/widgets/genrecombo.h b/widgets/genrecombo.h
index d9048da12..3a51a7a1e 100644
--- a/widgets/genrecombo.h
+++ b/widgets/genrecombo.h
@@ -24,8 +24,8 @@
 #ifndef GENRECOMBO_H
 #define GENRECOMBO_H
 
-#include <QtGui/QComboBox>
-#include <QtCore/QSet>
+#include <QComboBox>
+#include <QSet>
 
 class GenreCombo : public QComboBox
 {
diff --git a/widgets/groupedview.cpp b/widgets/groupedview.cpp
index 37b7c6986..43424f9b5 100644
--- a/widgets/groupedview.cpp
+++ b/widgets/groupedview.cpp
@@ -31,13 +31,13 @@
 #include "localize.h"
 #include "icons.h"
 #include "gtkstyle.h"
-#include <QtGui/QStyledItemDelegate>
-#include <QtGui/QApplication>
-#include <QtGui/QFontMetrics>
-#include <QtGui/QPainter>
-#include <QtGui/QLinearGradient>
-#include <QtGui/QAction>
-#include <QtGui/QDropEvent>
+#include <QStyledItemDelegate>
+#include <QApplication>
+#include <QFontMetrics>
+#include <QPainter>
+#include <QLinearGradient>
+#include <QAction>
+#include <QDropEvent>
 
 static int constCoverSize=32;
 static int constIconSize=16;
diff --git a/widgets/groupedview.h b/widgets/groupedview.h
index b407bc29c..d39879cfa 100644
--- a/widgets/groupedview.h
+++ b/widgets/groupedview.h
@@ -24,7 +24,7 @@
 #ifndef GROUPEDVIEW_H
 #define GROUPEDVIEW_H
 
-#include <QtCore/QSet>
+#include <QSet>
 #include "treeview.h"
 class Song;
 
diff --git a/widgets/icons.cpp b/widgets/icons.cpp
index f67192796..7ba012140 100644
--- a/widgets/icons.cpp
+++ b/widgets/icons.cpp
@@ -22,12 +22,12 @@
  */
 
 #include "icons.h"
-#include <QtGui/QApplication>
-#include <QtGui/QPixmap>
-#include <QtGui/QFont>
-#include <QtGui/QPainter>
-#include <QtGui/QPalette>
-#include <QtCore/QDir>
+#include <QApplication>
+#include <QPixmap>
+#include <QFont>
+#include <QPainter>
+#include <QPalette>
+#include <QDir>
 #include <math.h>
 
 static QList<int> constStdSizes=QList<int>() << 16 << 22 << 32 << 48;
diff --git a/widgets/itemview.cpp b/widgets/itemview.cpp
index a9474c53c..5d74dc804 100644
--- a/widgets/itemview.cpp
+++ b/widgets/itemview.cpp
@@ -32,12 +32,12 @@
 #include "config.h"
 #include "gtkstyle.h"
 #include "spinner.h"
-#include <QtGui/QToolButton>
-#include <QtGui/QStyle>
-#include <QtGui/QStyleOptionViewItem>
-#include <QtGui/QPainter>
-#include <QtGui/QAction>
-#include <QtCore/QTimer>
+#include <QToolButton>
+#include <QStyle>
+#include <QStyleOptionViewItem>
+#include <QPainter>
+#include <QAction>
+#include <QTimer>
 #ifdef ENABLE_KDE_SUPPORT
 #include <KDE/KGlobalSettings>
 #endif
diff --git a/widgets/itemview.h b/widgets/itemview.h
index 2b7cb79e9..870cba03a 100644
--- a/widgets/itemview.h
+++ b/widgets/itemview.h
@@ -25,7 +25,7 @@
 #define ITEMVIEW_H
 
 #include "ui_itemview.h"
-#include <QtCore/QMap>
+#include <QMap>
 
 class ProxyModel;
 class Spinner;
diff --git a/widgets/listview.cpp b/widgets/listview.cpp
index e7b5fb70c..1db7b3ffb 100644
--- a/widgets/listview.cpp
+++ b/widgets/listview.cpp
@@ -25,10 +25,10 @@
 #include "itemview.h"
 #include "config.h"
 #include "icons.h"
-#include <QtCore/QMimeData>
-#include <QtGui/QDrag>
-#include <QtGui/QMouseEvent>
-#include <QtGui/QMenu>
+#include <QMimeData>
+#include <QDrag>
+#include <QMouseEvent>
+#include <QMenu>
 
 ListView::ListView(QWidget *parent)
         : QListView(parent)
diff --git a/widgets/listview.h b/widgets/listview.h
index 13a1f791a..15f871b79 100644
--- a/widgets/listview.h
+++ b/widgets/listview.h
@@ -24,7 +24,7 @@
 #ifndef LISTVIEW_H
 #define LISTVIEW_H
 
-#include <QtGui/QListView>
+#include <QListView>
 
 class QMenu;
 class ListView : public QListView
diff --git a/widgets/playqueueview.cpp b/widgets/playqueueview.cpp
index 607c4459e..3369bd7d9 100644
--- a/widgets/playqueueview.cpp
+++ b/widgets/playqueueview.cpp
@@ -29,10 +29,10 @@
 #include "settings.h"
 #include "mpdstatus.h"
 #include "localize.h"
-#include <QtGui/QHeaderView>
-#include <QtGui/QMenu>
-#include <QtGui/QAction>
-#include <QtCore/QFile>
+#include <QHeaderView>
+#include <QMenu>
+#include <QAction>
+#include <QFile>
 
 PlayQueueTreeView::PlayQueueTreeView(QWidget *parent)
     : TreeView(parent)
diff --git a/widgets/playqueueview.h b/widgets/playqueueview.h
index 9117171db..f45227622 100644
--- a/widgets/playqueueview.h
+++ b/widgets/playqueueview.h
@@ -24,9 +24,9 @@
 #ifndef PLAYQUEUEVIEW_H
 #define PLAYQUEUEVIEW_H
 
-#include <QtGui/QStackedWidget>
-#include <QtGui/QAbstractItemView>
-#include <QtCore/QSet>
+#include <QStackedWidget>
+#include <QAbstractItemView>
+#include <QSet>
 #include "treeview.h"
 #include "song.h"
 
diff --git a/widgets/textbrowser.cpp b/widgets/textbrowser.cpp
index 19c2c0c70..9772763f9 100644
--- a/widgets/textbrowser.cpp
+++ b/widgets/textbrowser.cpp
@@ -22,7 +22,7 @@
  */
 
 #include "textbrowser.h"
-#include <QtGui/QPainter>
+#include <QPainter>
 
 static const int constMinSize=300;
 
diff --git a/widgets/textbrowser.h b/widgets/textbrowser.h
index 7ad5262c2..0daec18e4 100644
--- a/widgets/textbrowser.h
+++ b/widgets/textbrowser.h
@@ -24,9 +24,9 @@
 #ifndef TEXTBROWSER_H
 #define TEXTBROWSER_H
 
-#include <QtGui/QTextBrowser>
-#include <QtGui/QImage>
-#include <QtCore/QDebug>
+#include <QTextBrowser>
+#include <QImage>
+#include <QDebug>
 
 class TextBrowser : public QTextBrowser
 {
diff --git a/widgets/timeslider.cpp b/widgets/timeslider.cpp
index ff7fc5985..6976374d7 100644
--- a/widgets/timeslider.cpp
+++ b/widgets/timeslider.cpp
@@ -22,7 +22,7 @@
  */
 
 #include "timeslider.h"
-#include <QtCore/QTimer>
+#include <QTimer>
 
 TimeSlider::TimeSlider(QWidget *p)
     : QSlider(p)
diff --git a/widgets/timeslider.h b/widgets/timeslider.h
index 70f809632..7a5e21e3c 100644
--- a/widgets/timeslider.h
+++ b/widgets/timeslider.h
@@ -24,8 +24,8 @@
 #ifndef TIMESLIDER_H
 #define TIMESLIDER_H
 
-#include <QtGui/QSlider>
-#include <QtCore/QTime>
+#include <QSlider>
+#include <QTime>
 class QTimer;
 
 class TimeSlider : public QSlider
diff --git a/widgets/treeview.cpp b/widgets/treeview.cpp
index 5ca98f4bc..9065c9940 100644
--- a/widgets/treeview.cpp
+++ b/widgets/treeview.cpp
@@ -25,12 +25,12 @@
 #include "itemview.h"
 #include "icons.h"
 #include "config.h"
-#include <QtGui/QMouseEvent>
-#include <QtGui/QPaintEvent>
-#include <QtGui/QPainter>
-#include <QtGui/QDrag>
-#include <QtCore/QMimeData>
-#include <QtCore/QMap>
+#include <QMouseEvent>
+#include <QPaintEvent>
+#include <QPainter>
+#include <QDrag>
+#include <QMimeData>
+#include <QMap>
 
 TreeView::TreeView(QWidget *parent)
         : QTreeView(parent)
diff --git a/widgets/treeview.h b/widgets/treeview.h
index 15cec2574..cf171387b 100644
--- a/widgets/treeview.h
+++ b/widgets/treeview.h
@@ -24,7 +24,7 @@
 #ifndef TREEVIEW_H
 #define TREEVIEW_H
 
-#include <QtGui/QTreeView>
+#include <QTreeView>
 
 class TreeView : public QTreeView
 {
diff --git a/widgets/volumecontrol.cpp b/widgets/volumecontrol.cpp
index 77acc3d17..82b748798 100644
--- a/widgets/volumecontrol.cpp
+++ b/widgets/volumecontrol.cpp
@@ -23,11 +23,11 @@
 
 #include "volumecontrol.h"
 #include "icon.h"
-#include <QtGui/QFrame>
-#include <QtGui/QSlider>
-#include <QtGui/QLabel>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QApplication>
+#include <QFrame>
+#include <QSlider>
+#include <QLabel>
+#include <QVBoxLayout>
+#include <QApplication>
 
 VolumeControl::VolumeControl(QWidget *parent)
     : QMenu(parent)
diff --git a/widgets/volumecontrol.h b/widgets/volumecontrol.h
index db9e4842f..1aaffaf53 100644
--- a/widgets/volumecontrol.h
+++ b/widgets/volumecontrol.h
@@ -24,7 +24,7 @@
 #ifndef VOLUMECONTROL_H
 #define VOLUMECONTROL_H
 
-#include <QtGui/QMenu>
+#include <QMenu>
 
 class QSlider;