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

Conflicts:

	src/adblock/adblockwidget.h
	src/application.h
	src/history/historymanager.h
	src/tabpreviewpopup.cpp

Backported from master branch

1 files changed, 10 insertions, 11 deletions

diff --git a/src/history/historymanager.h b/src/history/historymanager.h
index d4531e5c..5be32b9e 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,13 +40,18 @@
 #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
  *
@@ -100,6 +102,7 @@ public:
 
 // ---------------------------------------------------------------------------------------------------------------
 
+
 class TabHistory
 {
 public:
@@ -133,13 +136,9 @@ public:
     QByteArray history;
 };
 
-// ---------------------------------------------------------------------------------------------------------------
 
+// ---------------------------------------------------------------------------------------------------------------
 
-// Forward Declarations
-class AutoSaver;
-class HistoryFilterModel;
-class HistoryTreeModel;
 
 /**
  * THE History Manager: