Get rid of all uses of GLIBMM_USING_STD()

* glib/src/*.{ccg,hg}: Remove all uses of GLIBMM_USING_STD().
We definitely do not need this anymore, and probably never
did.  We never covered all symbols from namespace std anyway
and never got any complaint about it.  Also, be careful to
always include the glibmmconfig.h header when it is needed.
* glib/glibmm/*.{cc,h}: ditto.
* glib/glibmmconfig.h.in: Clean up and re-indent.

44 files changed, 131 insertions, 273 deletions

diff --git a/ChangeLog b/ChangeLog
index 3530e03d..da8383af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2009-08-16  Daniel Elstner  <daniel.kitta@gmail.com>
 
+	Get rid of all uses of GLIBMM_USING_STD()
+
+	* glib/src/*.{ccg,hg}: Remove all uses of GLIBMM_USING_STD().
+	We definitely do not need this anymore, and probably never
+	did.  We never covered all symbols from namespace std anyway
+	and never got any complaint about it.  Also, be careful to
+	always include the glibmmconfig.h header when it is needed.
+	* glib/glibmm/*.{cc,h}: ditto.
+	* glib/glibmmconfig.h.in: Clean up and re-indent.
+
+2009-08-16  Daniel Elstner  <daniel.kitta@gmail.com>
+
 	Clean up C++ compiler test Autoconf macros
 
 	* build/cxx.m4: Clean up M4 code and switch to non-deprecated
diff --git a/glib/glibmm/arrayhandle.h b/glib/glibmm/arrayhandle.h
index 637bd4d7..9048d5ce 100644
--- a/glib/glibmm/arrayhandle.h
+++ b/glib/glibmm/arrayhandle.h
@@ -2,8 +2,6 @@
 #ifndef _GLIBMM_ARRAYHANDLE_H
 #define _GLIBMM_ARRAYHANDLE_H
 
-/* $Id$ */
-
 /* Copyright (C) 2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -21,9 +19,9 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <glibmmconfig.h>
 #include <glibmm/containerhandle_shared.h>
 
-
 namespace Glib
 {
 
diff --git a/glib/glibmm/containerhandle_shared.h b/glib/glibmm/containerhandle_shared.h
index 22230228..807abf3d 100644
--- a/glib/glibmm/containerhandle_shared.h
+++ b/glib/glibmm/containerhandle_shared.h
@@ -2,8 +2,6 @@
 #ifndef _GLIBMM_CONTAINERHANDLE_SHARED_H
 #define _GLIBMM_CONTAINERHANDLE_SHARED_H
 
-/* $Id$ */
-
 /* Copyright (C) 2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -21,6 +19,13 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <glibmmconfig.h>
+#include <glibmm/refptr.h>
+#include <glibmm/ustring.h>
+#include <glibmm/wrap.h>
+#include <glibmm/debug.h>
+#include <glib-object.h>
+
 #include <cstddef>
 #include <algorithm>
 #include <iterator>
@@ -28,22 +33,6 @@
 #include <deque>
 #include <list>
 
-#include <glib-object.h>
-#include <glibmm/refptr.h>
-#include <glibmm/ustring.h>
-#include <glibmm/wrap.h>
-#include <glibmm/debug.h>
-
-#include <glibmmconfig.h>
-GLIBMM_USING_STD(forward_iterator_tag)
-GLIBMM_USING_STD(random_access_iterator_tag)
-GLIBMM_USING_STD(distance)
-GLIBMM_USING_STD(copy)
-GLIBMM_USING_STD(vector)
-GLIBMM_USING_STD(deque)
-GLIBMM_USING_STD(list)
-
-
 namespace Glib
 {
 
diff --git a/glib/glibmm/containers.h b/glib/glibmm/containers.h
index 34b8778f..685789a0 100644
--- a/glib/glibmm/containers.h
+++ b/glib/glibmm/containers.h
@@ -2,8 +2,6 @@
 #ifndef _GLIBMM_CONTAINERS_H
 #define _GLIBMM_CONTAINERS_H
 
-/* $Id$ */
-
 /* containers.h
  *
  * Copyright (C) 1998-2002 The gtkmm Development Team
@@ -23,15 +21,10 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <glib.h>
+#include <glibmmconfig.h>
 #include <glibmm/sarray.h> /* for backward compatibility */
-
+#include <glib.h>
 #include <iterator>
-#include <glibmmconfig.h>
-
-GLIBMM_USING_STD(bidirectional_iterator_tag)
-GLIBMM_USING_STD(forward_iterator_tag)
-
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 
diff --git a/glib/glibmm/debug.h b/glib/glibmm/debug.h
index 0eea3f59..601beb3d 100644
--- a/glib/glibmm/debug.h
+++ b/glib/glibmm/debug.h
@@ -2,8 +2,6 @@
 #ifndef _GLIBMM_DEBUG_H
 #define _GLIBMM_DEBUG_H
 
