clarify the fact QXmppConstants_p.h is not API

47 files changed, 57 insertions, 46 deletions

diff --git a/src/base/QXmppArchiveIq.cpp b/src/base/QXmppArchiveIq.cpp
index 6137b1fb..253496cb 100644
--- a/src/base/QXmppArchiveIq.cpp
+++ b/src/base/QXmppArchiveIq.cpp
@@ -24,7 +24,7 @@
 #include <QDomElement>
 
 #include "QXmppArchiveIq.h"
-#include "QXmppConstants.h"
+#include "QXmppConstants_p.h"
 #include "QXmppUtils.h"
 
 QXmppArchiveMessage::QXmppArchiveMessage()
diff --git a/src/base/QXmppBindIq.cpp b/src/base/QXmppBindIq.cpp
index ac520c40..2252c791 100644
--- a/src/base/QXmppBindIq.cpp
+++ b/src/base/QXmppBindIq.cpp
@@ -28,7 +28,7 @@
 
 #include "QXmppBindIq.h"
 #include "QXmppUtils.h"
-#include "QXmppConstants.h"
+#include "QXmppConstants_p.h"
 
 /// Returns the bound JID.
 ///
diff --git a/src/base/QXmppByteStreamIq.cpp b/src/base/QXmppByteStreamIq.cpp
index 7f22d03b..bb2f4e2a 100644
--- a/src/base/QXmppByteStreamIq.cpp
+++ b/src/base/QXmppByteStreamIq.cpp
@@ -24,7 +24,7 @@
 #include <QDomElement>
 
 #include "QXmppByteStreamIq.h"
-#include "QXmppConstants.h"
+#include "QXmppConstants_p.h"
 #include "QXmppUtils.h"
 
 QString QXmppByteStreamIq::StreamHost::host() const
diff --git a/src/base/QXmppConstants.cpp b/src/base/QXmppConstants.cpp
index 85b02fba..a1a62de0 100644
--- a/src/base/QXmppConstants.cpp
+++ b/src/base/QXmppConstants.cpp
@@ -22,7 +22,7 @@
  */
 
 
-#include "QXmppConstants.h"
+#include "QXmppConstants_p.h"
 
 const char* ns_stream = "http://etherx.jabber.org/streams";
 const char* ns_client = "jabber:client";
diff --git a/src/base/QXmppConstants.h b/src/base/QXmppConstants_p.h
index 210f8319..df8e6154 100644
--- a/src/base/QXmppConstants.h
+++ b/src/base/QXmppConstants_p.h
@@ -25,6 +25,17 @@
 #ifndef QXMPPCONSTANTS_H
 #define QXMPPCONSTANTS_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the QXmpp API.  It exists for the convenience
+// of the QXmppTransferManager class.  This header file may change from
+// version to version without notice, or even be removed.
+//
+// We mean it.
+//
+
 extern const char* ns_stream;
 extern const char* ns_client;
 extern const char* ns_server;
diff --git a/src/base/QXmppDataForm.cpp b/src/base/QXmppDataForm.cpp
index 9894a59f..641632d4 100644
--- a/src/base/QXmppDataForm.cpp
+++ b/src/base/QXmppDataForm.cpp
@@ -26,7 +26,7 @@
 #include <QSize>
 #include <QStringList>
 
-#include "QXmppConstants.h"
+#include "QXmppConstants_p.h"
 #include "QXmppDataForm.h"
 #include "QXmppUtils.h"
 
diff --git a/src/base/QXmppDiscoveryIq.cpp b/src/base/QXmppDiscoveryIq.cpp
index 5bf6014a..14c141cc 100644
--- a/src/base/QXmppDiscoveryIq.cpp
+++ b/src/base/QXmppDiscoveryIq.cpp
@@ -24,7 +24,7 @@
 #include <QCryptographicHash>
 #include <QDomElement>
 
-#include "QXmppConstants.h"
+#include "QXmppConstants_p.h"
 #include "QXmppDiscoveryIq.h"
 #include "QXmppUtils.h"
 
diff --git a/src/base/QXmppEntityTimeIq.cpp b/src/base/QXmppEntityTimeIq.cpp
index 1148fb10..83bed430 100644
--- a/src/base/QXmppEntityTimeIq.cpp
+++ b/src/base/QXmppEntityTimeIq.cpp
@@ -26,7 +26,7 @@
 
 #include <QDomElement>
 
