For the classpath checkin see http://developer.classpath.org/pipermail/classpath-patches/2008-September/006249.html Checked in on the classpath-0.98 merge branch (this contains the fixes for the header files as well): http://gcc.gnu.org/ml/java-patches/2008-q3/msg00080.html Approved by Andrew Haley on irc. Matthias