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

85 files changed, 312 insertions, 240 deletions

diff --git a/src/adblock/adblockmanager.cpp b/src/adblock/adblockmanager.cpp
index b5739144..fca4ea03 100644
--- a/src/adblock/adblockmanager.cpp
+++ b/src/adblock/adblockmanager.cpp
@@ -45,6 +45,8 @@
 // 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 9b125737..fe92cf11 100644
--- a/src/adblock/adblockmanager.h
+++ b/src/adblock/adblockmanager.h
@@ -134,11 +134,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 0f9e4d7f..28ff7c0c 100644
--- a/src/adblock/adblockwidget.h
+++ b/src/adblock/adblockwidget.h
@@ -39,7 +39,6 @@
 
 // Qt Includes
 #include <QWidget>
-#include <QTreeWidgetItem>
 
 
 class AdBlockWidget : public QWidget, private Ui::adblock
diff --git a/src/analyzer/analyzerpanel.cpp b/src/analyzer/analyzerpanel.cpp
index 099a4123..3bd17e9c 100644
--- a/src/analyzer/analyzerpanel.cpp
+++ b/src/analyzer/analyzerpanel.cpp
@@ -30,6 +30,7 @@
 #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 8441a395..591e5947 100644
--- a/src/analyzer/analyzerpanel.h
+++ b/src/analyzer/analyzerpanel.h
@@ -31,13 +31,11 @@
 // 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 0cf26f90..882318d4 100644
--- a/src/analyzer/networkanalyzer.cpp
+++ b/src/analyzer/networkanalyzer.cpp
@@ -37,14 +37,17 @@
 #include <KPassivePopup>
 
 // Qt Includes
-#include <QtGui/QTreeWidget>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QHeaderView>
-#include <QtGui/QLabel>
+#include <QTreeWidget>
+#include <QVBoxLayout>
+#include <QHeaderView>
+#include <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 f5824b07..af1e1145 100644
--- a/src/analyzer/networkanalyzer.h
+++ b/src/analyzer/networkanalyzer.h
@@ -34,21 +34,21 @@
 #include "rekonq_defines.h"
 
 // Qt Includes
-#include <QtCore/QMap>
-#include <QtCore/QList>
+#include <QWidget>
 
-#include <QtGui/QWidget>
+#include <QMap>
+#include <QList>
 
-#include <QtNetwork/QNetworkAccessManager>
-#include <QtNetwork/QNetworkReply>
-#include <QtNetwork/QNetworkRequest>
-#include <QPoint>
+#include <QNetworkAccessManager>
 
 // 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 bfe5cc09..0dea1296 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -51,6 +51,7 @@
 #include "stackedurlbar.h"
 #include "tabbar.h"
 #include "urlbar.h"
+#include "urlresolver.h"
 #include "useragentmanager.h"
 #include "webtab.h"
 
@@ -70,6 +71,8 @@
 
 // Qt Includes
 #include <QVBoxLayout>
+#include <QDir>
+#include <QTimer>
 
 
 using namespace ThreadWeaver;
diff --git a/src/application.h b/src/application.h
index 2fe1499e..36114ae0 100644
--- a/src/application.h
+++ b/src/application.h
@@ -40,12 +40,13 @@
 #include <KUniqueApplication>
 
 // Qt Includes
-#include <QtCore/QDateTime>
-#include <QtCore/QWeakPointer>
+#include <QWeakPointer>
+
+// Forward Declarations
+class KAction;
 
 class QWebHistory;
 
-// Forward Declarations
 class AdBlockManager;
 class BookmarkManager;
 class DownloadManager;
@@ -58,8 +59,6 @@ class UserAgentManager;
 class SyncManager;
 class WebTab;
 
-class KAction;
-
 
 typedef QList< QWeakPointer<MainWindow> > MainWindowList;
 
diff --git a/src/bookmarks/bookmarkowner.cpp b/src/bookmarks/bookmarkowner.cpp
index a53b888b..be28448c 100644
--- a/src/bookmarks/bookmarkowner.cpp
+++ b/src/bookmarks/bookmarkowner.cpp
@@ -44,7 +44,7 @@
 #include <KMessageBox>
 
 // Qt Includes
-#include <QtGui/QClipboard>
+#include <QClipboard>
 
 
 BookmarkOwner::BookmarkOwner(KBookmarkManager *manager, QObject *parent)
diff --git a/src/bookmarks/bookmarkscontextmenu.h b/src/bookmarks/bookmarkscontextmenu.h
index 34ef66e0..c927f3a6 100644
--- a/src/bookmarks/bookmarkscontextmenu.h
+++ b/src/bookmarks/bookmarkscontextmenu.h
@@ -33,6 +33,7 @@
 // Forward Declarations
 class BookmarkOwner;
 
+
 class BookmarksContextMenu : public KBookmarkContextMenu
 {
 public:
diff --git a/src/clicktoflash.cpp b/src/clicktoflash.cpp
index 94ae40ae..baa61367 100644
--- a/src/clicktoflash.cpp
+++ b/src/clicktoflash.cpp
@@ -33,11 +33,12 @@
 #include <KLocalizedString>
 
 // Qt Includes
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QToolButton>
-#include <QtWebKit/QWebElement>
-#include <QtWebKit/QWebFrame>
-#include <QtWebKit/QWebView>
+#include <QHBoxLayout>
+#include <QToolButton>
+
+#include <QWebElement>
+#include <QWebFrame>
+#include <QWebView>
 
 
 ClickToFlash::ClickToFlash(const QUrl &pluginUrl, QWidget *parent)
diff --git a/src/clicktoflash.h b/src/clicktoflash.h
index d7648204..fcafea59 100644
--- a/src/clicktoflash.h
+++ b/src/clicktoflash.h
@@ -33,8 +33,8 @@
 #include "rekonq_defines.h"
 
 // Qt Includes
-#include <QtCore/QUrl>
-#include <QtGui/QWidget>
+#include <QUrl>
+#include <QWidget>
 
 // Forward Declarations
 class QWebElement;
@@ -63,4 +63,3 @@ private:
 };
 
 #endif // CLICKTOFLASH_H
