diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 48f8a7d3f88d..3355220d7478 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,17 @@
+2005-05-01  Paolo Carlini  <pcarlini@suse.de>
+
+	* config/os/aix/os_defines.h: Remove obsolete __off_t,
+	__off64_t, __ssize_t defines.
+	* config/os/djgpp/os_defines.h: Likewise.
+	* config/os/hpux/os_defines.h: Likewise.
+	* config/os/irix/irix5.2/os_defines.h: Likewise.
+	* config/os/irix/irix6.5/os_defines.h: Likewise.
+	* config/os/solaris/solaris2.5/os_defines.h: Likewise.
+	* config/os/solaris/solaris2.6/os_defines.h: Likewise.
+	* config/os/solaris/solaris2.7/os_defines.h: Likewise.
+	* docs/html/17_intro/porting.html: Don't discuss the defines.
+	* docs/html/17_intro/porting.texi: Likewise.
+
 2005-04-29  Paolo Carlini  <pcarlini@suse.de>
 	    Nathan Myers  <ncm@cantrip.org>
 
diff --git a/libstdc++-v3/config/os/aix/os_defines.h b/libstdc++-v3/config/os/aix/os_defines.h
index 3e4da946af55..8d445c434ead 100644
--- a/libstdc++-v3/config/os/aix/os_defines.h
+++ b/libstdc++-v3/config/os/aix/os_defines.h
@@ -43,8 +43,4 @@
 #define _ALL_SOURCE
 #endif
 
-#define __off_t off_t
-#define __off64_t off64_t
-#define __ssize_t ssize_t
-
 #endif
diff --git a/libstdc++-v3/config/os/djgpp/os_defines.h b/libstdc++-v3/config/os/djgpp/os_defines.h
index 5a43c061239c..c852ce831b3f 100644
--- a/libstdc++-v3/config/os/djgpp/os_defines.h
+++ b/libstdc++-v3/config/os/djgpp/os_defines.h
@@ -1,6 +1,6 @@
 // Specific definitions for DJGPP  -*- C++ -*-
 
-// Copyright (C) 2001 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2005 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
@@ -34,10 +34,6 @@
 // System-specific #define, typedefs, corrections, etc, go here.  This
 // file will come before all others.
 
-#define __off_t off_t
-#define __off64_t off64_t
-#define __ssize_t ssize_t
-
 // FIXME: should there be '#undef POSIX_SOURCE'?
 
 #endif
diff --git a/libstdc++-v3/config/os/hpux/os_defines.h b/libstdc++-v3/config/os/hpux/os_defines.h
index 6cba7390f388..ed790645a796 100644
--- a/libstdc++-v3/config/os/hpux/os_defines.h
+++ b/libstdc++-v3/config/os/hpux/os_defines.h
@@ -1,6 +1,6 @@
 // Specific definitions for HPUX  -*- C++ -*-
 
-// Copyright (C) 2000, 2002, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2000, 2002, 2004, 2005 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,10 +33,6 @@
 // System-specific #define, typedefs, corrections, etc, go here.  This
 // file will come before all others.
 
-#define __off_t off_t
-#define __off64_t off64_t
-#define __ssize_t ssize_t
-
 // Use macro form of ctype functions to ensure __SB_masks is defined.
 #define _SB_CTYPE_MACROS 1
 
diff --git a/libstdc++-v3/config/os/irix/irix5.2/os_defines.h b/libstdc++-v3/config/os/irix/irix5.2/os_defines.h
index 87556f8b7427..3d84c8306733 100644
--- a/libstdc++-v3/config/os/irix/irix5.2/os_defines.h
+++ b/libstdc++-v3/config/os/irix/irix5.2/os_defines.h
@@ -1,6 +1,6 @@
 // Specific definitions for IRIX  -*- C++ -*-
 
-// Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2002, 2005 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
@@ -44,10 +44,6 @@
 // the command-line.
 #undef _POSIX_SOURCE
 
