diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 9ebecfa2d08..2b02908df04 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,12 @@
 2001-06-09  Benjamin Kosnik  <bkoz@redhat.com>
 
+	* include/c_std/bits/std_cwchar.h: Remove size_t injection,
+	include std_cstddef.
+	* include/c_std/bits/std_ctime.h: Same.
+	* include/c_std/bits/std_cstring.h: Same.
+	* include/c_std/bits/std_cstdlib.h: Same.
+	
+	* include/c_std/bits/std_cstdio.h: Remove vsnprintf, snprintf.
 	* include/c_std/bits/std_cctype.h: Remove isblank.
 
 2001-06-09  Benjamin Kosnik  <bkoz@redhat.com>
diff --git a/libstdc++-v3/include/c_std/bits/std_cstdio.h b/libstdc++-v3/include/c_std/bits/std_cstdio.h
index 5f2ccf20b23..08392245444 100644
--- a/libstdc++-v3/include/c_std/bits/std_cstdio.h
+++ b/libstdc++-v3/include/c_std/bits/std_cstdio.h
@@ -52,14 +52,12 @@
 #undef fscanf
 #undef printf
 #undef scanf
-#undef snprintf
 #undef sprintf
 #undef sscanf
 #undef vfprintf
 #undef vfscanf
 #undef vprintf
 #undef vscanf
-#undef vsnprintf
 #undef vsprintf
 #undef vsscanf
 #undef fgetc
@@ -104,14 +102,12 @@ namespace std
   using ::fscanf;
   using ::printf;
   using ::scanf;
-  using ::snprintf;
   using ::sprintf;
   using ::sscanf;
   using ::vfprintf;
   using ::vfscanf;
   using ::vprintf;
   using ::vscanf;
-  using ::vsnprintf;
   using ::vsprintf;
   using ::vsscanf;
   using ::fgetc;
diff --git a/libstdc++-v3/include/c_std/bits/std_cstdlib.h b/libstdc++-v3/include/c_std/bits/std_cstdlib.h
index f1023c23127..5ab1197cace 100644
--- a/libstdc++-v3/include/c_std/bits/std_cstdlib.h
+++ b/libstdc++-v3/include/c_std/bits/std_cstdlib.h
@@ -35,6 +35,7 @@
 #define _CPP_CSTDLIB 1
 
 #include <bits/c++config.h>
+#include <bits/std_cstddef.h>
 
 #pragma GCC system_header
 #include_next <stdlib.h>
@@ -79,8 +80,6 @@
 
 namespace std 
 {
-  using ::size_t;	// cstddef
-
   using ::div_t;
   using ::ldiv_t;
 
diff --git a/libstdc++-v3/include/c_std/bits/std_cstring.h b/libstdc++-v3/include/c_std/bits/std_cstring.h
index 850c4d312ac..5ad06ee9e9a 100644
--- a/libstdc++-v3/include/c_std/bits/std_cstring.h
+++ b/libstdc++-v3/include/c_std/bits/std_cstring.h
@@ -34,6 +34,8 @@
 #ifndef _CPP_CSTRING
 #define _CPP_CSTRING 1
 
+#include <bits/std_cstddef.h>
+
 #pragma GCC system_header
 #include_next <string.h>
 
@@ -63,8 +65,6 @@
 
 namespace std 
 {
-  using ::size_t;	// cstddef
-
   using ::memcpy;
   using ::memmove;
   using ::strcpy;
diff --git a/libstdc++-v3/include/c_std/bits/std_ctime.h b/libstdc++-v3/include/c_std/bits/std_ctime.h
index 2fc6e427e41..b97c0460155 100644
--- a/libstdc++-v3/include/c_std/bits/std_ctime.h
+++ b/libstdc++-v3/include/c_std/bits/std_ctime.h
@@ -34,6 +34,8 @@
 #ifndef _CPP_CTIME
 #define _CPP_CTIME 1
 
+#include <bits/std_cstddef.h>
+
 #pragma GCC system_header
 #include_next <time.h>
 
@@ -50,8 +52,6 @@
 
 namespace std
 {
-  using ::size_t;	// cstddef
-
   using ::clock_t;
   using ::time_t;
   using ::tm;
diff --git a/libstdc++-v3/include/c_std/bits/std_cwchar.h b/libstdc++-v3/include/c_std/bits/std_cwchar.h
index 8ed0d8a53b3..2a440aac286 100644
--- a/libstdc++-v3/include/c_std/bits/std_cwchar.h
+++ b/libstdc++-v3/include/c_std/bits/std_cwchar.h
@@ -35,6 +35,7 @@
 #define _CPP_CWCHAR 1
 
 #include <bits/c++config.h>
+#include <bits/std_cstddef.h>
 
 #if _GLIBCPP_HAVE_WCHAR_H
 #pragma GCC system_header
@@ -121,8 +122,6 @@ namespace std
 #if _GLIBCPP_USE_WCHAR_T
 namespace std
 {
-  using ::size_t;	// cstddef
-
   using ::wint_t;
 
   using ::btowc;