Revert "Clean up headers && fix compilation with (the upcoming) qt 4.8.2"

This reverts commit 962d9dd1fc5fe530dc9a7e29c95a0a2c1e7aa885.

85 files changed, 248 insertions, 313 deletions

diff --git a/src/adblock/adblockmanager.cpp b/src/adblock/adblockmanager.cpp
index a9ac0612..5078f215 100644
--- a/src/adblock/adblockmanager.cpp
+++ b/src/adblock/adblockmanager.cpp
@@ -44,8 +44,6 @@
 // Qt Includes
 #include <QUrl>
 #include <QWebElement>
-#include <QNetworkReply>
-#include <QNetworkRequest>
 
 
 AdBlockManager::AdBlockManager(QObject *parent)
diff --git a/src/adblock/adblockmanager.h b/src/adblock/adblockmanager.h
index 07bed803..9d746e18 100644
--- a/src/adblock/adblockmanager.h
+++ b/src/adblock/adblockmanager.h
@@ -133,11 +133,11 @@
 
 // Qt Includes
 #include <QObject>
+#include <QNetworkReply>
 #include <QStringList>
 #include <QByteArray>
 
 // Forward Includes
-class QNetworkReply;
 class QNetworkRequest;
 class WebPage;
 
diff --git a/src/adblock/adblockwidget.h b/src/adblock/adblockwidget.h
index b54134e0..3c7c667b 100644
--- a/src/adblock/adblockwidget.h
+++ b/src/adblock/adblockwidget.h
@@ -32,7 +32,8 @@
 #include "ui_settings_adblock.h"
 
 // Qt Includes
-#include <QWidget>
+#include <QtGui/QWidget>
+#include <QtGui/QTreeWidgetItem>
 
 
 class AdBlockWidget : public QWidget, private Ui::adblock
diff --git a/src/analyzer/analyzerpanel.cpp b/src/analyzer/analyzerpanel.cpp
index 3bd17e9c..099a4123 100644
--- a/src/analyzer/analyzerpanel.cpp
+++ b/src/analyzer/analyzerpanel.cpp
@@ -30,7 +30,6 @@
 #include "analyzerpanel.moc"
 
 // Local Includes
-#include "mainwindow.h"
 #include "networkanalyzer.h"
 #include "networkaccessmanager.h"
 #include "webtab.h"
diff --git a/src/analyzer/analyzerpanel.h b/src/analyzer/analyzerpanel.h
index 591e5947..8441a395 100644
--- a/src/analyzer/analyzerpanel.h
+++ b/src/analyzer/analyzerpanel.h
@@ -31,11 +31,13 @@
 // Rekonq Includes
 #include "rekonq_defines.h"
 
+// Local Includes
+#include "mainwindow.h"
+
 // Qt Includes
 #include <QDockWidget>
 
 // Forward Declarations
-class MainWindow;
 class NetworkAnalyzer;
 
 
diff --git a/src/analyzer/networkanalyzer.cpp b/src/analyzer/networkanalyzer.cpp
index 882318d4..0cf26f90 100644
--- a/src/analyzer/networkanalyzer.cpp
+++ b/src/analyzer/networkanalyzer.cpp
@@ -37,17 +37,14 @@
 #include <KPassivePopup>
 
 // Qt Includes
-#include <QTreeWidget>
-#include <QVBoxLayout>
-#include <QHeaderView>
-#include <QLabel>
+#include <QtGui/QTreeWidget>
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
 #include <QApplication>
 #include <QSignalMapper>
 #include <QClipboard>
 
-#include <QNetworkReply>
-#include  <QNetworkRequest>
-
 
 NetworkAnalyzer::NetworkAnalyzer(QWidget *parent)
     : QWidget(parent)
diff --git a/src/analyzer/networkanalyzer.h b/src/analyzer/networkanalyzer.h
index af1e1145..f5824b07 100644
--- a/src/analyzer/networkanalyzer.h
+++ b/src/analyzer/networkanalyzer.h
@@ -34,21 +34,21 @@
 #include "rekonq_defines.h"
 
 // Qt Includes
-#include <QWidget>
+#include <QtCore/QMap>
+#include <QtCore/QList>
 
-#include <QMap>
-#include <QList>
+#include <QtGui/QWidget>
 
-#include <QNetworkAccessManager>
+#include <QtNetwork/QNetworkAccessManager>
+#include <QtNetwork/QNetworkReply>
+#include <QtNetwork/QNetworkRequest>
+#include <QPoint>
 
 // Forward Declarations
 class QTreeWidgetItem;
 class QSignalMapper;
 class QTreeWidget;
 
