diff -ur o-System/Applications/Preferences/main.m System/Applications/Preferences/main.m
--- o-System/Applications/Preferences/main.m	2003-07-09 13:31:58.000000000 -0600
+++ System/Applications/Preferences/main.m	2005-03-27 12:20:15.000000000 -0700
@@ -6,8 +6,13 @@
 
 #include <AppKit/NSApplication.h>
 #include <Foundation/NSBundle.h>
+#include <Foundation/NSProcessInfo.h>
 
-int main (int argc, const char *argv[], const char *env[]) 
+int main (int argc, char *argv[], char *env[]) 
 {
+#ifdef GS_PASS_ARGUMENTS
+       [NSProcessInfo initializeWithArguments: argv count: argc environment: env];
+#endif
+
-	return NSApplicationMain (argc, argv);
+	return NSApplicationMain (argc, (const char **)argv);
 }
diff -ur o-System/Applications/Terminal/main.m System/Applications/Terminal/main.m
--- o-System/Applications/Terminal/main.m	2003-11-25 08:51:54.000000000 -0700
+++ System/Applications/Terminal/main.m	2005-03-27 11:30:33.000000000 -0700
@@ -491,9 +491,12 @@
 @end
 
 
-int main(int argc, char **argv)
+int main(int argc, char **argv, char **env)
 {
 	CREATE_AUTORELEASE_POOL(arp);
+#ifdef GS_PASS_ARGUMENTS
+       [NSProcessInfo initializeWithArguments: argv count: argc environment: env];
+#endif
 
 /*	[NSObject enableDoubleReleaseCheck: YES];*/
 
diff -ur o-System/Applications/TextEdit/Edit_main.m System/Applications/TextEdit/Edit_main.m
--- o-System/Applications/TextEdit/Edit_main.m	2004-05-25 10:19:21.000000000 -0600
+++ System/Applications/TextEdit/Edit_main.m	2005-03-27 11:30:33.000000000 -0700
@@ -1,5 +1,10 @@
 #import <AppKit/NSApplication.h>
+#import <Foundation/NSProcessInfo.h>
+
+int main(int argc, char *argv[], char *env[]) {
+#ifdef GS_PASS_ARGUMENTS
+       [NSProcessInfo initializeWithArguments: argv count: argc environment: env];
+#endif
 
-int main(int argc, const char *argv[]) {
    return NSApplicationMain (argc, argv);
 }