14 files changed, 18 insertions, 54 deletions
diff --git a/libgfortran/io/close.c b/libgfortran/io/close.c
index 66ea6c3fb69..7bd8a3e05fd 100644
--- a/libgfortran/io/close.c
+++ b/libgfortran/io/close.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2005, 2007 Free Software Foundation, Inc.
    Contributed by Andy Vaught
 
 This file is part of the GNU Fortran 95 runtime library (libgfortran).
@@ -27,8 +27,6 @@ along with Libgfortran; see the file COPYING.  If not, write to
 the Free Software Foundation, 51 Franklin Street, Fifth Floor,
 Boston, MA 02110-1301, USA.  */
 
-#include "config.h"
-#include "libgfortran.h"
 #include "io.h"
 #include <limits.h>
 
diff --git a/libgfortran/io/file_pos.c b/libgfortran/io/file_pos.c
index c9034e8c8ca..0a7dd042896 100644
--- a/libgfortran/io/file_pos.c
+++ b/libgfortran/io/file_pos.c
@@ -27,10 +27,8 @@ along with Libgfortran; see the file COPYING.  If not, write to
 the Free Software Foundation, 51 Franklin Street, Fifth Floor,
 Boston, MA 02110-1301, USA.  */
 
-#include "config.h"
-#include <string.h>
-#include "libgfortran.h"
 #include "io.h"
+#include <string.h>
 
 /* file_pos.c-- Implement the file positioning statements, i.e. BACKSPACE,
    ENDFILE, and REWIND as well as the FLUSH statement.  */
diff --git a/libgfortran/io/format.c b/libgfortran/io/format.c
index d6afa0aaf45..038c80d95b1 100644
--- a/libgfortran/io/format.c
+++ b/libgfortran/io/format.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003, 2004, 2005, 2006
+/* Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007
    Free Software Foundation, Inc.
    Contributed by Andy Vaught
 
@@ -32,11 +32,9 @@ Boston, MA 02110-1301, USA.  */
 /* format.c-- parse a FORMAT string into a binary format suitable for
  * interpretation during I/O statements */
 
-#include "config.h"
+#include "io.h"
 #include <ctype.h>
 #include <string.h>
-#include "libgfortran.h"
-#include "io.h"
 
 #define FARRAY_SIZE 64
 
diff --git a/libgfortran/io/inquire.c b/libgfortran/io/inquire.c
index b1f4a14f6c4..84f4683f882 100644
--- a/libgfortran/io/inquire.c
+++ b/libgfortran/io/inquire.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2005, 2007 Free Software Foundation, Inc.
    Contributed by Andy Vaught
 
 This file is part of the GNU Fortran 95 runtime library (libgfortran).
@@ -30,8 +30,6 @@ Boston, MA 02110-1301, USA.  */
 
 /* Implement the non-IOLENGTH variant of the INQUIRY statement */
 
-#include "config.h"
-#include "libgfortran.h"
 #include "io.h"
 
 
diff --git a/libgfortran/io/intrinsics.c b/libgfortran/io/intrinsics.c
index 2402f486926..03493cf0625 100644
--- a/libgfortran/io/intrinsics.c
+++ b/libgfortran/io/intrinsics.c
@@ -28,8 +28,7 @@ License along with libgfortran; see the file COPYING.  If not,
 write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 Boston, MA 02110-1301, USA.  */
 
-#include "config.h"
-#include "libgfortran.h"
+#include "io.h"
 
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
@@ -37,8 +36,6 @@ Boston, MA 02110-1301, USA.  */
 
 #include <string.h>
 
-#include "io.h"
-
 static const int five = 5;
 static const int six = 6;
 
diff --git a/libgfortran/io/list_read.c b/libgfortran/io/list_read.c
index 219e9218cca..68fac2c10e9 100644
--- a/libgfortran/io/list_read.c
+++ b/libgfortran/io/list_read.c
@@ -29,11 +29,9 @@ the Free Software Foundation, 51 Franklin Street, Fifth Floor,
 Boston, MA 02110-1301, USA.  */
 
 
-#include "config.h"
+#include "io.h"
 #include <string.h>
 #include <ctype.h>
-#include "libgfortran.h"
-#include "io.h"
 
 
 /* List directed input.  Several parsing subroutines are practically
diff --git a/libgfortran/io/lock.c b/libgfortran/io/lock.c
index 39bb67090d8..88aed00165c 100644
--- a/libgfortran/io/lock.c
+++ b/libgfortran/io/lock.c
@@ -1,5 +1,5 @@
 /* Thread/recursion locking
-   Copyright 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright 2002, 2003, 2004, 2005, 2007 Free Software Foundation, Inc.
    Contributed by Paul Brook <paul@nowt.org> and Andy Vaught
 
 This file is part of the GNU Fortran 95 runtime library (libgfortran).
@@ -28,10 +28,8 @@ License along with libgfortran; see the file COPYING.  If not,
 write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 Boston, MA 02110-1301, USA.  */
 
-#include "config.h"
-#include <string.h>
-#include "libgfortran.h"
 #include "io.h"
+#include <string.h>
 
 /* library_start()-- Called with a library call is entered.  */
 
