13 files changed, 78 insertions, 53 deletions
diff --git a/src/application.h b/src/application.h
index 7a08eb1a..438a11e4 100644
--- a/src/application.h
+++ b/src/application.h
@@ -29,6 +29,7 @@
 #include <kio/job.h>
 #include <kio/jobclasses.h>
 
+// Forward Declarations
 class MainWindow;
 class WebView;
 class CookieJar;
diff --git a/src/mainview.cpp b/src/mainview.cpp
index cb84f56b..9e23ae2d 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -32,14 +32,18 @@
 #include "webview.h"
 
 // KDE Includes
+#include <KUrl>
+#include <KMenu>
+#include <KAction>
 #include <KShortcut>
 #include <KStandardShortcut>
 #include <KMessageBox>
 #include <KActionCollection>
 
 // Qt Includes
+#include <QtCore>
 #include <QtGui>
-#include <QDebug>
+#include <QtWebKit>
 
 
 
diff --git a/src/mainview.h b/src/mainview.h
index 1f443a37..05a9bb16 100644
--- a/src/mainview.h
+++ b/src/mainview.h
@@ -22,24 +22,24 @@
 #ifndef TABWIDGET_H
 #define TABWIDGET_H
 
-// Local Includes
-#include "tabbar.h"
-#include "webview.h"
 
 // KDE Includes
-#include <KUrl>
-#include <KMenu>
 #include <KTabWidget>
-#include <KAction>
 
-// Qt Includes
-#include <QLineEdit>
-#include <QWebPage>
 
-QT_BEGIN_NAMESPACE
+// Forward Declarations
+class WebView;
+class TabBar;
+
+class KUrl;
+class KAction;
+class KMenu;
+
+class QWebFrame;
 class QCompleter;
 class QStackedWidget;
-QT_END_NAMESPACE
+class QLineEdit;
+class QUrl;
 
 /**
  *   TabWidget that contains WebViews and a stack widget of associated line edits.
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index f28450fe..e24f4cf7 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -41,6 +41,7 @@
 #include "ui_passworddialog.h"
 
 // KDE Includes
+#include <KUrl>
 #include <KStatusBar>
 #include <KMenuBar>
 #include <KShortcut>
@@ -55,14 +56,9 @@
 
 
 // Qt Includes
-#include <QPlainTextEdit>
-#include <QPrintDialog>
-#include <QPrintPreviewDialog>
-#include <QPrinter>
-#include <QWebFrame>
-#include <QWebHistory>
-#include <QDebug>
-#include <QVBoxLayout>
+#include <QtGui>
+#include <QtCore>
+#include <QtWebKit>
 
 
 MainWindow::MainWindow()
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 4864f347..d620990e 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -25,18 +25,18 @@
 // Local Includes
 #include "findbar.h"
 #include "searchbar.h"
+#include "bookmarks.h"
+#include "mainview.h"
 
 // KDE Includes
-#include <KUrl>
 #include <KXmlGuiWindow>
 #include <KIcon>
-#include <KToolBar>
 #include <KAction>
-#include <KToggleAction>
+#include <KToolBar>
 #include <KMenu>
 
-class BookmarksProvider;
-class MainView;
+// Forward Declarations
+class KUrl;
 class QWebFrame;
 class WebView;
 
@@ -114,11 +114,12 @@ private:
     FindBar *m_findBar;
     KMenu *m_historyBackMenu;
     KMenu *m_windowMenu;
-    BookmarksProvider *m_bookmarksProvider;
     QAction *m_stopReload;
     QString m_lastSearch;
-    MainView *m_view;
     QString m_homePage;
+
+    MainView *m_view;
+    BookmarksProvider *m_bookmarksProvider;
 };
 
 #endif // MAINWINDOW_H
diff --git a/src/networkaccessmanager.h b/src/networkaccessmanager.h
index 7d683967..987e33f4 100644
--- a/src/networkaccessmanager.h
+++ b/src/networkaccessmanager.h
@@ -21,7 +21,9 @@
 #ifndef NETWORKACCESSMANAGER_H
 #define NETWORKACCESSMANAGER_H
 
-#include <QtNetwork/QNetworkAccessManager>
+
+#include <QNetworkAccessManager>
+
 
 class NetworkAccessManager : public QNetworkAccessManager
 {
diff --git a/src/searchbar.cpp b/src/searchbar.cpp
index 2f03e93a..1145d36e 100644
--- a/src/searchbar.cpp
+++ b/src/searchbar.cpp
@@ -26,8 +26,14 @@
 #include "mainwindow.h"
 
 // KDE Includes
+#include <KUrl>
 #include <KDebug>
 
+// Qt Includes
+#include <QtCore>
+#include <QtGui>
+
+
 SearchBar::SearchBar(QWidget *parent) : 
     KLineEdit(parent)
 {
diff --git a/src/searchbar.h b/src/searchbar.h
index 19c90a15..66319e60 100644
--- a/src/searchbar.h
+++ b/src/searchbar.h
@@ -23,12 +23,13 @@
 
 // KDE Includes
 #include <KLineEdit>
-#include <KUrl>
 
-// Qt Includes
-#include <QtGui>
+// Forward Declarations
+class KUrl;
+class QFocusEvent;
 
-/*
+
+/**
  * This class defines an internet search bar. 
  */
 class SearchBar : public KLineEdit
