--- old/src/share/classes/java/awt/image/DirectColorModel.java	2012-07-03 19:51:28.466716667 +0200
+++ new/src/share/classes/java/awt/image/DirectColorModel.java	2012-07-03 19:51:28.196712684 +0200
@@ -27,7 +27,6 @@
 
 import java.awt.color.ColorSpace;
 import java.awt.Transparency;
-import javax.tools.annotation.GenerateNativeHeader;
 
 /**
  * The <code>DirectColorModel</code> class is a <code>ColorModel</code>
@@ -107,8 +106,6 @@
  * @see ColorModel#getRGBdefault
  *
  */
-/* No native methods here, but the constants are needed in the supporting JNI code */
-@GenerateNativeHeader
 public class DirectColorModel extends PackedColorModel {
     private int red_mask;
     private int green_mask;
--- old/src/share/classes/sun/awt/CharsetString.java	2012-07-03 19:51:29.126726381 +0200
+++ new/src/share/classes/sun/awt/CharsetString.java	2012-07-03 19:51:28.856722411 +0200
@@ -24,10 +24,6 @@
  */
 package sun.awt;
 
-import javax.tools.annotation.GenerateNativeHeader;
-
-/* No native methods here, but the constants are needed in the supporting JNI code */
-@GenerateNativeHeader
 public class CharsetString {
     /**
      * chars for this string.  See also offset, length.
--- old/src/share/classes/sun/java2d/pipe/RegionIterator.java	2012-07-03 19:51:29.766735803 +0200
+++ new/src/share/classes/sun/java2d/pipe/RegionIterator.java	2012-07-03 19:51:29.506731974 +0200
@@ -27,14 +27,10 @@
 
 import java.awt.Rectangle;
 
-import javax.tools.annotation.GenerateNativeHeader;
-
 /**
  * This class defines the API for iterating through the bands
  * of a region object.
  */
-/* No native methods here, but the constants are needed in the supporting JNI code */
-@GenerateNativeHeader
 public class RegionIterator {
     Region region;
     int curIndex;
--- old/src/share/native/sun/awt/image/cvutils/img_globals.c	2012-07-03 19:51:30.426745514 +0200
+++ new/src/share/native/sun/awt/image/cvutils/img_globals.c	2012-07-03 19:51:30.146741403 +0200
@@ -31,7 +31,6 @@
 #include "img_globals.h"
 
 #include "java_awt_image_IndexColorModel.h"
-#include "java_awt_image_DirectColorModel.h"
 #include "java_awt_Transparency.h"
 
 /*