diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index d69c05977cd..0386adc8033 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+1999-05-10  Tom Tromey  <tromey@cygnus.com>
+
+	* gnu/gcj/RawData.java: Added copyright header.
+
+	* include/jni.h (_Jv_va_list): Always define as va_list.
+
 1999-05-9  Anthony Green  <green@cygnus.com>
 
 	* java/text/DateFormat.java (computeInstance): Separate time
diff --git a/libjava/gnu/gcj/RawData.java b/libjava/gnu/gcj/RawData.java
index ba0e2b7f58a..9473fb05e5f 100644
--- a/libjava/gnu/gcj/RawData.java
+++ b/libjava/gnu/gcj/RawData.java
@@ -1,3 +1,11 @@
+/* Copyright (C) 1999  Cygnus Solutions
+
+   This file is part of libgcj.
+
+This software is copyrighted work licensed under the terms of the
+Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
+details.  */
+
 package gnu.gcj;
 
 /** A type uses to indicate pointers to non-Java data. */
diff --git a/libjava/include/jni.h b/libjava/include/jni.h
index bf7b015cdca..d589b022309 100644
--- a/libjava/include/jni.h
+++ b/libjava/include/jni.h
@@ -9,14 +9,8 @@ details.  */
 #ifndef __JAVA_JNI_H__
 #define __JAVA_JNI_H__
 
-#ifdef __GNUC__
-# define __need___va_list
-# include <stdarg.h>
-# define _Jv_va_list __gnuc_va_list
-#else
-# include <stdarg.h>
-# define _Jv_va_list va_list
-#endif
+#include <stdarg.h>
+#define _Jv_va_list va_list
 
 #ifdef __cplusplus