@@ -27,11 +27,10 @@
 #import <ObjFW/OFString.h>
 #import <ObjFW/OFArray.h>
 #import <ObjFW/OFDictionary.h>
 #import <ObjFW/OFNumber.h>
 #import <ObjFW/OFData.h>
-#import <ObjFW/OFAutoreleasePool.h>
 
 #import <ObjFW/OFNotImplementedException.h>
 
 #import "XMPPFileStorage.h"
 
@@ -44,21 +43,21 @@
 - (instancetype)initWithFile: (OFString *)file
 {
 	self = [super init];
 
 	@try {
-		OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
+		void *pool = objc_autoreleasePoolPush();
 
 		_file = [file copy];
 		@try {
 			_data = [[OFData dataWithContentsOfFile: file]
 			    .messagePackValue copy];
 		} @catch (id e) {
 			_data = [[OFMutableDictionary alloc] init];
 		}
 
-		[pool release];
+		objc_autoreleasePoolPop(pool);
 	} @catch (id e) {
 		[self release];
 		@throw e;
 	}