-#define __off_t off_t
-#define __off64_t off64_t
-#define __ssize_t ssize_t
-
 // GCC does not use thunks on IRIX. 
 #define _G_USING_THUNKS 0
 
diff --git a/libstdc++-v3/config/os/irix/irix6.5/os_defines.h b/libstdc++-v3/config/os/irix/irix6.5/os_defines.h
index 6b0174b522df..bc6c7464e516 100644
--- a/libstdc++-v3/config/os/irix/irix6.5/os_defines.h
+++ b/libstdc++-v3/config/os/irix/irix6.5/os_defines.h
@@ -44,10 +44,6 @@
 // the command-line.
 #undef _POSIX_SOURCE
 
-#define __off_t off_t
-#define __off64_t off64_t
-#define __ssize_t ssize_t
-
 // GCC does not use thunks on IRIX. 
 #define _G_USING_THUNKS 0
 
diff --git a/libstdc++-v3/config/os/solaris/solaris2.5/os_defines.h b/libstdc++-v3/config/os/solaris/solaris2.5/os_defines.h
index 7e5a14ea41d1..89fab4cfaeb6 100644
--- a/libstdc++-v3/config/os/solaris/solaris2.5/os_defines.h
+++ b/libstdc++-v3/config/os/solaris/solaris2.5/os_defines.h
@@ -1,6 +1,6 @@
 // Specific definitions for Solaris 2.5  -*- C++ -*-
 
-// Copyright (C) 2000, 2002 Free Software Foundation, Inc.
+// Copyright (C) 2000, 2002, 2005 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,10 +33,4 @@
 // System-specific #define, typedefs, corrections, etc, go here.  This
 // file will come before all others.
 
-// These are typedefs which libio assumes are already in place (because
-// they really are, under Linux).
-#define __off_t     off_t
-#define __off64_t   off64_t
-#define __ssize_t   ssize_t
-
 #endif
diff --git a/libstdc++-v3/config/os/solaris/solaris2.6/os_defines.h b/libstdc++-v3/config/os/solaris/solaris2.6/os_defines.h
index 29d6cf5fd87d..1dc06449f64c 100644
--- a/libstdc++-v3/config/os/solaris/solaris2.6/os_defines.h
+++ b/libstdc++-v3/config/os/solaris/solaris2.6/os_defines.h
@@ -1,6 +1,6 @@
 // Specific definitions for Solaris 2.6  -*- C++ -*-
 
-// Copyright (C) 2000, 2002 Free Software Foundation, Inc.
+// Copyright (C) 2000, 2002, 2005 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,10 +33,4 @@
 // System-specific #define, typedefs, corrections, etc, go here.  This
 // file will come before all others.
 
-// These are typedefs which libio assumes are already in place (because
-// they really are, under Linux).
-#define __off_t     off_t
-#define __off64_t   off64_t
-#define __ssize_t   ssize_t
-
 #endif
diff --git a/libstdc++-v3/config/os/solaris/solaris2.7/os_defines.h b/libstdc++-v3/config/os/solaris/solaris2.7/os_defines.h
index 9131aa67e754..4ced192fbd87 100644
--- a/libstdc++-v3/config/os/solaris/solaris2.7/os_defines.h
+++ b/libstdc++-v3/config/os/solaris/solaris2.7/os_defines.h
@@ -1,6 +1,6 @@
 // Specific definitions for Solaris 7,8  -*- C++ -*-
 
-// Copyright (C) 2000, 2002 Free Software Foundation, Inc.
+// Copyright (C) 2000, 2002, 2005 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,11 +33,5 @@
 // System-specific #define, typedefs, corrections, etc, go here.  This
 // file will come before all others.
 
-// These are typedefs which libio assumes are already in place (because
-// they really are, under Linux).
-#define __off_t     off_t
-#define __off64_t   off64_t
-#define __ssize_t   ssize_t
-
 #endif
 
