diff --git a/ChangeLog b/ChangeLog
index ab4ec3c6..cd4a7804 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-09-18  Akim Demaille  <akim@epita.fr>
+
+	* configure.in: Append WARNING_CFLAGS to CFLAGS.
+	* src/Makefile.am (INCLUDES): Don't.
+	Be ready to fetch headers in lib/.
+
 2000-09-18  Akim Demaille  <akim@epita.fr>
 
 	* doc/bison.texinfo: Update the copyright.
diff --git a/configure.in b/configure.in
index c2add60f..b7ef080a 100644
--- a/configure.in
+++ b/configure.in
@@ -42,6 +42,7 @@ if test "${enableval}" = yes; then
   BISON_WARNING(-Wshadow)
   BISON_WARNING(-Wstrict-prototypes)
   BISON_WARNING(-Wwrite-strings)
+  CFLAGS="$CFLAGS $WARNING_CFLAGS"
 fi
 
 # Checks for libraries.
diff --git a/src/Makefile.am b/src/Makefile.am
index 42642db6..a7acb61d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,7 +5,7 @@ DEFS = @DEFS@ \
   -DXPFILE=\"${datadir}/bison.simple\" \
   -DXPFILE1=\"${datadir}/bison.hairy\" \
   -DLOCALEDIR=\"${datadir}/locale\"
-INCLUDES = -I../intl -I$(top_srcdir)/intl -I.. $(WARNING_CFLAGS)
+INCLUDES = -I../intl -I$(top_srcdir)/lib -I..
 LDADD = @INTLLIBS@ ../lib/libbison.a
 
 bin_PROGRAMS = bison