diff --git a/Doxyfile b/Doxyfile
index 7ed3492..afd1b8a 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -6,3 +6,4 @@ HTML_OUTPUT = .
 GENERATE_LATEX = NO
 HIDE_UNDOC_CLASSES = YES
 PREDEFINED = OF_HAVE_PROPERTIES
+IGNORE_PREFIX = XMPP
diff --git a/src/XMPPAuthenticator.h b/src/XMPPAuthenticator.h
index 3f4c974..63f4e43 100644
--- a/src/XMPPAuthenticator.h
+++ b/src/XMPPAuthenticator.h
@@ -27,9 +27,11 @@
  */
 @interface XMPPAuthenticator: OFObject
 {
+/// \cond internal
 	OFString *authzid;
 	OFString *authcid;
 	OFString *password;
+/// \endcond
 }
 
 #ifdef OF_HAVE_PROPERTIES
diff --git a/src/XMPPConnection.h b/src/XMPPConnection.h
index fbb19b4..dabce9b 100644
--- a/src/XMPPConnection.h
+++ b/src/XMPPConnection.h
@@ -135,6 +135,7 @@
     <OFXMLParserDelegate, OFXMLElementBuilderDelegate>
 #endif
 {
+/// \cond internal
 	id sock;
 	OFXMLParser *parser, *oldParser;
 	OFXMLElementBuilder *elementBuilder, *oldElementBuilder;
@@ -150,6 +151,7 @@
 	BOOL needsSession;
 	BOOL encryptionRequired, encrypted;
 	unsigned int lastID;
+/// \endcond
 }
 
 #ifdef OF_HAVE_PROPERTIES
diff --git a/src/XMPPExceptions.h b/src/XMPPExceptions.h
index 6ffe56d..8224e8a 100644
--- a/src/XMPPExceptions.h
+++ b/src/XMPPExceptions.h
@@ -30,7 +30,9 @@
  */
 @interface XMPPException: OFException
 {
+/// \cond internal
 	XMPPConnection *connection;
+/// \end
 }
 
 #ifdef OF_HAVE_PROPERTIES
@@ -68,8 +70,10 @@
  */
 @interface XMPPStreamErrorException: XMPPException
 {
+/// \cond internal
 	OFString *condition;
 	OFString *reason;
+/// \endcond
 }
 
 #ifdef OF_HAVE_PROPERTIES
@@ -117,8 +121,10 @@
  */
 @interface XMPPStringPrepFailedException: XMPPException
 {
+/// \cond internal
 	OFString *profile;
 	OFString *string;
+/// \endcond
 }
 
 #ifdef OF_HAVE_PROPERTIES
@@ -165,8 +171,10 @@
  */
 @interface XMPPIDNATranslationFailedException: XMPPException
 {
+/// \cond internal
 	OFString *operation;
 	OFString *string;
+/// \endcond
 }
 
 #ifdef OF_HAVE_PROPERTIES
@@ -213,7 +221,9 @@
  */
 @interface XMPPAuthFailedException: XMPPException
 {
+/// \cond internal
 	OFString *reason;
+/// \endcond
 }
 
 #ifdef OF_HAVE_PROPERTIES
diff --git a/src/XMPPJID.h b/src/XMPPJID.h
index e4199c8..e076b46 100644
--- a/src/XMPPJID.h
+++ b/src/XMPPJID.h
@@ -28,9 +28,11 @@
  */
 @interface XMPPJID: OFObject <OFCopying>
 {
+/// \cond internal
 	OFString *node;
 	OFString *domain;
 	OFString *resource;
+/// \endcond
 }
 
 #ifdef OF_HAVE_PROPERTIES
diff --git a/src/XMPPMulticastDelegate.h b/src/XMPPMulticastDelegate.h
index aab437d..467369a 100644
--- a/src/XMPPMulticastDelegate.h
+++ b/src/XMPPMulticastDelegate.h
@@ -29,7 +29,9 @@
  */
 @interface XMPPMulticastDelegate: OFObject
 {
+/// \cond internal
 	OFDataArray *delegates;
+/// \endcond
 }
 
 /**
diff --git a/src/XMPPRoster.h b/src/XMPPRoster.h
index b7ed9db..f49e67c 100644
--- a/src/XMPPRoster.h
+++ b/src/XMPPRoster.h
@@ -67,9 +67,11 @@
     <XMPPConnectionDelegate>
 #endif
 {
+/// \cond internal
 	XMPPConnection *connection;
 	OFMutableDictionary *rosterItems;
 	XMPPMulticastDelegate *delegates;
+/// \endcond
 }
 
 /**
diff --git a/src/XMPPRosterItem.h b/src/XMPPRosterItem.h
index 0fbf74d..1830127 100644
--- a/src/XMPPRosterItem.h
+++ b/src/XMPPRosterItem.h
@@ -24,12 +24,17 @@
 
 @class XMPPJID;
 
+/**
+ * \brief A class for representing an item in the roster.
+ */
 @interface XMPPRosterItem: OFObject
 {
+/// \cond intenral
 	XMPPJID *JID;
 	OFString *name;
 	OFString *subscription;
 	OFArray *groups;
+/// \endcond
 }
 
 #ifdef OF_HAVE_PROPERTIES
diff --git a/src/XMPPSCRAMAuth.h b/src/XMPPSCRAMAuth.h
index 0eb1326..7697721 100644
--- a/src/XMPPSCRAMAuth.h
+++ b/src/XMPPSCRAMAuth.h
@@ -29,6 +29,7 @@
  */
 @interface XMPPSCRAMAuth: XMPPAuthenticator
 {
+/// \cond internal
 	Class hashType;
 	OFString *cNonce;
 	OFString *GS2Header;
@@ -37,6 +38,7 @@
 	XMPPConnection *connection;
 	BOOL plusAvailable;
 	BOOL authenticated;
+/// \endcond
 }
 
 /**
diff --git a/src/XMPPStanza.h b/src/XMPPStanza.h
index d9eb1e3..2c4776c 100644
--- a/src/XMPPStanza.h
+++ b/src/XMPPStanza.h
@@ -30,10 +30,12 @@
  */
 @interface XMPPStanza: OFXMLElement
 {
+/// \cond internal
 	XMPPJID *from;
 	XMPPJID *to;
 	OFString *type;
 	OFString *ID;
+/// \endcond
 }
 
 #ifdef OF_HAVE_PROPERTIES