diff --git a/libgfortran/io/open.c b/libgfortran/io/open.c
index 67f8804f522..e4a54edc8fd 100644
--- a/libgfortran/io/open.c
+++ b/libgfortran/io/open.c
@@ -28,13 +28,10 @@ along with Libgfortran; see the file COPYING.  If not, write to
 the Free Software Foundation, 51 Franklin Street, Fifth Floor,
 Boston, MA 02110-1301, USA.  */
 
-#include "config.h"
+#include "io.h"
 #include <unistd.h>
-#include <stdio.h>
 #include <string.h>
 #include <errno.h>
-#include "libgfortran.h"
-#include "io.h"
 
 
 static const st_option access_opt[] = {
diff --git a/libgfortran/io/read.c b/libgfortran/io/read.c
index 0f7d9a6dcfc..2049cca7b01 100644
--- a/libgfortran/io/read.c
+++ b/libgfortran/io/read.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2005, 2007 Free Software Foundation, Inc.
    Contributed by Andy Vaught
 
 This file is part of the GNU Fortran 95 runtime library (libgfortran).
@@ -27,15 +27,11 @@ along with Libgfortran; see the file COPYING.  If not, write to
 the Free Software Foundation, 51 Franklin Street, Fifth Floor,
 Boston, MA 02110-1301, USA.  */
 
-
-#include "config.h"
+#include "io.h"
 #include <string.h>
 #include <errno.h>
 #include <ctype.h>
 #include <stdlib.h>
-#include <stdio.h>
-#include "libgfortran.h"
-#include "io.h"
 
 /* read.c -- Deal with formatted reads */
 
diff --git a/libgfortran/io/size_from_kind.c b/libgfortran/io/size_from_kind.c
index 033b554c614..882c6776c93 100644
--- a/libgfortran/io/size_from_kind.c
+++ b/libgfortran/io/size_from_kind.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2005, 2007 Free Software Foundation, Inc.
    Contributed by Janne Blomqvist
 
 This file is part of the GNU Fortran runtime library (libgfortran).
@@ -31,8 +31,6 @@ Boston, MA 02110-1301, USA.  */
 /* This file contains utility functions for determining the size of a
    variable given its kind. */
 
-#include "config.h"
-#include "libgfortran.h"
 #include "io.h"
 
 size_t
diff --git a/libgfortran/io/transfer.c b/libgfortran/io/transfer.c
index 04f9f735f83..8118707e7fb 100644
--- a/libgfortran/io/transfer.c
+++ b/libgfortran/io/transfer.c
@@ -32,11 +32,9 @@ Boston, MA 02110-1301, USA.  */
 
 /* transfer.c -- Top level handling of data transfer statements.  */
 
-#include "config.h"
+#include "io.h"
 #include <string.h>
 #include <assert.h>
-#include "libgfortran.h"
-#include "io.h"
 
 
 /* Calling conventions:  Data transfer statements are unlike other
diff --git a/libgfortran/io/unit.c b/libgfortran/io/unit.c
index fac67bdaf7e..644205fc19f 100644
--- a/libgfortran/io/unit.c
+++ b/libgfortran/io/unit.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2005, 2007 Free Software Foundation, Inc.
    Contributed by Andy Vaught
 
 This file is part of the GNU Fortran 95 runtime library (libgfortran).
@@ -27,11 +27,9 @@ along with Libgfortran; see the file COPYING.  If not, write to
 the Free Software Foundation, 51 Franklin Street, Fifth Floor,
 Boston, MA 02110-1301, USA.  */
 
-#include "config.h"
+#include "io.h"
 #include <stdlib.h>
 #include <string.h>
-#include "libgfortran.h"
-#include "io.h"
 
 
 /* IO locking rules:
diff --git a/libgfortran/io/unix.c b/libgfortran/io/unix.c
index 75721cc2ff5..ed76cb2885a 100644
--- a/libgfortran/io/unix.c
+++ b/libgfortran/io/unix.c
@@ -30,13 +30,11 @@ Boston, MA 02110-1301, USA.  */
 
 /* Unix stream I/O module */
 
-#include "config.h"
+#include "io.h"
 #include <stdlib.h>
 #include <limits.h>
 
 #include <unistd.h>
-#include <stdio.h>
-#include <stdarg.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <assert.h>
@@ -44,9 +42,6 @@ Boston, MA 02110-1301, USA.  */
 #include <string.h>
 #include <errno.h>
 
-#include "libgfortran.h"
-#include "io.h"
-
 #ifndef SSIZE_MAX
 #define SSIZE_MAX SHRT_MAX
 #endif
diff --git a/libgfortran/io/write.c b/libgfortran/io/write.c
index 6889de77f8f..062a4c74bb9 100644
--- a/libgfortran/io/write.c
+++ b/libgfortran/io/write.c
@@ -28,14 +28,11 @@ along with Libgfortran; see the file COPYING.  If not, write to
 the Free Software Foundation, 51 Franklin Street, Fifth Floor,
 Boston, MA 02110-1301, USA.  */
 
-#include "config.h"
+#include "io.h"
 #include <assert.h>
 #include <string.h>
 #include <ctype.h>
-#include <stdio.h>
 #include <stdlib.h>
-#include "libgfortran.h"
-#include "io.h"
 
 #define star_fill(p, n) memset(p, '*', n)