From a333c0d7446e38c3ec93f41c6761a64dbf6f6b0d Mon Sep 17 00:00:00 2001
From: Dirk Mueller <mueller@kde.org>
Date: Wed, 9 May 2007 22:23:52 +0000
Subject: [PATCH] include cleanup

svn path=/trunk/KDE/kdebase/apps/; revision=663054
---
 src/columnviewsettingspage.cpp    | 16 ++++++++--------
 src/detailsviewsettingspage.cpp   | 16 ++++++++--------
 src/dolphinapplication.cpp        |  2 +-
 src/dolphincolumnview.cpp         |  4 ++--
 src/dolphincolumnview.h           |  4 ++--
 src/dolphincontextmenu.cpp        |  8 ++++----
 src/dolphincontextmenu.h          |  4 ++--
 src/dolphincontroller.h           |  2 +-
 src/dolphindetailsview.cpp        |  2 +-
 src/dolphindetailsview.h          |  4 ++--
 src/dolphiniconsview.cpp          |  4 ++--
 src/dolphiniconsview.h            |  2 +-
 src/dolphinitemcategorizer.cpp    |  2 +-
 src/dolphinmainwindow.cpp         |  8 ++++----
 src/dolphinmainwindow.h           |  2 +-
 src/dolphinsortfilterproxymodel.h |  2 +-
 src/dolphinstatusbar.cpp          |  6 +++---
 src/dolphinview.cpp               | 15 +++++++--------
 src/dolphinview.h                 | 11 +++++------
 src/filterbar.cpp                 |  8 ++++----
 src/filterbar.h                   |  2 +-
 src/generalsettingspage.cpp       | 12 ++++++------
 src/generalviewsettingspage.cpp   | 12 ++++++------
 src/iconsizedialog.cpp            |  8 ++++----
 src/iconsviewsettingspage.cpp     | 16 ++++++++--------
 src/infosidebarpage.cpp           | 22 +++++++++++-----------
 src/infosidebarpage.h             |  8 ++++----
 src/klistview.cpp                 |  8 ++++----
 src/klistview.h                   |  2 +-
 src/libdolphin_export.h           |  2 +-
 src/metadatawidget.cpp            |  6 +++---
 src/metadatawidget.h              |  2 +-
 src/pixmapviewer.cpp              |  2 +-
 src/pixmapviewer.h                |  2 +-
 src/renamedialog.cpp              |  4 ++--
 src/sidebarpage.cpp               |  2 +-
 src/sidebarpage.h                 |  2 +-
 src/sidebartreeview.cpp           |  5 ++---
 src/sidebartreeview.h             |  2 +-
 src/statusbarmessagelabel.cpp     | 13 ++++++-------
 src/statusbarmessagelabel.h       |  6 +++---
 src/statusbarspaceinfo.cpp        |  2 +-
 src/statusbarspaceinfo.h          |  2 +-
 src/terminalsidebarpage.cpp       |  2 +-
 src/treeviewcontextmenu.cpp       |  4 ++--
 src/treeviewcontextmenu.h         |  2 +-
 src/treeviewsidebarpage.cpp       |  8 ++++----
 src/viewproperties.cpp            |  6 +++---
 src/viewpropertiesdialog.cpp      | 16 ++++++++--------
 src/viewpropsprogressinfo.cpp     |  8 ++++----
 src/viewsettingspage.cpp          |  8 ++++----
 51 files changed, 157 insertions(+), 161 deletions(-)

diff --git a/src/columnviewsettingspage.cpp b/src/columnviewsettingspage.cpp
index 6a25e7e42e..f843ca0fa5 100644
--- a/src/columnviewsettingspage.cpp
+++ b/src/columnviewsettingspage.cpp
@@ -26,14 +26,14 @@
 #include <kfontrequester.h>
 #include <klocale.h>
 
-#include <QButtonGroup>
-#include <QCheckBox>
-#include <QComboBox>
-#include <QGroupBox>
-#include <QGridLayout>
-#include <QLabel>
-#include <QRadioButton>
-#include <QSpinBox>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QCheckBox>
+#include <QtGui/QComboBox>
+#include <QtGui/QGroupBox>
+#include <QtGui/QGridLayout>
+#include <QtGui/QLabel>
+#include <QtGui/QRadioButton>
+#include <QtGui/QSpinBox>
 
 ColumnViewSettingsPage::ColumnViewSettingsPage(DolphinMainWindow* mainWindow,
                                                QWidget* parent) :
diff --git a/src/detailsviewsettingspage.cpp b/src/detailsviewsettingspage.cpp
index 23c0d9dcfd..c7f4acf3e0 100644
--- a/src/detailsviewsettingspage.cpp
+++ b/src/detailsviewsettingspage.cpp
@@ -26,14 +26,14 @@
 #include <kfontrequester.h>
 #include <klocale.h>
 
-#include <QButtonGroup>
-#include <QCheckBox>
-#include <QComboBox>
-#include <QGroupBox>
-#include <QGridLayout>
-#include <QLabel>
-#include <QRadioButton>
-#include <QSpinBox>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QCheckBox>
+#include <QtGui/QComboBox>
+#include <QtGui/QGroupBox>
+#include <QtGui/QGridLayout>
+#include <QtGui/QLabel>
+#include <QtGui/QRadioButton>
+#include <QtGui/QSpinBox>
 
 DetailsViewSettingsPage::DetailsViewSettingsPage(DolphinMainWindow* mainWindow,
                                                  QWidget* parent) :
diff --git a/src/dolphinapplication.cpp b/src/dolphinapplication.cpp
index 8c1464d53b..fc59eb08b3 100644
--- a/src/dolphinapplication.cpp
+++ b/src/dolphinapplication.cpp
@@ -24,7 +24,7 @@
 #include <applicationadaptor.h>
 #include <kcmdlineargs.h>
 #include <kurl.h>
-#include <QDBusConnection>
+#include <QtDBus/QDBusConnection>
 
 DolphinApplication::DolphinApplication() :
     m_lastId(0)
diff --git a/src/dolphincolumnview.cpp b/src/dolphincolumnview.cpp
index 734328bc65..563f68f31c 100644
--- a/src/dolphincolumnview.cpp
+++ b/src/dolphincolumnview.cpp
@@ -28,8 +28,8 @@
 #include <kfileitem.h>
 #include <kfileitemdelegate.h>
 
-#include <QAbstractProxyModel>
-#include <QPoint>
+#include <QtGui/QAbstractProxyModel>
+#include <QtCore/QPoint>
 
 DolphinColumnView::DolphinColumnView(QWidget* parent, DolphinController* controller) :
     QColumnView(parent),
diff --git a/src/dolphincolumnview.h b/src/dolphincolumnview.h
index 15dddf47fc..4c1aaf0a27 100644
--- a/src/dolphincolumnview.h
+++ b/src/dolphincolumnview.h
@@ -20,8 +20,8 @@
 #ifndef DOLPHINCOLUMNVIEW_H
 #define DOLPHINCOLUMNVIEW_H
 
-#include <QColumnView>
-#include <QStyleOptionViewItem>
+#include <QtGui/QColumnView>
+#include <QtGui/QStyleOption>
 
 class DolphinController;
 class DolphinView;
diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index ae1656f691..0329fce773 100644
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -42,10 +42,10 @@
 #include <kstandardaction.h>
 #include <kstandarddirs.h>
 
-#include <QApplication>
-#include <QClipboard>
-#include <QDir>
-#include <Q3ValueList>
+#include <QtGui/QApplication>
+#include <QtGui/QClipboard>
+#include <QtCore/QDir>
+#include <Qt3Support/Q3ValueList>
 
 DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent,
                                        KFileItem* fileInfo,
diff --git a/src/dolphincontextmenu.h b/src/dolphincontextmenu.h
index ac165eef90..b8920b7e21 100644
--- a/src/dolphincontextmenu.h
+++ b/src/dolphincontextmenu.h
@@ -25,9 +25,9 @@
 #include <kservice.h>
 #include <kurl.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
-#include <QVector>
+#include <QtCore/QVector>
 
 class KMenu;
 class KFileItem;
diff --git a/src/dolphincontroller.h b/src/dolphincontroller.h
index f9f4f4e471..b975558e23 100644
--- a/src/dolphincontroller.h
+++ b/src/dolphincontroller.h
@@ -22,7 +22,7 @@
 
 #include <dolphinview.h>
 #include <kurl.h>
-#include <QObject>
+#include <QtCore/QObject>
 #include <libdolphin_export.h>
 
 class KUrl;
diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp
index 4c4102e8bd..74963dc3dc 100644
--- a/src/dolphindetailsview.cpp
+++ b/src/dolphindetailsview.cpp
@@ -30,7 +30,7 @@
 #include <kdirmodel.h>
 #include <kfileitemdelegate.h>
 
-#include <QHeaderView>
+#include <QtGui/QHeaderView>
 
 DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* controller) :
     QTreeView(parent),
diff --git a/src/dolphindetailsview.h b/src/dolphindetailsview.h
index 681a5e1f98..e90a0bd891 100644
--- a/src/dolphindetailsview.h
+++ b/src/dolphindetailsview.h
@@ -22,8 +22,8 @@
 #define DOLPHINDETAILSVIEW_H
 
 #include <dolphinview.h>
-#include <QStyleOptionViewItem>
-#include <QTreeView>
+#include <QtGui/QStyleOption>
+#include <QtGui/QTreeView>
 #include <libdolphin_export.h>
 
 class DolphinController;
diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp
index 35789f7543..25a8581f4d 100644
--- a/src/dolphiniconsview.cpp
+++ b/src/dolphiniconsview.cpp
@@ -29,8 +29,8 @@
 #include <kfileitem.h>
 #include <kfileitemdelegate.h>
 
-#include <QAbstractProxyModel>
-#include <QPoint>
+#include <QtGui/QAbstractProxyModel>
+#include <QtCore/QPoint>
 
 DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controller) :
     KListView(parent),
diff --git a/src/dolphiniconsview.h b/src/dolphiniconsview.h
index 36df119d71..fce8f62bd4 100644
--- a/src/dolphiniconsview.h
+++ b/src/dolphiniconsview.h
@@ -22,7 +22,7 @@
 
 #include <klistview.h>
 #include <kitemcategorizer.h>
-#include <QStyleOptionViewItem>
+#include <QtGui/QStyleOption>
 #include <libdolphin_export.h>
 
 class DolphinController;
diff --git a/src/dolphinitemcategorizer.cpp b/src/dolphinitemcategorizer.cpp
index 34806446b3..05c23a01d6 100644
--- a/src/dolphinitemcategorizer.cpp
+++ b/src/dolphinitemcategorizer.cpp
@@ -25,7 +25,7 @@
 #include <klocale.h>
 #include <kdirmodel.h>
 
-#include <QSortFilterProxyModel>
+#include <QtGui/QSortFilterProxyModel>
 
 DolphinItemCategorizer::DolphinItemCategorizer() :
     KItemCategorizer()
diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index e4d219e867..d84775d59d 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -68,10 +68,10 @@
 #include <kstandardaction.h>
 #include <kurl.h>
 
-#include <QCloseEvent>
-#include <QClipboard>
-#include <QSplitter>
-#include <QDockWidget>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QClipboard>
+#include <QtGui/QSplitter>
+#include <QtGui/QDockWidget>
 
 DolphinMainWindow::DolphinMainWindow(int id) :
     KXmlGuiWindow(0),
diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index 1d7e6058d1..35b1b52678 100644
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -29,7 +29,7 @@
 #include <ksortablelist.h>
 #include <konq_undo.h>
 
-#include <QList>
+#include <QtCore/QList>
 
 class DolphinApplication;
 class KNewMenu;
diff --git a/src/dolphinsortfilterproxymodel.h b/src/dolphinsortfilterproxymodel.h
index e7fc781828..437ebca126 100644
--- a/src/dolphinsortfilterproxymodel.h
+++ b/src/dolphinsortfilterproxymodel.h
@@ -20,7 +20,7 @@
 #ifndef DOLPHINSORTFILTERPROXYMODEL_H
 #define DOLPHINSORTFILTERPROXYMODEL_H
 
-#include <QSortFilterProxyModel>
+#include <QtGui/QSortFilterProxyModel>
 #include <dolphinview.h>
 #include <libdolphin_export.h>
 
diff --git a/src/dolphinstatusbar.cpp b/src/dolphinstatusbar.cpp
index e2b4e68bab..b0bb8e871f 100644
--- a/src/dolphinstatusbar.cpp
+++ b/src/dolphinstatusbar.cpp
@@ -23,9 +23,9 @@
 #include "statusbarmessagelabel.h"
 #include "statusbarspaceinfo.h"
 
