@@ -20,11 +20,11 @@
 
 #import "OFXMLParser.h"
 #import "OFString.h"
 #import "OFArray.h"
 #import "OFDictionary.h"
-#import "OFBigDataArray.h"
+#import "OFData.h"
 #import "OFXMLAttribute.h"
 #import "OFStream.h"
 #ifdef OF_HAVE_FILES
 # import "OFFile.h"
 #endif
@@ -39,11 +39,11 @@
 typedef void (*state_function_t)(id, SEL);
 static SEL selectors[OF_XMLPARSER_NUM_STATES];
 static state_function_t lookupTable[OF_XMLPARSER_NUM_STATES];
 
 static OF_INLINE void
-appendToBuffer(OFDataArray *buffer, const char *string,
+appendToBuffer(OFMutableData *buffer, const char *string,
     of_string_encoding_t encoding, size_t length)
 {
 	if (OF_LIKELY(encoding == OF_STRING_ENCODING_UTF_8))
 		[buffer addItems: string
 			   count: length];
@@ -57,11 +57,11 @@
 		objc_autoreleasePoolPop(pool);
 	}
 }
 
 static OFString *
-transformString(OFXMLParser *parser, OFDataArray *buffer, size_t cut,
+transformString(OFXMLParser *parser, OFMutableData *buffer, size_t cut,
     bool unescape)
 {
 	char *items = [buffer items];
 	size_t length = [buffer count] - cut;
 	bool hasEntities = false;
@@ -186,11 +186,11 @@
 
 	@try {
 		void *pool;
 		OFMutableDictionary *dict;
 
-		_buffer = [[OFBigDataArray alloc] init];
+		_buffer = [[OFMutableData alloc] init];
 		_previous = [[OFMutableArray alloc] init];
 		_namespaces = [[OFMutableArray alloc] init];
 		_attributes = [[OFMutableArray alloc] init];
 
 		pool = objc_autoreleasePoolPush();