-class QNetworkReply;
-class QNetworkRequest;
-
 
 class NetworkAnalyzer : public QWidget
 {
diff --git a/src/application.cpp b/src/application.cpp
index def8b865..e0570a5b 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -51,7 +51,6 @@
 #include "stackedurlbar.h"
 #include "tabbar.h"
 #include "urlbar.h"
-#include "urlresolver.h"
 #include "useragentmanager.h"
 #include "webtab.h"
 
@@ -71,8 +70,6 @@
 
 // Qt Includes
 #include <QVBoxLayout>
-#include <QDir>
-#include <QTimer>
 
 
 using namespace ThreadWeaver;
diff --git a/src/application.h b/src/application.h
index bc1ddc72..2689e3f5 100644
--- a/src/application.h
+++ b/src/application.h
@@ -40,12 +40,11 @@
 #include <KUniqueApplication>
 
 // Qt Includes
-#include <QWeakPointer>
-
-// Forward Declarations
-class KAction;
+#include <QtCore/QDateTime>
+#include <QtCore/QWeakPointer>
 
 
+// Forward Declarations
 class AdBlockManager;
 class BookmarkManager;
 class DownloadManager;
@@ -57,6 +56,13 @@ class SessionManager;
 class UserAgentManager;
 class SyncManager;
 
+class KAction;
+
+namespace ThreadWeaver
+{
+class Job;
+}
+
 
 typedef QList< QWeakPointer<MainWindow> > MainWindowList;
 
diff --git a/src/bookmarks/bookmarkowner.cpp b/src/bookmarks/bookmarkowner.cpp
index be28448c..a53b888b 100644
--- a/src/bookmarks/bookmarkowner.cpp
+++ b/src/bookmarks/bookmarkowner.cpp
@@ -44,7 +44,7 @@
 #include <KMessageBox>
 
 // Qt Includes
-#include <QClipboard>
+#include <QtGui/QClipboard>
 
 
 BookmarkOwner::BookmarkOwner(KBookmarkManager *manager, QObject *parent)
diff --git a/src/bookmarks/bookmarkscontextmenu.h b/src/bookmarks/bookmarkscontextmenu.h
index c927f3a6..34ef66e0 100644
--- a/src/bookmarks/bookmarkscontextmenu.h
+++ b/src/bookmarks/bookmarkscontextmenu.h
@@ -33,7 +33,6 @@
 // Forward Declarations
 class BookmarkOwner;
 
-
 class BookmarksContextMenu : public KBookmarkContextMenu
 {
 public:
diff --git a/src/clicktoflash.cpp b/src/clicktoflash.cpp
index baa61367..94ae40ae 100644
--- a/src/clicktoflash.cpp
+++ b/src/clicktoflash.cpp
@@ -33,12 +33,11 @@
 #include <KLocalizedString>
 
 // Qt Includes
-#include <QHBoxLayout>
-#include <QToolButton>
-
-#include <QWebElement>
-#include <QWebFrame>
-#include <QWebView>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QToolButton>
+#include <QtWebKit/QWebElement>
+#include <QtWebKit/QWebFrame>
+#include <QtWebKit/QWebView>
 
 
 ClickToFlash::ClickToFlash(const QUrl &pluginUrl, QWidget *parent)
diff --git a/src/clicktoflash.h b/src/clicktoflash.h
index fcafea59..d7648204 100644
--- a/src/clicktoflash.h
+++ b/src/clicktoflash.h
@@ -33,8 +33,8 @@
 #include "rekonq_defines.h"
 
 // Qt Includes
-#include <QUrl>
-#include <QWidget>
+#include <QtCore/QUrl>
+#include <QtGui/QWidget>
 
 // Forward Declarations
 class QWebElement;
@@ -63,3 +63,4 @@ private:
 };
 
 #endif // CLICKTOFLASH_H
+
diff --git a/src/downloadmanager.cpp b/src/downloadmanager.cpp
index 4dc7e670..a3165764 100644
--- a/src/downloadmanager.cpp
+++ b/src/downloadmanager.cpp
@@ -52,9 +52,9 @@
 #include <QWebSettings>
 #include <QNetworkReply>
 
-#include <QDBusConnection>
-#include <QDBusConnectionInterface>
-#include <QDBusInterface>
+#include <QtDBus/QDBusConnection>
+#include <QtDBus/QDBusConnectionInterface>
+#include <QtDBus/QDBusInterface>
 
 
 DownloadManager::DownloadManager(QObject *parent)
diff --git a/src/findbar.cpp b/src/findbar.cpp
index d218340f..889d3921 100644
--- a/src/findbar.cpp
+++ b/src/findbar.cpp
@@ -43,13 +43,13 @@
 #include <KColorScheme>
 
 // Qt Includes
-#include <QTimer>
+#include <QtCore/QTimer>
 
-#include <QCheckBox>
-#include <QHBoxLayout>
-#include <QKeyEvent>
-#include <QLabel>
-#include <QToolButton>
+#include <QtGui/QCheckBox>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QLabel>
+#include <QtGui/QToolButton>
 
 
 FindBar::FindBar(MainWindow *window)
diff --git a/src/findbar.h b/src/findbar.h
index 04a6bd15..2b1ec602 100644
--- a/src/findbar.h
+++ b/src/findbar.h
@@ -33,7 +33,7 @@
 #include "rekonq_defines.h"
 
 // Qt Includes
-#include <QWidget>
+#include <QtGui/QWidget>
 
 // Forward Declarations
 class MainWindow;
diff --git a/src/history/autosaver.cpp b/src/history/autosaver.cpp
index ee84e299..bb2a7683 100644
--- a/src/history/autosaver.cpp
+++ b/src/history/autosaver.cpp
@@ -30,10 +30,10 @@
 #include "autosaver.moc"
 
 // Qt Includes
-#include <QMetaObject>
-#include <QTimerEvent>
-#include <QBasicTimer>
-#include <QTime>
+#include <QtCore/QMetaObject>
+#include <QtCore/QTimerEvent>
+#include <QtCore/QBasicTimer>
+#include <QtCore/QTime>
 
 
 const int AUTOSAVE_TIME  = 1000 * 3;  // seconds
diff --git a/src/history/autosaver.h b/src/history/autosaver.h
index 4c385ed6..f165377c 100644
--- a/src/history/autosaver.h
+++ b/src/history/autosaver.h
@@ -33,7 +33,7 @@
 #include "rekonq_defines.h"
 
 // Qt Includes
-#include <QObject>
+#include <QtCore/QObject>
 
 // Forward Declarations
 class QBasicTimer;
diff --git a/src/history/historymanager.cpp b/src/history/historymanager.cpp
index 95b2d586..602e4606 100644
--- a/src/history/historymanager.cpp
+++ b/src/history/historymanager.cpp
@@ -44,18 +44,16 @@
 #include <KCompletion>
 
 // Qt Includes
-#include <QList>
-#include <QUrl>
-#include <QDate>
-#include <QDateTime>
-#include <QString>
-#include <QFile>
-#include <QDataStream>
-#include <QBuffer>
-#include <QTemporaryFile>
-#include <QTimer>
-
-#include <QClipboard>
+#include <QtCore/QList>
+#include <QtCore/QUrl>
+#include <QtCore/QDate>
+#include <QtCore/QDateTime>
+#include <QtCore/QString>
+#include <QtCore/QFile>
+#include <QtCore/QDataStream>
+#include <QtCore/QBuffer>
+
+#include <QtGui/QClipboard>
 
 // generic algorithms
 #include <QtAlgorithms>
diff --git a/src/history/historymanager.h b/src/history/historymanager.h
index 5be32b9e..d4531e5c 100644
--- a/src/history/historymanager.h
+++ b/src/history/historymanager.h
@@ -33,6 +33,9 @@
 // Rekonq Includes
 #include "rekonq_defines.h"
 
+// Local Includes
+#include "urlresolver.h"
+
 // KDE Includes
 #include <KUrl>
 
@@ -40,18 +43,13 @@
 #include <QDateTime>
 #include <QHash>
 #include <QObject>
+#include <QTimer>
+#include <QSortFilterProxyModel>
+#include <QWebHistoryInterface>
 #include <QWebHistory>
 
 #include <math.h>
 
-// Forward Declarations
-class AutoSaver;
-class HistoryFilterModel;
-class HistoryTreeModel;
-
-class QWebHistory;
-
-
 /**
  * Elements in this class represent an history item
  *
@@ -102,7 +100,6 @@ public:
 
 // ---------------------------------------------------------------------------------------------------------------
 
-
 class TabHistory
 {
 public:
@@ -136,10 +133,14 @@ public:
     QByteArray history;
 };
 
-
 // ---------------------------------------------------------------------------------------------------------------
 
 
+// Forward Declarations
+class AutoSaver;
+class HistoryFilterModel;
+class HistoryTreeModel;
+
 /**
  * THE History Manager:
  * It manages rekonq history
diff --git a/src/history/historymodels.cpp b/src/history/historymodels.cpp
index 8894b334..16054054 100644
--- a/src/history/historymodels.cpp
+++ b/src/history/historymodels.cpp
@@ -35,7 +35,6 @@
 
 // Local Includes
 #include "application.h"
-#include "historymanager.h"
 #include "iconmanager.h"
 
 // KDE Includes
@@ -44,17 +43,16 @@
 #include <KIcon>
 
 // Qt Includes
-#include <QList>
-#include <QUrl>
-#include <QDate>
-#include <QDateTime>
-#include <QString>
-#include <QFile>
-#include <QDataStream>
-#include <QBuffer>
-
-#include <QClipboard>
-#include <QFileInfo>
+#include <QtCore/QList>
+#include <QtCore/QUrl>
+#include <QtCore/QDate>
+#include <QtCore/QDateTime>
+#include <QtCore/QString>
+#include <QtCore/QFile>
+#include <QtCore/QDataStream>
+#include <QtCore/QBuffer>
+
+#include <QtGui/QClipboard>
 
 // generic algorithms
 #include <QtAlgorithms>
diff --git a/src/history/historymodels.h b/src/history/historymodels.h
index 7588c6ff..9c3bfc36 100644
--- a/src/history/historymodels.h
+++ b/src/history/historymodels.h
@@ -33,16 +33,17 @@
 // Rekonq Includes
 #include "rekonq_defines.h"
 
+// Local Includes
+#include "historymanager.h"
+
 // KDE Includes
 #include <KUrl>
 
 // Qt Includes
 #include <QHash>
-#include <QAbstractTableModel>
-#include <QAbstractProxyModel>
-
-// Forward Declarations
-class HistoryManager;
+#include <QObject>
+#include <QSortFilterProxyModel>
+#include <QWebHistoryInterface>
 
 
 class REKONQ_TESTS_EXPORT HistoryModel : public QAbstractTableModel
@@ -174,6 +175,7 @@ private Q_SLOTS:
 private:
     int sourceDateRow(int row) const;
     mutable QList<int> m_sourceRowCache;
+
 };
 
 
diff --git a/src/history/historypanel.cpp b/src/history/historypanel.cpp
index 5037a4d1..e09b4f48 100644
--- a/src/history/historypanel.cpp
+++ b/src/history/historypanel.cpp
@@ -35,7 +35,6 @@
 // Local Includes
 #include "application.h"
 #include "paneltreeview.h"
-#include "historymanager.h"
 #include "historymodels.h"
 #include "urlfilterproxymodel.h"
 
@@ -46,7 +45,7 @@
 #include <KMessageBox>
 
 // Qt Includes
-#include <QHeaderView>
+#include <QtGui/QHeaderView>
 
 
 HistoryPanel::HistoryPanel(const QString &title, QWidget *parent, Qt::WindowFlags flags)
diff --git a/src/icondownloader.cpp b/src/icondownloader.cpp
index 6d1f3a5e..441c3ac2 100644
--- a/src/icondownloader.cpp
+++ b/src/icondownloader.cpp
@@ -24,11 +24,9 @@
 * ============================================================ */
 
 
-// Self Includes
 #include "icondownloader.h"
 #include "icondownloader.moc"
 
-// Qt Includes
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QNetworkRequest>
diff --git a/src/icondownloader.h b/src/icondownloader.h
index 54fd60fb..d2b1efb3 100644
--- a/src/icondownloader.h
+++ b/src/icondownloader.h
@@ -27,16 +27,13 @@
 #ifndef ICON_DOWNLOADER_H
 #define ICON_DOWNLOADER_H
 
-// rekonq Includes
+// rekonq includes
 #include "rekonq_defines.h"
 
-// Qt Includes
 #include <QObject>
 
-// KDE Includes
 #include <KUrl>
 
-// Forward Declarations
 class QNetworkReply;
 
 
diff --git a/src/iconmanager.cpp b/src/iconmanager.cpp
index 2876aa27..86fa5393 100644
--- a/src/iconmanager.cpp
+++ b/src/iconmanager.cpp
@@ -30,8 +30,8 @@
 
 // Local Includes
 #include "application.h"
-#include "icondownloader.h"
 #include "webicon.h"
+#include "icondownloader.h"
 
 // KDE Includes
 #include <KIO/Job>
@@ -41,11 +41,11 @@
 #include <KUrl>
 
 // Qt Includes
-#include <QDir>
+#include <QtCore/QDir>
 
-#include <QWebElement>
-#include <QWebFrame>
-#include <QWebSettings>
+#include <QtWebKit/QWebElement>
+#include <QtWebKit/QWebFrame>
+#include <QtWebKit/QWebSettings>
 
 
 IconManager::IconManager(QObject *parent)
diff --git a/src/iconmanager.h b/src/iconmanager.h
index f5416a95..4f4b9871 100644
--- a/src/iconmanager.h
+++ b/src/iconmanager.h
@@ -31,8 +31,7 @@
 #include "rekonq_defines.h"
 
 // Qt Includes
-#include <QObject>
-#include <QString>
+#include <QtCore/QObject>
 
 // Forward Declarations
 class KIcon;
diff --git a/src/mainview.cpp b/src/mainview.cpp
index 0cf1ef60..419dc413 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -36,7 +36,6 @@
 
 // Local Includes
 #include "application.h"
-#include "historymanager.h"
 #include "iconmanager.h"
 #include "mainwindow.h"
 #include "sessionmanager.h"
@@ -139,12 +138,6 @@ WebTab *MainView::currentWebTab() const
 }
 
 