-
diff --git a/src/downloadmanager.cpp b/src/downloadmanager.cpp
index a3165764..4dc7e670 100644
--- a/src/downloadmanager.cpp
+++ b/src/downloadmanager.cpp
@@ -52,9 +52,9 @@
 #include <QWebSettings>
 #include <QNetworkReply>
 
-#include <QtDBus/QDBusConnection>
-#include <QtDBus/QDBusConnectionInterface>
-#include <QtDBus/QDBusInterface>
+#include <QDBusConnection>
+#include <QDBusConnectionInterface>
+#include <QDBusInterface>
 
 
 DownloadManager::DownloadManager(QObject *parent)
diff --git a/src/findbar.cpp b/src/findbar.cpp
index 889d3921..d218340f 100644
--- a/src/findbar.cpp
+++ b/src/findbar.cpp
@@ -43,13 +43,13 @@
 #include <KColorScheme>
 
 // Qt Includes
-#include <QtCore/QTimer>
+#include <QTimer>
 
-#include <QtGui/QCheckBox>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QKeyEvent>
-#include <QtGui/QLabel>
-#include <QtGui/QToolButton>
+#include <QCheckBox>
+#include <QHBoxLayout>
+#include <QKeyEvent>
+#include <QLabel>
+#include <QToolButton>
 
 
 FindBar::FindBar(MainWindow *window)
diff --git a/src/findbar.h b/src/findbar.h
index 2b1ec602..04a6bd15 100644
--- a/src/findbar.h
+++ b/src/findbar.h
@@ -33,7 +33,7 @@
 #include "rekonq_defines.h"
 
 // Qt Includes
-#include <QtGui/QWidget>
+#include <QWidget>
 
 // Forward Declarations
 class MainWindow;
diff --git a/src/history/autosaver.cpp b/src/history/autosaver.cpp
index bb2a7683..ee84e299 100644
--- a/src/history/autosaver.cpp
+++ b/src/history/autosaver.cpp
@@ -30,10 +30,10 @@
 #include "autosaver.moc"
 
 // Qt Includes
-#include <QtCore/QMetaObject>
-#include <QtCore/QTimerEvent>
-#include <QtCore/QBasicTimer>
-#include <QtCore/QTime>
+#include <QMetaObject>
+#include <QTimerEvent>
+#include <QBasicTimer>
+#include <QTime>
 
 
 const int AUTOSAVE_TIME  = 1000 * 3;  // seconds
diff --git a/src/history/autosaver.h b/src/history/autosaver.h
index f165377c..4c385ed6 100644
--- a/src/history/autosaver.h
+++ b/src/history/autosaver.h
@@ -33,7 +33,7 @@
 #include "rekonq_defines.h"
 
 // Qt Includes
-#include <QtCore/QObject>
+#include <QObject>
 
 // Forward Declarations
 class QBasicTimer;
diff --git a/src/history/historymanager.cpp b/src/history/historymanager.cpp
index afc2ecf0..e55e8a98 100644
--- a/src/history/historymanager.cpp
+++ b/src/history/historymanager.cpp
@@ -44,16 +44,18 @@
 #include <KCompletion>
 
 // Qt Includes
-#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>
+#include <QList>
+#include <QUrl>
+#include <QDate>
+#include <QDateTime>
+#include <QString>
+#include <QFile>
+#include <QDataStream>
+#include <QBuffer>
+#include <QTemporaryFile>
+#include <QTimer>
+
+#include <QClipboard>
 
 // generic algorithms
 #include <QtAlgorithms>
diff --git a/src/history/historymanager.h b/src/history/historymanager.h
index fc2e9abd..4e727400 100644
--- a/src/history/historymanager.h
+++ b/src/history/historymanager.h
@@ -33,9 +33,6 @@
 // Rekonq Includes
 #include "rekonq_defines.h"
 
-// Local Includes
-#include "urlresolver.h"
-
 // KDE Includes
 #include <KUrl>
 
@@ -43,12 +40,18 @@
 #include <QDateTime>
 #include <QHash>
 #include <QObject>
-#include <QTimer>
-#include <QSortFilterProxyModel>
 #include <QWebHistory>
 
 #include <math.h>
 
