Index: native/jni/classpath/jcl.h
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/classpath/jcl.h,v
retrieving revision 1.9.2.3
diff -u -b -B -r1.9.2.3 jcl.h
--- native/jni/classpath/jcl.h	7 Aug 2005 18:34:12 -0000	1.9.2.3
+++ native/jni/classpath/jcl.h	6 Dec 2005 06:25:08 -0000
@@ -76,4 +76,15 @@
 #define DBG(x)
 #endif
 
+/* Some O/S's don't declare 'environ' */
+#if HAVE_CRT_EXTERNS_H
+/* Darwin does not have a variable named environ
+   but has a function which you can get the environ
+   variable with.  */
+#include <crt_externs.h>
+#define environ (*_NSGetEnviron())
+#else
+extern char **environ;
+#endif /* HAVE_CRT_EXTERNS_H */
+
 #endif
Index: native/jni/java-lang/java_lang_VMProcess.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-lang/java_lang_VMProcess.c,v
retrieving revision 1.2.2.7
diff -u -b -B -r1.2.2.7 java_lang_VMProcess.c
--- native/jni/java-lang/java_lang_VMProcess.c	2 Nov 2005 00:44:07 -0000	1.2.2.7
+++ native/jni/java-lang/java_lang_VMProcess.c	6 Dec 2005 06:25:09 -0000
@@ -50,23 +50,14 @@
 #include <fcntl.h>
 #include <stdio.h>
 
+#include <jcl.h>
+
 #include "target_native.h"
 #include "target_native_misc.h"
 
 /* Internal functions */
 static char *copy_string (JNIEnv * env, jobject string);
 static char *copy_elem (JNIEnv * env, jobject stringArray, jint i);
-
-/* Some O/S's don't declare 'environ' */
-#if HAVE_CRT_EXTERNS_H
-/* Darwin does not have a variable named environ
-   but has a function which you can get the environ
-   variable with.  */
-#include <crt_externs.h>
-#define environ (*_NSGetEnviron())
-#else
-extern char **environ;
-#endif /* HAVE_CRT_EXTERNS_H */
 
 /*
  * Internal helper function to copy a String in UTF-8 format.
Index: native/jni/java-lang/java_lang_VMSystem.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-lang/java_lang_VMSystem.c,v
retrieving revision 1.6.2.6
diff -u -b -B -r1.6.2.6 java_lang_VMSystem.c
--- native/jni/java-lang/java_lang_VMSystem.c	2 Aug 2005 20:12:40 -0000	1.6.2.6
+++ native/jni/java-lang/java_lang_VMSystem.c	6 Dec 2005 06:25:09 -0000
@@ -159,7 +159,6 @@
 Java_java_lang_VMSystem_environ (JNIEnv *env,
 				jclass klass __attribute__((__unused__)))
 {
-  extern char** environ;
   char **env_pointer;
   jobject variables;
   jclass list_class;