@@ -43,11 +43,11 @@
 # include <crt_externs.h>
 #elif defined(OF_WINDOWS)
 # include <windows.h>
 
 extern int _CRT_glob;
-extern void __wgetmainargs(int*, wchar_t***, wchar_t***, int, int*);
+extern void __wgetmainargs(int *, wchar_t ***, wchar_t ***, int, int *);
 #elif !defined(OF_IOS)
 extern char **environ;
 #endif
 
 #ifdef OF_PSP
@@ -66,15 +66,15 @@
 #  define SA_RESTART 0
 # endif
 #endif
 
 @interface OFApplication ()
-- (void)OF_setArgumentCount: (int*)argc
-	  andArgumentValues: (char**[])argv;
+- (void)OF_setArgumentCount: (int *)argc
+	  andArgumentValues: (char **[])argv;
 #ifdef OF_WINDOWS
 - (void)OF_setArgumentCount: (int)argc
-      andWideArgumentValues: (wchar_t*[])argv;
+      andWideArgumentValues: (wchar_t *[])argv;
 #endif
 - (void)OF_run;
 @end
 
 static OFApplication *app = nil;
@@ -153,26 +153,26 @@
 
 @implementation OFApplication
 @synthesize programName = _programName, arguments = _arguments;
 @synthesize environment = _environment;
 
-+ (OFApplication*)sharedApplication
++ (OFApplication *)sharedApplication
 {
 	return app;
 }
 
-+ (OFString*)programName
++ (OFString *)programName
 {
 	return [app programName];
 }
 
-+ (OFArray*)arguments
++ (OFArray *)arguments
 {
 	return [app arguments];
 }
 
-+ (OFDictionary*)environment
++ (OFDictionary *)environment
 {
 	return [app environment];
 }
 
 + (void)terminate
@@ -192,11 +192,11 @@
 	OF_UNREACHABLE
 #endif
 }
 
 #ifdef OF_HAVE_SANDBOX
-+ (void)activateSandbox: (OFSandbox*)sandbox
++ (void)activateSandbox: (OFSandbox *)sandbox
 {
 	[app activateSandbox: sandbox];
 }
 #endif
 
@@ -357,12 +357,12 @@
 	[_environment release];
 
 	[super dealloc];
 }
 
-- (void)OF_setArgumentCount: (int*)argc
-	  andArgumentValues: (char***)argv
+- (void)OF_setArgumentCount: (int *)argc
+	  andArgumentValues: (char ***)argv
 {
 #ifndef OF_WINDOWS
 	void *pool = objc_autoreleasePoolPush();
 	OFMutableArray *arguments;
 	of_string_encoding_t encoding;
@@ -398,11 +398,11 @@
 #endif
 }
 
 #ifdef OF_WINDOWS
 - (void)OF_setArgumentCount: (int)argc
-      andWideArgumentValues: (wchar_t**)argv
+      andWideArgumentValues: (wchar_t **)argv
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFMutableArray *arguments;
 
 	if (argc > 0) {
@@ -419,12 +419,12 @@
 
 	objc_autoreleasePoolPop(pool);
 }
 #endif
 
-- (void)getArgumentCount: (int**)argc
-       andArgumentValues: (char****)argv
+- (void)getArgumentCount: (int **)argc
+       andArgumentValues: (char ****)argv
 {
 	*argc = _argc;
 	*argv = _argv;
 }
 
@@ -440,11 +440,11 @@
 	sigemptyset(&sa.sa_mask);
 
 # define REGISTER_SIGNAL(sig)						\
 	if ([delegate respondsToSelector:				\
 	    @selector(applicationDidReceive##sig)]) {			\
-		_##sig##Handler = (void(*)(id, SEL))[(id)delegate	\
+		_##sig##Handler = (void (*)(id, SEL))[(id)delegate	\
 		    methodForSelector:					\
 		    @selector(applicationDidReceive##sig)];		\
 									\
 		sa.sa_handler = handle##sig;				\
 	} else								\
@@ -453,11 +453,11 @@
 	OF_ENSURE(sigaction(sig, &sa, NULL) == 0);
 #else
 # define REGISTER_SIGNAL(sig)						\
 	if ([delegate respondsToSelector:				\
 	    @selector(applicationDidReceive##sig)]) {			\
-		_##sig##Handler = (void(*)(id, SEL))[(id)delegate	\
+		_##sig##Handler = (void (*)(id, SEL))[(id)delegate	\
 		    methodForSelector:					\
 		    @selector(applicationDidReceive##sig)];		\
 		signal(sig, handle##sig);				\
 	} else								\
 		signal(sig, SIG_DFL);
@@ -521,11 +521,11 @@
 
 	OF_UNREACHABLE
 }
 
 #ifdef OF_HAVE_SANDBOX
-- (void)activateSandbox: (OFSandbox*)sandbox
+- (void)activateSandbox: (OFSandbox *)sandbox
 {
 # ifdef OF_HAVE_PLEDGE
 	void *pool = objc_autoreleasePoolPush();
 	const char *promises = [[sandbox pledgeString]
 	    cStringWithEncoding: [OFLocalization encoding]];