-#include <QLabel>
-#include <QProgressBar>
-#include <QTimer>
+#include <QtGui/QLabel>
+#include <QtGui/QProgressBar>
+#include <QtCore/QTimer>
 
 #include <kiconloader.h>
 #include <kvbox.h>
diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 64722e1e21..c51dbb464f 100644
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -20,14 +20,13 @@
 
 #include "dolphinview.h"
 
-#include <QApplication>
-#include <QClipboard>
-#include <QDropEvent>
-#include <QItemSelectionModel>
-#include <QMouseEvent>
-#include <QVBoxLayout>
-#include <QTimer>
-#include <QScrollBar>
+#include <QtGui/QApplication>
+#include <QtGui/QClipboard>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QItemSelection>
+#include <QtGui/QBoxLayout>
+#include <QtCore/QTimer>
+#include <QtGui/QScrollBar>
 
 #include <kdirmodel.h>
 #include <kfileitemdelegate.h>
diff --git a/src/dolphinview.h b/src/dolphinview.h
index f23460fec2..9581f6601c 100644
--- a/src/dolphinview.h
+++ b/src/dolphinview.h
@@ -29,12 +29,11 @@
 
 #include <kurlnavigator.h>
 
-#include <QDropEvent>
-#include <QLinkedList>
-#include <QListView>
-#include <QMouseEvent>
-#include <QVBoxLayout>
-#include <QWidget>
+#include <QtGui/QKeyEvent>
+#include <QtCore/QLinkedList>
+#include <QtGui/QListView>
+#include <QtGui/QBoxLayout>
+#include <QtGui/QWidget>
 
 class DolphinController;
 class FilterBar;
diff --git a/src/filterbar.cpp b/src/filterbar.cpp
index f7c582262f..f88bab2b2d 100644
--- a/src/filterbar.cpp
+++ b/src/filterbar.cpp
@@ -19,10 +19,10 @@
  ***************************************************************************/
 #include "filterbar.h"
 
-#include <QBoxLayout>
-#include <QKeyEvent>
-#include <QLabel>
-#include <QToolButton>
+#include <QtGui/QBoxLayout>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QLabel>
+#include <QtGui/QToolButton>
 
 #include <kdialog.h>
 #include <klocale.h>
diff --git a/src/filterbar.h b/src/filterbar.h
index 2dd02d28d4..8048a164a7 100644
--- a/src/filterbar.h
+++ b/src/filterbar.h
@@ -20,7 +20,7 @@
 #ifndef FILTERBAR_H
 #define FILTERBAR_H
 
-#include <QWidget>
+#include <QtGui/QWidget>
 
 class QLabel;
 class QToolButton;
diff --git a/src/generalsettingspage.cpp b/src/generalsettingspage.cpp
index 66426b5c6a..c094db9a0b 100644
--- a/src/generalsettingspage.cpp
+++ b/src/generalsettingspage.cpp
@@ -25,12 +25,12 @@
 #include <klocale.h>
 #include <kvbox.h>
 
-#include <QCheckBox>
-#include <QGroupBox>
-#include <QLabel>
-#include <QLineEdit>
-#include <QPushButton>
-#include <QRadioButton>
+#include <QtGui/QCheckBox>
+#include <QtGui/QGroupBox>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
+#include <QtGui/QPushButton>
+#include <QtGui/QRadioButton>
 
 #include "dolphinsettings.h"
 #include "dolphinmainwindow.h"
diff --git a/src/generalviewsettingspage.cpp b/src/generalviewsettingspage.cpp
index 42a5cb9de1..7b4eba1698 100644
--- a/src/generalviewsettingspage.cpp
+++ b/src/generalviewsettingspage.cpp
@@ -23,12 +23,12 @@
 #include "dolphin_generalsettings.h"
 #include "viewproperties.h"
 
-#include <QLabel>
-#include <QGroupBox>
-#include <QRadioButton>
-#include <QSlider>
-#include <QSpinBox>
-#include <QVBoxLayout>
+#include <QtGui/QLabel>
+#include <QtGui/QGroupBox>
+#include <QtGui/QRadioButton>
+#include <QtGui/QSlider>
+#include <QtGui/QSpinBox>
+#include <QtGui/QBoxLayout>
 
 #include <kconfiggroup.h>
 #include <kdialog.h>