-/* $Id$ */
-
 /* Copyright 2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -21,8 +19,8 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <glib.h>
 #include <glibmmconfig.h>
+#include <glib.h>
 
 // Some stuff that's useful when debugging gtkmm internals:
 
diff --git a/glib/glibmm/error.cc b/glib/glibmm/error.cc
index eaa8eaeb..df5441b4 100644
--- a/glib/glibmm/error.cc
+++ b/glib/glibmm/error.cc
@@ -1,5 +1,4 @@
 // -*- c++ -*-
-/* $Id$ */
 
 /* error.cc
  *
@@ -20,16 +19,11 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-//#include <glib/gtestutils.h> //For g_assert() in glib >= 2.15.0
-//#include <glib/gmessages.h> //For g_assert() in glib < 2.15.0
-#include <glib.h> //For g_assert() in all versions of glib.
-
-#include <map>
 #include <glibmmconfig.h>
 #include <glibmm/error.h>
 #include <glibmm/wrap_init.h>
-
-GLIBMM_USING_STD(map)
+#include <glib.h>
+#include <map>
 
 namespace
 {
diff --git a/glib/glibmm/error.h b/glib/glibmm/error.h
index 614c1915..fe7780d7 100644
--- a/glib/glibmm/error.h
+++ b/glib/glibmm/error.h
@@ -1,7 +1,6 @@
 // -*- c++ -*-
 #ifndef _GLIBMM_ERROR_H
 #define _GLIBMM_ERROR_H
-/* $Id$ */
 
 /* Copyright 2002 The gtkmm Development Team
  *
@@ -20,13 +19,9 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
-extern "C" { typedef struct _GError GError; }
-#endif
-
-#include <glib.h>
+#include <glibmmconfig.h>
 #include <glibmm/exception.h>
-#include <glibmmconfig.h> //For GLIBMM_EXCEPTIONS_ENABLED
+#include <glib.h>
 
 #ifndef GLIBMM_EXCEPTIONS_ENABLED
 //When not usinge exceptions, we pass auto_ptrs of the exceptions objects around instead. 
diff --git a/glib/glibmm/exceptionhandler.cc b/glib/glibmm/exceptionhandler.cc
index 40162871..493993d8 100644
--- a/glib/glibmm/exceptionhandler.cc
+++ b/glib/glibmm/exceptionhandler.cc
@@ -1,5 +1,4 @@
 // -*- c++ -*-
-/* $Id$ */
 
 /* exceptionhandler.cc
  *
@@ -20,17 +19,13 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <glib.h>
-#include <exception>
-#include <list>
-
 #include <glibmmconfig.h>
 #include <glibmm/error.h>
 #include <glibmm/exceptionhandler.h>
 #include <glibmm/thread.h>
-
-GLIBMM_USING_STD(exception)
-GLIBMM_USING_STD(list)
+#include <glib.h>
+#include <exception>
+#include <list>
 
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
 
diff --git a/glib/glibmm/exceptionhandler.h b/glib/glibmm/exceptionhandler.h
index 5eb785ee..9c23dbd8 100644
--- a/glib/glibmm/exceptionhandler.h
+++ b/glib/glibmm/exceptionhandler.h
@@ -2,8 +2,6 @@
 #ifndef _GLIBMM_EXCEPTIONHANDLER_H
 #define _GLIBMM_EXCEPTIONHANDLER_H
 
-/* $Id$ */
-
 /* exceptionhandler.h
  *
  * Copyright 2002 The gtkmm Development Team
@@ -23,8 +21,8 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <sigc++/sigc++.h>
 #include <glibmmconfig.h>
+#include <sigc++/sigc++.h>
 
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
 
diff --git a/glib/glibmm/listhandle.h b/glib/glibmm/listhandle.h
index df3400c3..13359b6f 100644
--- a/glib/glibmm/listhandle.h
+++ b/glib/glibmm/listhandle.h
@@ -2,8 +2,6 @@
 #ifndef _GLIBMM_LISTHANDLE_H
 #define _GLIBMM_LISTHANDLE_H
 
-/* $Id$ */
-
 /* Copyright (C) 2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -21,9 +19,9 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <glib.h>
+#include <glibmmconfig.h>
 #include <glibmm/containerhandle_shared.h>
-
+#include <glib.h>
 
 namespace Glib
 {
diff --git a/glib/glibmm/main.cc b/glib/glibmm/main.cc
index 83cc15ee..3e9047be 100644
--- a/glib/glibmm/main.cc
+++ b/glib/glibmm/main.cc
@@ -23,12 +23,8 @@
 #include <glibmm/thread.h>
 #include <glibmm/wrap.h>
 #include <glibmm/iochannel.h>
-
 #include <algorithm>
 
-GLIBMM_USING_STD(min)
-
-
 namespace
 {
 
diff --git a/glib/glibmm/main.h b/glib/glibmm/main.h
index 00430fe8..840379f9 100644
--- a/glib/glibmm/main.h
+++ b/glib/glibmm/main.h
@@ -2,8 +2,6 @@
 #ifndef _GLIBMM_MAIN_H
 #define _GLIBMM_MAIN_H
 
-/* $Id$ */
-
 /* Copyright (C) 2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -21,18 +19,13 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <glib.h>
-
-#include <vector>
-#include <sigc++/sigc++.h>
-
 #include <glibmmconfig.h>
 #include <glibmm/refptr.h>
 #include <glibmm/timeval.h>
 #include <glibmm/priorities.h>
-
-GLIBMM_USING_STD(vector)
-
+#include <sigc++/sigc++.h>
+#include <glib.h>
+#include <vector>
 
 namespace Glib
 {
@@ -41,13 +34,11 @@ class Cond;
 class Mutex;
 class IOChannel;
 
-
 /** @defgroup MainLoop The Main Event Loop
  * Manages all available sources of events.
  * @{
  */
 
