Index: src/OFArray.h
==================================================================
--- src/OFArray.h
+++ src/OFArray.h
@@ -16,11 +16,11 @@
 
 @class OFDataArray;
 @class OFString;
 
 /**
- * The OFArray class is a class for storing objects in an array.
+ * \brief A class for storing objects in an array.
  */
 @interface OFArray: OFObject <OFCopying, OFMutableCopying, OFFastEnumeration>
 {
 	OFDataArray *array;
 }
@@ -169,10 +169,11 @@
  * \return An OFEnumerator to enumarate through the array's objects
  */
 - (OFEnumerator*)enumerator;
 @end
 
+/// \cond internal
 @interface OFArrayEnumerator: OFEnumerator
 {
 	OFDataArray   *array;
 	size_t	      count;
 	unsigned long mutations;
@@ -181,7 +182,8 @@
 }
 
 - initWithDataArray: (OFDataArray*)data
    mutationsPointer: (unsigned long*)mutations_ptr;
 @end
+/// \endcond
 
 #import "OFMutableArray.h"

Index: src/OFArray.m
==================================================================
--- src/OFArray.m
+++ src/OFArray.m
@@ -350,10 +350,11 @@
 
 	[super dealloc];
 }
 @end
 
+/// \cond internal
 @implementation OFArrayEnumerator
 - initWithDataArray: (OFDataArray*)array_
    mutationsPointer: (unsigned long*)mutations_ptr_;
 {
 	self = [super init];
@@ -385,5 +386,6 @@
 	pos = 0;
 
 	return self;
 }
 @end
+/// \endcond

Index: src/OFAutoreleasePool.h
==================================================================
--- src/OFAutoreleasePool.h
+++ src/OFAutoreleasePool.h
@@ -12,10 +12,12 @@
 #import "OFObject.h"
 
 @class OFMutableArray;
 
 /**
+ * \brief A pool that keeps track of objects to release.
+ *
  * The OFAutoreleasePool class is a class that keeps track of objects that will
  * be released when the autorelease pool is released.
  *
  * Every thread has its own stack of autorelease pools.
  */

Index: src/OFConstString.h
==================================================================
--- src/OFConstString.h
+++ src/OFConstString.h
@@ -14,9 +14,9 @@
 #ifdef OF_APPLE_RUNTIME
 extern void *_OFConstStringClassReference;
 #endif
 
 /**
- * A class for storing constant strings using the @"" literal.
+ * \brief A class for storing constant strings using the \@"" literal.
  */
 @interface OFConstString: OFString {}
 @end

Index: src/OFDataArray.h
==================================================================
--- src/OFDataArray.h
+++ src/OFDataArray.h
@@ -10,11 +10,11 @@
  */
 
 #import "OFObject.h"
 
 /**
- * The OFDataArray class is a class for storing arbitrary data in an array.
+ * \brief A class for storing arbitrary data in an array.
  *
  * If you plan to store large hunks of data, you should consider using
  * OFBigDataArray, which allocates the memory in pages rather than in bytes.
  */
 @interface OFDataArray: OFObject <OFCopying>
@@ -141,14 +141,16 @@
 - removeNItems: (size_t)nitems
        atIndex: (size_t)index;
 @end
 
 /**
+ * \brief A class for storing arbitrary big data in an array.
+ *
  * The OFBigDataArray class is a class for storing arbitrary data in an array
  * and is designed to store large hunks of data. Therefore, it allocates
  * memory in pages rather than a chunk of memory for each item.
  */
 @interface OFBigDataArray: OFDataArray <OFCopying>
 {
 	size_t size;
 }
 @end