+// Forward Declarations
+class AutoSaver;
+class HistoryFilterModel;
+class HistoryTreeModel;
+
+class QWebHistory;
+
+
 /**
  * Elements in this class represent an history item
  *
@@ -99,6 +102,7 @@ public:
 
 // ---------------------------------------------------------------------------------------------------------------
 
+
 class TabHistory
 {
 public:
@@ -132,13 +136,9 @@ public:
     QByteArray history;
 };
 
-// ---------------------------------------------------------------------------------------------------------------
 
+// ---------------------------------------------------------------------------------------------------------------
 
-// Forward Declarations
-class AutoSaver;
-class HistoryFilterModel;
-class HistoryTreeModel;
 
 /**
  * THE History Manager:
diff --git a/src/history/historymodels.cpp b/src/history/historymodels.cpp
index d50d28a0..90886cac 100644
--- a/src/history/historymodels.cpp
+++ b/src/history/historymodels.cpp
@@ -35,6 +35,7 @@
 
 // Local Includes
 #include "application.h"
+#include "historymanager.h"
 #include "iconmanager.h"
 
 // KDE Includes
@@ -43,16 +44,17 @@
 #include <KIcon>
 
 // Qt Includes
-#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>
+#include <QList>
+#include <QUrl>
+#include <QDate>
+#include <QDateTime>
+#include <QString>
+#include <QFile>
+#include <QDataStream>
+#include <QBuffer>
+
+#include <QClipboard>
+#include <QFileInfo>
 
 // generic algorithms
 #include <QtAlgorithms>
diff --git a/src/history/historymodels.h b/src/history/historymodels.h
index 4f4f30b5..d8f20818 100644
--- a/src/history/historymodels.h
+++ b/src/history/historymodels.h
@@ -33,17 +33,16 @@
 // Rekonq Includes
 #include "rekonq_defines.h"
 
-// Local Includes
-#include "historymanager.h"
-
 // KDE Includes
 #include <KUrl>
 
 // Qt Includes
 #include <QHash>
-#include <QObject>
-#include <QSortFilterProxyModel>
-#include <QWebHistoryInterface>
+#include <QAbstractTableModel>
+#include <QAbstractProxyModel>
+
+// Forward Declarations
+class HistoryManager;
 
 
 class REKONQ_TESTS_EXPORT HistoryModel : public QAbstractTableModel
@@ -174,7 +173,6 @@ 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 e09b4f48..5037a4d1 100644
--- a/src/history/historypanel.cpp
+++ b/src/history/historypanel.cpp
@@ -35,6 +35,7 @@
 // Local Includes
 #include "application.h"
 #include "paneltreeview.h"
+#include "historymanager.h"
 #include "historymodels.h"
 #include "urlfilterproxymodel.h"
 
@@ -45,7 +46,7 @@
 #include <KMessageBox>
 
 // Qt Includes
-#include <QtGui/QHeaderView>
+#include <QHeaderView>
 
 
 HistoryPanel::HistoryPanel(const QString &title, QWidget *parent, Qt::WindowFlags flags)
diff --git a/src/icondownloader.cpp b/src/icondownloader.cpp
index 441c3ac2..6d1f3a5e 100644
--- a/src/icondownloader.cpp
+++ b/src/icondownloader.cpp
@@ -24,9 +24,11 @@
 * ============================================================ */
 
 
+// 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 d2b1efb3..54fd60fb 100644
--- a/src/icondownloader.h
+++ b/src/icondownloader.h
@@ -27,13 +27,16 @@
 #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 86fa5393..2876aa27 100644
--- a/src/iconmanager.cpp
+++ b/src/iconmanager.cpp
@@ -30,8 +30,8 @@
 
 // Local Includes
 #include "application.h"
-#include "webicon.h"
 #include "icondownloader.h"
+#include "webicon.h"
 
 // KDE Includes
 #include <KIO/Job>
@@ -41,11 +41,11 @@
 #include <KUrl>
 
 // Qt Includes
-#include <QtCore/QDir>
+#include <QDir>
 
-#include <QtWebKit/QWebElement>
-#include <QtWebKit/QWebFrame>
-#include <QtWebKit/QWebSettings>
+#include <QWebElement>
+#include <QWebFrame>
+#include <QWebSettings>
 
 
 IconManager::IconManager(QObject *parent)
diff --git a/src/iconmanager.h b/src/iconmanager.h
index 4f4b9871..f5416a95 100644
--- a/src/iconmanager.h
+++ b/src/iconmanager.h
@@ -31,7 +31,8 @@
 #include "rekonq_defines.h"
 
 // Qt Includes
-#include <QtCore/QObject>
+#include <QObject>
+#include <QString>
 
 // Forward Declarations
 class KIcon;
diff --git a/src/mainview.cpp b/src/mainview.cpp
index 2da26db7..a7a34b84 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -36,6 +36,7 @@
 
 // Local Includes
 #include "application.h"
+#include "historymanager.h"
 #include "iconmanager.h"
 #include "mainwindow.h"
 #include "sessionmanager.h"
@@ -138,6 +139,12 @@ 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 f2ed7cba..a80ba521 100644
--- a/src/mainview.h
+++ b/src/mainview.h
@@ -34,16 +34,15 @@
 // 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;
 
@@ -101,10 +100,7 @@ public:
      */
     WebTab *newWebTab(bool focused = true);
 
-    inline QList<TabHistory> recentlyClosedTabs()
-    {
-        return m_recentlyClosedTabs;
-    }
+    QList<TabHistory> recentlyClosedTabs();
 
     void restoreClosedTab(int i, bool inNewTab = true);
 
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 5465afa6..99430b9c 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -43,6 +43,7 @@
 #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 216e0f3d..55a44ce4 100644
--- a/src/networkaccessmanager.h
+++ b/src/networkaccessmanager.h
@@ -35,6 +35,9 @@
 // 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 77a2f62f..aa38e37b 100644
--- a/src/newtabpage.cpp
+++ b/src/newtabpage.cpp
@@ -37,6 +37,7 @@
 #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 b4f3bcd6..887d3cd1 100644
--- a/src/newtabpage.h
+++ b/src/newtabpage.h
@@ -36,8 +36,9 @@
 #include <KUrl>
 
 // Qt Includes
-#include <QtCore/QObject>
-#include <QtWebKit/QWebElement>
+#include <QObject>
+#include <QString>
+#include <QWebElement>
 
 // Forward Declarations
 class KBookmark;
diff --git a/src/opensearch/opensearchmanager.cpp b/src/opensearch/opensearchmanager.cpp
index ad2f7092..04e687f3 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 <QtCore/QFile>
-#include <QtCore/QFileInfo>
+#include <QFile>
+#include <QFileInfo>
 #include <QDBusMessage>
 #include <QDBusConnection>
 