diff --git a/libstdc++-v3/docs/html/17_intro/porting.html b/libstdc++-v3/docs/html/17_intro/porting.html
index b0275592d30c..54438b898d60 100644
--- a/libstdc++-v3/docs/html/17_intro/porting.html
+++ b/libstdc++-v3/docs/html/17_intro/porting.html
@@ -5,7 +5,7 @@
 <meta name="description" content="Porting libstdc++-v3">
 <meta name="generator" content="makeinfo 4.6">
 <!--
-Copyright &copy; 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+Copyright &copy; 2000, 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
 
    <p>Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.2 or
@@ -114,25 +114,10 @@ OS portion of the triplet (the default), then nothing needs to be changed.
    <p>The first file to create in this directory, should be called
 <code>os_defines.h</code>.  This file contains basic macro definitions
 that are required to allow the C++ library to work with your C library. 
-This file should provide macro definitions for <code>__off_t</code>,
-<code>__off64_t</code>, and <code>__ssize_t</code>.  Typically, this just looks
-like:
 
-<pre class="example">     #define __off_t off_t
-     #define __off64_t off64_t
-     #define __ssize_t ssize_t
-     </pre>
-
-<p>You don't have to provide these definitions if your system library
-already defines these types - but the only library known to provide
-these types is the GNU C Library, so you will almost certainly have to
-provide these macros.  Note that this file does not have to include a
-header file that defines <code>off_t</code>, or the other types; you simply
-have to provide the macros.
-
-   <p>In addition, several libstdc++-v3 source files unconditionally define
-the macro <code>_POSIX_SOURCE</code>.  On many systems, defining this macro
-causes large portions of the C library header files to be eliminated
+   <p>Several libstdc++-v3 source files unconditionally define the macro
+<code>_POSIX_SOURCE</code>.  On many systems, defining this macro causes
+large portions of the C library header files to be eliminated
 at preprocessing time.  Therefore, you may have to <code>#undef</code> this
 macro, or define other macros (like <code>_LARGEFILE_SOURCE</code> or
 <code>__EXTENSIONS__</code>).  You won't know what macros to define or
diff --git a/libstdc++-v3/docs/html/17_intro/porting.texi b/libstdc++-v3/docs/html/17_intro/porting.texi
index 988c2c2203a6..090bdf771556 100644
--- a/libstdc++-v3/docs/html/17_intro/porting.texi
+++ b/libstdc++-v3/docs/html/17_intro/porting.texi
@@ -9,7 +9,8 @@
 @setchapternewpage odd
 
 @copying
-Copyright @copyright{} 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+Copyright @copyright{} 2000, 2001, 2002, 2003, 2005 
+Free Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.2 or
@@ -120,27 +121,10 @@ OS portion of the triplet (the default), then nothing needs to be changed.
 The first file to create in this directory, should be called
 @file{os_defines.h}.  This file contains basic macro definitions
 that are required to allow the C++ library to work with your C library.
-This file should provide macro definitions for @code{__off_t},
-@code{__off64_t}, and @code{__ssize_t}.  Typically, this just looks
-like:
 
-@example
-#define __off_t off_t
-#define __off64_t off64_t
-#define __ssize_t ssize_t
-@end example
-
-@noindent
-You don't have to provide these definitions if your system library
-already defines these types -- but the only library known to provide
-these types is the GNU C Library, so you will almost certainly have to
-provide these macros.  Note that this file does not have to include a
-header file that defines @code{off_t}, or the other types; you simply
-have to provide the macros.
-
-In addition, several libstdc++-v3 source files unconditionally define
-the macro @code{_POSIX_SOURCE}.  On many systems, defining this macro
-causes large portions of the C library header files to be eliminated
+Several libstdc++-v3 source files unconditionally define the macro
+@code{_POSIX_SOURCE}.  On many systems, defining this macro causes
+large portions of the C library header files to be eliminated
 at preprocessing time.  Therefore, you may have to @code{#undef} this
 macro, or define other macros (like @code{_LARGEFILE_SOURCE} or
 @code{__EXTENSIONS__}).  You won't know what macros to define or