Index: src/OFApplication.h
==================================================================
--- src/OFApplication.h
+++ src/OFApplication.h
@@ -19,11 +19,11 @@
 
 #define OF_APPLICATION_DELEGATE(cls)					\
 	int								\
 	main(int argc, char *argv[])					\
 	{								\
-		return of_application_main(argc, argv, [cls class]);	\
+		return of_application_main(&argc, &argv, [cls class]);	\
 	}
 
 /**
  * \brief A protocol for delegates of OFApplication.
  */
@@ -99,20 +99,20 @@
  *
  * \param argc The number of arguments
  * \param argv The argument values
  */
 - (void)setArgumentCount: (int*)argc
-       andArgumentValues: (char***)argv;
+       andArgumentValues: (char**[])argv;
 
 /**
  * Gets args and argv.o
  *
  * \param argc A pointer where a pointer to argc should be stored
  * \param argv A pointer where a pointer to argv should be stored
  */
 - (void)getArgumentCount: (int**)argc
-       andArgumentValues: (char****)argv;
+       andArgumentValues: (char***[])argv;
 
 /**
  * \return The name of the program (argv[0])
  */
 - (OFString*)programName;
@@ -158,6 +158,6 @@
 @end
 
 @interface OFObject (OFApplicationDelegate) <OFApplicationDelegate>
 @end
 
-extern int of_application_main(int, char*[], Class);
+extern int of_application_main(int*, char**[], Class);

Index: src/OFApplication.m
==================================================================
--- src/OFApplication.m
+++ src/OFApplication.m
@@ -37,17 +37,17 @@
 
 	[delegate applicationWillTerminate];
 }
 
 int
-of_application_main(int argc, char *argv[], Class cls)
+of_application_main(int *argc, char **argv[], Class cls)
 {
 	OFApplication *app = [OFApplication sharedApplication];
 	id <OFApplicationDelegate> delegate = [[cls alloc] init];
 
-	[app setArgumentCount: &argc
-	    andArgumentValues: &argv];
+	[app setArgumentCount: argc
+	    andArgumentValues: argv];
 
 	[app setDelegate: delegate];
 	[(id)delegate release];
 
 	[app run];
@@ -144,11 +144,11 @@
 
 	programName = [[OFString alloc] initWithCString: (*argv)[0]];
 	arguments = [[OFMutableArray alloc] init];
 
 	for (i = 1; i < *argc; i++)
-		[arguments addObject: [OFString stringWithCString: *(argv)[i]]];
+		[arguments addObject: [OFString stringWithCString: (*argv)[i]]];
 
 	[pool release];
 }
 
 - (void)getArgumentCount: (int**)argc_