diff --git a/src/opensearch/opensearchmanager.h b/src/opensearch/opensearchmanager.h
index b2f772fb..a72e4e20 100644
--- a/src/opensearch/opensearchmanager.h
+++ b/src/opensearch/opensearchmanager.h
@@ -40,8 +40,7 @@
 #include <kio/jobclasses.h>
 
 // Qt Includes
-#include <QtCore/QObject>
-#include <QFile>
+#include <QObject>
 
 // Forward Declarations
 class OpenSearchEngine;
diff --git a/src/opensearch/opensearchreader.cpp b/src/opensearch/opensearchreader.cpp
index c2bf0f09..897fca29 100644
--- a/src/opensearch/opensearchreader.cpp
+++ b/src/opensearch/opensearchreader.cpp
@@ -38,7 +38,7 @@
 #include <KLocalizedString>
 
 // Qt Includes
-#include <QtCore/QIODevice>
+#include <QIODevice>
 
 
 OpenSearchReader::OpenSearchReader()
diff --git a/src/opensearch/opensearchreader.h b/src/opensearch/opensearchreader.h
index 70b560f1..d1c644ae 100644
--- a/src/opensearch/opensearchreader.h
+++ b/src/opensearch/opensearchreader.h
@@ -34,7 +34,7 @@
 #include "rekonq_defines.h"
 
 // Qt Includes
-#include <QtCore/QXmlStreamReader>
+#include <QXmlStreamReader>
 
 // Forward Declarations
 class OpenSearchEngine;
diff --git a/src/paneltreeview.cpp b/src/paneltreeview.cpp
index a4966f1b..ebad68aa 100644
--- a/src/paneltreeview.cpp
+++ b/src/paneltreeview.cpp
@@ -36,8 +36,8 @@
 #include <KUrl>
 
 // Qt Includes
-#include <QtGui/QClipboard>
-#include <QtGui/QMouseEvent>
+#include <QClipboard>
+#include <QMouseEvent>
 
 
 PanelTreeView::PanelTreeView(QWidget *parent)
diff --git a/src/paneltreeview.h b/src/paneltreeview.h
index 921fe3f2..1b640310 100644
--- a/src/paneltreeview.h
+++ b/src/paneltreeview.h
@@ -32,7 +32,7 @@
 #include "rekonq_defines.h"
 
 // Qt Includes
-#include <QtGui/QTreeView>
+#include <QTreeView>
 
 // Forward Declarations
 class KUrl;
diff --git a/src/previewselectorbar.cpp b/src/previewselectorbar.cpp
index d72e9eb1..b743e3c9 100644
--- a/src/previewselectorbar.cpp
+++ b/src/previewselectorbar.cpp
@@ -25,21 +25,19 @@
 * ============================================================ */
 
 
-// Auto Includes
+// Self 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 a4b44f34..46fb0c39 100644
--- a/src/protocolhandler.cpp
+++ b/src/protocolhandler.cpp
@@ -43,6 +43,7 @@
 // KDE Includes
 #include <KIO/Job>
 #include <KDirLister>
+#include <KLocale>
 #include <KLocalizedString>
 #include <KMessageBox>
 #include <KProcess>
@@ -52,8 +53,8 @@
 #include <KRun>
 
 // Qt Includes
-#include <QtNetwork/QNetworkRequest>
-#include <QtWebKit/QWebFrame>
+#include <QNetworkRequest>
+#include <QWebFrame>
 #include <QTextDocument>
 
 
diff --git a/src/protocolhandler.h b/src/protocolhandler.h
index bdc45534..f35fdcc6 100644
--- a/src/protocolhandler.h
+++ b/src/protocolhandler.h
@@ -35,7 +35,7 @@
 #include <KUrl>
 
 // Qt Includes
-#include <QtCore/QObject>
+#include <QObject>
 
 // Forward Declarations
 class KDirLister;
diff --git a/src/rekonqmenu.h b/src/rekonqmenu.h
index e3d659f7..8bda008b 100644
--- a/src/rekonqmenu.h
+++ b/src/rekonqmenu.h
@@ -36,6 +36,9 @@
 // KDE Includes
 #include <KMenu>
 