-
 /** A bitwise combination representing an I/O condition to watch for on an
  * event source.
  * The flags correspond to those used by the <tt>%poll()</tt> system call
diff --git a/glib/glibmm/object.h b/glib/glibmm/object.h
index 32e64964..9d48d933 100644
--- a/glib/glibmm/object.h
+++ b/glib/glibmm/object.h
@@ -1,7 +1,6 @@
 // -*- c++ -*-
 #ifndef _GLIBMM_OBJECT_H
 #define _GLIBMM_OBJECT_H
-/* $Id$ */
 
 /* Copyright 2002 The gtkmm Development Team
  *
@@ -26,7 +25,7 @@
 # error "X11/Xlib.h seems to have been included before this header. Due to some commonly-named macros in X11/Xlib.h, it may only be included after any glibmm, gdkmm, or gtkmm headers."
 #endif
 
-#include <glib.h> /* for G_GNUC_NULL_TERMINATED */
+#include <glibmmconfig.h>
 #include <glibmm/objectbase.h>
 #include <glibmm/wrap.h>
 #include <glibmm/quark.h>
@@ -34,8 +33,7 @@
 #include <glibmm/utility.h> /* Could be private, but that would be tedious. */
 #include <glibmm/containerhandle_shared.h> /* Because its specializations may be here. */
 #include <glibmm/value.h>
-
-#include <glibmmconfig.h>
+#include <glib.h> /* for G_GNUC_NULL_TERMINATED */
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 extern "C"
diff --git a/glib/glibmm/objectbase.h b/glib/glibmm/objectbase.h
index cbee1d92..69b77224 100644
--- a/glib/glibmm/objectbase.h
+++ b/glib/glibmm/objectbase.h
@@ -2,8 +2,6 @@
 #ifndef _GLIBMM_OBJECTBASE_H
 #define _GLIBMM_OBJECTBASE_H
 
-/* $Id$ */
-
 /* Copyright 2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -21,25 +19,21 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <glibmmconfig.h>
 #include <glibmm/signalproxy.h>
 #include <glibmm/propertyproxy.h>
 #include <glibmm/ustring.h>
 #include <glibmm/value.h>
 #include <glibmm/quark.h>
-#include <sigc++/trackable.h>
-#include <typeinfo>
 #include <glibmmconfig.h>
 #include <glibmm/debug.h>
-
-#include <glibmmconfig.h>
-
-GLIBMM_USING_STD(type_info)
+#include <sigc++/trackable.h>
+#include <typeinfo>
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 extern "C" { typedef struct _GObject GObject; }
 #endif
 
-
 namespace Glib
 {
 
diff --git a/glib/glibmm/property.h b/glib/glibmm/property.h
index 9f0b293f..3252d411 100644
--- a/glib/glibmm/property.h
+++ b/glib/glibmm/property.h
@@ -1,7 +1,6 @@
 // -*- c++ -*-
 #ifndef _GLIBMM_PROPERTY_H
 #define _GLIBMM_PROPERTY_H
-/* $Id$ */
 
 /* Copyright 2002 The gtkmm Development Team
  *
@@ -20,6 +19,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <glibmmconfig.h>
 #include <glibmm/propertyproxy.h>
 
 #ifdef GLIBMM_PROPERTIES_ENABLED
diff --git a/glib/glibmm/propertyproxy.h b/glib/glibmm/propertyproxy.h
index 1fe87729..c563c1fb 100644
--- a/glib/glibmm/propertyproxy.h
+++ b/glib/glibmm/propertyproxy.h
@@ -1,7 +1,6 @@
 // -*- c++ -*-
 #ifndef _GLIBMM_PROPERTYPROXY_H
 #define _GLIBMM_PROPERTYPROXY_H
-/* $Id$ */
 
 /* propertyproxy.h
  *
@@ -22,6 +21,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <glibmmconfig.h>
 #include <glibmm/propertyproxy_base.h>
 
 #ifdef GLIBMM_PROPERTIES_ENABLED
diff --git a/glib/glibmm/propertyproxy_base.h b/glib/glibmm/propertyproxy_base.h
index cf319fbe..fcd40778 100644
--- a/glib/glibmm/propertyproxy_base.h
+++ b/glib/glibmm/propertyproxy_base.h
@@ -1,7 +1,6 @@
 // -*- c++ -*-
 #ifndef _GLIBMM_PROPERTYPROXY_BASE_H
 #define _GLIBMM_PROPERTYPROXY_BASE_H
-/* $Id$ */
 
 /* propertyproxy_base.h
  *
@@ -23,7 +22,6 @@
  */
 
 #include <glibmmconfig.h>
