From 7da56bf73511359ca53df9d5b0652af9c70fcdec Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Fri, 25 May 2012 18:55:22 -0700
Subject: [PATCH] 7172014: Remove empty and unused javah include files

Reviewed-by: ohair, erikj
---
 jdk/src/share/native/sun/awt/image/cvutils/img_dcm.h    | 2 --
 jdk/src/share/native/sun/awt/image/cvutils/img_dcm8.h   | 2 --
 jdk/src/share/native/sun/java2d/pipe/SpanClipRenderer.c | 1 -
 jdk/src/solaris/native/sun/awt/initIDs.c                | 2 --
 4 files changed, 7 deletions(-)

diff --git a/jdk/src/share/native/sun/awt/image/cvutils/img_dcm.h b/jdk/src/share/native/sun/awt/image/cvutils/img_dcm.h
index 4bc29f0ee59..a3eb74d5265 100644
--- a/jdk/src/share/native/sun/awt/image/cvutils/img_dcm.h
+++ b/jdk/src/share/native/sun/awt/image/cvutils/img_dcm.h
@@ -52,8 +52,6 @@
 #define DecodeDeclared
 #endif
 
-#include "java_awt_image_DirectColorModel.h"
-
 #define DeclareDCMVars                                          \
     IfAlpha(int alpha_mask;                                     \
             int alpha_scale;                                    \
diff --git a/jdk/src/share/native/sun/awt/image/cvutils/img_dcm8.h b/jdk/src/share/native/sun/awt/image/cvutils/img_dcm8.h
index df3d5bf4919..42a29434c81 100644
--- a/jdk/src/share/native/sun/awt/image/cvutils/img_dcm8.h
+++ b/jdk/src/share/native/sun/awt/image/cvutils/img_dcm8.h
@@ -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;
diff --git a/jdk/src/share/native/sun/java2d/pipe/SpanClipRenderer.c b/jdk/src/share/native/sun/java2d/pipe/SpanClipRenderer.c
index addb4ad6e37..ad53574bdeb 100644
--- a/jdk/src/share/native/sun/java2d/pipe/SpanClipRenderer.c
+++ b/jdk/src/share/native/sun/java2d/pipe/SpanClipRenderer.c
@@ -31,7 +31,6 @@
 #include "jni_util.h"
 
 #include "sun_java2d_pipe_SpanClipRenderer.h"
-#include "sun_java2d_pipe_RegionIterator.h"
 
 jfieldID pBandsArrayID;
 jfieldID pEndIndexID;
diff --git a/jdk/src/solaris/native/sun/awt/initIDs.c b/jdk/src/solaris/native/sun/awt/initIDs.c
index 41080d6dcec..3bd1e68903c 100644
--- a/jdk/src/solaris/native/sun/awt/initIDs.c
+++ b/jdk/src/solaris/native/sun/awt/initIDs.c
@@ -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"