+// Forward Declarations
+class QWidget;
+
 
 /**
  * Menu shown inside rekonq window.
diff --git a/src/sessionmanager.cpp b/src/sessionmanager.cpp
index b0ef1fce..02488801 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 <QtCore/QFile>
+#include <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->tabBar()->currentIndex() == tabNo)
+            if (mv->currentIndex() == tabNo)
             {
                 tab.setAttribute("currentTab", 1);
             }
@@ -188,7 +188,7 @@ bool SessionManager::restoreSessionFromScratch()
 
         int currentTab = loadViewTabs(mv, window, false);
 
-        mv->tabBar()->setCurrentIndex(currentTab);
+        mv->setCurrentIndex(currentTab);
     }
 
     return true;
@@ -210,7 +210,7 @@ void SessionManager::restoreCrashedSession()
 
         int currentTab = loadViewTabs(mv, window, true);
 
-        mv->tabBar()->setCurrentIndex(currentTab);
+        mv->setCurrentIndex(currentTab);
     }
 
     setSessionManagementEnabled(true);
@@ -234,7 +234,7 @@ int SessionManager::restoreSavedSession()
 
         int currentTab = loadViewTabs(mv, window, true);
 
-        mv->tabBar()->setCurrentIndex(currentTab);
+        mv->setCurrentIndex(currentTab);
     }
 
     return winNo;
@@ -261,7 +261,7 @@ bool SessionManager::restoreMainWindow(MainWindow* window)
 
         int currentTab = loadViewTabs(mv, savedWindowElement, false);
 
-        mv->tabBar()->setCurrentIndex(currentTab);
+        mv->setCurrentIndex(currentTab);
 
         return true;
     }
diff --git a/src/sessionmanager.h b/src/sessionmanager.h
index b4748fde..810d9b5c 100644
--- a/src/sessionmanager.h
+++ b/src/sessionmanager.h
@@ -34,10 +34,10 @@
 #include "rekonq_defines.h"
 
 // Qt Includes
-#include <QtCore/QObject>
+#include <QObject>
+#include <QString>
 
 // Forward Declarations
-class QString;
 class TabHistory;
 class MainWindow;
 
diff --git a/src/sslinfodialog.cpp b/src/sslinfodialog.cpp
index 234dbb82..2f0b44e4 100644
--- a/src/sslinfodialog.cpp
+++ b/src/sslinfodialog.cpp
@@ -28,21 +28,22 @@
 #include "sslinfodialog.h"
 #include "sslinfodialog.moc"
 
-
+// KDE Includes
 #include <KFileDialog>
 
-#include <QtCore/QDate>
-#include <QtCore/QFile>
-
-#include <QtGui/QLabel>
-#include <QtGui/QTextDocument>
-
-#include <QtNetwork/QSslCertificate>
-
 #include <kglobal.h>
 #include <klocale.h>
 #include <ktcpsocket.h>
 
+// Qt Includes
+#include <QDate>
+#include <QFile>
+
+#include <QLabel>
+#include <QTextDocument>
+
+#include <QSslCertificate>
+
 
 SslInfoDialog::SslInfoDialog(const QString &host, const WebSslInfo &info, QWidget *parent)
     : KDialog(parent)
diff --git a/src/sslinfodialog.h b/src/sslinfodialog.h
index 0c7f97ce..94f610c6 100644
--- a/src/sslinfodialog.h
+++ b/src/sslinfodialog.h
@@ -27,19 +27,25 @@
 #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"
 
-#include <KDE/KDialog>
+// KDE Includes
+#include <KDialog>
 
-#include <QList>
+// Qt Includes
+#include <QString>
 
+// Forward Declarations
 class QSslCertificate;
-class QString;
+
 
 /**
  * Rekonq SSL Information Dialog
diff --git a/src/sync/syncmanager.cpp b/src/sync/syncmanager.cpp
index 5766f418..de14703c 100644
--- a/src/sync/syncmanager.cpp
+++ b/src/sync/syncmanager.cpp
@@ -42,6 +42,9 @@
 // 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 326d8647..e3bcf3eb 100644
--- a/src/tabbar.cpp
+++ b/src/tabbar.cpp
@@ -35,6 +35,7 @@
 #include "rekonq.h"
 
 #include "application.h"
+#include "historymanager.h"
 #include "iconmanager.h"
 #include "mainview.h"
 #include "mainwindow.h"
@@ -52,12 +53,14 @@
 #include <KColorScheme>
 
 // Qt Includes
-#include <QtGui/QLabel>
-#include <QtGui/QLayout>
-#include <QtGui/QMouseEvent>
-#include <QtGui/QToolButton>
+#include <QLabel>
+#include <QLayout>
+#include <QMouseEvent>
+#include <QToolButton>
 #include <QPropertyAnimation>
 #include <QStyleOptionFrameV3>
+#include <QSignalMapper>
+#include <QTimer>
 
 
 static inline QByteArray highlightPropertyName(int index)
@@ -66,6 +69,9 @@ 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 3e29b248..161612c2 100644
--- a/src/tabbar.h
+++ b/src/tabbar.h
@@ -37,9 +37,6 @@
 // KDE Includes
 #include <KTabBar>
 
-//Qt Includes
-#include <QSignalMapper>
-
 // Forward Declarations
 class TabPreviewPopup;
 class TabHighlightEffect;
@@ -47,7 +44,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 b6f191d8..121afd15 100644
--- a/src/tabhighlighteffect.cpp
+++ b/src/tabhighlighteffect.cpp
@@ -24,18 +24,25 @@
 * ============================================================ */
 
 
-//Self Includes
+// Self Includes
 #include "tabhighlighteffect.h"
 #include "tabhighlighteffect.moc"
 
-//Qt Includes
+// Local Includes
+#include "tabbar.h"
+
+// Qt Includes
+#include <QEvent>
+#include <QPainter>
 #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 6deaa285..88302283 100644
--- a/src/tabhighlighteffect.h
+++ b/src/tabhighlighteffect.h
@@ -30,12 +30,14 @@
 
 // Qt Includes
 #include <QGraphicsEffect>
-#include <QPainter>
-#include <QEvent>
+#include <QColor>
 
 // Forward Declarations
 class TabBar;
 
+class QEvent;
+class QPainter;
+
 
 class TabHighlightEffect : public QGraphicsEffect
 {
diff --git a/src/tabpreviewpopup.cpp b/src/tabpreviewpopup.cpp
index 52c06cfb..63ff542d 100644
--- a/src/tabpreviewpopup.cpp
+++ b/src/tabpreviewpopup.cpp
@@ -29,10 +29,10 @@
 #include "tabpreviewpopup.h"
 
 // Rekonq Includes
-#include "webtab.h"
-#include "tabbar.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 01995a20..5c62102f 100644
--- a/src/tabpreviewpopup.h
+++ b/src/tabpreviewpopup.h
@@ -53,9 +53,6 @@ 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);
@@ -63,6 +60,10 @@ 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 b36af2bc..536befb8 100644
--- a/src/urlbar/bookmarkwidget.cpp
+++ b/src/urlbar/bookmarkwidget.cpp
@@ -41,10 +41,10 @@
 #include <KLineEdit>
 
 // Qt Includes
-#include <QtGui/QDialogButtonBox>
-#include <QtGui/QFormLayout>
-#include <QtGui/QLabel>
-#include <QtGui/QPushButton>
+#include <QDialogButtonBox>
+#include <QFormLayout>
+#include <QLabel>
+#include <QPushButton>
 
 
 BookmarkWidget::BookmarkWidget(const KBookmark &bookmark, QWidget *parent)
