--- glademm-2.6.0.orig/src/writers/optionmenu.cc
+++ glademm-2.6.0/src/writers/optionmenu.cc
@@ -21,6 +21,8 @@
 #include "button.hh"
 #include "../strsep.h"
 
+#include <cstring>
+
 class Gtk_OptionMenu : public Gtk_Button
 {	static const char * const MenuTags;
 	static Tag menu;
--- glademm-2.6.0.orig/src/writers/ctree.cc
+++ glademm-2.6.0/src/writers/ctree.cc
@@ -21,6 +21,8 @@
 
 #include "container.hh"
 
+#include <cstring>
+
 class Gtk_CTree : public Gtk_Container
 {public:
 	typedef Gtk_Container Parent;
--- glademm-2.6.0.orig/src/writers/xpmname.cc
+++ glademm-2.6.0/src/writers/xpmname.cc
@@ -2,6 +2,8 @@
 #include <string>
 #include <Configuration.hh>
 
+#include <cstring>
+
 // parts taken from
 /* xpmtoppm.c - read an X11 pixmap file and produce a portable pixmap
 **
--- glademm-2.6.0.orig/src/writers/gnome_about.cc
+++ glademm-2.6.0/src/writers/gnome_about.cc
@@ -21,6 +21,8 @@
 #include "gnome_dialog.hh"
 #include "../strsep.h"
 
+#include <cstring>
+
 class Gnome_About : public Gnome_Dialog
 {public:
 	typedef Gnome_Dialog Parent;
--- glademm-2.6.0.orig/src/writers/bonobo_dock.cc
+++ glademm-2.6.0/src/writers/bonobo_dock.cc
@@ -20,6 +20,8 @@
 
 #include "container.hh"
 
+#include <cstring>
+
 class Bonobo_Dock : public Gtk_Container
 {public:
 	typedef Gtk_Container Parent;
--- glademm-2.6.0.orig/src/writers/bonobo_dockitem.cc
+++ glademm-2.6.0/src/writers/bonobo_dockitem.cc
@@ -20,6 +20,8 @@
 
 #include "bin.hh"
 
+#include <cstring>
+
 class Bonobo_DockItem : public Gtk_Bin
 {public:
 	typedef Gtk_Bin Parent;
--- glademm-2.6.0.orig/src/writers/clist.cc
+++ glademm-2.6.0/src/writers/clist.cc
@@ -21,6 +21,8 @@
 #include "clist.hh"
 #include "../strsep.h"
 
+#include <cstring>
+
 static Gtk_CList Gtk_CList(false);
 
 const std::string Gtk_CList::TypeName(const Widget &w) const
--- glademm-2.6.0.orig/src/writers/combo.cc
+++ glademm-2.6.0/src/writers/combo.cc
@@ -21,6 +21,8 @@
 #include "combo.hh"
 #include "../strsep.h"
 
+#include <cstring>
+
 static Gtk_Combo Gtk_Combo(false);
 
 const std::string Gtk_Combo::TypeName(const Widget &w) const
--- glademm-2.6.0.orig/src/TagStream.hh
+++ glademm-2.6.0/src/TagStream.hh
@@ -26,6 +26,8 @@
 #include <fstream>
 #include <strstream>
 
+#include <cstring>
+
 class TagStream : public Tag
 {	// ---- for reading -----
 	// copied from _GbWidgetLoadData
--- glademm-2.6.0.orig/src/Tag.cc
+++ glademm-2.6.0/src/Tag.cc
@@ -23,6 +23,8 @@
 #include <locale.h>
 #include <iostream>
 
+#include <cstring>
+
 const Tag *Tag::find(const std::string &tp) const
 {  const_iterator i=find(begin(),tp);
    if (i==end()) return 0;
--- glademm-2.6.0.orig/src/TagStream.cc
+++ glademm-2.6.0/src/TagStream.cc
@@ -20,7 +20,8 @@
 #include "TagStream.hh"
 #include <cstring>
 #include <unistd.h>
-#include <algo.h>
+#include <algorithm>
+#include <iostream>
 
 //#define REMEMBER_EMPTY_SPACE
 
@@ -73,10 +74,10 @@
 {  std::string ret;
    std::string::const_iterator i(cont.begin());
    while (i!=cont.end())
-   {  std::string::const_iterator verbatim(::find(i,cont.end(),'&'));
+   {  std::string::const_iterator verbatim(std::find(i,cont.end(),'&'));
       ret+=std::string(i,verbatim);
       if (verbatim!=cont.end())
-      {  std::string::const_iterator endtag(::find(verbatim,cont.end(),';'));
+      {  std::string::const_iterator endtag(std::find(verbatim,cont.end(),';'));
          if (endtag!=cont.end()) ++endtag;
          std::string tag(verbatim,endtag);
          if (tag[1]=='#' && tag[2]=='x')