@@ -421,11 +421,11 @@
 }
 
 - (OFString*)stringValue
 {
 	OFMutableString *ret;
-	OFXMLElement **objects;
+	OFXMLElement *const *objects;
 	size_t i, count = [_children count];
 
 	if (count == 0)
 		return @"";
 
@@ -452,11 +452,11 @@
 {
 	void *pool;
 	char *cString;
 	size_t length, i, j, attributesCount;
 	OFString *prefix, *parentPrefix;
-	OFXMLAttribute **attributesObjects;
+	OFXMLAttribute *const *attributesObjects;
 	OFString *ret;
 	OFString *defaultNS;
 
 	pool = objc_autoreleasePoolPush();
 
@@ -593,11 +593,11 @@
 		objc_autoreleasePoolPop(pool2);
 	}
 
 	/* Childen */
 	if (_children != nil) {
-		OFXMLElement **childrenObjects = [_children objects];
+		OFXMLElement *const *childrenObjects = [_children objects];
 		size_t childrenCount = [_children count];
 		OFDataArray *tmp = [OFDataArray dataArray];
 		bool indent;
 
 		if (indentation > 0) {
@@ -821,11 +821,11 @@
 	objc_autoreleasePoolPop(pool);
 }
 
 - (OFXMLAttribute*)attributeForName: (OFString*)attributeName
 {
-	OFXMLAttribute **objects = [_attributes objects];
+	OFXMLAttribute *const *objects = [_attributes objects];
 	size_t i, count = [_attributes count];
 
 	for (i = 0; i < count; i++)
 		if (objects[i]->_namespace == nil &&
 		    [objects[i]->_name isEqual: attributeName])
@@ -835,11 +835,11 @@
 }
 
 - (OFXMLAttribute*)attributeForName: (OFString*)attributeName
 			  namespace: (OFString*)attributeNS
 {
-	OFXMLAttribute **objects;
+	OFXMLAttribute *const *objects;
 	size_t i, count;
 
 	if (attributeNS == nil)
 		return [self attributeForName: attributeName];
 
@@ -854,11 +854,11 @@
 	return nil;
 }
 
 - (void)removeAttributeForName: (OFString*)attributeName
 {
-	OFXMLAttribute **objects = [_attributes objects];
+	OFXMLAttribute *const *objects = [_attributes objects];
 	size_t i, count = [_attributes count];
 
 	for (i = 0; i < count; i++) {
 		if (objects[i]->_namespace == nil &&
 		    [objects[i]->_name isEqual: attributeName]) {
@@ -870,11 +870,11 @@
 }
 
 - (void)removeAttributeForName: (OFString*)attributeName
 		     namespace: (OFString*)attributeNS
 {
-	OFXMLAttribute **objects;
+	OFXMLAttribute *const *objects;
 	size_t i, count;
 
 	if (attributeNS == nil) {
 		[self removeAttributeForName: attributeName];
 		return;
@@ -1012,11 +1012,11 @@
 }
 
 - (OFArray*)elements
 {
 	OFMutableArray *ret = [OFMutableArray array];
-	OFXMLElement **objects = [_children objects];
+	OFXMLElement *const *objects = [_children objects];
 	size_t i, count = [_children count];
 
 	for (i = 0; i < count; i++)
 		if ([objects[i] isKindOfClass: [OFXMLElement class]])
 			[ret addObject: objects[i]];
@@ -1027,11 +1027,11 @@
 }
 
 - (OFArray*)elementsForName: (OFString*)elementName
 {
 	OFMutableArray *ret = [OFMutableArray array];
-	OFXMLElement **objects = [_children objects];
+	OFXMLElement *const *objects = [_children objects];
 	size_t i, count = [_children count];
 
 	for (i = 0; i < count; i++)
 		if ([objects[i] isKindOfClass: [OFXMLElement class]] &&
 		    objects[i]->_namespace == nil &&
@@ -1044,11 +1044,11 @@
 }
 
 - (OFArray*)elementsForNamespace: (OFString*)elementNS
 {
 	OFMutableArray *ret = [OFMutableArray array];
-	OFXMLElement **objects = [_children objects];
+	OFXMLElement *const *objects = [_children objects];
 	size_t i, count = [_children count];
 
 	for (i = 0; i < count; i++)
 		if ([objects[i] isKindOfClass: [OFXMLElement class]] &&
 		    objects[i]->_name != nil &&
@@ -1062,11 +1062,11 @@
 
 - (OFArray*)elementsForName: (OFString*)elementName
 		  namespace: (OFString*)elementNS
 {
 	OFMutableArray *ret;
-	OFXMLElement **objects;
+	OFXMLElement *const *objects;
 	size_t i, count;
 
 	if (elementNS == nil)
 		return [self elementsForName: elementName];