@@ -333,11 +333,10 @@
 	  andArgumentValues: (char***)argv
 {
 #ifndef OF_WINDOWS
 	void *pool = objc_autoreleasePoolPush();
 	OFMutableArray *arguments;
-	int i;
 	of_string_encoding_t encoding;
 
 	_argc = argc;
 	_argv = argv;
 
@@ -352,11 +351,11 @@
 		_programName = [[OFString alloc] initWithCString: (*argv)[0]
 							encoding: encoding];
 		arguments = [[OFMutableArray alloc] init];
 		_arguments = arguments;
 
-		for (i = 1; i < *argc; i++)
+		for (int i = 1; i < *argc; i++)
 			[arguments addObject:
 			    [OFString stringWithCString: (*argv)[i]
 					       encoding: encoding]];
 
 		[arguments makeImmutable];
@@ -373,17 +372,16 @@
 - (void)OF_setArgumentCount: (int)argc
       andWideArgumentValues: (wchar_t**)argv
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFMutableArray *arguments;
-	int i;
 
 	if (argc > 0) {
 		_programName = [[OFString alloc] initWithUTF16String: argv[0]];
 		arguments = [[OFMutableArray alloc] init];
 
-		for (i = 1; i < argc; i++)
+		for (int i = 1; i < argc; i++)
 			[arguments addObject:
 			    [OFString stringWithUTF16String: argv[i]]];
 
 		[arguments makeImmutable];
 		_arguments = arguments;