-QList<TabHistory> MainView::recentlyClosedTabs()
-{
-    return m_recentlyClosedTabs;
-}
-
-
 void MainView::updateTabBar()
 {
     if (ReKonfig::alwaysShowTabBar() || count() > 1)
diff --git a/src/mainview.h b/src/mainview.h
index a80ba521..f2ed7cba 100644
--- a/src/mainview.h
+++ b/src/mainview.h
@@ -34,15 +34,16 @@
 // Rekonq Includes
 #include "rekonq_defines.h"
 
+// Local Includes
+#include "historymanager.h"
+
 // KDE Includes
 #include <KTabWidget>
 
 // Forward Declarations
 class HistoryItem;
-class MainWindow;
 class StackedUrlBar;
 class TabBar;
-class TabHistory;
 class UrlBar;
 class WebTab;
 
@@ -100,7 +101,10 @@ public:
      */
     WebTab *newWebTab(bool focused = true);
 
-    QList<TabHistory> recentlyClosedTabs();
+    inline QList<TabHistory> recentlyClosedTabs()
+    {
+        return m_recentlyClosedTabs;
+    }
 
     void restoreClosedTab(int i, bool inNewTab = true);
 
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 1a34299b..e954e7d3 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -43,7 +43,6 @@
 #include "bookmarkstoolbar.h"
 #include "downloadmanager.h"
 #include "findbar.h"
-#include "historymanager.h"
 #include "historypanel.h"
 #include "iconmanager.h"
 #include "mainview.h"
diff --git a/src/networkaccessmanager.h b/src/networkaccessmanager.h
index 55a44ce4..216e0f3d 100644
--- a/src/networkaccessmanager.h
+++ b/src/networkaccessmanager.h
@@ -35,9 +35,6 @@
 // KDE Includes
 #include <KIO/AccessManager>
 
-// Qt Includes
-#include <QByteArray>
-
 
 class REKONQ_TESTS_EXPORT NetworkAccessManager : public KIO::Integration::AccessManager
 {
diff --git a/src/newtabpage.cpp b/src/newtabpage.cpp
index aa38e37b..77a2f62f 100644
--- a/src/newtabpage.cpp
+++ b/src/newtabpage.cpp
@@ -37,7 +37,6 @@
 #include "bookmarkmanager.h"
 #include "downloadmanager.h"
 #include "iconmanager.h"
-#include "historymanager.h"
 #include "historymodels.h"
 #include "mainview.h"
 #include "mainwindow.h"
diff --git a/src/newtabpage.h b/src/newtabpage.h
index 887d3cd1..b4f3bcd6 100644
--- a/src/newtabpage.h
+++ b/src/newtabpage.h
@@ -36,9 +36,8 @@
 #include <KUrl>
 
 // Qt Includes
-#include <QObject>
-#include <QString>
-#include <QWebElement>
+#include <QtCore/QObject>
+#include <QtWebKit/QWebElement>
 
 // Forward Declarations
 class KBookmark;
diff --git a/src/opensearch/opensearchmanager.cpp b/src/opensearch/opensearchmanager.cpp
index 480e9a26..12b93ec2 100644
--- a/src/opensearch/opensearchmanager.cpp
+++ b/src/opensearch/opensearchmanager.cpp
@@ -31,10 +31,10 @@
 #include "opensearchmanager.moc"
 
 // Local Includes
-#include "application.h"
 #include "opensearchengine.h"
 #include "opensearchreader.h"
 #include "opensearchwriter.h"
+#include "application.h"
 
 // KDE Includes
 #include <KGlobal>
@@ -47,8 +47,8 @@
 #include <KConfigGroup>
 
 // Qt Includes
-#include <QFile>
-#include <QFileInfo>
+#include <QtCore/QFile>
+#include <QtCore/QFileInfo>
 #include <QDBusMessage>
 #include <QDBusConnection>
 
diff --git a/src/opensearch/opensearchmanager.h b/src/opensearch/opensearchmanager.h
index e698e0ee..84272f26 100644
--- a/src/opensearch/opensearchmanager.h
+++ b/src/opensearch/opensearchmanager.h
@@ -40,7 +40,8 @@
 #include <kio/jobclasses.h>
 
 // Qt Includes
-#include <QObject>
+#include <QtCore/QObject>
+#include <QFile>
 
 // Forward Declarations
 class OpenSearchEngine;
diff --git a/src/opensearch/opensearchreader.cpp b/src/opensearch/opensearchreader.cpp
index 897fca29..c2bf0f09 100644
--- a/src/opensearch/opensearchreader.cpp
+++ b/src/opensearch/opensearchreader.cpp
@@ -38,7 +38,7 @@
 #include <KLocalizedString>
 
 // Qt Includes
-#include <QIODevice>
+#include <QtCore/QIODevice>
 
 
 OpenSearchReader::OpenSearchReader()
diff --git a/src/opensearch/opensearchreader.h b/src/opensearch/opensearchreader.h
index d1c644ae..70b560f1 100644
--- a/src/opensearch/opensearchreader.h
+++ b/src/opensearch/opensearchreader.h
@@ -34,7 +34,7 @@
 #include "rekonq_defines.h"
 
 // Qt Includes
-#include <QXmlStreamReader>
+#include <QtCore/QXmlStreamReader>
 
 // Forward Declarations
 class OpenSearchEngine;
diff --git a/src/paneltreeview.cpp b/src/paneltreeview.cpp
index ebad68aa..a4966f1b 100644
--- a/src/paneltreeview.cpp
+++ b/src/paneltreeview.cpp
@@ -36,8 +36,8 @@
 #include <KUrl>
 
 // Qt Includes
-#include <QClipboard>
-#include <QMouseEvent>
+#include <QtGui/QClipboard>
+#include <QtGui/QMouseEvent>
 
 
 PanelTreeView::PanelTreeView(QWidget *parent)
diff --git a/src/paneltreeview.h b/src/paneltreeview.h
index 1b640310..921fe3f2 100644
--- a/src/paneltreeview.h
+++ b/src/paneltreeview.h
@@ -32,7 +32,7 @@
 #include "rekonq_defines.h"
 
 // Qt Includes
-#include <QTreeView>
+#include <QtGui/QTreeView>
 
 // Forward Declarations
 class KUrl;
diff --git a/src/previewselectorbar.cpp b/src/previewselectorbar.cpp
index b743e3c9..d72e9eb1 100644
--- a/src/previewselectorbar.cpp
+++ b/src/previewselectorbar.cpp
@@ -25,19 +25,21 @@
 * ============================================================ */
 
 
-// Self Includes
+// Auto Includes
 #include "previewselectorbar.h"
 #include "previewselectorbar.moc"
 
 // Auto Includes
 #include "rekonq.h"
 
+// Self Includes
+#include "websnap.h"
+
 // Local Include
 #include "application.h"
 #include "mainwindow.h"
 #include "webpage.h"
 #include "webtab.h"
-#include "websnap.h"
 
 // KDE Includes
 #include <KIcon>
diff --git a/src/protocolhandler.cpp b/src/protocolhandler.cpp
index fa7ca7f5..c63c37af 100644
--- a/src/protocolhandler.cpp
+++ b/src/protocolhandler.cpp
@@ -44,7 +44,6 @@
 // KDE Includes
 #include <KIO/Job>
 #include <KDirLister>
-#include <KLocale>
 #include <KLocalizedString>
 #include <KMessageBox>
 #include <KProcess>
@@ -54,8 +53,8 @@
 #include <KRun>
 
 // Qt Includes
-#include <QNetworkRequest>
-#include <QWebFrame>
+#include <QtNetwork/QNetworkRequest>
+#include <QtWebKit/QWebFrame>
 #include <QTextDocument>
 
 
diff --git a/src/protocolhandler.h b/src/protocolhandler.h
index 3bd44131..80f37dfc 100644
--- a/src/protocolhandler.h
+++ b/src/protocolhandler.h
@@ -35,7 +35,7 @@
 #include <KUrl>
 
 // Qt Includes
-#include <QObject>
+#include <QtCore/QObject>
 
 // Forward Declarations
 class KDirLister;
diff --git a/src/rekonqmenu.h b/src/rekonqmenu.h
index 8bda008b..e3d659f7 100644
--- a/src/rekonqmenu.h
+++ b/src/rekonqmenu.h
@@ -36,9 +36,6 @@
 // KDE Includes
 #include <KMenu>
 
-// Forward Declarations
-class QWidget;
-
 
 /**
  * Menu shown inside rekonq window.
diff --git a/src/sessionmanager.cpp b/src/sessionmanager.cpp
index 02488801..b0ef1fce 100644
--- a/src/sessionmanager.cpp
+++ b/src/sessionmanager.cpp
@@ -32,16 +32,16 @@
 
 // Local Includes
 #include "application.h"
-#include "historymanager.h"
 #include "mainview.h"
 #include "mainwindow.h"
+#include "tabbar.h"
 #include "webtab.h"
 
 // KDE Includes
 #include <KStandardDirs>
 
 // Qt Includes
-#include <QFile>
+#include <QtCore/QFile>
 
 
 // Only used internally
@@ -148,7 +148,7 @@ void SessionManager::saveSession()
             tab.setAttribute("title", mv->webTab(tabNo)->view()->title()); // redundant, but needed for closedSites()
             // as there's not way to read out the historyData
             tab.setAttribute("url", u.url());
-            if (mv->currentIndex() == tabNo)
+            if (mv->tabBar()->currentIndex() == tabNo)
             {
                 tab.setAttribute("currentTab", 1);
             }
@@ -188,7 +188,7 @@ bool SessionManager::restoreSessionFromScratch()
 
         int currentTab = loadViewTabs(mv, window, false);
 
-        mv->setCurrentIndex(currentTab);
+        mv->tabBar()->setCurrentIndex(currentTab);
     }
 
     return true;
@@ -210,7 +210,7 @@ void SessionManager::restoreCrashedSession()
 
         int currentTab = loadViewTabs(mv, window, true);
 
-        mv->setCurrentIndex(currentTab);
+        mv->tabBar()->setCurrentIndex(currentTab);
     }
 
     setSessionManagementEnabled(true);
@@ -234,7 +234,7 @@ int SessionManager::restoreSavedSession()
 
         int currentTab = loadViewTabs(mv, window, true);
 
-        mv->setCurrentIndex(currentTab);
+        mv->tabBar()->setCurrentIndex(currentTab);
     }
 
     return winNo;
@@ -261,7 +261,7 @@ bool SessionManager::restoreMainWindow(MainWindow* window)
 
         int currentTab = loadViewTabs(mv, savedWindowElement, false);
 
-        mv->setCurrentIndex(currentTab);
+        mv->tabBar()->setCurrentIndex(currentTab);
 
         return true;
     }
diff --git a/src/sessionmanager.h b/src/sessionmanager.h
index 810d9b5c..b4748fde 100644
--- a/src/sessionmanager.h
+++ b/src/sessionmanager.h
@@ -34,10 +34,10 @@
 #include "rekonq_defines.h"
 
 // Qt Includes
-#include <QObject>
-#include <QString>
+#include <QtCore/QObject>
 
 // Forward Declarations
+class QString;
 class TabHistory;
 class MainWindow;
 
diff --git a/src/sslinfodialog.cpp b/src/sslinfodialog.cpp
index 2f0b44e4..234dbb82 100644
--- a/src/sslinfodialog.cpp
+++ b/src/sslinfodialog.cpp
@@ -28,21 +28,20 @@
 #include "sslinfodialog.h"
 #include "sslinfodialog.moc"
 
-// KDE Includes
+
 #include <KFileDialog>
 
-#include <kglobal.h>
-#include <klocale.h>
-#include <ktcpsocket.h>
+#include <QtCore/QDate>
+#include <QtCore/QFile>
 
-// Qt Includes
-#include <QDate>
-#include <QFile>
+#include <QtGui/QLabel>
+#include <QtGui/QTextDocument>
 
-#include <QLabel>
-#include <QTextDocument>
+#include <QtNetwork/QSslCertificate>
 
-#include <QSslCertificate>
+#include <kglobal.h>
+#include <klocale.h>
+#include <ktcpsocket.h>
 
 
 SslInfoDialog::SslInfoDialog(const QString &host, const WebSslInfo &info, QWidget *parent)
diff --git a/src/sslinfodialog.h b/src/sslinfodialog.h
index 94f610c6..0c7f97ce 100644
--- a/src/sslinfodialog.h
+++ b/src/sslinfodialog.h
@@ -27,25 +27,19 @@
 #ifndef SSL_INFO_DIALOG_H
 #define SSL_INFO_DIALOG_H
 
-
-// Rekonq Includes
 #include "rekonq_defines.h"
 
-// Local Includes
 #include "websslinfo.h"
 
 // Ui Includes
 #include "ui_sslinfo.h"
 
-// KDE Includes
-#include <KDialog>
+#include <KDE/KDialog>
 
-// Qt Includes
-#include <QString>
+#include <QList>
 
-// Forward Declarations
 class QSslCertificate;
-
+class QString;
 
 /**
  * Rekonq SSL Information Dialog
diff --git a/src/sync/syncmanager.cpp b/src/sync/syncmanager.cpp
index de14703c..5766f418 100644
--- a/src/sync/syncmanager.cpp
+++ b/src/sync/syncmanager.cpp
@@ -42,9 +42,6 @@
 // KDE Includes
 #include <klocalizedstring.h>
 
-// Qt Includes
-#include <QPointer>
-
 
 SyncManager::SyncManager(QObject *parent)
     : QObject(parent)
diff --git a/src/tabbar.cpp b/src/tabbar.cpp
index e3bcf3eb..326d8647 100644
--- a/src/tabbar.cpp
+++ b/src/tabbar.cpp
@@ -35,7 +35,6 @@
 #include "rekonq.h"
 
 #include "application.h"
-#include "historymanager.h"
 #include "iconmanager.h"
 #include "mainview.h"
 #include "mainwindow.h"
@@ -53,14 +52,12 @@
 #include <KColorScheme>
 
 // Qt Includes
-#include <QLabel>
-#include <QLayout>
-#include <QMouseEvent>
-#include <QToolButton>
+#include <QtGui/QLabel>
+#include <QtGui/QLayout>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QToolButton>
 #include <QPropertyAnimation>
 #include <QStyleOptionFrameV3>
-#include <QSignalMapper>
-#include <QTimer>
 
 
 static inline QByteArray highlightPropertyName(int index)
@@ -69,9 +66,6 @@ static inline QByteArray highlightPropertyName(int index)
 }
 
 
-// ----------------------------------------------
-
-
 TabBar::TabBar(QWidget *parent)
     : KTabBar(parent)
     , m_actualIndex(-1)
diff --git a/src/tabbar.h b/src/tabbar.h
index 161612c2..3e29b248 100644
--- a/src/tabbar.h
+++ b/src/tabbar.h
@@ -37,6 +37,9 @@
 // KDE Includes
 #include <KTabBar>
 
+//Qt Includes
+#include <QSignalMapper>
+
 // Forward Declarations
 class TabPreviewPopup;
 class TabHighlightEffect;
@@ -44,7 +47,7 @@ class TabHighlightEffect;
 class KActionMenu;
 
 class QPropertyAnimation;
-class QSignalMapper;
+
 
 /**
  * Tab bar with a few more features such as
diff --git a/src/tabhighlighteffect.cpp b/src/tabhighlighteffect.cpp
index 121afd15..b6f191d8 100644
--- a/src/tabhighlighteffect.cpp
+++ b/src/tabhighlighteffect.cpp
@@ -24,25 +24,18 @@
 * ============================================================ */
 
 
-// Self Includes
+//Self Includes
 #include "tabhighlighteffect.h"
 #include "tabhighlighteffect.moc"
 
-// Local Includes
-#include "tabbar.h"
-
-// Qt Includes
-#include <QEvent>
-#include <QPainter>
+//Qt Includes
 #include <QVariant>
+#include <tabbar.h>
 
 
 const QByteArray prep("hAnim");
 
 
-// ---------------------------------------------------------------------------
-
-
 TabHighlightEffect::TabHighlightEffect(TabBar *tabBar)
     : QGraphicsEffect(tabBar)
     , m_tabBar(tabBar)
diff --git a/src/tabhighlighteffect.h b/src/tabhighlighteffect.h
index 88302283..6deaa285 100644
--- a/src/tabhighlighteffect.h
+++ b/src/tabhighlighteffect.h
@@ -30,14 +30,12 @@
 
 // Qt Includes
 #include <QGraphicsEffect>
-#include <QColor>
+#include <QPainter>
+#include <QEvent>
 
 // Forward Declarations
 class TabBar;
 
-class QEvent;
-class QPainter;
-
 
 class TabHighlightEffect : public QGraphicsEffect
 {
diff --git a/src/tabpreviewpopup.cpp b/src/tabpreviewpopup.cpp
index e2df4989..4466868d 100644
--- a/src/tabpreviewpopup.cpp
+++ b/src/tabpreviewpopup.cpp
@@ -29,10 +29,11 @@
 #include "tabpreviewpopup.h"
 
 // Rekonq Includes
+#include "webtab.h"
+#include "tabbar.h"
+#include "websnap.h"
 #include "application.h"
 #include "mainwindow.h"
-#include "tabbar.h"
-#include "webtab.h"
 
 //Qt Includes
 #include <QLabel>
diff --git a/src/tabpreviewpopup.h b/src/tabpreviewpopup.h
index 5c62102f..01995a20 100644
--- a/src/tabpreviewpopup.h
+++ b/src/tabpreviewpopup.h
@@ -53,6 +53,9 @@ public:
     virtual ~TabPreviewPopup();
 
 private:
+    QLabel *m_thumbnail;
+    QLabel *m_url;
+
     void setWebTab(WebTab *tab = 0);
     void setUrl(const QString& text);
     void setThumbnail(const QPixmap& pixmap);
@@ -60,10 +63,6 @@ private:
 
 protected:
     void paintEvent(QPaintEvent *event);
-
-private:
-    QLabel *m_thumbnail;
-    QLabel *m_url;
 };
 
 #endif // TABPREVIEWPOPUP_H
diff --git a/src/urlbar/bookmarkwidget.cpp b/src/urlbar/bookmarkwidget.cpp
index 536befb8..b36af2bc 100644
--- a/src/urlbar/bookmarkwidget.cpp
+++ b/src/urlbar/bookmarkwidget.cpp
@@ -41,10 +41,10 @@
 #include <KLineEdit>
 
 // Qt Includes
-#include <QDialogButtonBox>
-#include <QFormLayout>
-#include <QLabel>
-#include <QPushButton>
+#include <QtGui/QDialogButtonBox>
+#include <QtGui/QFormLayout>
+#include <QtGui/QLabel>
+#include <QtGui/QPushButton>
 
 
 BookmarkWidget::BookmarkWidget(const KBookmark &bookmark, QWidget *parent)
diff --git a/src/urlbar/bookmarkwidget.h b/src/urlbar/bookmarkwidget.h
index c2985759..f70fc750 100644
--- a/src/urlbar/bookmarkwidget.h
+++ b/src/urlbar/bookmarkwidget.h
@@ -29,7 +29,7 @@
 #define BOOKMARKWIDGET_H
 
 // Qt Includes
-#include <QMenu>
+#include <QtGui/QMenu>
 
 // Forward Declarations
 class KBookmark;
diff --git a/src/urlbar/completionwidget.cpp b/src/urlbar/completionwidget.cpp
index 92ef4fb9..f4e7220a 100644
--- a/src/urlbar/completionwidget.cpp
+++ b/src/urlbar/completionwidget.cpp
@@ -33,7 +33,7 @@
 
 // Local Includes
 #include "application.h"
-#include "listitem.h"
+#include "urlresolver.h"
 #include "searchengine.h"
 #include "urlbar.h"
 
@@ -42,12 +42,12 @@
 #include <KUrl>
 
 // Qt Includes
-#include <QPoint>
-#include <QSize>
-#include <QEvent>
+#include <QtCore/QPoint>
+#include <QtCore/QSize>
+#include <QtCore/QEvent>
 
-#include <QVBoxLayout>
-#include <QKeyEvent>
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QKeyEvent>
 
 
 
diff --git a/src/urlbar/completionwidget.h b/src/urlbar/completionwidget.h
index 92d1bd39..dc4eb3a4 100644
--- a/src/urlbar/completionwidget.h
+++ b/src/urlbar/completionwidget.h
@@ -32,7 +32,7 @@
 #include "rekonq_defines.h"
 
 // Local Includes
-#include "urlresolver.h"
+#include "listitem.h"
 
 // KDE Includes
 #include <KService>
@@ -40,9 +40,6 @@
 // Qt Includes
 #include <QFrame>
 
-// Forward Declarations
-class ListItem;
-
 
 class CompletionWidget : public QFrame
 {
diff --git a/src/urlbar/favoritewidget.cpp b/src/urlbar/favoritewidget.cpp
index 6a4ffaba..f72deace 100644
--- a/src/urlbar/favoritewidget.cpp
+++ b/src/urlbar/favoritewidget.cpp
@@ -35,7 +35,6 @@
 #include "application.h"
 #include "bookmarkmanager.h"
 #include "bookmarkowner.h"
-#include "webtab.h"
 
 // KDE Includes
 #include <KLocalizedString>
@@ -43,10 +42,10 @@
 #include <KLineEdit>
 
 // Qt Includes
-#include <QDialogButtonBox>
-#include <QFormLayout>
-#include <QLabel>
-#include <QPushButton>
+#include <QtGui/QDialogButtonBox>
+#include <QtGui/QFormLayout>
+#include <QtGui/QLabel>
+#include <QtGui/QPushButton>
 
 
 FavoriteWidget::FavoriteWidget(WebTab *tab, QWidget *parent)
diff --git a/src/urlbar/favoritewidget.h b/src/urlbar/favoritewidget.h
index d0b05f14..c75d2a7e 100644
--- a/src/urlbar/favoritewidget.h
+++ b/src/urlbar/favoritewidget.h
@@ -29,11 +29,11 @@
 
 
 // Qt Includes
-#include <QMenu>
-#include <QCheckBox>
+#include <QtGui/QMenu>
+#include <QtGui/QCheckBox>
 
-// Forward Declarations
-class WebTab;
+// Local Includes
+#include "webtab.h"
 
 
 class FavoriteWidget : public QMenu
diff --git a/src/urlbar/listitem.cpp b/src/urlbar/listitem.cpp
index 92552e7e..c66d3727 100644
--- a/src/urlbar/listitem.cpp
+++ b/src/urlbar/listitem.cpp
@@ -49,6 +49,7 @@
 #include <QActionGroup>
 #include <QHBoxLayout>
 #include <QVBoxLayout>
+#include <QLabel>
 #include <QSizePolicy>
 #include <QPixmap>
 #include <QStylePainter>
@@ -56,7 +57,6 @@
 #include <QWebSettings>
 #include <QFile>
 #include <QTextDocument>
-#include <QBitArray>
 
 
 ListItem::ListItem(const UrlSearchItem &item, QWidget *parent)
@@ -392,14 +392,14 @@ ImageLabel::ImageLabel(const QString &url, int width, int height, QWidget *paren
     {
         KIO::TransferJob *job = KIO::get(KUrl(url), KIO::NoReload, KIO::HideProgressInfo);
         connect(job,  SIGNAL(data(KIO::Job*,QByteArray)),
-                this, SLOT(slotData(KJob*,QByteArray)));
+                this, SLOT(slotData(KIO::Job*,QByteArray)));
         connect(job,  SIGNAL(result(KJob*)),
                 this, SLOT(slotResult(KJob*)));
     }
 }
 
 
-void ImageLabel::slotData(KJob *job, const QByteArray &data)
+void ImageLabel::slotData(KIO::Job *job, const QByteArray &data)
 {
     Q_UNUSED(job);
     m_data.append(data);
diff --git a/src/urlbar/listitem.h b/src/urlbar/listitem.h
index 84e3501b..c2f79c93 100644
--- a/src/urlbar/listitem.h
+++ b/src/urlbar/listitem.h
@@ -31,25 +31,22 @@
 // Rekonq Includes
 #include "rekonq_defines.h"
 
+// Local Includes
+#include "urlresolver.h"
+
 // KDE Includes
 #include <KToolBar>
 #include <KService>
-#include <KUrl>
+#include <KIcon>
 
 // Qt Includes
 #include <QWidget>
-#include <QLabel>
 #include <QStyleOptionViewItemV4>
-#include <QString>
-#include <QByteArray>
+#include <QLabel>
 
 // Forward Declarations
 class UrlSearchItem;
-
 class KAction;
-class KIcon;
-class KJob;
-
 class QActionGroup;
 
 
@@ -261,7 +258,7 @@ private:
     QByteArray m_data;
 
 private Q_SLOTS:
-    void slotData(KJob* job, const QByteArray& data);
+    void slotData(KIO::Job* job, const QByteArray& data);
     void slotResult(KJob* job);
 };
 
diff --git a/src/urlbar/rsswidget.cpp b/src/urlbar/rsswidget.cpp
index 2e452fbb..d4778cf5 100644
--- a/src/urlbar/rsswidget.cpp
+++ b/src/urlbar/rsswidget.cpp
@@ -42,13 +42,13 @@
 #include <KUrl>
 
 // Qt Includes
-#include <QDBusConnectionInterface>
-#include <QDBusInterface>
+#include <QtDBus/QDBusConnectionInterface>
+#include <QtDBus/QDBusInterface>
 
-#include <QDialogButtonBox>
-#include <QFormLayout>
-#include <QLabel>
-#include <QPushButton>
+#include <QtGui/QDialogButtonBox>
+#include <QtGui/QFormLayout>
+#include <QtGui/QLabel>
+#include <QtGui/QPushButton>
 
 
 RSSWidget::RSSWidget(const QMap< KUrl, QString > &map, QWidget *parent)
diff --git a/src/urlbar/rsswidget.h b/src/urlbar/rsswidget.h
index eaa3de7d..702ea3ae 100644
--- a/src/urlbar/rsswidget.h
+++ b/src/urlbar/rsswidget.h
@@ -28,7 +28,7 @@
 #define RSSWIDGET_H
 
 // Qt Includes
-#include <QMenu>
+#include <QtGui/QMenu>
 
 // Forward Declarations
 class KComboBox;
diff --git a/src/urlbar/sslwidget.cpp b/src/urlbar/sslwidget.cpp
index 52724733..127dae86 100644
--- a/src/urlbar/sslwidget.cpp
+++ b/src/urlbar/sslwidget.cpp
@@ -34,13 +34,11 @@
 #include "sslinfodialog.h"
 
 // Qt Includes
-#include <QPointer>
-
-#include <QDialogButtonBox>
-#include <QGridLayout>
-#include <QLabel>
-#include <QPushButton>
-#include <QTextDocument>
+#include <QtGui/QDialogButtonBox>
+#include <QtGui/QGridLayout>
+#include <QtGui/QLabel>
+#include <QtGui/QPushButton>
+#include <QtGui/QTextDocument>
 
 
 SSLWidget::SSLWidget(const QUrl &url, const WebSslInfo &info, QWidget *parent)
diff --git a/src/urlbar/sslwidget.h b/src/urlbar/sslwidget.h
index dd6f020d..bc1e2291 100644
--- a/src/urlbar/sslwidget.h
+++ b/src/urlbar/sslwidget.h
@@ -32,9 +32,8 @@
 #include "websslinfo.h"
 
 // Qt Includes
-#include <QMenu>
-
-#include <QUrl>
+#include <QtGui/QMenu>
+#include <QtCore/QUrl>
 
 
 class SSLWidget : public QMenu
diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index 2b4b7bf0..43109db3 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -55,12 +55,11 @@
 #include <KMenu>
 
 // Qt Includes
-#include <QPainter>
-#include <QPaintEvent>
-#include <QPalette>
-#include <QVBoxLayout>
+#include <QtGui/QPainter>
+#include <QtGui/QPaintEvent>
+#include <QtGui/QPalette>
+#include <QtGui/QVBoxLayout>
 #include <QClipboard>
-#include <QTimer>
 
 
 
diff --git a/src/urlbar/urlresolver.h b/src/urlbar/urlresolver.h
index 97a5e9a4..57b3e11e 100644
--- a/src/urlbar/urlresolver.h
+++ b/src/urlbar/urlresolver.h
@@ -34,7 +34,6 @@
 // Locale Includes
 #include "application.h"
 #include "opensearchmanager.h"
-#include "suggestionparser.h"
 
 // KDE Includes
 #include <KUrl>
@@ -43,6 +42,7 @@
 // Qt Includes
 #include <QString>
 #include <QList>
+#include "suggestionparser.h"
 
 
 class UrlSearchItem
diff --git a/src/urlbar/webshortcutwidget.cpp b/src/urlbar/webshortcutwidget.cpp
index 409d0b32..d44f6f1a 100644
--- a/src/urlbar/webshortcutwidget.cpp
+++ b/src/urlbar/webshortcutwidget.cpp
@@ -42,7 +42,6 @@
 #include <QDialogButtonBox>
 #include <QFormLayout>
 
-
 WebShortcutWidget::WebShortcutWidget(QWidget *parent)
     : QMenu(parent)
     , m_wsLineEdit(new QLineEdit(this))
diff --git a/src/urlfilterproxymodel.h b/src/urlfilterproxymodel.h
index 6cb8574e..3d0c6582 100644
--- a/src/urlfilterproxymodel.h
+++ b/src/urlfilterproxymodel.h
@@ -33,7 +33,7 @@
 #include "rekonq_defines.h"
 
 // Qt Includes
-#include <QSortFilterProxyModel>
+#include <QtGui/QSortFilterProxyModel>
 
 
 /**
diff --git a/src/urlpanel.cpp b/src/urlpanel.cpp
index 8e0d425f..b4359148 100644
--- a/src/urlpanel.cpp
+++ b/src/urlpanel.cpp
@@ -38,9 +38,9 @@
 #include <KLocalizedString>
 
 // Qt Includes
-#include <QLabel>
-#include <QHBoxLayout>
-#include <QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
 
 
 UrlPanel::UrlPanel(const QString &title, QWidget *parent, Qt::WindowFlags flags)
diff --git a/src/urlpanel.h b/src/urlpanel.h
index c8d15a8e..73ffc024 100644
--- a/src/urlpanel.h
+++ b/src/urlpanel.h
@@ -33,7 +33,7 @@
 #include "rekonq_defines.h"
 
 // Qt Includes
-#include <QDockWidget>
+#include <QtGui/QDockWidget>
 
 // Forward Declarations
 class PanelTreeView;
@@ -69,12 +69,12 @@ protected Q_SLOTS:
     virtual void contextMenuGroup(const QPoint &pos) = 0;
     virtual void contextMenuEmpty(const QPoint &pos) = 0;
 
-private Q_SLOTS:
-    void expandTreeView();
-
 private:
     PanelTreeView *_treeView;
     bool _loaded;
+
+private Q_SLOTS:
+    void expandTreeView();
 };
 
 
diff --git a/src/useragent/useragentmanager.h b/src/useragent/useragentmanager.h
index 6037cc7c..84042cf6 100644
--- a/src/useragent/useragentmanager.h
+++ b/src/useragent/useragentmanager.h
@@ -28,10 +28,8 @@
 #define USER_AGENT_MANAGER_H
 
 
-// Qt Includes
 #include <QObject>
 
-// Forward Declarations
 class WebTab;
 
 class KAction;
diff --git a/src/walletbar.h b/src/walletbar.h
index f1bbd2cb..e63cb941 100644
--- a/src/walletbar.h
+++ b/src/walletbar.h
@@ -36,7 +36,6 @@
 
 // Qt Includes
 #include <QUrl>
-#include <QString>
 
 
 class REKONQ_TESTS_EXPORT WalletBar : public KMessageWidget
diff --git a/src/webicon.cpp b/src/webicon.cpp
index 7943cfb6..03097956 100644
--- a/src/webicon.cpp
+++ b/src/webicon.cpp
@@ -33,8 +33,8 @@
 #include "iconmanager.h"
 
 // Qt Includes
-#include <QTimer>
-#include <QWebFrame>
+#include <QtCore/QTimer>
+#include <QtWebKit/QWebFrame>
 
 
 WebIcon::WebIcon(const KUrl& url, QObject *parent)
diff --git a/src/webicon.h b/src/webicon.h
index 39f98e7e..df5cc828 100644
--- a/src/webicon.h
+++ b/src/webicon.h
@@ -34,7 +34,7 @@
 #include <KUrl>
 
 // Qt Includes
-#include <QWebPage>
+#include <QtWebKit/QWebPage>
 
 
 class REKONQ_TESTS_EXPORT WebIcon : public QObject
diff --git a/src/webinspectorpanel.cpp b/src/webinspectorpanel.cpp
index 06e98643..59e95167 100644
--- a/src/webinspectorpanel.cpp
+++ b/src/webinspectorpanel.cpp
@@ -35,8 +35,8 @@
 #include "webtab.h"
 
 // Qt Includes
-#include <QAction>
-#include <QWebInspector>
+#include <QtGui/QAction>
+#include <QtWebKit/QWebInspector>
 
 
 WebInspectorPanel::WebInspectorPanel(QString title, QWidget *parent)
diff --git a/src/webinspectorpanel.h b/src/webinspectorpanel.h
index ebe82267..92da538b 100644
--- a/src/webinspectorpanel.h
+++ b/src/webinspectorpanel.h
@@ -33,16 +33,16 @@
 #include "rekonq_defines.h"
 
 // Qt Includes
-#include <QDockWidget>
+#include <QtGui/QDockWidget>
 
 // Forward
 class QWebInspector;
 
 
 /**
- *  Docked web inspector
- *  behaviour : hide/show by tab, not globally
-**/
+    Docked web inspector
+    behaviour : hide/show by tab, not globally
+*/
 class REKONQ_TESTS_EXPORT WebInspectorPanel : public QDockWidget
 {
     Q_OBJECT
diff --git a/src/webpage.cpp b/src/webpage.cpp
index f803643e..f22d478b 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -41,7 +41,6 @@
 #include "adblockmanager.h"
 #include "application.h"
 #include "downloadmanager.h"
-#include "historymanager.h"
 #include "iconmanager.h"
 #include "mainview.h"
 #include "mainwindow.h"
@@ -71,9 +70,7 @@
 #include <kparts/browseropenorsavequestion.h>
 
 // Qt Includes
-#include <QTextDocument>
-#include <QFileInfo>
-#include <QNetworkReply>
+#include <QtGui/QTextDocument>
 
 
 // Returns true if the scheme and domain of the two urls match...
diff --git a/src/webpluginfactory.cpp b/src/webpluginfactory.cpp
index b62af1c8..7713c74b 100644
--- a/src/webpluginfactory.cpp
+++ b/src/webpluginfactory.cpp
@@ -29,10 +29,9 @@
 #include "webpluginfactory.h"
 #include "webpluginfactory.moc"
 
-// Auto Includes
+// Local Includes
 #include "rekonq.h"
 
-// Local Includes
 #include "clicktoflash.h"
 
 
diff --git a/src/websnap.h b/src/websnap.h
index 3e9111f8..fc5da869 100644
--- a/src/websnap.h
+++ b/src/websnap.h
@@ -37,8 +37,8 @@
 #include <KUrl>
 
 // Qt Includes
-#include <QObject>
-#include <QWebPage>
+#include <QtCore/QObject>
+#include <QtWebKit/QWebPage>
 
 // Forward Declarations
 class QPixmap;
diff --git a/src/webview.cpp b/src/webview.cpp
index cc3828c4..688816e6 100644
--- a/src/webview.cpp
+++ b/src/webview.cpp
@@ -53,16 +53,14 @@
 #include <KToolInvocation>
 
 // Qt Includes
-#include <QFile>
-#include <QTimer>
+#include <QtCore/QFile>
+#include <QtCore/QTimer>
 
-#include <QClipboard>
-#include <QContextMenuEvent>
-#include <QLabel>
+#include <QtGui/QClipboard>
+#include <QtGui/QContextMenuEvent>
 
-#include <QWebFrame>
-#include <QWebHistory>
-#include <QNetworkRequest>
+#include <QtWebKit/QWebFrame>
+#include <QtWebKit/QWebHistory>
 
 
 WebView::WebView(QWidget* parent)
diff --git a/src/webview.h b/src/webview.h
index 09dc58e6..18977798 100644
--- a/src/webview.h
+++ b/src/webview.h
@@ -35,17 +35,14 @@
 // KDE Includes
 #include <KWebView>
 
-// Qt Includes
-#include <QTime>
-#include <QPoint>
-#include <QPixmap>
+//Qt Includes
+#include <QtCore/QTime>
+#include <QLabel>
+#include <QToolTip>
 
 // Forward Declarations
 class WebPage;
 
-class QLabel;
-class QTimer;
-
 
 class REKONQ_TESTS_EXPORT WebView : public KWebView
 {
diff --git a/src/zoombar.cpp b/src/zoombar.cpp
index 292ef413..d709b38a 100644
--- a/src/zoombar.cpp
+++ b/src/zoombar.cpp
@@ -44,10 +44,10 @@
 #include <KConfigGroup>
 
 // Qt Includes
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QSlider>
-#include <QToolButton>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QLabel>
+#include <QtGui/QSlider>
+#include <QtGui/QToolButton>
 
 
 ZoomBar::ZoomBar(QWidget *parent)
diff --git a/src/zoombar.h b/src/zoombar.h
index e1ec1ced..8261447b 100644
--- a/src/zoombar.h
+++ b/src/zoombar.h
@@ -33,12 +33,12 @@
 #include "rekonq_defines.h"
 
 // Qt Includes
-#include <QWidget>
+#include <QtGui/QWidget>
+#include <QtGui/QLabel>
 
 // Forward Declarations
 class MainWindow;
 
-class QLabel;
 class QSlider;
 class QToolButton;