diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index cb3ab699f21..1bb7202618a 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,15 @@
+2004-11-03  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* include/bits/c++config: Spacing.
+	* libsupc++/del_op.cc: Include c++config.h.
+	* libsupc++/del_opnt.cc: Same.
+	* libsupc++/del_opv.cc: Same.
+	* libsupc++/del_opvnt.cc: Same.
+	* libsupc++/new_op.cc: Same.
+	* libsupc++/new_opnt.cc: Same.
+	* libsupc++/new_opv.cc: Same.
+	* libsupc++/new_opvnt.cc: Same.
+
 2004-11-03  Aaron W. LaFramboise  <aaronavay62@aaronwl.com>
 
 	* config/os/bsd/darwin/os_defines.h
diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config
index 064280b6756..23889bc314a 100644
--- a/libstdc++-v3/include/bits/c++config
+++ b/libstdc++-v3/include/bits/c++config
@@ -51,11 +51,11 @@
 # define _GLIBCXX_EXTERN_TEMPLATE 1
 #endif
 
-// Certain function definitions that are meant to be overridable
-// from user code are decorated with this macro.  For some targets,
-// this macro causes these definitions to be weak.
+// Certain function definitions that are meant to be overridable from
+// user code are decorated with this macro.  For some targets, this
+// macro causes these definitions to be weak.
 #ifndef _GLIBCXX_WEAK_DEFINITION
-#define _GLIBCXX_WEAK_DEFINITION
+# define _GLIBCXX_WEAK_DEFINITION
 #endif
 
 // Debug mode support. Debug mode basic_string is not allowed to be
diff --git a/libstdc++-v3/libsupc++/del_op.cc b/libstdc++-v3/libsupc++/del_op.cc
index 388f50863b1..d76e888e755 100644
--- a/libstdc++-v3/libsupc++/del_op.cc
+++ b/libstdc++-v3/libsupc++/del_op.cc
@@ -1,6 +1,6 @@
 // Boilerplate support routines for -*- C++ -*- dynamic memory management.
 
-// Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation
+// Copyright (C) 1997, 1998, 1999, 2000, 2004 Free Software Foundation
 //
 // This file is part of GCC.
 //
@@ -30,6 +30,7 @@
 
 #include "new"
 #include <cstdlib>
+#include <bits/c++config.h>
 
 #if _GLIBCXX_HOSTED
 using std::free;
diff --git a/libstdc++-v3/libsupc++/del_opnt.cc b/libstdc++-v3/libsupc++/del_opnt.cc
index 76b7d69e002..4fce2136c7b 100644
--- a/libstdc++-v3/libsupc++/del_opnt.cc
+++ b/libstdc++-v3/libsupc++/del_opnt.cc
@@ -1,6 +1,6 @@
 // Boilerplate support routines for -*- C++ -*- dynamic memory management.
 
-// Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation
+// Copyright (C) 1997, 1998, 1999, 2000, 2004 Free Software Foundation
 //
 // This file is part of GCC.
 //
@@ -29,6 +29,7 @@
 // the GNU General Public License.
 
 #include "new"
+#include <bits/c++config.h>
 
 extern "C" void free (void *);
 
diff --git a/libstdc++-v3/libsupc++/del_opv.cc b/libstdc++-v3/libsupc++/del_opv.cc
index 94cdfde32ca..c8d7f33d829 100644
--- a/libstdc++-v3/libsupc++/del_opv.cc
+++ b/libstdc++-v3/libsupc++/del_opv.cc
@@ -1,6 +1,6 @@
 // Boilerplate support routines for -*- C++ -*- dynamic memory management.
 
-// Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation
+// Copyright (C) 1997, 1998, 1999, 2000, 2004 Free Software Foundation
 //
 // This file is part of GCC.
 //
@@ -29,6 +29,7 @@
 // the GNU General Public License.
 
 #include "new"
+#include <bits/c++config.h>
 
 _GLIBCXX_WEAK_DEFINITION void
 operator delete[] (void *ptr) throw ()