Index: src/OFDictionary.h
==================================================================
--- src/OFDictionary.h
+++ src/OFDictionary.h
@@ -24,11 +24,11 @@
 	uint32_t	     hash;
 };
 /// \endcond
 
 /**
- * The OFDictionary class is a class for using hash tables.
+ * \brief A class for storing objects in a hash table.
  */
 @interface OFDictionary: OFObject <OFCopying, OFMutableCopying,
     OFFastEnumeration>
 {
 	struct of_dictionary_bucket *data;
@@ -157,10 +157,11 @@
  * \return An OFEnumerator to enumerate through the dictionary's keys
  */
 - (OFEnumerator*)keyEnumerator;
 @end
 
+/// \cond internal
 @interface OFDictionaryEnumerator: OFEnumerator
 {
 	struct of_dictionary_bucket *data;
 	size_t			    size;
 	unsigned long		    mutations;
@@ -176,7 +177,8 @@
 @interface OFDictionaryObjectEnumerator: OFDictionaryEnumerator
 @end
 
 @interface OFDictionaryKeyEnumerator: OFDictionaryEnumerator
 @end
+/// \endcond
 
 #import "OFMutableDictionary.h"

Index: src/OFDictionary.m
==================================================================
--- src/OFDictionary.m
+++ src/OFDictionary.m
@@ -583,10 +583,11 @@
 
 	return hash;
 }
 @end
 
+/// \cond internal
 @implementation OFDictionaryEnumerator
 -     initWithData: (struct of_dictionary_bucket*)data_
 	      size: (size_t)size_
   mutationsPointer: (unsigned long*)mutations_ptr_
 {
@@ -638,5 +639,6 @@
 		return data[pos++].key;
 	else
 		return nil;
 }
 @end
+/// \endcond

Index: src/OFEnumerator.h
==================================================================
--- src/OFEnumerator.h
+++ src/OFEnumerator.h
@@ -10,11 +10,11 @@
  */
 
 #import "OFObject.h"
 
 /**
- * The OFEnumerator class provides methods to enumerate through collections.
+ * \brief A class which provides methods to enumerate through collections.
  */
 @interface OFEnumerator: OFObject {}
 /**
  * \return The next object
  */
@@ -33,10 +33,13 @@
  * We need this bad check to see if we already imported Cocoa, which defines
  * this as well.
  */
 #define of_fast_enumeration_state_t NSFastEnumerationState
 #ifndef NSINTEGER_DEFINED
+/**
+ * \brief State information for fast enumerations.
+ */
 typedef struct __of_fast_enumeration_state {
 	/// Arbitrary state information for the enumeration
 	unsigned long state;
 	/// Pointer to a C array of objects to return
 	id *itemsPtr;
@@ -46,13 +49,15 @@
 	unsigned long extra[5];
 } of_fast_enumeration_state_t;
 #endif
 
 /**
+ * \brief A protocol for fast enumeration.
+ *
  * The OFFastEnumeration protocol needs to be implemented by all classes
  * supporting fast enumeration.
  */
 @protocol OFFastEnumeration
 - (int)countByEnumeratingWithState: (of_fast_enumeration_state_t*)state
 			   objects: (id*)objects
 			     count: (int)count;
 @end

Index: src/OFExceptions.h
==================================================================
--- src/OFExceptions.h
+++ src/OFExceptions.h
@@ -14,11 +14,11 @@
 #import "OFObject.h"
 
 @class OFString;
 
 /**
- * An exception indicating an object could not be allocated.
+ * \brief An exception indicating an object could not be allocated.
  *
  * This exception is preallocated, as if there's no memory, no exception can
  * be allocated of course. That's why you shouldn't and even can't deallocate
  * it.
  *
@@ -39,11 +39,14 @@
  */
 - (OFString*)string;
 @end
 
 /**
- * The OFException class is the base class for all exceptions in ObjFW.
+ * \brief The base class for all exceptions in ObjFW
+ *
+ * The OFException class is the base class for all exceptions in ObjFW, except
+ * the OFAllocFailedException.
  *
  * IMPORTANT: Exceptions do NOT use OFAutoreleasePools and can't be autoreleased
  * either! You have to make sure to dealloc the exception in your \@catch block!
  */
 @interface OFException: OFObject
@@ -78,11 +81,11 @@
  */
 - (OFString*)string;
 @end
 
 /**
- * An OFException indicating there is not enough memory available.
+ * \brief An exception indicating there is not enough memory available.
  */
 @interface OFOutOfMemoryException: OFException
 {
 	size_t req_size;
 }
@@ -110,17 +113,18 @@
  */
 - (size_t)requestedSize;
 @end
 
 /**
- * An OFException indicating that a mutation was detected while enumerating.
+ * \brief An exception indicating that a mutation was detected while
+ *        enumerating.
  */
 @interface OFEnumerationMutationException: OFException {}
 @end
 
 /**
- * An OFException indicating the given memory is not part of the object.
+ * \brief An exception indicating the given memory is not part of the object.
  */
 @interface OFMemoryNotPartOfObjectException: OFException
 {
 	void *pointer;
 }
@@ -148,11 +152,12 @@
  */
 - (void*)pointer;
 @end
 
 /**
- * An OFException indicating that a method or part of it is not implemented.
+ * \brief An exception indicating that a method or part of it is not
+ *        implemented.
  */
 @interface OFNotImplementedException: OFException
 {
 	SEL selector;
 }
@@ -175,17 +180,17 @@
 - initWithClass: (Class)class_
        selector: (SEL)selector;
 @end
 
 /**
- * An OFException indicating the given value is out of range.
+ * \brief An exception indicating the given value is out of range.
  */
 @interface OFOutOfRangeException: OFException {}
 @end
 
 /**
- * An OFException indicating that the argument is invalid for this method.
+ * \brief An exception indicating that the argument is invalid for this method.
  */
 @interface OFInvalidArgumentException: OFException
 {
 	SEL selector;
 }
@@ -208,35 +213,36 @@
 - initWithClass: (Class)class_
        selector: (SEL)selector;
 @end
 
 /**
- * An OFException indicating that the encoding is invalid for this object.
+ * \brief An exception indicating that the encoding is invalid for this object.
  */
 @interface OFInvalidEncodingException: OFException {}
 @end
 
 /**
- * An OFException indicating that the format is invalid.
+ * \brief An exception indicating that the format is invalid.
  */
 @interface OFInvalidFormatException: OFException {}
 @end
 
 /**
- * An OFException indicating that a parser encountered malformed or invalid XML.
+ * \brief An exception indicating that a parser encountered malformed or
+ *        invalid XML.
  */
 @interface OFMalformedXMLException: OFException {}
 @end
 
 /**
- * An OFException indicating that initializing something failed.
+ * \brief An exception indicating that initializing something failed.
  */
 @interface OFInitializationFailedException: OFException {}
 @end
 
 /**
- * An OFException indicating the file couldn't be opened.
+ * \brief An exception indicating the file couldn't be opened.
  */
 @interface OFOpenFileFailedException: OFException
 {
 	OFString *path;
 	OFString *mode;
@@ -280,11 +286,11 @@
  */
 - (OFString*)mode;
 @end
 
 /**
- * An OFException indicating a read or write to the file failed.
+ * \brief An exception indicating a read or write to the file failed.
  */
 @interface OFReadOrWriteFailedException: OFException
 {
 	size_t req_size;
 	int    err;
@@ -318,23 +324,23 @@
  */
 - (size_t)requestedSize;
 @end
 
 /**
- * An OFException indicating a read on the file failed.
+ * \brief An exception indicating a read on a file failed.
  */
 @interface OFReadFailedException: OFReadOrWriteFailedException {}
 @end
 
 /**
- * An OFException indicating a write to the file failed.
+ * \brief An exception indicating a write to a file failed.
  */
 @interface OFWriteFailedException: OFReadOrWriteFailedException {}
 @end
 
 /**
- * An OFException indicating that changing the mode of the file failed.
+ * \brief An exception indicating that changing the mode of a file failed.
  */
 @interface OFChangeFileModeFailedException: OFException
 {
 	OFString *path;
 	mode_t mode;
@@ -379,11 +385,11 @@
 - (mode_t)mode;
 @end
 
 #ifndef _WIN32
 /**
- * An OFException indicating that changing the owner of the file failed.
+ * \brief An exception indicating that changing the owner of a file failed.
  */
 @interface OFChangeFileOwnerFailedException: OFException
 {
 	OFString *path;
 	uid_t owner;
@@ -438,11 +444,11 @@
 - (gid_t)group;
 @end
 #endif
 
 /**
- * An OFException indicating that renaming a file failed.
+ * \brief An exception indicating that renaming a file failed.
  */
 @interface OFRenameFileFailedException: OFException
 {
 	OFString *from;
 	OFString *to;
@@ -486,11 +492,11 @@
  */
 - (OFString*)to;
 @end
 
 /**
- * An OFException indicating that deleting a file failed.
+ * \brief An exception indicating that deleting a file failed.
  */
 @interface OFDeleteFileFailedException: OFException
 {
 	OFString *path;
 	int err;
@@ -525,11 +531,11 @@
 - (OFString*)path;
 @end
 
 #ifndef _WIN32
 /**
- * An OFException indicating that creating a link failed.
+ * \brief An exception indicating that creating a link failed.
  */
 @interface OFLinkFailedException: OFException
 {
 	OFString *src;
 	OFString *dest;
@@ -573,11 +579,11 @@
  */
 - (OFString*)destination;
 @end
 
 /**
- * An OFException indicating that creating a symlink failed.
+ * \brief An exception indicating that creating a symlink failed.
  */
 @interface OFSymlinkFailedException: OFException
 {
 	OFString *src;
 	OFString *dest;
@@ -622,30 +628,30 @@
 - (OFString*)destination;
 @end
 #endif
 
 /**
- * An OFException indicating that setting an option failed.
+ * \brief An exception indicating that setting an option failed.
  */
 @interface OFSetOptionFailedException: OFException {}
 @end
 
 /**
- * An OFException indicating a socket is not connected or bound.
+ * \brief An exception indicating a socket is not connected or bound.
  */
 @interface OFNotConnectedException: OFException {}
 @end
 
 /**
- * An OFException indicating an attempt to connect or bind an already connected
- * or bound socket.
+ * \brief An exception indicating an attempt to connect or bind an already
+ *        connected or bound socket.
  */
 @interface OFAlreadyConnectedException: OFException {}
 @end
 
 /**
- * An OFException indicating the translation of an address failed.
+ * \brief An exception indicating the translation of an address failed.
  */
 @interface OFAddressTranslationFailedException: OFException
 {
 	OFString *node;
 	OFString *service;
@@ -689,11 +695,11 @@
  */
 - (OFString*)service;
 @end
 
 /**
- * An OFException indicating that the connection could not be established.
+ * \brief An exception indicating that the connection could not be established.
  */
 @interface OFConnectionFailedException: OFException
 {
 	OFString *node;
 	OFString *service;
@@ -737,11 +743,11 @@
  */
 - (OFString*)service;
 @end
 
 /**
- * An OFException indicating that binding the socket failed.
+ * \brief An exception indicating that binding the socket failed.
  */
 @interface OFBindFailedException: OFException
 {
 	OFString *node;
 	OFString *service;
@@ -795,11 +801,11 @@
  */
 - (int)family;
 @end
 
 /**
- * An OFException indicating that listening on the socket failed.
+ * \brief An exception indicating that listening on the socket failed.
  */
 @interface OFListenFailedException: OFException
 {
 	int backlog;
 	int err;
@@ -833,11 +839,11 @@
  */
 - (int)backLog;
 @end
 
 /**
- * An OFException indicating that accepting a connection failed.
+ * \brief An exception indicating that accepting a connection failed.
  */
 @interface OFAcceptFailedException: OFException
 {
 	int err;
 }
@@ -847,27 +853,27 @@
  */
 - (int)errNo;
 @end
 
 /**
- * An OFException indicating that joining the thread failed.
+ * \brief An exception indicating that joining the thread failed.
  */
 @interface OFThreadJoinFailedException: OFException {}
 @end
 
 /**
- * An OFException indicating that locking a mutex failed.
+ * \brief An exception indicating that locking a mutex failed.
  */
 @interface OFMutexLockFailedException: OFException {}
 @end
 
 /**
- * An OFException indicating that unlocking a mutex failed.
+ * \brief An exception indicating that unlocking a mutex failed.
  */
 @interface OFMutexUnlockFailedException: OFException {}
 @end
 
 /**
- * An OFException indicating that the hash has already been calculated.
+ * \brief An exception indicating that the hash has already been calculated.
  */
 @interface OFHashAlreadyCalculatedException: OFException {}
 @end

Index: src/OFFile.h
==================================================================
--- src/OFFile.h
+++ src/OFFile.h
@@ -16,11 +16,11 @@
 #import "OFStream.h"
 
 @class OFString;
 
 /**
- * The OFFile class provides functions to read, write and manipulate files.
+ * \brief A class which provides functions to read, write and manipulate files.
  */
 @interface OFFile: OFStream
 {
 	FILE *fp;
 	BOOL close;
@@ -126,14 +126,11 @@
  *	     It is not closed when the OFFile object is deallocated!
  */
 - initWithFilePointer: (FILE*)fp;
 @end
 
-@interface OFFileSingleton: OFFile
-@end
-
 /// An OFFile object for stdin
 extern OFFile *of_stdin;
 /// An OFFile object for stdout
 extern OFFile *of_stdout;
 /// An OFFile object for stderr
 extern OFFile *of_stderr;

Index: src/OFFile.m
==================================================================
--- src/OFFile.m
+++ src/OFFile.m
@@ -27,10 +27,15 @@
 #endif
 
 OFFile *of_stdin = nil;
 OFFile *of_stdout = nil;
 OFFile *of_stderr = nil;
+
+/// \cond internal
+@interface OFFileSingleton: OFFile
+@end
+/// \endcond
 
 @implementation OFFile
 + (void)load
 {
 	if (self != [OFFile class])
@@ -222,10 +227,11 @@
 
 	return self;
 }
 @end
 
+/// \cond internal
 @implementation OFFileSingleton
 - initWithPath: (OFString*)path
 	  mode: (OFString*)mode
 {
 	@throw [OFNotImplementedException newWithClass: isa
@@ -256,5 +262,6 @@
 	@throw [OFNotImplementedException newWithClass: isa
 					      selector: _cmd];
 	[super dealloc];	/* Get rid of stupid warning */
 }
 @end
+/// \endcond

Index: src/OFHashes.h
==================================================================
--- src/OFHashes.h
+++ src/OFHashes.h
@@ -16,11 +16,11 @@
 #define OF_SHA1_DIGEST_SIZE 20
 
 extern int _OFHashing_reference;
 
 /**
- * The OFMD5Hash class provides functions to create an MD5 hash.
+ * \brief A class which provides functions to create an MD5 hash.
  */
 @interface OFMD5Hash: OFObject
 {
 	uint32_t buf[4];
 	uint32_t bits[2];
@@ -49,11 +49,11 @@
  */
 - (uint8_t*)digest;
 @end
 
 /**
- * The OFSHA1Hash class provides functions to create an SHA1 hash.
+ * \brief A class which provides functions to create an SHA1 hash.
  */
 @interface OFSHA1Hash: OFObject
 {
 	uint32_t state[5];
 	uint64_t count;

Index: src/OFList.h
==================================================================
--- src/OFList.h
+++ src/OFList.h
@@ -10,10 +10,12 @@
  */
 
 #import "OFObject.h"
 
 /**
+ * \brief A list object.
+ *
  * A struct that contains a pointer to the next list object, the previous list
  * object and the object.
  */
 typedef struct __of_list_object {
 	/// A pointer to the next list object in the list
@@ -23,11 +25,11 @@
 	/// The object for the list object
 	id			object;
 } of_list_object_t;
 
 /**
- * The OFList class provides easy to use double-linked lists.
+ * \brief A class which provides easy to use double-linked lists.
  */
 @interface OFList: OFObject <OFCopying>
 {
 	of_list_object_t *first;
 	of_list_object_t *last;

Index: src/OFMutableArray.h
==================================================================
--- src/OFMutableArray.h
+++ src/OFMutableArray.h
@@ -10,12 +10,11 @@
  */
 
 #import "OFArray.h"
 
 /**
- * The OFMutableArray class is a class for storing, adding and removing objects
- * in an array.
+ * \brief A class for storing, adding and removing objects in an array.
  */
 @interface OFMutableArray: OFArray
 {
 	unsigned long mutations;
 }

Index: src/OFMutableDictionary.h
==================================================================
--- src/OFMutableDictionary.h
+++ src/OFMutableDictionary.h
@@ -10,11 +10,11 @@
  */
 
 #import "OFDictionary.h"
 
 /**
- * The OFMutableDictionary class is a class for using mutable hash tables.
+ * \brief A class for using mutable hash tables.
  */
 @interface OFMutableDictionary: OFDictionary
 {
 	unsigned long mutations;
 }

Index: src/OFMutableString.h
==================================================================
--- src/OFMutableString.h
+++ src/OFMutableString.h
@@ -13,11 +13,11 @@
 #include <stdarg.h>
 
 #import "OFString.h"
 
 /**
- * A class for storing and modifying strings.
+ * \brief A class for storing and modifying strings.
  */
 @interface OFMutableString: OFString {}
 /**
  * Sets the OFString to the specified UTF-8 encoded C string.
  *

Index: src/OFNumber.h
==================================================================
--- src/OFNumber.h
+++ src/OFNumber.h
@@ -39,12 +39,11 @@
 	OF_NUMBER_FLOAT,
 	OF_NUMBER_DOUBLE,
 };
 
 /**
- * The OFNumber class provides a way to store a number in an object and to
- * manipulate it.
+ * \brief provides a way to store a number in an object and to manipulate it.
  */
 @interface OFNumber: OFObject
 {
 	union {
 		char	       char_;

Index: src/OFObject.h
==================================================================
--- src/OFObject.h
+++ src/OFObject.h
@@ -15,11 +15,11 @@
 #include <stdint.h>
 
 #import <objc/objc.h>
 
 /**
- * A result of a comparison.
+ * \brief A result of a comparison.
  */
 typedef enum __of_comparison_result {
 	/// The left object is smaller than the right
 	OF_ORDERED_ASCENDING = -1,
 	/// Both objects are equal
@@ -27,19 +27,19 @@
 	/// The left object is bigger than the right
 	OF_ORDERED_DESCENDING = 1
 } of_comparison_result_t;
 
 /**
- * A range.
+ * \brief A range.
  */
 typedef struct __of_range {
 	size_t start;
 	size_t length;
 } of_range_t;
 
 /**
- * The OFObject class is the base class for all other classes inside ObjFW.
+ * \brief The root class for all other classes inside ObjFW.
  */
 @interface OFObject
 {
 	/// The class of the object
 	Class isa;
@@ -302,24 +302,26 @@
  */
 - (void)dealloc;
 @end
 
 /**
- * Objects implementing this protocol can be copied.
+ * \brief A protocol for creation of copies.
  */
 @protocol OFCopying
 /**
  * \return A copy of the object
  */
 - (id)copy;
 @end
 
 /**
+ * \brief A protocol for creation of mutable copies.
+ *
  * This protocol is implemented by objects that can be mutable and immutable
  * and allows returning a mutable copy.
  */
 @protocol OFMutableCopying
 /**
  * \return A copy of the object
  */
 - (id)mutableCopy;
 @end

Index: src/OFPlugin.h
==================================================================
--- src/OFPlugin.h
+++ src/OFPlugin.h
@@ -14,16 +14,16 @@
 @class OFString;
 
 #ifndef _WIN32
 typedef void* of_plugin_handle_t;
 #else
-#include <windows.h>
+# include <windows.h>
 typedef HMODULE of_plugin_handle_t;
 #endif
 
 /**
- * The OFPlugin class provides a system for loading plugins at runtime.
+ * \brief Provides a system for loading plugins at runtime.
  */
 @interface OFPlugin: OFObject
 {
 	of_plugin_handle_t handle;
 }

Index: src/OFSocket.h
==================================================================
--- src/OFSocket.h
+++ src/OFSocket.h
@@ -15,11 +15,11 @@
 # define _WIN32_WINNT 0x0501
 # include <winsock2.h>
 #endif
 
 /**
- * The OFTCPSocket class provides functions to create and use sockets.
+ * \brief A class which provides functions to create and use sockets.
  */
 @interface OFSocket: OFStream
 {
 #ifndef _WIN32
 	int		sock;

Index: src/OFStream.h
==================================================================
--- src/OFStream.h
+++ src/OFStream.h
@@ -12,11 +12,11 @@
 #import "OFObject.h"
 
 @class OFString;
 
 /**
- * The OFStream class provides a base class for different types of streams.
+ * \brief A base class for different types of streams.
  */
 @interface OFStream: OFObject
 {
 	char   *cache;
 	size_t cache_len;

Index: src/OFString.h
==================================================================
--- src/OFString.h
+++ src/OFString.h
@@ -30,11 +30,11 @@
 extern size_t of_string_index_to_position(const char*, size_t, size_t);
 
 @class OFArray;
 
 /**
- * A class for managing strings.
+ * \brief A class for handling strings.
  */
 @interface OFString: OFObject <OFCopying, OFMutableCopying>
 {
 	char	     *string;
 	unsigned int length;

Index: src/OFTCPSocket.h
==================================================================
--- src/OFTCPSocket.h
+++ src/OFTCPSocket.h
@@ -22,11 +22,11 @@
 #endif
 
 @class OFString;
 
 /**
- * The OFTCPSocket class provides functions to create and use sockets.
+ * \brief A class which provides functions to create and use TCP sockets.
  */
 @interface OFTCPSocket: OFSocket
 {
 	struct sockaddr	*saddr;
 	socklen_t	saddr_len;

Index: src/OFThread.h
==================================================================
--- src/OFThread.h
+++ src/OFThread.h
@@ -13,11 +13,11 @@
 #import "OFList.h"
 
 #import "threading.h"
 
 /**
- * A Thread Local Storage key.
+ * \brief A class for Thread Local Storage keys.
  */
 @interface OFTLSKey: OFObject
 {
 @public
 	of_tlskey_t key;
@@ -50,21 +50,20 @@
  */
 - initWithDestructor: (void(*)(id))destructor;
 @end
 
 /**
- * The OFThread class provides portable threads.
+ * \brief A class which provides portable threads.
  *
  * To use it, you should create a new class derived from it and reimplement
  * main.
  */
 @interface OFThread: OFObject
 {
 	id object;
 	of_thread_t thread;
 	BOOL running;
-
 @public
 	id retval;
 }
 
 /**
@@ -116,11 +115,11 @@
  */
 - join;
 @end
 
 /**
- * A class for creating mutual exclusions.
+ * \brief A class for creating mutual exclusions.
  */
 @interface OFMutex: OFObject
 {
 	of_mutex_t mutex;
 }

Index: src/OFURLEncoding.h
==================================================================
--- src/OFURLEncoding.h
+++ src/OFURLEncoding.h
@@ -12,12 +12,11 @@
 #import "OFString.h"
 
 extern int _OFURLEncoding_reference;
 
 /**
- * The OFString (OFURLEncoding) category provides an easy way to encode and
- * decode strings for URLs.
+ * \brief A category which provides URL encoding and decoding.
  */
 @interface OFString (OFURLEncoding)
 /**
  * Encodes a string for use in a URL.
  *

Index: src/OFXMLElement.h
==================================================================
--- src/OFXMLElement.h
+++ src/OFXMLElement.h
@@ -16,11 +16,11 @@
 @class OFMutableArray;
 
 extern int _OFXMLElement_reference;
 
 /**
- * The OFXMLAttribute represents an attribute of an XML element as an object.
+ * \brief A representation of an attribute of an XML element as an object.
  */
 @interface OFXMLAttribute: OFObject
 {
 	OFString *prefix;
 	OFString *name;
@@ -74,10 +74,12 @@
  */
 - (OFString*)stringValue;
 @end
 
 /**
+ * \brief A representation of an XML element as an object.
+ *
  * The OFXMLElement represents an XML element as an object which can be
  * modified and converted back to XML again.
  */
 @interface OFXMLElement: OFObject
 {
@@ -151,16 +153,15 @@
  */
 - addChild: (OFXMLElement*)child;
 @end
 
 /**
- * The OFString (OFXMLEscaping) category provides an easy way to escape strings
- * for use in an XML document.
+ * \brief A category to escape strings for use in an XML document.
  */
 @interface OFString (OFXMLEscaping)
 /**
  * Escapes a string for use in an XML document.
  *
  * \return A new autoreleased string
  */
 - stringByXMLEscaping;
 @end

Index: src/OFXMLParser.h
==================================================================
--- src/OFXMLParser.h
+++ src/OFXMLParser.h
@@ -17,11 +17,11 @@
 @class OFXMLParser;
 @class OFArray;
 @class OFMutableArray;
 
 /**
- * A protocol that needs to be implemented by delegates for OFXMLParser.
+ * \brief A protocol that needs to be implemented by delegates for OFXMLParser.
  */
 @protocol OFXMLParserDelegate
 /**
  * This callback is called when the XML parser found the start of a new tag.
  *
@@ -81,12 +81,12 @@
 -    (OFString*)xmlParser: (OFXMLParser*)parser
   foundUnknownEntityNamed: (OFString*)entity;
 @end
 
 /**
- * A protocol that needs to be implemented by delegates for 
- * stringByXMLUnescapingWithHandler:.
+ * \brief A protocol that needs to be implemented by delegates for
+ *	  stringByXMLUnescapingWithHandler:.
  */
 @protocol OFXMLUnescapingDelegate
 /**
  * This callback is called when an unknown entity was found while trying to
  * unescape XML. The callback is supposed to return a substitution for the
@@ -98,12 +98,14 @@
  */
 - (OFString*)foundUnknownEntityNamed: (OFString*)entity;
 @end
 
 /**
- * An event-based XML parser which calls the delegate's callbacks as soon as
- * it finds something, thus suitable for streams as well.
+ * \brief An event-based XML parser.
+ *
+ * OFXMLParser is an event-based XML parser which calls the delegate's callbacks
+ * as soon asit finds something, thus suitable for streams as well.
  */
 @interface OFXMLParser: OFObject <OFXMLUnescapingDelegate>
 {
 	OFObject <OFXMLParserDelegate> *delegate;
 	enum {
@@ -159,12 +161,11 @@
 - parseBuffer: (const char*)buf
      withSize: (size_t)size;
 @end
 
 /**
- * The OFString (OFXMLUnescaping) category provides methods to unescape XML in
- * strings.
+ * \brief A category for unescaping XML in strings.
  */
 @interface OFString (OFXMLUnescaping)
 /**
  * Unescapes XML in the string.
  */

Index: src/asprintf.h
==================================================================
--- src/asprintf.h
+++ src/asprintf.h
@@ -10,10 +10,10 @@
  */
 
 #import "objfw-defs.h"
 
 #ifndef OF_HAVE_ASPRINTF
-#include <stdarg.h>
+# include <stdarg.h>
 
 extern int asprintf(char**, const char*, ...);
 extern int vasprintf(char**, const char*, va_list);
 #endif