diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index b755b4336b7..1a8d41dce26 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-28  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* include/bits/atomic_base.h: Do not include <stddef.h>.
+	(kill_dependency): Uglify ret.
+
 2011-01-26  Johannes Singler  <singler@kit.edu>
 
         * include/parallel/numeric (inner_product, partial_sum):
diff --git a/libstdc++-v3/include/bits/atomic_base.h b/libstdc++-v3/include/bits/atomic_base.h
index 74fc997bfdb..f70b717b783 100644
--- a/libstdc++-v3/include/bits/atomic_base.h
+++ b/libstdc++-v3/include/bits/atomic_base.h
@@ -1,6 +1,6 @@
 // -*- C++ -*- header.
 
-// Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+// Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -33,7 +33,6 @@
 #pragma GCC system_header
 
 #include <bits/c++config.h>
-#include <stddef.h>
 #include <stdbool.h>
 #include <stdint.h>
 
@@ -72,8 +71,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
     inline _Tp
     kill_dependency(_Tp __y)
     {
-      _Tp ret(__y);
-      return ret;
+      _Tp __ret(__y);
+      return __ret;
     }
 
   /**