diff --git a/src/urlbar/bookmarkwidget.h b/src/urlbar/bookmarkwidget.h
index f70fc750..c2985759 100644
--- a/src/urlbar/bookmarkwidget.h
+++ b/src/urlbar/bookmarkwidget.h
@@ -29,7 +29,7 @@
 #define BOOKMARKWIDGET_H
 
 // Qt Includes
-#include <QtGui/QMenu>
+#include <QMenu>
 
 // Forward Declarations
 class KBookmark;
diff --git a/src/urlbar/completionwidget.cpp b/src/urlbar/completionwidget.cpp
index f4e7220a..92ef4fb9 100644
--- a/src/urlbar/completionwidget.cpp
+++ b/src/urlbar/completionwidget.cpp
@@ -33,7 +33,7 @@
 
 // Local Includes
 #include "application.h"
-#include "urlresolver.h"
+#include "listitem.h"
 #include "searchengine.h"
 #include "urlbar.h"
 
@@ -42,12 +42,12 @@
 #include <KUrl>
 
 // Qt Includes
-#include <QtCore/QPoint>
-#include <QtCore/QSize>
-#include <QtCore/QEvent>
+#include <QPoint>
+#include <QSize>
+#include <QEvent>
 
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QKeyEvent>
+#include <QVBoxLayout>
+#include <QKeyEvent>
 
 
 
diff --git a/src/urlbar/completionwidget.h b/src/urlbar/completionwidget.h
index dc4eb3a4..92d1bd39 100644
--- a/src/urlbar/completionwidget.h
+++ b/src/urlbar/completionwidget.h
@@ -32,7 +32,7 @@
 #include "rekonq_defines.h"
 
 // Local Includes
-#include "listitem.h"
+#include "urlresolver.h"
 
 // KDE Includes
 #include <KService>
@@ -40,6 +40,9 @@
 // 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 f72deace..6a4ffaba 100644
--- a/src/urlbar/favoritewidget.cpp
+++ b/src/urlbar/favoritewidget.cpp
@@ -35,6 +35,7 @@
 #include "application.h"
 #include "bookmarkmanager.h"
 #include "bookmarkowner.h"
+#include "webtab.h"
 
 // KDE Includes
 #include <KLocalizedString>
@@ -42,10 +43,10 @@
 #include <KLineEdit>
 
 // Qt Includes
-#include <QtGui/QDialogButtonBox>
-#include <QtGui/QFormLayout>
-#include <QtGui/QLabel>
-#include <QtGui/QPushButton>
+#include <QDialogButtonBox>
+#include <QFormLayout>
+#include <QLabel>
+#include <QPushButton>
 
 
 FavoriteWidget::FavoriteWidget(WebTab *tab, QWidget *parent)
diff --git a/src/urlbar/favoritewidget.h b/src/urlbar/favoritewidget.h
index c75d2a7e..d0b05f14 100644
--- a/src/urlbar/favoritewidget.h
+++ b/src/urlbar/favoritewidget.h
@@ -29,11 +29,11 @@
 
 
 // Qt Includes
-#include <QtGui/QMenu>
-#include <QtGui/QCheckBox>
+#include <QMenu>
+#include <QCheckBox>
 
-// Local Includes
-#include "webtab.h"
+// Forward Declarations
+class WebTab;
 
 
 class FavoriteWidget : public QMenu
diff --git a/src/urlbar/listitem.cpp b/src/urlbar/listitem.cpp
index c66d3727..92552e7e 100644
--- a/src/urlbar/listitem.cpp
+++ b/src/urlbar/listitem.cpp
@@ -49,7 +49,6 @@
 #include <QActionGroup>
 #include <QHBoxLayout>
 #include <QVBoxLayout>
-#include <QLabel>
 #include <QSizePolicy>
 #include <QPixmap>
 #include <QStylePainter>
@@ -57,6 +56,7 @@
 #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(KIO::Job*,QByteArray)));
+                this, SLOT(slotData(KJob*,QByteArray)));
         connect(job,  SIGNAL(result(KJob*)),
                 this, SLOT(slotResult(KJob*)));
     }
 }
 
 
-void ImageLabel::slotData(KIO::Job *job, const QByteArray &data)
+void ImageLabel::slotData(KJob *job, const QByteArray &data)
 {
     Q_UNUSED(job);
     m_data.append(data);
diff --git a/src/urlbar/listitem.h b/src/urlbar/listitem.h
index c2f79c93..84e3501b 100644
--- a/src/urlbar/listitem.h
+++ b/src/urlbar/listitem.h
@@ -31,22 +31,25 @@
 // Rekonq Includes
 #include "rekonq_defines.h"
 
-// Local Includes
-#include "urlresolver.h"
-
 // KDE Includes
 #include <KToolBar>
 #include <KService>
-#include <KIcon>
+#include <KUrl>
 
 // Qt Includes
 #include <QWidget>
-#include <QStyleOptionViewItemV4>
 #include <QLabel>
+#include <QStyleOptionViewItemV4>
+#include <QString>
+#include <QByteArray>
 
 // Forward Declarations
 class UrlSearchItem;
+
 class KAction;
+class KIcon;
+class KJob;
+
 class QActionGroup;
 
 
@@ -258,7 +261,7 @@ private:
     QByteArray m_data;
 
 private Q_SLOTS:
-    void slotData(KIO::Job* job, const QByteArray& data);
+    void slotData(KJob* job, const QByteArray& data);
     void slotResult(KJob* job);
 };
 
