diff --git a/ChangeLog b/ChangeLog
index 93720bb2f..925f787da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-05-23  Alexandre Duret-Lutz  <aduret@src.lip6.fr>
+
+	* m4/gccwarn.m4: Do not use -Winline, this is inappropriate
+	with STL.
+	* src/ltlast/atomic_prop.cc, src/ltlvisit/lunabbrev.cc,
+	src/ltlvisit/nenoform.cc: Include <cassert>.
+
 2003-05-16  Alexandre Duret-Lutz  <aduret@src.lip6.fr>
 
 	* src/ltlvisit/dotty.cc: Rewrite to display formulae as
diff --git a/m4/gccwarn.m4 b/m4/gccwarn.m4
index 878d614da..5601050ea 100644
--- a/m4/gccwarn.m4
+++ b/m4/gccwarn.m4
@@ -25,7 +25,6 @@ EOF
   ac_cv_prog_gxx_warn_flags="-W -Wall"
   for cf_opt in \
    Wcast-align \
-   Winline \
    Wpointer-arith \
    Wwrite-strings \
    Wstrict-prototypes \
@@ -43,4 +42,3 @@ EOF
 fi
 AC_SUBST([WARNING_CXXFLAGS], ["${ac_cv_prog_gxx_warn_flags}"])
 ])
-
diff --git a/src/ltlast/atomic_prop.cc b/src/ltlast/atomic_prop.cc
index eb9518aa4..3def91a89 100644
--- a/src/ltlast/atomic_prop.cc
+++ b/src/ltlast/atomic_prop.cc
@@ -1,5 +1,6 @@
 #include "atomic_prop.hh"
 #include "visitor.hh"
+#include <cassert>
 
 namespace spot
 {
diff --git a/src/ltlvisit/lunabbrev.cc b/src/ltlvisit/lunabbrev.cc
index a6f599385..3676113df 100644
--- a/src/ltlvisit/lunabbrev.cc
+++ b/src/ltlvisit/lunabbrev.cc
@@ -1,6 +1,7 @@
 #include "ltlast/allnodes.hh"
 #include "ltlvisit/clone.hh"
 #include "lunabbrev.hh"
+#include <cassert>
 
 namespace spot
 {
diff --git a/src/ltlvisit/nenoform.cc b/src/ltlvisit/nenoform.cc
index 131d21791..e8d18dfb8 100644
--- a/src/ltlvisit/nenoform.cc
+++ b/src/ltlvisit/nenoform.cc
@@ -1,5 +1,6 @@
 #include "nenoform.hh"
 #include "ltlast/allnodes.hh"
+#include <cassert>
 
 namespace spot
 {