diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 4379a610a43e903c4cff30786395b4e4c335f39d..cddb6447985c0c79bcc5ef64a244ce1773646089 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+2002-01-17  Tom Tromey  <tromey@redhat.com>
+
+	* java/awt/AWTError.java: Replaced with Classpath version.
+	* java/awt/AWTException.java: Replaced with Classpath version.
+	* java/awt/IllegalComponentStateException.java: Replaced with
+	Classpath version.
+
 2002-01-16  Tom Tromey  <tromey@redhat.com>
 
 	* java/awt/Canvas.java (serialVersionUID): New constant.
diff --git a/libjava/java/awt/AWTError.java b/libjava/java/awt/AWTError.java
index 1ba1cbb14898481536c904f9a38307cc75e495c7..19591fb4f810f0229964994653ec2131f81624a5 100644
--- a/libjava/java/awt/AWTError.java
+++ b/libjava/java/awt/AWTError.java
@@ -1,25 +1,51 @@
-/* Copyright (C) 2000  Free Software Foundation
+/* AWTError.java -- A serious AWT error occurred.
+   Copyright (C) 1999 Free Software Foundation, Inc.
 
-   This file is part of libjava.
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+As a special exception, if you link this library with other files to
+produce an executable, this library does not by itself cause the
+resulting executable to be covered by the GNU General Public License.
+This exception does not however invalidate any other reasons why the
+executable file might be covered by the GNU General Public License. */
 
-This software is copyrighted work licensed under the terms of the
-Libjava License.  Please consult the file "LIBJAVA_LICENSE" for
-details.  */
 
 package java.awt;
 
-/** An exception of this type is thrown by AWT in some situations,
- * usually when major problems are encountered.
- * @author Tom Tromey <tromey@cygnus.com>
- * @date April 8, 2000
- */
+/**
+  * This error is thrown when a critical AWT error occurs.
+  *
+  * @author Aaron M. Renn (arenn@urbanophile.com)
+  */
 public class AWTError extends Error
 {
-  /** Make a new instance of AWTError
-   * @param s Text associated with the exception
-   */
-  public AWTError (String s)
-  {
-    super (s);
-  }
+
+/**
+  * Initializes a new instance of <code>AWTError</code> with the specified
+  * descriptive error message.
+  *
+  * @param message The descriptive error message.
+  */
+public
+AWTError(String message)
+{
+  super(message);
 }
+
+} // class AWTError 
+
diff --git a/libjava/java/awt/AWTException.java b/libjava/java/awt/AWTException.java
index 8cc7bff9c2d07cda93044b0a86b6879f43268ac7..716ff8594e37ab3052c4b4cfe4cb2d4c17c0e856 100644
--- a/libjava/java/awt/AWTException.java
+++ b/libjava/java/awt/AWTException.java
@@ -1,27 +1,52 @@
-/* Copyright (C) 2000  Free Software Foundation
+/* AWTException.java -- Generic AWT exception
+   Copyright (C) 1999 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+As a special exception, if you link this library with other files to
+produce an executable, this library does not by itself cause the
+resulting executable to be covered by the GNU General Public License.
+This exception does not however invalidate any other reasons why the
+executable file might be covered by the GNU General Public License. */
 
-   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 java.awt;
 
 /**
- * @author Tom Tromey <tromey@cygnus.com>
- * @date Tue Apr  4 2000
- */
-/* Written using "Java Class Libraries", 2nd edition, ISBN 0-201-31002-3
- * "The Java Language Specification", ISBN 0-201-63451-1
- * plus online API docs for JDK 1.2 beta from http://www.javasoft.com.
- * Status:  Believed complete and correct.
- */
- 
+  * This is a generic exception that indicates an error occurred in the
+  * AWT system.
+  *
+  * @author Aaron M. Renn (arenn@urbanophile.com)
+  */
 public class AWTException extends Exception
 {
-  public AWTException (String message)
-  {
-    super (message);
-  }
+
+/**
+  * Initializes a new instance of <code>AWTException</code> with the
+  * specified detailed error message.
+  *
+  * @param message The detailed error message.
+  */
+public
+AWTException(String message)
+{
+  super(message);
 }
+
+} // class AWTException 
+
diff --git a/libjava/java/awt/IllegalComponentStateException.java b/libjava/java/awt/IllegalComponentStateException.java
index ff97a576ecf8459248450aa9554344446a6a6251..fff2eaca72c8a7a2fa6bffa6f9f53b6c1a7f36d2 100644
--- a/libjava/java/awt/IllegalComponentStateException.java
+++ b/libjava/java/awt/IllegalComponentStateException.java
@@ -1,30 +1,64 @@
-/* Copyright (C) 2000  Free Software Foundation
+/* IllegalComponentStateException.java -- Bad component state
+   Copyright (C) 1999 Free Software Foundation, Inc.
 
-   This file is part of libjava.
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+As a special exception, if you link this library with other files to
+produce an executable, this library does not by itself cause the
+resulting executable to be covered by the GNU General Public License.
+This exception does not however invalidate any other reasons why the
+executable file might be covered by the GNU General Public License. */
 
-This software is copyrighted work licensed under the terms of the
-Libjava License.  Please consult the file "LIBJAVA_LICENSE" for
-details.  */
 
 package java.awt;
 
 /**
- * @author Tom Tromey <tromey@cygnus.com>
- * @date April 8, 2000
- */
+  * This exception is thrown when the requested operation failed because
+  * a component was not in the proper state.
+  *
+  * @author Aaron M. Renn (arenn@urbanophile.com)
+  */
+public class IllegalComponentStateException extends IllegalStateException
+{
 
-/* Status: Believed complete and correct to JDK 1.2.  */
+/**
+  * Initializes a new instance of <code>IllegalComponentStateException</code>
+  * with the specified detailed error message.
+  *
+  * @param message The detailed error message.
+  */
+public
+IllegalComponentStateException(String message)
+{
+  super(message);
+}
 
+/*************************************************************************/
 
-public class IllegalComponentStateException extends IllegalStateException
+/**
+  * Initializes a new instance of <code>IllegalComponentStateException</code>
+  * with no detailed error message.
+  */
+public
+IllegalComponentStateException()
 {
-  public IllegalComponentStateException ()
-  {
-    super ();
-  }
-
-  public IllegalComponentStateException (String s)
-  {
-    super (s);
-  }
+  super();
 }
+
+} // class IllegalComponentStateException
+