diff --git a/src/urlbar/rsswidget.cpp b/src/urlbar/rsswidget.cpp
index d4778cf5..2e452fbb 100644
--- a/src/urlbar/rsswidget.cpp
+++ b/src/urlbar/rsswidget.cpp
@@ -42,13 +42,13 @@
 #include <KUrl>
 
 // Qt Includes
-#include <QtDBus/QDBusConnectionInterface>
-#include <QtDBus/QDBusInterface>
+#include <QDBusConnectionInterface>
+#include <QDBusInterface>
 
-#include <QtGui/QDialogButtonBox>
-#include <QtGui/QFormLayout>
-#include <QtGui/QLabel>
-#include <QtGui/QPushButton>
+#include <QDialogButtonBox>
+#include <QFormLayout>
+#include <QLabel>
+#include <QPushButton>
 
 
 RSSWidget::RSSWidget(const QMap< KUrl, QString > &map, QWidget *parent)
diff --git a/src/urlbar/rsswidget.h b/src/urlbar/rsswidget.h
index 702ea3ae..eaa3de7d 100644
--- a/src/urlbar/rsswidget.h
+++ b/src/urlbar/rsswidget.h
@@ -28,7 +28,7 @@
 #define RSSWIDGET_H
 
 // Qt Includes
-#include <QtGui/QMenu>
+#include <QMenu>
 
 // Forward Declarations
 class KComboBox;
diff --git a/src/urlbar/sslwidget.cpp b/src/urlbar/sslwidget.cpp
index 127dae86..52724733 100644
--- a/src/urlbar/sslwidget.cpp
+++ b/src/urlbar/sslwidget.cpp
@@ -34,11 +34,13 @@
 #include "sslinfodialog.h"
 
 // Qt Includes
-#include <QtGui/QDialogButtonBox>
-#include <QtGui/QGridLayout>
-#include <QtGui/QLabel>
-#include <QtGui/QPushButton>
-#include <QtGui/QTextDocument>
+#include <QPointer>
+
+#include <QDialogButtonBox>
+#include <QGridLayout>
+#include <QLabel>
+#include <QPushButton>
+#include <QTextDocument>
 
 
 SSLWidget::SSLWidget(const QUrl &url, const WebSslInfo &info, QWidget *parent)
diff --git a/src/urlbar/sslwidget.h b/src/urlbar/sslwidget.h
index bc1e2291..dd6f020d 100644
--- a/src/urlbar/sslwidget.h
+++ b/src/urlbar/sslwidget.h
@@ -32,8 +32,9 @@
 #include "websslinfo.h"
 
 // Qt Includes
-#include <QtGui/QMenu>
-#include <QtCore/QUrl>
+#include <QMenu>
+
+#include <QUrl>
 
 
 class SSLWidget : public QMenu
diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index 8f5a10a3..5e1df8c5 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -55,11 +55,12 @@
 #include <KMenu>
 
 // Qt Includes
-#include <QtGui/QPainter>
-#include <QtGui/QPaintEvent>
-#include <QtGui/QPalette>
-#include <QtGui/QVBoxLayout>
+#include <QPainter>
+#include <QPaintEvent>
+#include <QPalette>
+#include <QVBoxLayout>
 #include <QClipboard>
+#include <QTimer>
 
 
 
diff --git a/src/urlbar/urlresolver.h b/src/urlbar/urlresolver.h
index 57b3e11e..97a5e9a4 100644
--- a/src/urlbar/urlresolver.h
+++ b/src/urlbar/urlresolver.h
@@ -34,6 +34,7 @@
 // Locale Includes
 #include "application.h"
 #include "opensearchmanager.h"
+#include "suggestionparser.h"
 
 // KDE Includes
 #include <KUrl>
@@ -42,7 +43,6 @@
 // Qt Includes
 #include <QString>
 #include <QList>
-#include "suggestionparser.h"
 
 
 class UrlSearchItem
diff --git a/src/urlbar/webshortcutwidget.cpp b/src/urlbar/webshortcutwidget.cpp
index d44f6f1a..409d0b32 100644
--- a/src/urlbar/webshortcutwidget.cpp
+++ b/src/urlbar/webshortcutwidget.cpp
@@ -42,6 +42,7 @@
 #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 3d0c6582..6cb8574e 100644
--- a/src/urlfilterproxymodel.h
+++ b/src/urlfilterproxymodel.h
@@ -33,7 +33,7 @@
 #include "rekonq_defines.h"
 
 // Qt Includes