diff --git a/libstdc++-v3/libsupc++/del_opvnt.cc b/libstdc++-v3/libsupc++/del_opvnt.cc
index 180b08f63d4..3ce4e10287a 100644
--- a/libstdc++-v3/libsupc++/del_opvnt.cc
+++ b/libstdc++-v3/libsupc++/del_opvnt.cc
@@ -1,6 +1,6 @@
 // Boilerplate support routines for -*- C++ -*- dynamic memory management.
 
-// Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation
+// Copyright (C) 1997, 1998, 1999, 2000, 2004 Free Software Foundation
 //
 // This file is part of GCC.
 //
@@ -29,6 +29,7 @@
 // the GNU General Public License.
 
 #include "new"
+#include <bits/c++config.h>
 
 _GLIBCXX_WEAK_DEFINITION void
 operator delete[] (void *ptr, const std::nothrow_t&) throw ()
diff --git a/libstdc++-v3/libsupc++/new_op.cc b/libstdc++-v3/libsupc++/new_op.cc
index 0ebec1cd36f..43c22405eb5 100644
--- a/libstdc++-v3/libsupc++/new_op.cc
+++ b/libstdc++-v3/libsupc++/new_op.cc
@@ -1,5 +1,7 @@
 // Support routines for the -*- C++ -*- dynamic memory management.
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation
+
+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2004
+// Free Software Foundation
 //
 // This file is part of GCC.
 //
@@ -30,6 +32,7 @@
 #include "new"
 #include <cstdlib>
 #include <exception_defines.h>
+#include <bits/c++config.h>
 
 using std::new_handler;
 using std::bad_alloc;
diff --git a/libstdc++-v3/libsupc++/new_opnt.cc b/libstdc++-v3/libsupc++/new_opnt.cc
index 1b29c1a5f12..c25ce5a2d30 100644
--- a/libstdc++-v3/libsupc++/new_opnt.cc
+++ b/libstdc++-v3/libsupc++/new_opnt.cc
@@ -1,5 +1,5 @@
 // Support routines for the -*- C++ -*- dynamic memory management.
-// Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation
+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2004 Free Software Foundation
 //
 // This file is part of GCC.
 //
@@ -29,6 +29,7 @@
 
 #include "new"
 #include <exception_defines.h>
+#include <bits/c++config.h>
 
 using std::new_handler;
 using std::bad_alloc;
diff --git a/libstdc++-v3/libsupc++/new_opv.cc b/libstdc++-v3/libsupc++/new_opv.cc
index 9fa7d19ecc4..abf9771ed0b 100644
--- a/libstdc++-v3/libsupc++/new_opv.cc
+++ b/libstdc++-v3/libsupc++/new_opv.cc
@@ -1,6 +1,6 @@
 // Boilerplate support routines for -*- C++ -*- dynamic memory management.
 
-// Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation
+// Copyright (C) 1997, 1998, 1999, 2000, 2004 Free Software Foundation
 //
 // This file is part of GCC.
 //
@@ -29,8 +29,9 @@
 // the GNU General Public License.
 
 #include "new"
+#include <bits/c++config.h>
 
-_GLIBCXX_WEAK_DEFINITION void *
+_GLIBCXX_WEAK_DEFINITION void*
 operator new[] (std::size_t sz) throw (std::bad_alloc)
 {
   return ::operator new(sz);
diff --git a/libstdc++-v3/libsupc++/new_opvnt.cc b/libstdc++-v3/libsupc++/new_opvnt.cc
index 79b8cdc1077..eb7016afea3 100644
--- a/libstdc++-v3/libsupc++/new_opvnt.cc
+++ b/libstdc++-v3/libsupc++/new_opvnt.cc
@@ -1,6 +1,6 @@
 // Boilerplate support routines for -*- C++ -*- dynamic memory management.
 
-// Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation
+// Copyright (C) 1997, 1998, 1999, 2000, 2004 Free Software Foundation
 //
 // This file is part of GCC.
 //
@@ -29,8 +29,9 @@
 // the GNU General Public License.
 
 #include "new"
-
-_GLIBCXX_WEAK_DEFINITION void *
+#include <bits/c++config.h>
+ 
+_GLIBCXX_WEAK_DEFINITION void*
 operator new[] (std::size_t sz, const std::nothrow_t& nothrow) throw()
 {
   return ::operator new(sz, nothrow);