diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index fbcc79dc71bcf5dcb1ac7f85d1d54b11d97e47e7..110376e2c025f0fbbae667b7039c1bb2a1dd1526 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-05  Kelley Cook  <kcook@gcc.gnu.org>
+
+	* acconfig.h: Delete macros already ACDEFINED.
+	* config.h.in: Regenerate.
+
 2005-04-05  Kelley Cook  <kcook@gcc.gnu.org>
 
 	* acconfig.h (HAVE_MODF): Remove.
diff --git a/libstdc++-v3/acconfig.h b/libstdc++-v3/acconfig.h
index cc2a10e7c24b7655cdab2ee31556aebe8bce6972..ffc33e8472f5ad0937f84cafbf3aee9d15f1a331 100644
--- a/libstdc++-v3/acconfig.h
+++ b/libstdc++-v3/acconfig.h
@@ -56,51 +56,9 @@
 // Define if gthr-default.h exists (meaning that threading support is enabled).
 #undef HAVE_GTHR_DEFAULT
 
-// Define if the atan2f function exists.
-#undef HAVE_ATAN2F 
-
-// Define if the atan2l function exists.
-#undef HAVE_ATAN2L
-
-// Define if the tanl function exists.
-#undef HAVE_TANL
-
-// Define if the copysignf function exists.
-#undef HAVE_COPYSIGNF
-
-// Define if getpagesize exists.
-#undef HAVE_GETPAGESIZE
-
-// Define if setenv exists.
-#undef HAVE_SETENV
-
-// Define if sigsetjmp exists.
-#undef HAVE_SIGSETJMP
-
 // Define if mbstate_t exists in wchar.h.
 #undef HAVE_MBSTATE_T
 
-// Define if you have the modff function.
-#undef HAVE_MODFF
-
-// Define if you have the modfl function.
-#undef HAVE_MODFL
-
-// Define if you have the expf function.
-#undef HAVE_EXPF
-
-// Define if you have the expl function.
-#undef HAVE_EXPL
-
-// Define if you have the hypot function.
-#undef HAVE_HYPOT
-
-// Define if you have the hypotf function.
-#undef HAVE_HYPOTF
-
-// Define if you have the hypotl function.
-#undef HAVE_HYPOTL
-
 // Define if poll is available in <poll.h>.
 #undef HAVE_POLL
 
diff --git a/libstdc++-v3/config.h.in b/libstdc++-v3/config.h.in
index 986adf4454c2ca9de95a582dcd08f57136af6686..03200d39d6407733c1ee21bd279b790022a384b8 100644
--- a/libstdc++-v3/config.h.in
+++ b/libstdc++-v3/config.h.in
@@ -57,51 +57,9 @@
 // Define if gthr-default.h exists (meaning that threading support is enabled).
 #undef HAVE_GTHR_DEFAULT
 
-// Define if the atan2f function exists.
-#undef HAVE_ATAN2F 
-
-// Define if the atan2l function exists.
-#undef HAVE_ATAN2L
-
-// Define if the tanl function exists.
-#undef HAVE_TANL
-
-// Define if the copysignf function exists.
-#undef HAVE_COPYSIGNF
-
-// Define if getpagesize exists.
-#undef HAVE_GETPAGESIZE
-
-// Define if setenv exists.
-#undef HAVE_SETENV
-
-// Define if sigsetjmp exists.
-#undef HAVE_SIGSETJMP
-
 // Define if mbstate_t exists in wchar.h.
 #undef HAVE_MBSTATE_T
 
-// Define if you have the modff function.
-#undef HAVE_MODFF
-
-// Define if you have the modfl function.
-#undef HAVE_MODFL
-
-// Define if you have the expf function.
-#undef HAVE_EXPF
-
-// Define if you have the expl function.
-#undef HAVE_EXPL
-
-// Define if you have the hypot function.
-#undef HAVE_HYPOT
-
-// Define if you have the hypotf function.
-#undef HAVE_HYPOTF
-
-// Define if you have the hypotl function.
-#undef HAVE_HYPOTL
-
 // Define if poll is available in <poll.h>.
 #undef HAVE_POLL