-#include "QXmppConstants.h"
+#include "QXmppConstants_p.h"
 #include "QXmppUtils.h"
 
 /// Returns the timezone offset in seconds.
diff --git a/src/base/QXmppIbbIq.cpp b/src/base/QXmppIbbIq.cpp
index d4e9f43f..62d4aab5 100644
--- a/src/base/QXmppIbbIq.cpp
+++ b/src/base/QXmppIbbIq.cpp
@@ -25,7 +25,7 @@
 #include <QDomElement>
 #include <QXmlStreamWriter>
 
-#include "QXmppConstants.h"
+#include "QXmppConstants_p.h"
 #include "QXmppIbbIq.h"
 
 QXmppIbbOpenIq::QXmppIbbOpenIq() : QXmppIq(QXmppIq::Set), m_block_size(1024)
diff --git a/src/base/QXmppJingleIq.cpp b/src/base/QXmppJingleIq.cpp
index 899509e7..8ad1d3c4 100644
--- a/src/base/QXmppJingleIq.cpp
+++ b/src/base/QXmppJingleIq.cpp
@@ -26,7 +26,7 @@
 #include <QDomElement>
 #include <QRegExp>
 
-#include "QXmppConstants.h"
+#include "QXmppConstants_p.h"
 #include "QXmppJingleIq.h"
 #include "QXmppUtils.h"
 
diff --git a/src/base/QXmppMessage.cpp b/src/base/QXmppMessage.cpp
index b7e83ddf..cdccba73 100644
--- a/src/base/QXmppMessage.cpp
+++ b/src/base/QXmppMessage.cpp
@@ -27,7 +27,7 @@
 #include <QXmlStreamWriter>
 #include <QPair>
 
-#include "QXmppConstants.h"
+#include "QXmppConstants_p.h"
 #include "QXmppMessage.h"
 #include "QXmppUtils.h"
 
diff --git a/src/base/QXmppMucIq.cpp b/src/base/QXmppMucIq.cpp
index 5ddfd96e..f1003434 100644
--- a/src/base/QXmppMucIq.cpp
+++ b/src/base/QXmppMucIq.cpp
@@ -23,7 +23,7 @@
 
 #include <QDomElement>
 
-#include "QXmppConstants.h"
+#include "QXmppConstants_p.h"
 #include "QXmppMucIq.h"
 #include "QXmppUtils.h"
 
diff --git a/src/base/QXmppNonSASLAuth.cpp b/src/base/QXmppNonSASLAuth.cpp
index efc7ed6d..9a212d9b 100644
--- a/src/base/QXmppNonSASLAuth.cpp
+++ b/src/base/QXmppNonSASLAuth.cpp
@@ -25,7 +25,7 @@
 #include <QDomElement>
 #include <QXmlStreamWriter>
 
-#include "QXmppConstants.h"
+#include "QXmppConstants_p.h"
 #include "QXmppNonSASLAuth.h"
 #include "QXmppUtils.h"
 
diff --git a/src/base/QXmppPingIq.cpp b/src/base/QXmppPingIq.cpp
index e2531a2b..a0278887 100644
--- a/src/base/QXmppPingIq.cpp
+++ b/src/base/QXmppPingIq.cpp
@@ -21,7 +21,7 @@
  *
  */
 
-#include "QXmppConstants.h"
+#include "QXmppConstants_p.h"
 #include "QXmppPingIq.h"
 #include "QXmppUtils.h"
 
diff --git a/src/base/QXmppPresence.cpp b/src/base/QXmppPresence.cpp
index e518e6d7..07d0aa9e 100644
--- a/src/base/QXmppPresence.cpp
+++ b/src/base/QXmppPresence.cpp
@@ -27,7 +27,7 @@
 #include <QtDebug>
 #include <QDomElement>
 #include <QXmlStreamWriter>
