diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 8a816fc9e5adeda2397f61162dcd84f1b7f241f7..a1cb0d0917537697d086f41f19c1d648f6488a38 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,9 @@
+2009-11-19  Janne Blomqvist  <jb@gcc.gnu.org>
+
+	* io/fbuf.h: Move includes after include guard.
+	* io/format.h: Likewise.
+	* io/unix.h: Likewise.
+
 2009-11-18  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
 
 	PR libgfortran/42090
diff --git a/libgfortran/io/fbuf.h b/libgfortran/io/fbuf.h
index 368cec28b2cc727ef963d3995689453bb6772641..c82d01b2b988b8e568e284ee70c1c0899300670a 100644
--- a/libgfortran/io/fbuf.h
+++ b/libgfortran/io/fbuf.h
@@ -23,11 +23,11 @@ a copy of the GCC Runtime Library Exception along with this program;
 see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 <http://www.gnu.org/licenses/>.  */
 
-#include "io.h"
-
 #ifndef GFOR_FBUF_H
 #define GFOR_FBUF_H
 
+#include "io.h"
+
 
 /* Formatting buffer. This is a temporary scratch buffer used by
    formatted read and writes.  After every formatted I/O statement,
diff --git a/libgfortran/io/format.h b/libgfortran/io/format.h
index c338daa19504730a4f907d944741367a18c2a399..4abbbea437ec7b91216c84f0acbb78ea83e30c53 100644
--- a/libgfortran/io/format.h
+++ b/libgfortran/io/format.h
@@ -23,11 +23,12 @@ a copy of the GCC Runtime Library Exception along with this program;
 see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 <http://www.gnu.org/licenses/>.  */
 
-#include "io.h"
-
 #ifndef GFOR_FORMAT_H
 #define GFOR_FORMAT_H
 
+#include "io.h"
+
+
 /* Format tokens.  Only about half of these can be stored in the
    format nodes.  */
 
diff --git a/libgfortran/io/unix.h b/libgfortran/io/unix.h
index 721c63c02e4f29e1bc609ba85d56c471ea88ab8d..f0f0712457a4cc04038ca3b0223bd7a50e9aad10 100644
--- a/libgfortran/io/unix.h
+++ b/libgfortran/io/unix.h
@@ -23,11 +23,12 @@ a copy of the GCC Runtime Library Exception along with this program;
 see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 <http://www.gnu.org/licenses/>.  */
 
-#include "io.h"
-
 #ifndef GFOR_UNIX_H
 #define GFOR_UNIX_H
 
+#include "io.h"
+
+
 struct stream
 {
   ssize_t (*read) (struct stream *, void *, ssize_t);