diff -uNr glademm-0.6.4b/src/ChildParamList.hh glademm-0.6.4b.patched/src/ChildParamList.hh
--- glademm-0.6.4b/src/ChildParamList.hh	2001-10-11 16:07:22.000000000 +0200
+++ glademm-0.6.4b.patched/src/ChildParamList.hh	2004-02-20 17:52:45.819512408 +0100
@@ -22,6 +22,7 @@
 #define CHILDPARAMLIST_HH
 #include <config.h>
 #include "Tag.hh"
+#include <cassert>
 
 class ChildParamList
 {  	const Tag *tag;
diff -uNr glademm-0.6.4b/src/Cxx.cc glademm-0.6.4b.patched/src/Cxx.cc
--- glademm-0.6.4b/src/Cxx.cc	2002-04-03 10:22:41.000000000 +0200
+++ glademm-0.6.4b.patched/src/Cxx.cc	2004-02-20 17:50:37.684991816 +0100
@@ -20,6 +20,7 @@
 
 #include "Cxx.hh"
 #include <strstream>
+#include <cassert>
 #include "Configuration.hh"
 #include "Widget_type.hh"
 #include "WidgetMap.hh"
diff -uNr glademm-0.6.4b/src/Cxx_Fileset.cc glademm-0.6.4b.patched/src/Cxx_Fileset.cc
--- glademm-0.6.4b/src/Cxx_Fileset.cc	2002-04-03 10:22:41.000000000 +0200
+++ glademm-0.6.4b.patched/src/Cxx_Fileset.cc	2004-02-20 17:52:08.283218792 +0100
@@ -22,6 +22,7 @@
 #include "Configuration.hh"
 #include "writers/WriterBase.hh"
 #include "WidgetMap.hh"
+#include <cassert>
 
 Cxx_Fileset::Cxx_Fileset(const Tag &t, Cxx &_toplevel)
 	: top(t), toplevel(_toplevel)
diff -uNr glademm-0.6.4b/src/Cxx_Fs_Signal.cc glademm-0.6.4b.patched/src/Cxx_Fs_Signal.cc
--- glademm-0.6.4b/src/Cxx_Fs_Signal.cc	2001-11-22 10:44:00.000000000 +0100
+++ glademm-0.6.4b.patched/src/Cxx_Fs_Signal.cc	2004-02-20 17:51:31.756771656 +0100
@@ -22,6 +22,7 @@
 #include "Configuration.hh"
 #include "writers/WriterBase.hh"
 #include "WidgetMap.hh"
+#include <cassert>
 
 static bool WidgetIsContained(const Widget &parent,const Widget &w)
 {  if (w==parent) return true;
diff -uNr glademm-0.6.4b/src/Naming.cc glademm-0.6.4b.patched/src/Naming.cc
--- glademm-0.6.4b/src/Naming.cc	2001-10-11 16:07:23.000000000 +0200
+++ glademm-0.6.4b.patched/src/Naming.cc	2004-02-20 17:52:29.432003688 +0100
@@ -24,6 +24,7 @@
 #include "Configuration.hh"
 #include <cctype>
 #include <unistd.h>
+#include <cassert>
 // kind of macro misuse, but everything else is non-portable
 #define __FILELINE__ __FILE__ << ':' << __LINE__ <<
 
diff -uNr glademm-0.6.4b/src/SourceWriter/CxxFile.cc glademm-0.6.4b.patched/src/SourceWriter/CxxFile.cc
--- glademm-0.6.4b/src/SourceWriter/CxxFile.cc	2002-03-01 22:50:24.000000000 +0100
+++ glademm-0.6.4b.patched/src/SourceWriter/CxxFile.cc	2004-02-20 17:51:51.652747008 +0100
@@ -24,6 +24,7 @@
 #include "CxxFile.hh"
 #include <cstdio>
 #include <algo.h>
+#include <cassert>
 
 CxxFile &CxxFile::GlobalContext(Global_Context new_gc,bool stay_inside)
 // insert blank line if necessary
diff -uNr glademm-0.6.4b/src/Widget.hh glademm-0.6.4b.patched/src/Widget.hh
--- glademm-0.6.4b/src/Widget.hh	2001-10-11 16:07:23.000000000 +0200
+++ glademm-0.6.4b.patched/src/Widget.hh	2004-02-20 17:51:13.601531672 +0100
@@ -24,6 +24,7 @@
 #include "Tag.hh"
 #include <iterator>
 #include <list>
+#include <cassert>
 #include "Widget_type.hh"
 #include "ChildParamList.hh"
 
diff -uNr glademm-0.6.4b/src/const_contained_iterator.cc glademm-0.6.4b.patched/src/const_contained_iterator.cc
--- glademm-0.6.4b/src/const_contained_iterator.cc	2001-10-12 09:11:08.000000000 +0200
+++ glademm-0.6.4b.patched/src/const_contained_iterator.cc	2004-02-20 17:50:51.214934952 +0100
@@ -20,6 +20,7 @@
 
 #include "Widget.hh"
 #include <cstring>
+#include <cassert>
 #include "writers/WriterBase.hh"
 #include "Widget_type.hh"
 
diff -uNr glademm-0.6.4b/src/writers/Class.cc glademm-0.6.4b.patched/src/writers/Class.cc
--- glademm-0.6.4b/src/writers/Class.cc	2002-01-21 18:19:32.000000000 +0100
+++ glademm-0.6.4b.patched/src/writers/Class.cc	2004-02-20 17:54:16.879669160 +0100
@@ -18,6 +18,7 @@
  */
 
 #include "WriterBase.hh"
+#include <cassert>
 
 // XXX: Compound and Class are the same???
 
diff -uNr glademm-0.6.4b/src/writers/WriterBase.cc glademm-0.6.4b.patched/src/writers/WriterBase.cc
--- glademm-0.6.4b/src/writers/WriterBase.cc	2002-01-21 18:21:29.000000000 +0100
+++ glademm-0.6.4b.patched/src/writers/WriterBase.cc	2004-02-20 17:54:58.308371040 +0100
@@ -18,6 +18,7 @@
  */
 
 #include "WriterBase.hh"
+#include <cassert>
 
 safemap<std::string,const WriterBase *> Writer;
 
diff -uNr glademm-0.6.4b/src/writers/button.cc glademm-0.6.4b.patched/src/writers/button.cc
--- glademm-0.6.4b/src/writers/button.cc	2002-03-04 15:31:44.000000000 +0100
+++ glademm-0.6.4b.patched/src/writers/button.cc	2004-02-20 17:53:55.421931232 +0100
@@ -19,6 +19,7 @@
  */
 
 #include "button.hh"
+#include <cassert>
 
 void Gtk_Button::ApplyPreferences(Tag &t) const
 {  Parent::ApplyPreferences(t);
diff -uNr glademm-0.6.4b/src/writers/gnome_dialog.cc glademm-0.6.4b.patched/src/writers/gnome_dialog.cc
--- glademm-0.6.4b/src/writers/gnome_dialog.cc	2002-04-02 17:14:58.000000000 +0200
+++ glademm-0.6.4b.patched/src/writers/gnome_dialog.cc	2004-02-20 17:54:07.333120456 +0100
@@ -24,6 +24,7 @@
 
 #include <cstdio>
 #include "gnome_dialog.hh"
+#include <cassert>
 
 static Gnome_Dialog Gnome_Dialog(false);
 
diff -uNr glademm-0.6.4b/src/writers/gnome_druidpagestd.cc glademm-0.6.4b.patched/src/writers/gnome_druidpagestd.cc
--- glademm-0.6.4b/src/writers/gnome_druidpagestd.cc	2002-04-02 17:14:58.000000000 +0200
+++ glademm-0.6.4b.patched/src/writers/gnome_druidpagestd.cc	2004-02-20 17:54:48.425873408 +0100
@@ -19,6 +19,7 @@
  */
 
 #include "gnome_druidpage.hh"
+#include <cassert>
 
 class Gnome_DruidPageStandard : public Gnome_DruidPage
 {public:
diff -uNr glademm-0.6.4b/src/writers/gnome_propertybox.cc glademm-0.6.4b.patched/src/writers/gnome_propertybox.cc
--- glademm-0.6.4b/src/writers/gnome_propertybox.cc	2002-04-02 17:14:58.000000000 +0200
+++ glademm-0.6.4b.patched/src/writers/gnome_propertybox.cc	2004-02-20 17:54:27.710022696 +0100
@@ -18,6 +18,7 @@
  */
 
 #include "gnome_dialog.hh"
+#include <cassert>
 
 class Gnome_PropertyBox : public Gnome_Dialog
 {public:
diff -uNr glademm-0.6.4b/src/writers/menubar.cc glademm-0.6.4b.patched/src/writers/menubar.cc
--- glademm-0.6.4b/src/writers/menubar.cc	2002-01-21 18:19:39.000000000 +0100
+++ glademm-0.6.4b.patched/src/writers/menubar.cc	2004-02-20 17:53:42.633875312 +0100
@@ -19,6 +19,7 @@
  */
 
 #include "container.hh"
+#include <cassert>
 
 class Gtk_MenuBar : public Gtk_Container
 {public:
diff -uNr glademm-0.6.4b/src/writers/pixmapmenuitem.cc glademm-0.6.4b.patched/src/writers/pixmapmenuitem.cc
--- glademm-0.6.4b/src/writers/pixmapmenuitem.cc	2002-01-21 18:19:41.000000000 +0100
+++ glademm-0.6.4b.patched/src/writers/pixmapmenuitem.cc	2004-02-20 17:53:02.219019304 +0100
@@ -21,6 +21,7 @@
 // strange wrapper - uses Gnome Widget, wrapped via Gtk_MenuItem
 
 #include "menuitem.hh"
+#include <cassert>
 
 class Gtk_PixmapMenuItem : public Gtk_MenuItem
 {public:
diff -uNr glademm-0.6.4b/src/writers/toolbar.cc glademm-0.6.4b.patched/src/writers/toolbar.cc
--- glademm-0.6.4b/src/writers/toolbar.cc	2002-04-02 17:35:13.000000000 +0200
+++ glademm-0.6.4b.patched/src/writers/toolbar.cc	2004-02-20 17:53:32.038486056 +0100
@@ -19,6 +19,7 @@
  */
 
 #include "container.hh"
+#include <cassert>
 
 class Gtk_Toolbar : public Gtk_Container
 {	bool isXPM(const std::string &file) const;
diff -uNr glademm-0.6.4b/src/writers/window.cc glademm-0.6.4b.patched/src/writers/window.cc
--- glademm-0.6.4b/src/writers/window.cc	2002-01-21 18:22:47.000000000 +0100
+++ glademm-0.6.4b.patched/src/writers/window.cc	2004-02-20 17:53:20.428251080 +0100
@@ -21,6 +21,7 @@
 // AccelGroups really made it ugly
 
 #include "window.hh"
+#include <cassert>
 
 static Gtk_Window Gtk_Window(false);