-#include "QXmppConstants.h"
+#include "QXmppConstants_p.h"
 
 static const char* presence_types[] = {
     "error",
diff --git a/src/base/QXmppPubSubIq.cpp b/src/base/QXmppPubSubIq.cpp
index 3f311e9c..1ab6aaa0 100644
--- a/src/base/QXmppPubSubIq.cpp
+++ b/src/base/QXmppPubSubIq.cpp
@@ -23,7 +23,7 @@
 
 #include <QDomElement>
 
-#include "QXmppConstants.h"
+#include "QXmppConstants_p.h"
 #include "QXmppPubSubIq.h"
 #include "QXmppUtils.h"
 
diff --git a/src/base/QXmppRegisterIq.cpp b/src/base/QXmppRegisterIq.cpp
index 80462e57..e8517c87 100644
--- a/src/base/QXmppRegisterIq.cpp
+++ b/src/base/QXmppRegisterIq.cpp
@@ -23,7 +23,7 @@
 
 #include <QDomElement>
 
-#include "QXmppConstants.h"
+#include "QXmppConstants_p.h"
 #include "QXmppRegisterIq.h"
 
 /// Returns the email for this registration IQ.
diff --git a/src/base/QXmppResultSet.cpp b/src/base/QXmppResultSet.cpp
index 364e7d0e..51635bcd 100644
--- a/src/base/QXmppResultSet.cpp
+++ b/src/base/QXmppResultSet.cpp
@@ -22,7 +22,7 @@
  */
 
 
-#include "QXmppConstants.h"
+#include "QXmppConstants_p.h"
 #include "QXmppResultSet.h"
 #include "QXmppUtils.h"
 
diff --git a/src/base/QXmppRosterIq.cpp b/src/base/QXmppRosterIq.cpp
index 488e2e6e..b41dc799 100644
--- a/src/base/QXmppRosterIq.cpp
+++ b/src/base/QXmppRosterIq.cpp
@@ -26,7 +26,7 @@
 #include <QXmlStreamWriter>
 
 #include "QXmppRosterIq.h"
-#include "QXmppConstants.h"
+#include "QXmppConstants_p.h"
 #include "QXmppUtils.h"
 
 /// Adds an item to the roster IQ.
diff --git a/src/base/QXmppRpcIq.cpp b/src/base/QXmppRpcIq.cpp
index 05e065f6..f96b8d91 100644
--- a/src/base/QXmppRpcIq.cpp
+++ b/src/base/QXmppRpcIq.cpp
@@ -28,7 +28,7 @@
 #include <QDateTime>
 #include <QStringList>
 
-#include "QXmppConstants.h"
+#include "QXmppConstants_p.h"
 #include "QXmppRpcIq.h"
 #include "QXmppUtils.h"
 
diff --git a/src/base/QXmppSessionIq.cpp b/src/base/QXmppSessionIq.cpp
index e4ee2aa0..f472e3f2 100644
--- a/src/base/QXmppSessionIq.cpp
+++ b/src/base/QXmppSessionIq.cpp
@@ -26,7 +26,7 @@
 #include <QXmlStreamWriter>
 
 #include "QXmppSessionIq.h"
-#include "QXmppConstants.h"
+#include "QXmppConstants_p.h"
 #include "QXmppUtils.h"
 
 /// \cond
diff --git a/src/base/QXmppStanza.cpp b/src/base/QXmppStanza.cpp
index 1e512145..99b0692e 100644
--- a/src/base/QXmppStanza.cpp
+++ b/src/base/QXmppStanza.cpp
@@ -26,7 +26,7 @@
 
 #include "QXmppStanza.h"
 #include "QXmppUtils.h"
-#include "QXmppConstants.h"
+#include "QXmppConstants_p.h"
 
 #include <QDomElement>
 #include <QXmlStreamWriter>
diff --git a/src/base/QXmppStream.cpp b/src/base/QXmppStream.cpp
index d497dbb5..9ea20856 100644
--- a/src/base/QXmppStream.cpp
+++ b/src/base/QXmppStream.cpp
@@ -23,7 +23,7 @@
  */
 
 
-#include "QXmppConstants.h"
+#include "QXmppConstants_p.h"
 #include "QXmppLogger.h"
 #include "QXmppStanza.h"
 #include "QXmppStream.h"
diff --git a/src/base/QXmppStreamFeatures.cpp b/src/base/QXmppStreamFeatures.cpp
index 6102eb24..322530b5 100644
--- a/src/base/QXmppStreamFeatures.cpp
+++ b/src/base/QXmppStreamFeatures.cpp
@@ -23,7 +23,7 @@
 
 #include <QDomElement>
 
-#include "QXmppConstants.h"
+#include "QXmppConstants_p.h"
 #include "QXmppStreamFeatures.h"
 
 QXmppStreamFeatures::QXmppStreamFeatures()
diff --git a/src/base/QXmppStreamInitiationIq.cpp b/src/base/QXmppStreamInitiationIq.cpp
index 926eb31a..c75bab43 100644
--- a/src/base/QXmppStreamInitiationIq.cpp
+++ b/src/base/QXmppStreamInitiationIq.cpp
@@ -23,7 +23,7 @@
 
 #include <QDomElement>
 
-#include "QXmppConstants.h"
+#include "QXmppConstants_p.h"
 #include "QXmppStreamInitiationIq_p.h"
 #include "QXmppUtils.h"
 
diff --git a/src/base/QXmppVCardIq.cpp b/src/base/QXmppVCardIq.cpp
index 448a97ca..86c01d78 100644
--- a/src/base/QXmppVCardIq.cpp
+++ b/src/base/QXmppVCardIq.cpp
@@ -27,7 +27,7 @@
 
 #include "QXmppVCardIq.h"
 #include "QXmppUtils.h"
-#include "QXmppConstants.h"
+#include "QXmppConstants_p.h"
 
 static QString getImageType(const QByteArray &contents)
 {
diff --git a/src/base/QXmppVersionIq.cpp b/src/base/QXmppVersionIq.cpp
index a6f7de26..f75cb344 100644
--- a/src/base/QXmppVersionIq.cpp
+++ b/src/base/QXmppVersionIq.cpp
@@ -23,7 +23,7 @@
 
 #include <QDomElement>
 
-#include "QXmppConstants.h"
+#include "QXmppConstants_p.h"
 #include "QXmppUtils.h"
 #include "QXmppVersionIq.h"
 
diff --git a/src/base/base.pri b/src/base/base.pri
index 88bf918b..3326d07d 100644
--- a/src/base/base.pri
+++ b/src/base/base.pri
@@ -4,7 +4,6 @@ INSTALL_HEADERS += \
     base/QXmppBindIq.h \
     base/QXmppBookmarkSet.h \
     base/QXmppByteStreamIq.h \
-    base/QXmppConstants.h \
     base/QXmppDataForm.h \
     base/QXmppDiscoveryIq.h \
     base/QXmppElement.h \
@@ -39,6 +38,7 @@ INSTALL_HEADERS += \
 
 HEADERS += \
     base/QXmppCodec_p.h \
+    base/QXmppConstants_p.h \
     base/QXmppSasl_p.h \
     base/QXmppStreamInitiationIq_p.h \
     base/QXmppStun_p.h
diff --git a/src/client/QXmppArchiveManager.cpp b/src/client/QXmppArchiveManager.cpp
index eddb4d2a..290437ef 100644
--- a/src/client/QXmppArchiveManager.cpp
+++ b/src/client/QXmppArchiveManager.cpp
@@ -26,7 +26,7 @@
 #include "QXmppArchiveIq.h"
 #include "QXmppArchiveManager.h"
 #include "QXmppClient.h"
-#include "QXmppConstants.h"
+#include "QXmppConstants_p.h"
 
 /// \cond
 QStringList QXmppArchiveManager::discoveryFeatures() const
diff --git a/src/client/QXmppBookmarkManager.cpp b/src/client/QXmppBookmarkManager.cpp
index 0878a0c9..7364f1a3 100644
--- a/src/client/QXmppBookmarkManager.cpp
+++ b/src/client/QXmppBookmarkManager.cpp
@@ -26,7 +26,7 @@
 #include "QXmppBookmarkManager.h"
 #include "QXmppBookmarkSet.h"
 #include "QXmppClient.h"
-#include "QXmppConstants.h"
+#include "QXmppConstants_p.h"
 #include "QXmppIq.h"
 #include "QXmppUtils.h"
 
diff --git a/src/client/QXmppCallManager.cpp b/src/client/QXmppCallManager.cpp
index 8f5ddbb2..6b75d21d 100644
--- a/src/client/QXmppCallManager.cpp
+++ b/src/client/QXmppCallManager.cpp
@@ -26,7 +26,7 @@
 
 #include "QXmppCallManager.h"
 #include "QXmppClient.h"
-#include "QXmppConstants.h"
+#include "QXmppConstants_p.h"
 #include "QXmppJingleIq.h"
 #include "QXmppRtpChannel.h"
 #include "QXmppStun.h"
diff --git a/src/client/QXmppCarbonManager.cpp b/src/client/QXmppCarbonManager.cpp
index 106e8ef5..17beaff4 100644
--- a/src/client/QXmppCarbonManager.cpp
+++ b/src/client/QXmppCarbonManager.cpp
@@ -24,7 +24,7 @@
 #include <QDomElement>
 
 #include "QXmppCarbonManager.h"
-#include "QXmppConstants.h"
+#include "QXmppConstants_p.h"
 #include "QXmppClient.h"
 #include "QXmppDiscoveryManager.h"
 #include "QXmppMessage.h"
diff --git a/src/client/QXmppClient.cpp b/src/client/QXmppClient.cpp
index 51e80ab0..bd28288f 100644
--- a/src/client/QXmppClient.cpp
+++ b/src/client/QXmppClient.cpp
@@ -26,7 +26,7 @@
 
 #include "QXmppClient.h"
 #include "QXmppClientExtension.h"
-#include "QXmppConstants.h"
+#include "QXmppConstants_p.h"
 #include "QXmppLogger.h"
 #include "QXmppOutgoingClient.h"
 #include "QXmppMessage.h"
diff --git a/src/client/QXmppDiscoveryManager.cpp b/src/client/QXmppDiscoveryManager.cpp
index 7c9a777e..72dbc15f 100644
--- a/src/client/QXmppDiscoveryManager.cpp
+++ b/src/client/QXmppDiscoveryManager.cpp
@@ -27,7 +27,7 @@
 #include <QCoreApplication>
 
 #include "QXmppClient.h"
-#include "QXmppConstants.h"
+#include "QXmppConstants_p.h"
 #include "QXmppDataForm.h"
 #include "QXmppDiscoveryIq.h"
 #include "QXmppStream.h"
diff --git a/src/client/QXmppEntityTimeManager.cpp b/src/client/QXmppEntityTimeManager.cpp
index 4b73ecfa..f12f2c71 100644
--- a/src/client/QXmppEntityTimeManager.cpp
+++ b/src/client/QXmppEntityTimeManager.cpp
@@ -28,7 +28,7 @@
 #include <QDateTime>
 
 #include "QXmppClient.h"
-#include "QXmppConstants.h"
+#include "QXmppConstants_p.h"
 #include "QXmppEntityTimeIq.h"
 #include "QXmppUtils.h"
 
diff --git a/src/client/QXmppMessageReceiptManager.cpp b/src/client/QXmppMessageReceiptManager.cpp
index f993574a..be165664 100644
--- a/src/client/QXmppMessageReceiptManager.cpp
+++ b/src/client/QXmppMessageReceiptManager.cpp
@@ -26,7 +26,7 @@
 
 #include <QDomElement>
 
-#include "QXmppConstants.h"
+#include "QXmppConstants_p.h"
 #include "QXmppMessage.h"
 #include "QXmppClient.h"
 
diff --git a/src/client/QXmppMucManager.cpp b/src/client/QXmppMucManager.cpp
index c281f491..ccc15ba5 100644
--- a/src/client/QXmppMucManager.cpp
+++ b/src/client/QXmppMucManager.cpp
@@ -25,7 +25,7 @@
 #include <QMap>
 
 #include "QXmppClient.h"
-#include "QXmppConstants.h"
+#include "QXmppConstants_p.h"
 #include "QXmppDiscoveryManager.h"
 #include "QXmppMessage.h"
 #include "QXmppMucIq.h"
diff --git a/src/client/QXmppOutgoingClient.cpp b/src/client/QXmppOutgoingClient.cpp
index 2846cba2..133d61ee 100644
--- a/src/client/QXmppOutgoingClient.cpp
+++ b/src/client/QXmppOutgoingClient.cpp
@@ -33,7 +33,7 @@
 #endif
 
 #include "QXmppConfiguration.h"
-#include "QXmppConstants.h"
+#include "QXmppConstants_p.h"
 #include "QXmppIq.h"
 #include "QXmppLogger.h"
 #include "QXmppMessage.h"
diff --git a/src/client/QXmppRpcManager.cpp b/src/client/QXmppRpcManager.cpp
index fb034999..5143611c 100644
--- a/src/client/QXmppRpcManager.cpp
+++ b/src/client/QXmppRpcManager.cpp
@@ -22,7 +22,7 @@
  */
 
 #include "QXmppClient.h"
-#include "QXmppConstants.h"
+#include "QXmppConstants_p.h"
 #include "QXmppInvokable.h"
 #include "QXmppRemoteMethod.h"
 #include "QXmppRpcIq.h"
diff --git a/src/client/QXmppTransferManager.cpp b/src/client/QXmppTransferManager.cpp
index d0741511..2313261e 100644
--- a/src/client/QXmppTransferManager.cpp
+++ b/src/client/QXmppTransferManager.cpp
@@ -34,7 +34,7 @@
 
 #include "QXmppByteStreamIq.h"
 #include "QXmppClient.h"
-#include "QXmppConstants.h"
+#include "QXmppConstants_p.h"
 #include "QXmppIbbIq.h"
 #include "QXmppSocks.h"
 #include "QXmppStreamInitiationIq_p.h"
diff --git a/src/client/QXmppVCardManager.cpp b/src/client/QXmppVCardManager.cpp
index ee506c60..5e2aadf5 100644
--- a/src/client/QXmppVCardManager.cpp
+++ b/src/client/QXmppVCardManager.cpp
@@ -23,7 +23,7 @@
 
 
 #include "QXmppClient.h"
-#include "QXmppConstants.h"
+#include "QXmppConstants_p.h"
 #include "QXmppUtils.h"
 #include "QXmppVCardIq.h"
 #include "QXmppVCardManager.h"
diff --git a/src/client/QXmppVersionManager.cpp b/src/client/QXmppVersionManager.cpp
index 7aeaa58a..e32c72c2 100644
--- a/src/client/QXmppVersionManager.cpp
+++ b/src/client/QXmppVersionManager.cpp
@@ -25,7 +25,7 @@
 #include <QDomElement>
 
 #include "QXmppClient.h"
-#include "QXmppConstants.h"
+#include "QXmppConstants_p.h"
 #include "QXmppGlobal.h"
 #include "QXmppVersionManager.h"
 #include "QXmppVersionIq.h"
diff --git a/src/server/QXmppDialback.cpp b/src/server/QXmppDialback.cpp
index 25282f56..3d97f081 100644
--- a/src/server/QXmppDialback.cpp
+++ b/src/server/QXmppDialback.cpp
@@ -23,7 +23,7 @@
 
 #include <QDomElement>
 
-#include "QXmppConstants.h"
+#include "QXmppConstants_p.h"
 #include "QXmppDialback.h"
 #include "QXmppUtils.h"
 
diff --git a/src/server/QXmppIncomingClient.cpp b/src/server/QXmppIncomingClient.cpp
index 4f04718c..6a4e529f 100644
--- a/src/server/QXmppIncomingClient.cpp
+++ b/src/server/QXmppIncomingClient.cpp
@@ -28,7 +28,7 @@
 #include <QTimer>
 
 #include "QXmppBindIq.h"
-#include "QXmppConstants.h"
+#include "QXmppConstants_p.h"
 #include "QXmppMessage.h"
 #include "QXmppPasswordChecker.h"
 #include "QXmppSasl_p.h"
diff --git a/src/server/QXmppIncomingServer.cpp b/src/server/QXmppIncomingServer.cpp
index 96944aa5..90419586 100644
--- a/src/server/QXmppIncomingServer.cpp
+++ b/src/server/QXmppIncomingServer.cpp
@@ -26,7 +26,7 @@
 #include <QSslKey>
 #include <QSslSocket>
 
-#include "QXmppConstants.h"
+#include "QXmppConstants_p.h"
 #include "QXmppDialback.h"
 #include "QXmppIncomingServer.h"
 #include "QXmppOutgoingServer.h"
diff --git a/src/server/QXmppOutgoingServer.cpp b/src/server/QXmppOutgoingServer.cpp
index 3aaa4a4a..3855da4d 100644
--- a/src/server/QXmppOutgoingServer.cpp
+++ b/src/server/QXmppOutgoingServer.cpp
@@ -31,7 +31,7 @@
 #include "qdnslookup.h"
 #endif
 
-#include "QXmppConstants.h"
+#include "QXmppConstants_p.h"
 #include "QXmppDialback.h"
 #include "QXmppOutgoingServer.h"
 #include "QXmppStreamFeatures.h"
diff --git a/src/server/QXmppServer.cpp b/src/server/QXmppServer.cpp
index 192a0093..13be2169 100644
--- a/src/server/QXmppServer.cpp
+++ b/src/server/QXmppServer.cpp
@@ -29,7 +29,7 @@
 #include <QSslKey>
 #include <QSslSocket>
 
-#include "QXmppConstants.h"
+#include "QXmppConstants_p.h"
 #include "QXmppDialback.h"
 #include "QXmppIq.h"
 #include "QXmppIncomingClient.h"