-
 #include <glibmm/value.h>
 #include <glibmm/signalproxy.h>
 
diff --git a/glib/glibmm/quark.h b/glib/glibmm/quark.h
index b5eb1c5d..c0bdc814 100644
--- a/glib/glibmm/quark.h
+++ b/glib/glibmm/quark.h
@@ -1,7 +1,6 @@
 // -*- c++ -*-
 #ifndef _GLIBMM_QUARK_H
 #define _GLIBMM_QUARK_H
-/* $Id$ */
 
 /* quark.h
  *
@@ -22,9 +21,9 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <glib.h>
+#include <glibmmconfig.h>
 #include <glibmm/ustring.h>
-
+#include <glib.h>
 
 namespace Glib
 {
diff --git a/glib/glibmm/refptr.h b/glib/glibmm/refptr.h
index 5bb7e413..381188f4 100644
--- a/glib/glibmm/refptr.h
+++ b/glib/glibmm/refptr.h
@@ -2,8 +2,6 @@
 #ifndef _GLIBMM_REFPTR_H
 #define _GLIBMM_REFPTR_H
 
-/* $Id$ */
-
 /* Copyright 2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -21,6 +19,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <glibmmconfig.h>
 
 namespace Glib
 {
diff --git a/glib/glibmm/slisthandle.h b/glib/glibmm/slisthandle.h
index 2b8630a7..70028c39 100644
--- a/glib/glibmm/slisthandle.h
+++ b/glib/glibmm/slisthandle.h
@@ -2,8 +2,6 @@
 #ifndef _GLIBMM_SLISTHANDLE_H
 #define _GLIBMM_SLISTHANDLE_H
 
-/* $Id$ */
-
 /* Copyright (C) 2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -21,9 +19,9 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <glib.h>
+#include <glibmmconfig.h>
 #include <glibmm/containerhandle_shared.h>
-
+#include <glib.h>
 
 namespace Glib
 {
diff --git a/glib/glibmm/streamiochannel.cc b/glib/glibmm/streamiochannel.cc
index e5bed3c4..fce34560 100644
--- a/glib/glibmm/streamiochannel.cc
+++ b/glib/glibmm/streamiochannel.cc
@@ -22,9 +22,6 @@
 #include <fstream>
 #include <iostream>
 
-GLIBMM_USING_STD(ios)
-
-
 namespace Glib
 {
 
diff --git a/glib/glibmm/streamiochannel.h b/glib/glibmm/streamiochannel.h
index 3644c5b5..702a097b 100644
--- a/glib/glibmm/streamiochannel.h
+++ b/glib/glibmm/streamiochannel.h
@@ -1,5 +1,4 @@
 // -*- c++ -*-
-/* $Id$ */
 
 /* Copyright (C) 2002 The gtkmm Development Team
  *
@@ -21,15 +20,10 @@
 #ifndef _GLIBMM_STREAMIOCHANNEL_H
 #define _GLIBMM_STREAMIOCHANNEL_H
 
-#include <glibmm/iochannel.h>
 #include <glibmmconfig.h>
+#include <glibmm/iochannel.h>
 #include <iosfwd>
 
-GLIBMM_USING_STD(istream)
-GLIBMM_USING_STD(ostream)
-GLIBMM_USING_STD(iostream)
-
-
 namespace Glib
 {
 
@@ -62,6 +56,4 @@ protected:
 
 } // namespace Glib
 
-
 #endif /* _GLIBMM_STREAMIOCHANNEL_H */
-
diff --git a/glib/glibmm/stringutils.cc b/glib/glibmm/stringutils.cc
index 19351e33..6cb781e5 100644
--- a/glib/glibmm/stringutils.cc
+++ b/glib/glibmm/stringutils.cc
@@ -18,17 +18,12 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <glibmmconfig.h>
 #include <glibmm/stringutils.h>
 #include <glibmm/utility.h>
 #include <glib.h>
 #include <cerrno>
 #include <stdexcept>
