Index: acinclude.m4
===================================================================
RCS file: /cvsroot/classpath/classpath/acinclude.m4,v
retrieving revision 1.38
diff -u -b -B -r1.38 acinclude.m4
--- acinclude.m4	19 May 2004 06:11:59 -0000	1.38
+++ acinclude.m4	19 May 2004 12:09:16 -0000
@@ -370,37 +370,6 @@
 ])
 
 dnl -----------------------------------------------------------
-dnl CLASSPATH_WITH_INCLUDEDIR - checks for user specified extra include directories
-dnl -----------------------------------------------------------
-AC_DEFUN([CLASSPATH_WITH_INCLUDEDIR],
-[
-  AC_ARG_WITH(includedir,
-  [  --with-includedir=DIR   specify path to an extra include dir ],
-  [
-    AC_MSG_CHECKING(for includedir)
-    if test "x${withval}" != x && test "x${withval}" != xyes && test "x${withval}" != xno; then
-      if test -r ${withval}; then
-        if test "x${EXTRA_INCLUDES}" = x; then
-          EXTRA_INCLUDES="-I${withval}"
-        else
-          EXTRA_INCLUDES="${EXTRA_INCLUDES} -I${withval}"
-        fi
-        AC_SUBST(EXTRA_INCLUDES)
-        AC_MSG_RESULT("added ${withval}")
-      else
-        AC_MSG_RESULT("${withval} does not exist")
-      fi
-    fi
-  ],
-  [
-    if test -z "$EXTRA_INCLUDES"; then
-      EXTRA_INCLUDES=""
-      AC_SUBST(EXTRA_INCLUDES)
-    fi
-  ])
-])
-
-dnl -----------------------------------------------------------
 dnl CLASSPATH_WITH_GLIBJ - specify what to install
 dnl -----------------------------------------------------------
 AC_DEFUN([CLASSPATH_WITH_GLIBJ],
Index: configure.ac
===================================================================
RCS file: /cvsroot/classpath/classpath/configure.ac,v
retrieving revision 1.25
diff -u -b -B -r1.25 configure.ac
--- configure.ac	19 May 2004 06:02:50 -0000	1.25
+++ configure.ac	19 May 2004 12:09:16 -0000
@@ -143,12 +143,12 @@
 
 CLASSPATH_WITH_JAVAH
 
-CLASSPATH_WITH_INCLUDEDIR
-
 dnl ----------------------------------------------------------- 
 dnl Add the include files for the native abstraction layer.
 dnl -----------------------------------------------------------
-EXTRA_INCLUDES="${EXTRA_INCLUDES} -I\$(top_srcdir)/native/target/Linux -I\$(top_srcdir)/native/target/generic"
+AM_CPPFLAGS="-I\$(top_srcdir)/include -I\$(top_srcdir)/native/jni/classpath"
+AM_CPPFLAGS="$AM_CPPFLAGS -I\$(top_srcdir)/native/target/Linux -I\$(top_srcdir)/native/target/generic"
+AC_SUBST(AM_CPPFLAGS)
 
 dnl -----------------------------------------------------------
 if test "x${COMPILE_JNI}" = xyes; then
Index: native/fdlibm/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/fdlibm/Makefile.am,v
retrieving revision 1.5
diff -u -b -B -r1.5 Makefile.am
--- native/fdlibm/Makefile.am	12 Apr 2004 10:43:41 -0000	1.5
+++ native/fdlibm/Makefile.am	19 May 2004 12:09:17 -0000
@@ -51,6 +51,3 @@
 # and our normal -ansi -pedantic -Wall -Werror breaks this lib.
 AM_CFLAGS = 
 
-INCLUDES =  @EXTRA_INCLUDES@ \
-	     -I$(top_builddir)/include 
-
Index: native/jni/classpath/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/classpath/Makefile.am,v
retrieving revision 1.2
diff -u -b -B -r1.2 Makefile.am
--- native/jni/classpath/Makefile.am	12 Apr 2004 10:43:41 -0000	1.2
+++ native/jni/classpath/Makefile.am	19 May 2004 12:09:17 -0000
@@ -6,8 +6,3 @@
 				native_state.c native_state.h
 
 libclasspath_la_LDFLAGS = @CLASSPATH_MODULE@
-
-INCLUDES =  -I. @EXTRA_INCLUDES@ \
-	    -I$(top_srcdir)/include \
-	    -I$(top_builddir)/include 
-
Index: native/jni/gtk-peer/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/Makefile.am,v
retrieving revision 1.9
diff -u -b -B -r1.9 Makefile.am
--- native/jni/gtk-peer/Makefile.am	1 May 2004 11:03:30 -0000	1.9
+++ native/jni/gtk-peer/Makefile.am	19 May 2004 12:09:18 -0000
@@ -37,12 +37,6 @@
 			gthread-jni.h \
 			gtkpeer.h 
 
+libgtkpeer_la_CPPFLAGS = $(AM_CPPFLAGS) @GTK_CFLAGS@
 libgtkpeer_la_LIBADD = $(top_builddir)/native/jni/classpath/native_state.lo
 libgtkpeer_la_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@
-
-INCLUDES = -I. @EXTRA_INCLUDES@ \
-	   @GTK_CFLAGS@ \
-	   -I$(top_srcdir)/native/jni/classpath \
-           -I$(top_srcdir)/include \
-	   -I$(top_builddir)/include
-
Index: native/jni/java-awt/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-awt/Makefile.am,v
retrieving revision 1.2
diff -u -b -B -r1.2 Makefile.am
--- native/jni/java-awt/Makefile.am	12 Apr 2004 10:43:41 -0000	1.2
+++ native/jni/java-awt/Makefile.am	19 May 2004 12:09:18 -0000
@@ -2,11 +2,5 @@
 
 libjavaawt_la_SOURCES = gnu_java_awt_EmbeddedWindow.c
 			
-
 libjavaawt_la_LDFLAGS = @CLASSPATH_MODULE@
 libjavaawt_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo
-
-INCLUDES = -I. @EXTRA_INCLUDES@ \
-	   -I$(top_srcdir)/native/jni/classpath \
-           -I$(top_srcdir)/include \
-	   -I$(top_builddir)/include 
Index: native/jni/java-io/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-io/Makefile.am,v
retrieving revision 1.16
diff -u -b -B -r1.16 Makefile.am
--- native/jni/java-io/Makefile.am	26 Apr 2004 20:51:32 -0000	1.16
+++ native/jni/java-io/Makefile.am	19 May 2004 12:09:18 -0000
@@ -7,9 +7,4 @@
 			java_io_VMObjectStreamClass.c
 
 libjavaio_la_LDFLAGS = @CLASSPATH_MODULE@ 
-
 libjavaio_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo
-INCLUDES = -I. @EXTRA_INCLUDES@ \
-	   -I$(top_srcdir)/native/jni/classpath \
-           -I$(top_srcdir)/include \
-	   -I$(top_builddir)/include 
Index: native/jni/java-lang/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-lang/Makefile.am,v
retrieving revision 1.8
diff -u -b -B -r1.8 Makefile.am
--- native/jni/java-lang/Makefile.am	27 Apr 2004 22:56:05 -0000	1.8
+++ native/jni/java-lang/Makefile.am	19 May 2004 12:09:18 -0000
@@ -8,16 +8,12 @@
 			java_lang_Math.c \
 			java_lang_VMProcess.c
 
-libjavalangreflect_la_SOURCES = java_lang_reflect_Array.c
-
+libjavalang_la_CFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/native/fdlibm
 libjavalang_la_LIBADD = $(wildcard $(top_builddir)/native/fdlibm/*.lo) \
 			$(top_builddir)/native/jni/classpath/jcl.lo
 libjavalang_la_LDFLAGS = @CLASSPATH_MODULE@
-libjavalangreflect_la_LDFLAGS = @CLASSPATH_MODULE@
 
-INCLUDES = -I. @EXTRA_INCLUDES@ \
-	   -I$(top_srcdir)/native/jni/classpath \
-	   -I$(top_srcdir)/native/fdlibm \
-           -I$(top_srcdir)/include \
-	   -I$(top_builddir)/include 
+libjavalangreflect_la_CFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/native/fdlibm
+libjavalangreflect_la_SOURCES = java_lang_reflect_Array.c
 
+libjavalangreflect_la_LDFLAGS = @CLASSPATH_MODULE@
Index: native/jni/java-net/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-net/Makefile.am,v
retrieving revision 1.6
diff -u -b -B -r1.6 Makefile.am
--- native/jni/java-net/Makefile.am	12 Apr 2004 10:43:41 -0000	1.6
+++ native/jni/java-net/Makefile.am	19 May 2004 12:09:19 -0000
@@ -9,8 +9,3 @@
 
 libjavanet_la_LDFLAGS = @CLASSPATH_MODULE@
 libjavanet_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo
-
-INCLUDES = -I. @EXTRA_INCLUDES@ \
-	   -I$(top_srcdir)/native/jni/classpath \
-           -I$(top_srcdir)/include \
-	   -I$(top_builddir)/include 
Index: native/jni/java-nio/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-nio/Makefile.am,v
retrieving revision 1.8
diff -u -b -B -r1.8 Makefile.am
--- native/jni/java-nio/Makefile.am	30 Apr 2004 08:29:46 -0000	1.8
+++ native/jni/java-nio/Makefile.am	19 May 2004 12:09:19 -0000
@@ -10,8 +10,3 @@
 
 libjavanio_la_LDFLAGS = @CLASSPATH_MODULE@
 libjavanio_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo
-
-INCLUDES = -I. @EXTRA_INCLUDES@ \
-	   -I$(top_srcdir)/native/jni/classpath \
-           -I$(top_srcdir)/include \
-	   -I$(top_builddir)/include 
Index: native/jni/java-util/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-util/Makefile.am,v
retrieving revision 1.4
diff -u -b -B -r1.4 Makefile.am
--- native/jni/java-util/Makefile.am	12 Apr 2004 10:43:41 -0000	1.4
+++ native/jni/java-util/Makefile.am	19 May 2004 12:09:19 -0000
@@ -3,7 +3,3 @@
 libjavautil_la_SOURCES = java_util_TimeZone.c
 
 libjavautil_la_LDFLAGS = @CLASSPATH_MODULE@
-
-INCLUDES = -I. @EXTRA_INCLUDES@ \
-           -I$(top_srcdir)/include \
-	   -I$(top_builddir)/include