Index: generators/TableGenerator.m
==================================================================
--- generators/TableGenerator.m
+++ generators/TableGenerator.m
@@ -87,11 +87,11 @@
 	client = [OFHTTPClient client];
 	response = [client performRequest: request];
 
 	while ((line = [response readLine]) != nil) {
 		void *pool2;
-		OFArray *split;
+		OFArray OF_GENERIC(OFString*) *split;
 		OFString *const *splitObjects;
 		of_unichar_t codep;
 
 		if ([line length] == 0)
 			continue;
@@ -136,11 +136,11 @@
 	client = [OFHTTPClient client];
 	response = [client performRequest: request];
 
 	while ((line = [response readLine]) != nil) {
 		void *pool2;
-		OFArray *split;
+		OFArray OF_GENERIC(OFString*) *split;
 		OFString *const *splitObjects;
 		of_unichar_t codep;
 
 		if ([line length] == 0 || [line hasPrefix: @"#"])
 			continue;

Index: utils/ofhash/OFHash.m
==================================================================
--- utils/ofhash/OFHash.m
+++ utils/ofhash/OFHash.m
@@ -69,11 +69,11 @@
 }
 
 @implementation OFHash
 - (void)applicationDidFinishLaunching
 {
-	OFArray *arguments = [OFApplication arguments];
+	OFArray OF_GENERIC(OFString*) *arguments = [OFApplication arguments];
 	id <OFHash> hash;
 	OFEnumerator *enumerator;
 	OFString *path;
 	int exitStatus = 0;
 

Index: utils/ofhttp/OFHTTP.m
==================================================================
--- utils/ofhttp/OFHTTP.m
+++ utils/ofhttp/OFHTTP.m
@@ -48,11 +48,11 @@
 #define MEBIBYTE (1024 * 1024)
 #define KIBIBYTE (1024)
 
 @interface OFHTTP: OFObject
 {
-	OFArray *_URLs;
+	OFArray OF_GENERIC(OFString*) *_URLs;
 	size_t _URLIndex;
 	int _errorCode;
 	OFString *_outputPath;
 	bool _continue, _detectFileName, _quiet, _verbose;
 	OFDataArray *_body;
@@ -545,11 +545,11 @@
 	OFString *URLString = nil;
 	OFURL *URL;
 	OFMutableDictionary *clientHeaders;
 	OFHTTPRequest *request;
 	OFHTTPResponse *response;
-	OFDictionary *headers;
+	OFDictionary OF_GENERIC(OFString*, OFString*) *headers;
 	OFString *fileName = nil, *lengthString, *type;
 
 	_length = -1;
 	_received = _resumedFrom = 0;
 
@@ -670,11 +670,12 @@
 
 		[of_stdout writeFormat: @"  Name: %@\n", fileName];
 
 		if (_verbose) {
 			void *pool = objc_autoreleasePoolPush();
-			OFDictionary *headers = [response headers];
+			OFDictionary OF_GENERIC(OFString*, OFString*) *headers =
+			    [response headers];
 			OFEnumerator *keyEnumerator = [headers keyEnumerator];
 			OFEnumerator *objectEnumerator =
 			    [headers objectEnumerator];
 			OFString *key, *object;