-#include <glibmmconfig.h>
-
-GLIBMM_USING_STD(out_of_range)
-GLIBMM_USING_STD(overflow_error)
-GLIBMM_USING_STD(underflow_error)
-
 
 bool Glib::str_has_prefix(const std::string& str, const std::string& prefix)
 {
diff --git a/glib/glibmm/threadpool.cc b/glib/glibmm/threadpool.cc
index 9c20dc30..82ff7750 100644
--- a/glib/glibmm/threadpool.cc
+++ b/glib/glibmm/threadpool.cc
@@ -1,5 +1,4 @@
 // -*- c++ -*-
-/* $Id$ */
 
 /* Copyright (C) 2002 The gtkmm Development Team
  *
@@ -18,14 +17,11 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <glibmmconfig.h>
 #include <glibmm/threadpool.h>
 #include <glibmm/exceptionhandler.h>
 #include <glib.h>
 #include <list>
-#include <glibmmconfig.h>
-
-GLIBMM_USING_STD(list)
-
 
 namespace Glib
 {
diff --git a/glib/glibmm/ustring.cc b/glib/glibmm/ustring.cc
index 9b7140df..c872439d 100644
--- a/glib/glibmm/ustring.cc
+++ b/glib/glibmm/ustring.cc
@@ -18,6 +18,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <glibmmconfig.h>
 #include <glibmm/ustring.h>
 #include <glibmm/convert.h>
 #include <glibmm/error.h>
@@ -26,16 +27,12 @@
 #include <algorithm>
 #include <iostream>
 #include <cstring>
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <glibmmconfig.h>
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
 # include <stdexcept>
 #endif
-GLIBMM_USING_STD(find)
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 namespace
 {
diff --git a/glib/glibmm/ustring.h b/glib/glibmm/ustring.h
index 0a7614c2..37142079 100644
--- a/glib/glibmm/ustring.h
+++ b/glib/glibmm/ustring.h
@@ -21,29 +21,18 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <glib.h>
+#include <glibmmconfig.h>
 #include <glibmm/unicode.h>
+#include <glib.h>
 
 #include <iosfwd>
 #include <iterator>
 #include <sstream>
 #include <string>
-
-#include <glibmmconfig.h>
-GLIBMM_USING_STD(bidirectional_iterator_tag)
-GLIBMM_USING_STD(reverse_iterator)
-GLIBMM_USING_STD(string)
-GLIBMM_USING_STD(istream)
-GLIBMM_USING_STD(ostream)
-
-#ifdef GLIBMM_HAVE_STD_ITERATOR_TRAITS
-GLIBMM_USING_STD(iterator_traits)
-#else
+#ifndef GLIBMM_HAVE_STD_ITERATOR_TRAITS
 #include <cstddef> /* for ptrdiff_t */
-GLIBMM_USING_STD(random_access_iterator_tag)
 #endif
 
-
 namespace Glib
 {
 
diff --git a/glib/glibmm/utility.h b/glib/glibmm/utility.h
index 4c353c5b..000e1b08 100644
--- a/glib/glibmm/utility.h
+++ b/glib/glibmm/utility.h
@@ -1,7 +1,6 @@
 // -*- c++ -*-
 #ifndef _GLIBMM_UTILITY_H
 #define _GLIBMM_UTILITY_H
-/* $Id$ */
 
 /* Copyright 2002 The gtkmm Development Team
  *
@@ -20,9 +19,9 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <glib.h>
+#include <glibmmconfig.h>
 #include <glibmm/ustring.h>
-
+#include <glib.h>
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 
@@ -111,6 +110,4 @@ void append_canonical_typename(std::string& dest, const char* type_name);
 
 #endif /* DOXYGEN_SHOULD_SKIP_THIS */
 
-
 #endif /* _GLIBMM_UTILITY_H */
-
diff --git a/glib/glibmm/value.h b/glib/glibmm/value.h
index 13a63b6a..c0890154 100644
--- a/glib/glibmm/value.h
+++ b/glib/glibmm/value.h
@@ -1,7 +1,6 @@
 // -*- c++ -*-
 #ifndef _GLIBMM_VALUE_H
 #define _GLIBMM_VALUE_H
-/* $Id$ */
 
 /* Copyright 2002 The gtkmm Development Team
  *
@@ -20,10 +19,10 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <glib-object.h>
+#include <glibmmconfig.h>
 #include <glibmm/refptr.h>
 #include <glibmm/ustring.h>
-
+#include <glib-object.h>
 
 namespace Glib
 {
diff --git a/glib/glibmm/value_custom.h b/glib/glibmm/value_custom.h
index a2f6ca4e..17db8791 100644
--- a/glib/glibmm/value_custom.h
+++ b/glib/glibmm/value_custom.h
@@ -27,12 +27,9 @@
 #endif
 #endif
 
+#include <glibmmconfig.h>
 #include <new>
 #include <typeinfo>
-#include <glibmmconfig.h>
-
-GLIBMM_USING_STD(nothrow)
-
 
 namespace Glib
 {
diff --git a/glib/glibmm/wrap.cc b/glib/glibmm/wrap.cc
index 4541b622..cfc138e6 100644
--- a/glib/glibmm/wrap.cc
+++ b/glib/glibmm/wrap.cc
@@ -20,17 +20,13 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <glib-object.h>
-#include <glib.h>
-
-#include <vector>
+#include <glibmmconfig.h>
 #include <glibmm/object.h>
 #include <glibmm/quark.h>
 #include <glibmm/wrap.h>
-
-#include <glibmmconfig.h>
-GLIBMM_USING_STD(vector)
-
+#include <vector>
+#include <glib.h>
+#include <glib-object.h>
 
 namespace
 {
diff --git a/glib/glibmmconfig.h.in b/glib/glibmmconfig.h.in
index b4dcddec..eff6fb37 100644
--- a/glib/glibmmconfig.h.in
+++ b/glib/glibmmconfig.h.in
@@ -1,3 +1,6 @@
+/*
+ * @configure_input@
+ */
 #ifndef _GLIBMM_CONFIG_H
 #define _GLIBMM_CONFIG_H 1
 
@@ -6,24 +9,24 @@
 #undef GLIBMM_MINOR_VERSION
 #undef GLIBMM_MICRO_VERSION
 
-// detect common platforms
-#if defined(_WIN32)
-// Win32 compilers have a lot of varation
-#if defined(_MSC_VER)
-#define GLIBMM_MSC
-#define GLIBMM_WIN32
-#define GLIBMM_DLL
-#elif defined(__CYGWIN__)
-#define GLIBMM_CONFIGURE
-#elif defined(__MINGW32__)
-#define GLIBMM_WIN32
-#define GLIBMM_CONFIGURE
+/* detect common platforms */
+#ifdef _WIN32
+  /* Win32 compilers have a lot of varation */
+# if defined(_MSC_VER)
+#  define GLIBMM_MSC 1
+#  define GLIBMM_WIN32 1
+#  define GLIBMM_DLL 1
+# elif defined(__CYGWIN__)
+#  define GLIBMM_CONFIGURE 1
+# elif defined(__MINGW32__)
+#  define GLIBMM_WIN32 1
+#  define GLIBMM_CONFIGURE 1
+# else
+   /* AIX clR compiler complains about this even though it doesn't get this far */
+#  error "Unknown architecture (send me gcc --dumpspecs or equiv)"
+# endif
 #else
-//AIX clR compiler complains about this even though it doesn't get this far:
-//#warning "Unknown architecture (send me gcc --dumpspecs or equiv)"
-#endif
-#else
-#define GLIBMM_CONFIGURE
+# define GLIBMM_CONFIGURE 1
 #endif /* _WIN32 */
 
 #ifdef GLIBMM_CONFIGURE
@@ -31,9 +34,8 @@
 #undef GLIBMM_CXX_HAVE_MUTABLE
 #undef GLIBMM_CXX_HAVE_NAMESPACES
 #undef GLIBMM_HAVE_WIDE_STREAM
-//#undef GLIBMM_CXX_GAUB
-//#undef GLIBMM_CXX_AMBIGUOUS_TEMPLATES
-#undef GLIBMM_HAVE_NAMESPACE_STD
+/*#undef GLIBMM_CXX_GAUB*/
+/*#undef GLIBMM_CXX_AMBIGUOUS_TEMPLATES*/
 #undef GLIBMM_HAVE_STD_ITERATOR_TRAITS
 #undef GLIBMM_HAVE_SUN_REVERSE_ITERATOR
 #undef GLIBMM_HAVE_TEMPLATE_SEQUENCE_CTORS
@@ -52,47 +54,39 @@
 #endif
 
 #ifdef GLIBMM_MSC
-  #define GLIBMM_CXX_HAVE_MUTABLE 1
-  #define GLIBMM_CXX_HAVE_NAMESPACES 1
-  #define GLIBMM_HAVE_NAMESPACE_STD 1
-  #define GLIBMM_HAVE_STD_ITERATOR_TRAITS 1
-  #define GLIBMM_HAVE_TEMPLATE_SEQUENCE_CTORS 2
-  #define GLIBMM_HAVE_DISAMBIGUOUS_CONST_TEMPLATE_SPECIALIZATIONS 1
-  #define GLIBMM_HAVE_C_STD_TIME_T_IS_NOT_INT32 1
-  #define GLIBMM_CAN_USE_DYNAMIC_CAST_IN_UNUSED_TEMPLATE_WITHOUT_DEFINITION 1
-  #define GLIBMM_CAN_ASSIGN_NON_EXTERN_C_FUNCTIONS_TO_EXTERN_C_CALLBACKS 1
-  #define GLIBMM_CAN_USE_NAMESPACES_INSIDE_EXTERNC 1
-  #define GLIBMM_PROPERTIES_ENABLED 1
-  #define GLIBMM_VFUNCS_ENABLED 1
-  #define GLIBMM_EXCEPTIONS_ENABLED 1
-  #define GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED 1
-  #pragma warning (disable: 4786 4355 4800 4181)
-#endif
-
-#ifndef GLIBMM_HAVE_NAMESPACE_STD
-#  define GLIBMM_USING_STD(Symbol) namespace std { using ::Symbol; }
-#else
-#  define GLIBMM_USING_STD(Symbol) /* empty */
+# define GLIBMM_CXX_HAVE_MUTABLE 1
+# define GLIBMM_CXX_HAVE_NAMESPACES 1
+# define GLIBMM_HAVE_STD_ITERATOR_TRAITS 1
+# define GLIBMM_HAVE_TEMPLATE_SEQUENCE_CTORS 2
+# define GLIBMM_HAVE_DISAMBIGUOUS_CONST_TEMPLATE_SPECIALIZATIONS 1
+# define GLIBMM_HAVE_C_STD_TIME_T_IS_NOT_INT32 1
+# define GLIBMM_CAN_USE_DYNAMIC_CAST_IN_UNUSED_TEMPLATE_WITHOUT_DEFINITION 1
+# define GLIBMM_CAN_ASSIGN_NON_EXTERN_C_FUNCTIONS_TO_EXTERN_C_CALLBACKS 1
+# define GLIBMM_CAN_USE_NAMESPACES_INSIDE_EXTERNC 1
+# define GLIBMM_PROPERTIES_ENABLED 1
+# define GLIBMM_VFUNCS_ENABLED 1
+# define GLIBMM_EXCEPTIONS_ENABLED 1
+# define GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED 1
+# pragma warning (disable: 4786 4355 4800 4181)
 #endif
 
-// Enable DLL-specific stuff only when not building a static library
+/* Enable DLL-specific stuff only when not building a static library */
 #if !defined(__CYGWIN__) && defined(__MINGW32__) && !defined(GLIBMM_STATIC_LIB)
-  #define GLIBMM_DLL
+# define GLIBMM_DLL 1
 #endif
 
 #ifdef GLIBMM_DLL
-  #if defined(GLIBMM_BUILD) && defined(_WINDLL)
-    /* Do not dllexport as it is handled by gendef on MSVC */
-    #define GLIBMM_API 
-  #elif !defined(GLIBMM_BUILD)
-    #define GLIBMM_API __declspec(dllimport)
-  #else
-    /* Build a static library */
-    #define GLIBMM_API
-  #endif /* GLIBMM_BUILD - _WINDLL */
+# if defined(GLIBMM_BUILD) && defined(_WINDLL)
+   /* Do not dllexport as it is handled by gendef on MSVC */
+#  define GLIBMM_API 
+# elif !defined(GLIBMM_BUILD)
+#  define GLIBMM_API __declspec(dllimport)
+# else
+   /* Build a static library */
+#  define GLIBMM_API
+# endif /* GLIBMM_BUILD - _WINDLL */
 #else
-  #define GLIBMM_API
+# define GLIBMM_API
 #endif /* GLIBMM_DLL */
 
 #endif /* _GLIBMM_CONFIG_H */
-
diff --git a/glib/src/convert.hg b/glib/src/convert.hg
index dcccf68d..079454af 100644
--- a/glib/src/convert.hg
+++ b/glib/src/convert.hg
@@ -19,10 +19,10 @@
 
 _DEFS(glibmm,glib)
 
-#include <glib.h> /* for gsize */
-
+#include <glibmmconfig.h>
 #include <glibmm/error.h>
 #include <glibmm/ustring.h>
+#include <glib.h> /* for gsize */
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 extern "C" { typedef struct _GIConv* GIConv; }
diff --git a/glib/src/date.ccg b/glib/src/date.ccg
index e7c3dbc8..1be35724 100644
--- a/glib/src/date.ccg
+++ b/glib/src/date.ccg
@@ -28,9 +28,6 @@
 #include <glibmm/convert.h>
 #include <glibmm/utility.h>
 
-#include <glibmmconfig.h>
-GLIBMM_USING_STD(max)
-
 namespace Glib
 {
 
diff --git a/glib/src/date.hg b/glib/src/date.hg
index a0587c8c..ec9bcc61 100644
--- a/glib/src/date.hg
+++ b/glib/src/date.hg
@@ -23,8 +23,8 @@ _DEFS(glibmm,glib)
 #m4 #undef G_DISABLE_DEPRECATED //So we can use deprecated functions in our deprecated methods.
 #m4 _POP()
 
+#include <glibmmconfig.h>
 #include <glibmm/ustring.h>
-
 #include <glib.h>
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
diff --git a/glib/src/fileutils.hg b/glib/src/fileutils.hg
index 4deae383..69176c73 100644
--- a/glib/src/fileutils.hg
+++ b/glib/src/fileutils.hg
@@ -23,16 +23,10 @@ _DEFS(glibmm,glib)
 extern "C" { typedef struct _GDir GDir; }
 #endif
 
+#include <glibmm/error.h>
 #include <iterator>
 #include <string>
 
-#include <glibmmconfig.h>
-#include <glibmm/error.h>
-
-GLIBMM_USING_STD(input_iterator_tag)
-GLIBMM_USING_STD(string)
-
-
 namespace Glib
 {
 
diff --git a/glib/src/iochannel.hg b/glib/src/iochannel.hg
index 91e412cd..0c017306 100644
--- a/glib/src/iochannel.hg
+++ b/glib/src/iochannel.hg
@@ -20,22 +20,18 @@
 
 _DEFS(glibmm,glib)
 
+#include <glibmmconfig.h>
 #include <glibmm/error.h>
 #include <glibmm/main.h>
 #include <glibmm/refptr.h>
 #include <glibmm/ustring.h>
 #include <glib.h>
-
 #include <string>
-#include <glibmmconfig.h>
-
-GLIBMM_USING_STD(string)
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 extern "C" { typedef struct _GIOChannel GIOChannel; }
 #endif
 
-
 namespace Glib
 {
 
diff --git a/glib/src/keyfile.hg b/glib/src/keyfile.hg
index 83779746..8acaf781 100644
--- a/glib/src/keyfile.hg
+++ b/glib/src/keyfile.hg
@@ -17,6 +17,7 @@
 
 _DEFS(glibmm,glib)
 
+#include <glibmmconfig.h>
 #include <glibmm/ustring.h>
 #include <glibmm/arrayhandle.h>
 #include <glibmm/error.h>
diff --git a/glib/src/markup.hg b/glib/src/markup.hg
index b70e6532..5aa967f4 100644
--- a/glib/src/markup.hg
+++ b/glib/src/markup.hg
@@ -21,17 +21,12 @@ _DEFS(glibmm,glib)
 
 #include <glibmm/error.h>
 #include <sigc++/sigc++.h>
-
 #include <map>
-#include <glibmmconfig.h>
-
-GLIBMM_USING_STD(map)
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 extern "C" { typedef struct _GMarkupParseContext GMarkupParseContext; }
 #endif
 
-
 namespace Glib
 {
 
diff --git a/glib/src/module.hg b/glib/src/module.hg
index 951fa938..94aade50 100644
--- a/glib/src/module.hg
+++ b/glib/src/module.hg
@@ -19,16 +19,12 @@
 
 _DEFS(glibmm,glib)
 
-#include <glibmmconfig.h>
 #include <string>
 
-GLIBMM_USING_STD(string)
-
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 extern "C" { typedef struct _GModule GModule; }
 #endif
 
-
 namespace Glib
 {
 
diff --git a/glib/src/regex.hg b/glib/src/regex.hg
index 5f275d7f..ce971dc0 100644
--- a/glib/src/regex.hg
+++ b/glib/src/regex.hg
@@ -17,6 +17,7 @@
 
 _DEFS(glibmm,glib)
 
+#include <glibmmconfig.h>
 #include <glibmm/refptr.h>
 #include <glibmm/ustring.h>
 #include <glibmm/error.h>
diff --git a/glib/src/shell.hg b/glib/src/shell.hg
index 3f818f99..8db7cd64 100644
--- a/glib/src/shell.hg
+++ b/glib/src/shell.hg
@@ -19,15 +19,10 @@
 
 _DEFS(glibmm,glib)
 
-#include <glib.h>
-#include <string>
-
 #include <glibmm/arrayhandle.h>
 #include <glibmm/error.h>
-
-#include <glibmmconfig.h>
-GLIBMM_USING_STD(string)
-
+#include <glib.h>
+#include <string>
 
 namespace Glib
 {
diff --git a/glib/src/spawn.hg b/glib/src/spawn.hg
index ecbceb47..4fcbb724 100644
--- a/glib/src/spawn.hg
+++ b/glib/src/spawn.hg
@@ -19,14 +19,11 @@
 
 _DEFS(glibmm,glib)
 
-#include <string>
-#include <sigc++/sigc++.h>
+#include <glibmmconfig.h>
 #include <glibmm/arrayhandle.h>
 #include <glibmm/error.h>
-
-#include <glibmmconfig.h>
-GLIBMM_USING_STD(string)
-
+#include <sigc++/sigc++.h>
+#include <string>
 
 namespace Glib
 {
diff --git a/glib/src/thread.hg b/glib/src/thread.hg
index 439d98dc..60696fdc 100644
--- a/glib/src/thread.hg
+++ b/glib/src/thread.hg
@@ -1,5 +1,3 @@
-/* $Id: thread.hg,v 1.13 2005/01/21 12:48:05 murrayc Exp $ */
-
 /* Copyright (C) 2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -19,12 +17,12 @@
 
 _DEFS(glibmm,glib)
 
-#include <glib.h>
-#include <cstddef>
-
-#include <sigc++/sigc++.h>
+#include <glibmmconfig.h>
 #include <glibmm/error.h>
 #include <glibmm/timeval.h>
+#include <sigc++/sigc++.h>
+#include <glib.h>
+#include <cstddef>
 
 /* Shadow THREAD_PRIORITY_NORMAL macro (from winbase.h).
  */
diff --git a/glib/src/uriutils.hg b/glib/src/uriutils.hg
index 50a9f1b4..687fb829 100644
--- a/glib/src/uriutils.hg
+++ b/glib/src/uriutils.hg
@@ -20,10 +20,6 @@
 _DEFS(glibmm,glib)
 
 #include <string>
-#include <glibmmconfig.h>
-
-GLIBMM_USING_STD(string)
-
 
 namespace Glib
 {