diff --git a/src/iconsizedialog.cpp b/src/iconsizedialog.cpp
index 22ce110271..948cfc5e64 100644
--- a/src/iconsizedialog.cpp
+++ b/src/iconsizedialog.cpp
@@ -28,10 +28,10 @@
 #include <klocale.h>
 #include <kvbox.h>
 
-#include <QGroupBox>
-#include <QLabel>
-#include <QSlider>
-#include <QVBoxLayout>
+#include <QtGui/QGroupBox>
+#include <QtGui/QLabel>
+#include <QtGui/QSlider>
+#include <QtGui/QBoxLayout>
 
 IconSizeDialog::IconSizeDialog(QWidget* parent) :
     KDialog(parent),
diff --git a/src/iconsviewsettingspage.cpp b/src/iconsviewsettingspage.cpp
index 862cf0c3c6..3bba6f12fc 100644
--- a/src/iconsviewsettingspage.cpp
+++ b/src/iconsviewsettingspage.cpp
@@ -30,14 +30,14 @@
 #include <kglobalsettings.h>
 #include <klocale.h>
 
-#include <QComboBox>
-#include <QGroupBox>
-#include <QLabel>
-#include <QListView>
-#include <QPushButton>
-#include <QSpinBox>
-#include <QGridLayout>
-#include <QtDebug>
+#include <QtGui/QComboBox>
+#include <QtGui/QGroupBox>
+#include <QtGui/QLabel>
+#include <QtGui/QListView>
+#include <QtGui/QPushButton>
+#include <QtGui/QSpinBox>
+#include <QtGui/QGridLayout>
+#include <QtCore/QDebug>
 
 IconsViewSettingsPage::IconsViewSettingsPage(DolphinMainWindow* mainWindow,
                                              QWidget* parent) :
diff --git a/src/infosidebarpage.cpp b/src/infosidebarpage.cpp
index d900945e87..8d99ddecef 100644
--- a/src/infosidebarpage.cpp
+++ b/src/infosidebarpage.cpp
@@ -21,17 +21,17 @@
 
 #include "infosidebarpage.h"
 
-#include <QLayout>
-#include <QPixmap>
-#include <QLabel>
-#include <QTimer>
-#include <QPushButton>
-#include <QMenu>
-#include <QPainter>
-#include <QFontMetrics>
-#include <QEvent>
-#include <QInputDialog>
-#include <QDir>
+#include <QtGui/QLayout>
+#include <QtGui/QPixmap>
+#include <QtGui/QLabel>
+#include <QtCore/QTimer>
+#include <QtGui/QPushButton>
+#include <QtGui/QMenu>
+#include <QtGui/QPainter>
+#include <QtGui/QFontMetrics>
+#include <QtCore/QEvent>
+#include <QtGui/QInputDialog>
+#include <QtCore/QDir>
 
 #include <kfileplacesmodel.h>
 #include <klocale.h>
diff --git a/src/infosidebarpage.h b/src/infosidebarpage.h
index 2a0f2ead73..5aa4f5d07c 100644
--- a/src/infosidebarpage.h
+++ b/src/infosidebarpage.h
@@ -23,10 +23,10 @@
 #include <sidebarpage.h>
 
 #include <QtGui/QPushButton>
-#include <QPixmap>
-#include <QEvent>
-#include <QLabel>
-#include <QList>
+#include <QtGui/QPixmap>
+#include <QtCore/QEvent>
+#include <QtGui/QLabel>
+#include <QtCore/QList>
 
 #include <kurl.h>
 #include <kmimetype.h>
diff --git a/src/klistview.cpp b/src/klistview.cpp
index a7244dfed4..75c799a26a 100644
--- a/src/klistview.cpp
+++ b/src/klistview.cpp
@@ -20,10 +20,10 @@
 
 // NOTE: rectForIndex() not virtual on QListView !! relevant ?
 
-#include <QPainter>
-#include <QScrollBar>
-#include <QPaintEvent>
-#include <QSortFilterProxyModel>
+#include <QtGui/QPainter>
+#include <QtGui/QScrollBar>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QSortFilterProxyModel>
 
 #include <kdebug.h>
 
diff --git a/src/klistview.h b/src/klistview.h
index 0644e8637c..c8bd5215e8 100644
--- a/src/klistview.h
+++ b/src/klistview.h
@@ -21,7 +21,7 @@
 #ifndef __KLISTVIEW_H__
 #define __KLISTVIEW_H__
 
