diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index bc1a437f26e..17231c6f14b 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2007-03-03  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* include/debug/functions.h: Use cstddef.
+	
+	* testsuite/tr1/3_function_objects/headers/functional/
+	using_namespace_std_tr1_placeholders.cc: Fix include.
+	
 2007-03-03  Benjamin Kosnik  <bkoz@redhat.com>
 
 	* crossconfig.m4 (djgpp): Correct builtin defines to HAVE___,
diff --git a/libstdc++-v3/include/debug/functions.h b/libstdc++-v3/include/debug/functions.h
index a61c0b9f4ee..ee7037fad06 100644
--- a/libstdc++-v3/include/debug/functions.h
+++ b/libstdc++-v3/include/debug/functions.h
@@ -36,7 +36,7 @@
 #define _GLIBCXX_DEBUG_FUNCTIONS_H 1
 
 #include <bits/c++config.h>
-#include <stddef.h>                       // for ptrdiff_t
+#include <cstddef>                       // for ptrdiff_t
 #include <bits/stl_iterator_base_types.h> // for iterator_traits, categories
 #include <bits/cpp_type_traits.h>         // for __is_integer
 
diff --git a/libstdc++-v3/testsuite/tr1/3_function_objects/headers/functional/using_namespace_std_tr1_placeholders.cc b/libstdc++-v3/testsuite/tr1/3_function_objects/headers/functional/using_namespace_std_tr1_placeholders.cc
index faddc0dcc65..02a44573abf 100644
--- a/libstdc++-v3/testsuite/tr1/3_function_objects/headers/functional/using_namespace_std_tr1_placeholders.cc
+++ b/libstdc++-v3/testsuite/tr1/3_function_objects/headers/functional/using_namespace_std_tr1_placeholders.cc
@@ -18,7 +18,7 @@
 // Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
 // USA.
 
-#include <tr1/tuple>
+#include <tr1/functional>
 
 namespace gnu
 {