Index: src/OFHTTPResponse.m
==================================================================
--- src/OFHTTPResponse.m
+++ src/OFHTTPResponse.m
@@ -42,10 +42,11 @@
 		STATE_PARAM_VALUE,
 		STATE_PARAM_QUOTED_VALUE,
 		STATE_AFTER_PARAM_VALUE
 	} state = STATE_TYPE;
 	OFString *name = nil, *value = nil, *charset = nil;
+	of_string_encoding_t ret;
 
 	last = 0;
 	for (size_t i = 0; i < length; i++) {
 		switch (state) {
 		case STATE_TYPE:
@@ -125,14 +126,16 @@
 		if ([name isEqual: @"charset"])
 			charset = value;
 	}
 
 	@try {
-		return of_string_parse_encoding(charset);
+		ret = of_string_parse_encoding(charset);
 	} @catch (OFInvalidEncodingException *e) {
-		return OF_STRING_ENCODING_AUTODETECT;
+		ret = OF_STRING_ENCODING_AUTODETECT;
 	}
+
+	return ret;
 }
 
 @implementation OFHTTPResponse
 @synthesize statusCode = _statusCode, headers = _headers, cookies = _cookies;
 

Index: src/OFObject.m
==================================================================
--- src/OFObject.m
+++ src/OFObject.m
@@ -58,12 +58,11 @@
 #elif defined(OF_HAVE_THREADS)
 # import "threading.h"
 #endif
 
 #ifdef OF_APPLE_RUNTIME
-static double NSFoundationVersionNumber
-    OF_WEAK_REF("NSFoundationVersionNumber");
+extern double NSFoundationVersionNumber;
 #endif
 
 #if defined(OF_HAVE_FORWARDING_TARGET_FOR_SELECTOR)
 extern id of_forward(id, SEL, ...);
 extern struct stret of_forward_stret(id, SEL, ...);

Index: src/OFTarArchive.m
==================================================================
--- src/OFTarArchive.m
+++ src/OFTarArchive.m
@@ -52,14 +52,16 @@
 - initWithPath: (OFString *)path
 {
 	OFFile *file = [[OFFile alloc] initWithPath: path
 					       mode: @"rb"];
 	@try {
-		return [self initWithStream: file];
+		self = [self initWithStream: file];
 	} @finally {
 		[file release];
 	}
+
+	return self;
 }
 #endif
 
 - (void)dealloc
 {

Index: src/OFZIPArchive.m
==================================================================
--- src/OFZIPArchive.m
+++ src/OFZIPArchive.m
@@ -174,14 +174,16 @@
 - initWithPath: (OFString *)path
 {
 	OFFile *file = [[OFFile alloc] initWithPath: path
 					       mode: @"rb"];
 	@try {
-		return [self initWithSeekableStream: file];
+		self = [self initWithSeekableStream: file];
 	} @finally {
 		[file release];
 	}
+
+	return self;
 }
 #endif
 
 - (void)dealloc
 {

Index: src/bridge/NSArray_OFArray.h
==================================================================
--- src/bridge/NSArray_OFArray.h
+++ src/bridge/NSArray_OFArray.h
@@ -14,13 +14,17 @@
  * file.
  */
 
 #import <Foundation/NSArray.h>
 
-OF_ASSUME_NONNULL_BEGIN
+#ifdef OF_BRIDGE_LOCAL_INCLUDES
+# import "OFArray.h"
+#else
+# import <ObjFW/OFArray.h>
+#endif
 
-@class OFArray;
+OF_ASSUME_NONNULL_BEGIN
 
 @interface NSArray_OFArray: NSArray
 {
 	OFArray *_array;
 }

Index: src/bridge/NSDictionary_OFDictionary.h
==================================================================
--- src/bridge/NSDictionary_OFDictionary.h
+++ src/bridge/NSDictionary_OFDictionary.h
@@ -14,13 +14,17 @@
  * file.
  */
 
 #import <Foundation/NSDictionary.h>
 
-OF_ASSUME_NONNULL_BEGIN
+#ifdef OF_BRIDGE_LOCAL_INCLUDES
+# import "OFDictionary.h"
+#else
+# import <ObjFW/OFDictionary.h>
+#endif
 
-@class OFDictionary;
+OF_ASSUME_NONNULL_BEGIN
 
 @interface NSDictionary_OFDictionary: NSDictionary
 {
 	OFDictionary *_dictionary;
 }