cleanup includes / forward declarations

10 files changed, 3 insertions, 33 deletions

diff --git a/src/base/QXmppArchiveIq.h b/src/base/QXmppArchiveIq.h
index b4663fdd..e39e3925 100644
--- a/src/base/QXmppArchiveIq.h
+++ b/src/base/QXmppArchiveIq.h
@@ -29,9 +29,6 @@
 
 #include <QDateTime>
 
-class QXmlStreamWriter;
-class QDomElement;
-
 /// \brief The QXmppArchiveMessage class represents an archived message
 /// as defined by XEP-0136: Message Archiving.
 
diff --git a/src/base/QXmppBookmarkSet.h b/src/base/QXmppBookmarkSet.h
index fbe881e7..e854e4df 100644
--- a/src/base/QXmppBookmarkSet.h
+++ b/src/base/QXmppBookmarkSet.h
@@ -25,13 +25,9 @@
 #define QXMPPBOOKMARKSET_H
 
 #include <QList>
-#include <QString>
 #include <QUrl>
-#include <QXmlStreamWriter>
 
-#include "QXmppGlobal.h"
-
-class QDomElement;
+#include "QXmppStanza.h"
 
 /// \brief The QXmppBookmarkConference class represents a bookmark for a conference room,
 /// as defined by XEP-0048: Bookmarks.
diff --git a/src/base/QXmppByteStreamIq.h b/src/base/QXmppByteStreamIq.h
index c095d40a..408cccfd 100644
--- a/src/base/QXmppByteStreamIq.h
+++ b/src/base/QXmppByteStreamIq.h
@@ -28,9 +28,6 @@
 
 #include <QHostAddress>
 
-class QDomElement;
-class QXmlStreamWriter;
-
 class QXMPP_EXPORT QXmppByteStreamIq : public QXmppIq
 {
 public:
diff --git a/src/base/QXmppDataForm.h b/src/base/QXmppDataForm.h
index e9f56196..8ecc015d 100644
--- a/src/base/QXmppDataForm.h
+++ b/src/base/QXmppDataForm.h
@@ -25,14 +25,10 @@
 #define QXMPPDATAFORM_H
 
 #include <QPair>
-#include <QSharedDataPointer>
-#include <QString>
 #include <QVariant>
-#include <QXmlStreamWriter>
 
-#include "QXmppGlobal.h"
+#include "QXmppStanza.h"
 
-class QDomElement;
 class QXmppDataFormPrivate;
 class QXmppDataFormFieldPrivate;
 class QXmppDataFormMediaPrivate;
diff --git a/src/base/QXmppDiscoveryIq.h b/src/base/QXmppDiscoveryIq.h
index 509d4601..979acf12 100644
--- a/src/base/QXmppDiscoveryIq.h
+++ b/src/base/QXmppDiscoveryIq.h
@@ -27,8 +27,6 @@
 #include "QXmppDataForm.h"
 #include "QXmppIq.h"
 
-class QDomElement;
-
 class QXMPP_EXPORT QXmppDiscoveryIq : public QXmppIq
 {
 public:
diff --git a/src/base/QXmppIbbIq.h b/src/base/QXmppIbbIq.h
index 2369af8d..83557f92 100644
--- a/src/base/QXmppIbbIq.h
+++ b/src/base/QXmppIbbIq.h
@@ -27,9 +27,6 @@
 
 #include "QXmppIq.h"
 
-class QDomElement;
-class QXmlStreamWriter;
-
 class QXmppIbbOpenIq: public QXmppIq
 {
 public:
diff --git a/src/base/QXmppPingIq.h b/src/base/QXmppPingIq.h
index c864ffc3..31aaa662 100644
--- a/src/base/QXmppPingIq.h
+++ b/src/base/QXmppPingIq.h
@@ -26,9 +26,6 @@
 
 #include "QXmppIq.h"
 
-class QXmlStreamWriter;
-class QDomElement;
-
 class QXMPP_EXPORT QXmppPingIq : public QXmppIq
 {
 public:
diff --git a/src/base/QXmppResultSet.h b/src/base/QXmppResultSet.h
index c3968174..5c7d309b 100644
--- a/src/base/QXmppResultSet.h
+++ b/src/base/QXmppResultSet.h
@@ -24,11 +24,9 @@
 #ifndef QXMPPRESULTSET_H
 #define QXMPPRESULTSET_H
 
-#include "QXmppElement.h"
 #include <QDateTime>
 
-class QXmlStreamWriter;
-class QDomElement;
+#include "QXmppStanza.h"
 
 /// \brief The QXmppResultSetQuery class represents a set element in a query
 /// as defined by XEP-0059: Result Set Management.
diff --git a/src/base/QXmppRpcIq.h b/src/base/QXmppRpcIq.h
index 3aa3ae58..383cb300 100644
--- a/src/base/QXmppRpcIq.h
+++ b/src/base/QXmppRpcIq.h
@@ -28,9 +28,6 @@
 #include "QXmppIq.h"
 #include <QVariant>
 
-class QXmlStreamWriter;
-class QDomElement;
-
 class QXMPP_EXPORT QXmppRpcMarshaller
 {
 public:
diff --git a/src/base/QXmppStreamInitiationIq_p.h b/src/base/QXmppStreamInitiationIq_p.h
index a8e9eb15..e3a75c3b 100644
--- a/src/base/QXmppStreamInitiationIq_p.h
+++ b/src/base/QXmppStreamInitiationIq_p.h
@@ -30,9 +30,6 @@
 #include "QXmppIq.h"
 #include "QXmppTransferManager.h"
 
-class QDomElement;
-class QXmlStreamWriter;
-
 //
 //  W A R N I N G
 //  -------------