-#include <QListView>
+#include <QtGui/QListView>
 
 #include <libdolphin_export.h>
 
diff --git a/src/libdolphin_export.h b/src/libdolphin_export.h
index 05b22513bc..99af8bed2d 100644
--- a/src/libdolphin_export.h
+++ b/src/libdolphin_export.h
@@ -24,7 +24,7 @@
 #include <kdemacros.h>
 
 /* needed, because e.g. Q_OS_UNIX is so frequently used */
-#include <QtCore/qglobal.h>
+#include <QtCore/QBool>
 
 #ifdef MAKE_DOLPHINPRIVATE_LIB
 # define LIBDOLPHINPRIVATE_EXPORT KDE_EXPORT
diff --git a/src/metadatawidget.cpp b/src/metadatawidget.cpp
index 4859a893c8..1bab4abd7b 100644
--- a/src/metadatawidget.cpp
+++ b/src/metadatawidget.cpp
@@ -23,9 +23,9 @@
 
 #include <klocale.h>
 
-#include <QLabel>
-#include <QGridLayout>
-#include <QTextEdit>
+#include <QtGui/QLabel>
+#include <QtGui/QGridLayout>
+#include <QtGui/QTextEdit>
 
 #ifdef HAVE_KMETADATA
 #include <kmetadata/kmetadatatagwidget.h>
diff --git a/src/metadatawidget.h b/src/metadatawidget.h
index b51cb593d6..f66599ff58 100644
--- a/src/metadatawidget.h
+++ b/src/metadatawidget.h
@@ -20,7 +20,7 @@
 #ifndef METADATA_WIDGET_H
 #define METADATA_WIDGET_H
 
-#include <QWidget>
+#include <QtGui/QWidget>
 
 #include <kurl.h>
 
diff --git a/src/pixmapviewer.cpp b/src/pixmapviewer.cpp
index b25dcdc67b..79e2487a70 100644
--- a/src/pixmapviewer.cpp
+++ b/src/pixmapviewer.cpp
@@ -22,7 +22,7 @@
 #include <kiconloader.h>
 #include <QtGui/QPainter>
 #include <QtGui/QPixmap>
-#include <QtGui/QPaintEvent>
+#include <QtGui/QKeyEvent>
 
 PixmapViewer::PixmapViewer(QWidget* parent, Transition transition) :
     QWidget(parent),
diff --git a/src/pixmapviewer.h b/src/pixmapviewer.h
index df4bd13b39..165c40455d 100644
--- a/src/pixmapviewer.h
+++ b/src/pixmapviewer.h
@@ -22,7 +22,7 @@
 
 #include <QtGui/QWidget>
 #include <QtGui/QPixmap>
-#include <QTimeLine>
+#include <QtCore/QTimeLine>
 
 class QPaintEvent;
 
diff --git a/src/renamedialog.cpp b/src/renamedialog.cpp
index 7bee7b9e7a..51468f7a27 100644
--- a/src/renamedialog.cpp
+++ b/src/renamedialog.cpp
@@ -22,8 +22,8 @@
 #include <klineedit.h>
 #include <klocale.h>
 
-#include <QLabel>
-#include <QVBoxLayout>
+#include <QtGui/QLabel>
+#include <QtGui/QBoxLayout>
 
 RenameDialog::RenameDialog(const KUrl::List& items) :
     KDialog(),
diff --git a/src/sidebarpage.cpp b/src/sidebarpage.cpp
index 479bfcad0e..cb0e516e7d 100644
--- a/src/sidebarpage.cpp
+++ b/src/sidebarpage.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include "sidebarpage.h"
-#include <QWidget>
+#include <QtGui/QWidget>
 #include <kfileitem.h>
 #include <kurl.h>
 
diff --git a/src/sidebarpage.h b/src/sidebarpage.h
index 019f5dc1cc..697e8de58d 100644
--- a/src/sidebarpage.h
+++ b/src/sidebarpage.h
@@ -21,7 +21,7 @@
 #ifndef _SIDEBARPAGE_H_
 #define _SIDEBARPAGE_H_
 
-#include <QWidget>
+#include <QtGui/QWidget>
 #include <kurl.h>
 #include <kfileitem.h>
 
diff --git a/src/sidebartreeview.cpp b/src/sidebartreeview.cpp
index 05889702e5..b6f9dc4a61 100644
--- a/src/sidebartreeview.cpp
+++ b/src/sidebartreeview.cpp
@@ -22,9 +22,8 @@
 #include <kdirmodel.h>
 #include <kfileitemdelegate.h>
 
-#include <QDragEnterEvent>
-#include <QDropEvent>
-#include <QHeaderView>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QHeaderView>
 
 SidebarTreeView::SidebarTreeView(QWidget* parent) :
     QTreeView(parent)
diff --git a/src/sidebartreeview.h b/src/sidebartreeview.h
index d12737151a..045a256af2 100644
--- a/src/sidebartreeview.h
+++ b/src/sidebartreeview.h
@@ -21,7 +21,7 @@
 #define SIDEBARTREEVIEW_H
 
 #include <kurl.h>
-#include <QTreeView>
+#include <QtGui/QTreeView>
 
 /**
  * @brief Tree view widget which is used for the sidebar panel.
diff --git a/src/statusbarmessagelabel.cpp b/src/statusbarmessagelabel.cpp
index a8956caafd..f5c6326938 100644
--- a/src/statusbarmessagelabel.cpp
+++ b/src/statusbarmessagelabel.cpp
@@ -25,13 +25,12 @@
 #include <kicon.h>
 #include <klocale.h>
 
-#include <QFontMetrics>
-#include <QPainter>
-#include <QPaintEvent>
-#include <QPushButton>
-#include <QPixmap>
-#include <QResizeEvent>
-#include <QTimer>
+#include <QtGui/QFontMetrics>
+#include <QtGui/QPainter>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QPushButton>
+#include <QtGui/QPixmap>
+#include <QtCore/QTimer>
 
 StatusBarMessageLabel::StatusBarMessageLabel(QWidget* parent) :
     QWidget(parent),
diff --git a/src/statusbarmessagelabel.h b/src/statusbarmessagelabel.h
index d7751885a8..dcefdedfb3 100644
--- a/src/statusbarmessagelabel.h
+++ b/src/statusbarmessagelabel.h
@@ -23,10 +23,10 @@
 
 #include <dolphinstatusbar.h>
 
-#include <QList>
-#include <QPixmap>
+#include <QtCore/QList>
+#include <QtGui/QPixmap>
 
-#include <QWidget>
+#include <QtGui/QWidget>
 
 class QPaintEvent;
 class QResizeEvent;
diff --git a/src/statusbarspaceinfo.cpp b/src/statusbarspaceinfo.cpp
index 794d140787..999f0ad54b 100644
--- a/src/statusbarspaceinfo.cpp
+++ b/src/statusbarspaceinfo.cpp
@@ -22,7 +22,7 @@
 
 #include <QtCore/QTimer>
 #include <QtGui/QPainter>
-#include <QtGui/QPaintEvent>
+#include <QtGui/QKeyEvent>
 
 #include <kglobalsettings.h>
 #include <kdiskfreespace.h>
diff --git a/src/statusbarspaceinfo.h b/src/statusbarspaceinfo.h
index 8f0c60a134..3ff75bb975 100644
--- a/src/statusbarspaceinfo.h
+++ b/src/statusbarspaceinfo.h
@@ -23,7 +23,7 @@
 #include <kurl.h>
 
 #include <QtGui/QColor>
-#include <QtGui/QPaintEvent>
+#include <QtGui/QKeyEvent>
 #include <QtGui/QWidget>
 
 class KDiskFreeSp;
diff --git a/src/terminalsidebarpage.cpp b/src/terminalsidebarpage.cpp
index 9331961bcd..287f7d79d1 100644
--- a/src/terminalsidebarpage.cpp
+++ b/src/terminalsidebarpage.cpp
@@ -23,7 +23,7 @@
 #include <kde_terminal_interface.h>
 #include <kparts/part.h>
 
-#include <QVBoxLayout>
+#include <QtGui/QBoxLayout>
 
 TerminalSidebarPage::TerminalSidebarPage(QWidget* parent) :
     SidebarPage(parent),
diff --git a/src/treeviewcontextmenu.cpp b/src/treeviewcontextmenu.cpp
index 96287d8d01..e799b667f2 100644
--- a/src/treeviewcontextmenu.cpp
+++ b/src/treeviewcontextmenu.cpp
@@ -30,8 +30,8 @@
 
 #include "renamedialog.h"
 
-#include <QApplication>
-#include <QClipboard>
+#include <QtGui/QApplication>
+#include <QtGui/QClipboard>
 
 TreeViewContextMenu::TreeViewContextMenu(QWidget* parent,
                                          KFileItem* fileInfo) :
diff --git a/src/treeviewcontextmenu.h b/src/treeviewcontextmenu.h
index 88e1b03e98..678904c94a 100644
--- a/src/treeviewcontextmenu.h
+++ b/src/treeviewcontextmenu.h
@@ -20,7 +20,7 @@
 #ifndef TREEVIEWCONTEXTMENU_H
 #define TREEVIEWCONTEXTMENU_H
 
-#include <QObject>
+#include <QtCore/QObject>
 
 class KMenu;
 class KFileItem;
diff --git a/src/treeviewsidebarpage.cpp b/src/treeviewsidebarpage.cpp
index 0e6edff086..1f537bd719 100644
--- a/src/treeviewsidebarpage.cpp
+++ b/src/treeviewsidebarpage.cpp
@@ -31,10 +31,10 @@
 #include <kdirmodel.h>
 #include <kfileitem.h>
 
-#include <QHeaderView>
-#include <QItemSelectionModel>
-#include <QTreeView>
-#include <QVBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QItemSelection>
+#include <QtGui/QTreeView>
+#include <QtGui/QBoxLayout>
 
 TreeViewSidebarPage::TreeViewSidebarPage(QWidget* parent) :
     SidebarPage(parent),
diff --git a/src/viewproperties.cpp b/src/viewproperties.cpp
index 21f0c39da8..7996c6703e 100644
--- a/src/viewproperties.cpp
+++ b/src/viewproperties.cpp
@@ -20,9 +20,9 @@
 
 #include <assert.h>
 
-#include <QDateTime>
-#include <QFile>
-#include <QFileInfo>
+#include <QtCore/QDate>
+#include <QtCore/QFile>
+#include <QtCore/QFileInfo>
 
 #include <kcomponentdata.h>
 #include <klocale.h>
diff --git a/src/viewpropertiesdialog.cpp b/src/viewpropertiesdialog.cpp
index 99f40bfa92..192ce46274 100644
--- a/src/viewpropertiesdialog.cpp
+++ b/src/viewpropertiesdialog.cpp
@@ -34,14 +34,14 @@
 #include <kstandarddirs.h>
 #include <kurl.h>
 
-#include <QButtonGroup>
-#include <QCheckBox>
-#include <QComboBox>
-#include <QGridLayout>
-#include <QGroupBox>
-#include <QLabel>
-#include <QRadioButton>
-#include <QVBoxLayout>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QCheckBox>
+#include <QtGui/QComboBox>
+#include <QtGui/QGridLayout>
+#include <QtGui/QGroupBox>
+#include <QtGui/QLabel>
+#include <QtGui/QRadioButton>
+#include <QtGui/QBoxLayout>
 
 ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     KDialog(dolphinView),
diff --git a/src/viewpropsprogressinfo.cpp b/src/viewpropsprogressinfo.cpp
index b01e2bc846..8011dd301e 100644
--- a/src/viewpropsprogressinfo.cpp
+++ b/src/viewpropsprogressinfo.cpp
@@ -22,10 +22,10 @@
 #include "applyviewpropsjob.h"
 #include "viewproperties.h"
 
-#include <QLabel>
-#include <QProgressBar>
-#include <QTimer>
-#include <QVBoxLayout>
+#include <QtGui/QLabel>
+#include <QtGui/QProgressBar>
+#include <QtCore/QTimer>
+#include <QtGui/QBoxLayout>
 
 #include <assert.h>
 #include <klocale.h>
diff --git a/src/viewsettingspage.cpp b/src/viewsettingspage.cpp
index 59f101eb98..9791588d6d 100644
--- a/src/viewsettingspage.cpp
+++ b/src/viewsettingspage.cpp
@@ -25,10 +25,10 @@
 #include "generalviewsettingspage.h"
 #include "iconsviewsettingspage.h"
 
-#include <QVBoxLayout>
-#include <QTabWidget>
-#include <QLayout>
-#include <QLabel>
+#include <QtGui/QBoxLayout>
+#include <QtGui/QTabWidget>
+#include <QtGui/QLayout>
+#include <QtGui/QLabel>
 
 #include <kdialog.h>
 #include <klocale.h>