-#include <QtGui/QSortFilterProxyModel>
+#include <QSortFilterProxyModel>
 
 
 /**
diff --git a/src/urlpanel.cpp b/src/urlpanel.cpp
index b4359148..8e0d425f 100644
--- a/src/urlpanel.cpp
+++ b/src/urlpanel.cpp
@@ -38,9 +38,9 @@
 #include <KLocalizedString>
 
 // Qt Includes
-#include <QtGui/QLabel>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QHeaderView>
+#include <QLabel>
+#include <QHBoxLayout>
+#include <QHeaderView>
 
 
 UrlPanel::UrlPanel(const QString &title, QWidget *parent, Qt::WindowFlags flags)
diff --git a/src/urlpanel.h b/src/urlpanel.h
index 73ffc024..c8d15a8e 100644
--- a/src/urlpanel.h
+++ b/src/urlpanel.h
@@ -33,7 +33,7 @@
 #include "rekonq_defines.h"
 
 // Qt Includes
-#include <QtGui/QDockWidget>
+#include <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 84042cf6..6037cc7c 100644
--- a/src/useragent/useragentmanager.h
+++ b/src/useragent/useragentmanager.h
@@ -28,8 +28,10 @@
 #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 e63cb941..f1bbd2cb 100644
--- a/src/walletbar.h
+++ b/src/walletbar.h
@@ -36,6 +36,7 @@
 
 // Qt Includes
 #include <QUrl>
+#include <QString>
 
 
 class REKONQ_TESTS_EXPORT WalletBar : public KMessageWidget
diff --git a/src/webicon.cpp b/src/webicon.cpp
index 03097956..7943cfb6 100644
--- a/src/webicon.cpp
+++ b/src/webicon.cpp
@@ -33,8 +33,8 @@
 #include "iconmanager.h"
 
 // Qt Includes
-#include <QtCore/QTimer>
-#include <QtWebKit/QWebFrame>
+#include <QTimer>
+#include <QWebFrame>
 
 
 WebIcon::WebIcon(const KUrl& url, QObject *parent)
diff --git a/src/webicon.h b/src/webicon.h
index df5cc828..39f98e7e 100644
--- a/src/webicon.h
+++ b/src/webicon.h
@@ -34,7 +34,7 @@
 #include <KUrl>
 
 // Qt Includes
-#include <QtWebKit/QWebPage>
+#include <QWebPage>
 
 
 class REKONQ_TESTS_EXPORT WebIcon : public QObject
diff --git a/src/webinspectorpanel.cpp b/src/webinspectorpanel.cpp
index 59e95167..06e98643 100644
--- a/src/webinspectorpanel.cpp
+++ b/src/webinspectorpanel.cpp
@@ -35,8 +35,8 @@
 #include "webtab.h"
 
 // Qt Includes
-#include <QtGui/QAction>
-#include <QtWebKit/QWebInspector>
+#include <QAction>
+#include <QWebInspector>
 
 
 WebInspectorPanel::WebInspectorPanel(QString title, QWidget *parent)
diff --git a/src/webinspectorpanel.h b/src/webinspectorpanel.h
index 92da538b..ebe82267 100644
--- a/src/webinspectorpanel.h
+++ b/src/webinspectorpanel.h
@@ -33,16 +33,16 @@
 #include "rekonq_defines.h"
 
 // Qt Includes
-#include <QtGui/QDockWidget>
+#include <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 2f4b5efc..c6e318e8 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -41,6 +41,7 @@
 #include "adblockmanager.h"
 #include "application.h"
 #include "downloadmanager.h"
+#include "historymanager.h"
 #include "iconmanager.h"
 #include "mainview.h"
 #include "mainwindow.h"
@@ -70,7 +71,9 @@
 #include <kparts/browseropenorsavequestion.h>
 
 // Qt Includes
-#include <QtGui/QTextDocument>
+#include <QTextDocument>
+#include <QFileInfo>
+#include <QNetworkReply>
 
 
 // Returns true if the scheme and domain of the two urls match...
diff --git a/src/webpluginfactory.cpp b/src/webpluginfactory.cpp
index 7713c74b..b62af1c8 100644
--- a/src/webpluginfactory.cpp
+++ b/src/webpluginfactory.cpp
@@ -29,9 +29,10 @@
 #include "webpluginfactory.h"
 #include "webpluginfactory.moc"
 
-// Local Includes
+// Auto Includes
 #include "rekonq.h"
 
+// Local Includes
 #include "clicktoflash.h"
 
 
diff --git a/src/websnap.h b/src/websnap.h
index fc5da869..3e9111f8 100644
--- a/src/websnap.h
+++ b/src/websnap.h
@@ -37,8 +37,8 @@
 #include <KUrl>
 
 // Qt Includes
-#include <QtCore/QObject>
-#include <QtWebKit/QWebPage>
+#include <QObject>
+#include <QWebPage>
 
 // Forward Declarations
 class QPixmap;
diff --git a/src/webview.cpp b/src/webview.cpp
index d2e351c4..579e6a78 100644
--- a/src/webview.cpp
+++ b/src/webview.cpp
@@ -54,14 +54,16 @@
 #include <KToolInvocation>
 
 // Qt Includes
-#include <QtCore/QFile>
-#include <QtCore/QTimer>
+#include <QFile>
+#include <QTimer>
 
-#include <QtGui/QClipboard>
-#include <QtGui/QContextMenuEvent>
+#include <QClipboard>
+#include <QContextMenuEvent>
+#include <QLabel>
 
-#include <QtWebKit/QWebFrame>
-#include <QtWebKit/QWebHistory>
+#include <QWebFrame>
+#include <QWebHistory>
+#include <QNetworkRequest>
 
 
 WebView::WebView(QWidget* parent)
diff --git a/src/webview.h b/src/webview.h
index 3ae9b7e9..f789e354 100644
--- a/src/webview.h
+++ b/src/webview.h
@@ -35,14 +35,17 @@
 // KDE Includes
 #include <KWebView>
 
-//Qt Includes
-#include <QtCore/QTime>
-#include <QLabel>
-#include <QToolTip>
+// Qt Includes
+#include <QTime>
+#include <QPoint>
+#include <QPixmap>
 
 // 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 d709b38a..292ef413 100644
--- a/src/zoombar.cpp
+++ b/src/zoombar.cpp
@@ -44,10 +44,10 @@
 #include <KConfigGroup>
 
 // Qt Includes
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QLabel>
-#include <QtGui/QSlider>
-#include <QtGui/QToolButton>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QSlider>
+#include <QToolButton>
 
 
 ZoomBar::ZoomBar(QWidget *parent)
diff --git a/src/zoombar.h b/src/zoombar.h
index 8261447b..e1ec1ced 100644
--- a/src/zoombar.h
+++ b/src/zoombar.h
@@ -33,12 +33,12 @@
 #include "rekonq_defines.h"
 
 // Qt Includes
-#include <QtGui/QWidget>
-#include <QtGui/QLabel>
+#include <QWidget>
 
 // Forward Declarations
 class MainWindow;
 
+class QLabel;
 class QSlider;
 class QToolButton;