--- a/jdk/src/share/native/sun/awt/image/cvutils/img_dcm.h	Wed Jul 05 18:11:33 2017 +0200
+++ b/jdk/src/share/native/sun/awt/image/cvutils/img_dcm.h	Fri May 25 18:55:22 2012 -0700
@@ -52,8 +52,6 @@
 #define DecodeDeclared
 #endif
 
-#include "java_awt_image_DirectColorModel.h"
-
 #define DeclareDCMVars                                          \
     IfAlpha(int alpha_mask;                                     \
             int alpha_scale;                                    \

--- a/jdk/src/share/native/sun/awt/image/cvutils/img_dcm8.h	Wed Jul 05 18:11:33 2017 +0200
+++ b/jdk/src/share/native/sun/awt/image/cvutils/img_dcm8.h	Fri May 25 18:55:22 2012 -0700
@@ -52,8 +52,6 @@
 #define DecodeDeclared
 #endif
 
-#include "java_awt_image_DirectColorModel.h"
-
 #define DeclareDCM8Vars                                         \
     IfAlpha(unsigned int alpha_off;)                            \
     unsigned int red_off, green_off, blue_off;

--- a/jdk/src/share/native/sun/java2d/pipe/SpanClipRenderer.c	Wed Jul 05 18:11:33 2017 +0200
+++ b/jdk/src/share/native/sun/java2d/pipe/SpanClipRenderer.c	Fri May 25 18:55:22 2012 -0700
@@ -31,7 +31,6 @@
 #include "jni_util.h"
 
 #include "sun_java2d_pipe_SpanClipRenderer.h"
-#include "sun_java2d_pipe_RegionIterator.h"
 
 jfieldID pBandsArrayID;
 jfieldID pEndIndexID;

--- a/jdk/src/solaris/native/sun/awt/initIDs.c	Wed Jul 05 18:11:33 2017 +0200
+++ b/jdk/src/solaris/native/sun/awt/initIDs.c	Fri May 25 18:55:22 2012 -0700
@@ -26,14 +26,12 @@
 #include "java_awt_Color.h"
 #include "java_awt_Dimension.h"
 #include "java_awt_MenuBar.h"
-//#include "java_awt_Label.h"
 #include "java_awt_FontMetrics.h"
 #include "java_awt_event_MouseEvent.h"
 #include "java_awt_Rectangle.h"
 #include "java_awt_ScrollPaneAdjustable.h"
 #include "java_awt_Toolkit.h"
 #include "java_awt_CheckboxMenuItem.h"
-#include "sun_awt_CharsetString.h"
 
 #include "jni_util.h"