diff --git a/src/settings.h b/src/settings.h
index 109e3111..02322d4c 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -24,8 +24,8 @@
 // KDE Includes
 #include <KConfigDialog>
 
-// Qt Includes
-#include <QWidget>
+// Forward Declarations
+class QWidget;
 
 class Private;
 
diff --git a/src/urlbar.cpp b/src/urlbar.cpp
index 3940d040..75f436be 100644
--- a/src/urlbar.cpp
+++ b/src/urlbar.cpp
@@ -17,12 +17,18 @@
  *
  * ============================================================ */
 
-// Local Includes
+// Self Includes
 #include "urlbar.h"
 #include "urlbar.moc"
 
+// Local Includes
 #include "application.h"
 #include "mainwindow.h"
+#include "webview.h"
+
+// Qt Includes
+#include <QtCore>
+#include <QtGui>
 
 
 UrlBar::UrlBar(QWidget *parent)
diff --git a/src/urlbar.h b/src/urlbar.h
index c77f3b77..dfb59bcf 100644
--- a/src/urlbar.h
+++ b/src/urlbar.h
@@ -20,14 +20,18 @@
 #ifndef URLBAR_H
 #define URLBAR_H
 
-// Local Includes
-#include "webview.h"
 
 // KDE Includes
 #include <KHistoryComboBox>
 
-// Qt Includes
-#include <QtGui>
+// Forward Declarations
+class WebView;
+
+class QWidget;
+class QLineEdit;
+class QUrl;
+class QLinearGradient;
+class QColor;
 
 
 class UrlBar : public KHistoryComboBox
@@ -51,9 +55,9 @@ protected:
 private:
     QLinearGradient generateGradient(const QColor &color) const;
 
-    WebView*   m_webView;
-    QLineEdit*  m_lineEdit;
-    QColor       m_defaultBaseColor;
+    WebView* m_webView;
+    QLineEdit* m_lineEdit;
+    QColor m_defaultBaseColor;
 };
 
 #endif
diff --git a/src/webview.cpp b/src/webview.cpp
index 0c2e0b6e..cf4d2398 100644
--- a/src/webview.cpp
+++ b/src/webview.cpp
@@ -18,7 +18,7 @@
  *
  * ============================================================ */
 
-// Local Includes
+// Self Includes
 #include "webview.h"
 #include "webview.moc"
 
@@ -34,17 +34,16 @@
 
 // KDE Includes
 #include <KStandardDirs>
+#include <KUrl>
 #include <KDebug>
 
 // Qt Includes
-#include <QClipboard>
-#include <QMenu>
-#include <QMouseEvent>
-#include <QBuffer>
-// ---
+#include <QtCore>
+#include <QtGui>
 #include <QtWebKit>
 #include <QUiLoader>
 
+
 WebPage::WebPage(QObject *parent)
     : QWebPage(parent)
     , m_keyboardModifiers(Qt::NoModifier)
diff --git a/src/webview.h b/src/webview.h
index 6892fbd4..b3d6ca1b 100644
--- a/src/webview.h
+++ b/src/webview.h
@@ -21,19 +21,21 @@
 #ifndef WEBVIEW_H
 #define WEBVIEW_H
 
+// KDE Includes
 #include <KUrl>
 
-#include <QWebView>
+// Qt Includes
+#include <QWebPage>
+
+// Forward Declarations
+class MainWindow;
 
-QT_BEGIN_NAMESPACE
+class QWebFrame;
 class QAuthenticator;
 class QMouseEvent;
 class QNetworkProxy;
 class QNetworkReply;
 class QSslError;
-QT_END_NAMESPACE
-
-class MainWindow;
 
 
 class WebPage : public QWebPage 
@@ -68,6 +70,9 @@ private:
 
 // ---------------------------------------------------------------------------------------------------------------------------------------
 
+// Qt Includes
+#include <QWebView>
+
 
 class WebView : public QWebView 
 {