diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 799f0c8a2652da4cfec9c1692f73d28c23292aa6..0b917160e0f355d36de3fa5fa07714b4eff2cea6 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -394,6 +394,10 @@ Severity   : normal
 Bugzilla   : 13454
 Description: Add jbd statistics patch for RHEL5 and 2.6.18-vanilla
 
+Severity   : minor
+Bugzilla   : 13732 
+Description: change order of libsysio includes
+Details    : '#include sysio.h' should always come before '#include xtio.h'
 
 --------------------------------------------------------------------------------
 
diff --git a/lustre/liblustre/dir.c b/lustre/liblustre/dir.c
index db2048835e061dbb005d9b098a4120fca74a5496..dc565975b26baced2ebb765f62d47c44e6af6a8d 100644
--- a/lustre/liblustre/dir.c
+++ b/lustre/liblustre/dir.c
@@ -33,10 +33,10 @@
 #include <fcntl.h>
 #include <sys/queue.h>
 
+#include <sysio.h>
 #ifdef HAVE_XTIO_H
 #include <xtio.h>
 #endif
-#include <sysio.h>
 #include <fs.h>
 #include <mount.h>
 #include <inode.h>
diff --git a/lustre/liblustre/file.c b/lustre/liblustre/file.c
index 153c64cc9e072b4740fce2fa00b95ff9d87bdad9..a1d50dacf60ffb83f299fc10e28b4bb9ef6efb1b 100644
--- a/lustre/liblustre/file.c
+++ b/lustre/liblustre/file.c
@@ -32,10 +32,10 @@
 #include <sys/queue.h>
 #include <fcntl.h>
 
+#include <sysio.h>
 #ifdef HAVE_XTIO_H
 #include <xtio.h>
 #endif
-#include <sysio.h>
 #include <fs.h>
 #include <mount.h>
 #include <inode.h>
diff --git a/lustre/liblustre/llite_lib.c b/lustre/liblustre/llite_lib.c
index e6d04e6576e868b1a9ca8a79b7fb24fc53f8e23e..0d673681d32df4b61460c325b04becf6a10f1054 100644
--- a/lustre/liblustre/llite_lib.c
+++ b/lustre/liblustre/llite_lib.c
@@ -29,10 +29,10 @@
 #include <sys/stat.h>
 #include <sys/queue.h>
 
+#include <sysio.h>
 #ifdef HAVE_XTIO_H
 #include <xtio.h>
 #endif
-#include <sysio.h>
 #include <fs.h>
 #include <mount.h>
 #include <inode.h>
diff --git a/lustre/liblustre/namei.c b/lustre/liblustre/namei.c
index ccedc5f20f87666816d4f85d4b03d803a64487ad..3d5a7ee0c4e512b2d7df915d7c4fa71f0e9eebd4 100644
--- a/lustre/liblustre/namei.c
+++ b/lustre/liblustre/namei.c
@@ -32,10 +32,10 @@
 #include <fcntl.h>
 #include <sys/queue.h>
 
+#include <sysio.h>
 #ifdef HAVE_XTIO_H
 #include <xtio.h>
 #endif
-#include <sysio.h>
 #include <fs.h>
 #include <mount.h>
 #include <inode.h>
diff --git a/lustre/liblustre/rw.c b/lustre/liblustre/rw.c
index 62a241daab7635ae791b803247a435527e729c93..bb7d124bc6074aaf38190018e182cddfc5d3b3fb 100644
--- a/lustre/liblustre/rw.c
+++ b/lustre/liblustre/rw.c
@@ -33,10 +33,10 @@
 #include <fcntl.h>
 #include <sys/uio.h>
 
+#include <sysio.h>
 #ifdef HAVE_XTIO_H
 #include <xtio.h>
 #endif
-#include <sysio.h>
 #include <fs.h>
 #include <mount.h>
 #include <inode.h>
diff --git a/lustre/liblustre/super.c b/lustre/liblustre/super.c
index 0173a1d43625bf2f53f0d0a10ddaca692d87027c..00621f116375a6b9502e9d265a6599996450eafb 100644
--- a/lustre/liblustre/super.c
+++ b/lustre/liblustre/super.c
@@ -37,10 +37,10 @@
 # include <sys/statfs.h>
 #endif
 
+#include <sysio.h>
 #ifdef HAVE_XTIO_H
 #include <xtio.h>
 #endif
-#include <sysio.h>
 #include <fs.h>
 #include <mount.h>
 #include <inode.h>