Include file cleanup.

4 files changed, 27 insertions, 20 deletions

diff --git a/libvchan/init.c b/libvchan/init.c
index 7cc6edb..be4396d 100644
--- a/libvchan/init.c
+++ b/libvchan/init.c
@@ -19,20 +19,22 @@
  *
  */
 
+#include <sys/types.h>
 #include <sys/mman.h>
-#include <sys/user.h>
-#include <errno.h>
-#include <fcntl.h>
 #include <sys/ioctl.h>
-#include <malloc.h>
-#include <xs.h>
+#include <sys/user.h>
+#include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-#include <stdlib.h>
+#include <fcntl.h>
+
+#include <xs.h>
+#include <xen/sys/evtchn.h>
+
 #include "libvchan.h"
 #include "gntalloc.h"
 #include "gntdev.h"
-#include <xen/sys/evtchn.h>
 
 #ifndef PAGE_SHIFT
 #define PAGE_SHIFT 12
diff --git a/libvchan/io.c b/libvchan/io.c
index 4d87255..7ef0289 100644
--- a/libvchan/io.c
+++ b/libvchan/io.c
@@ -19,14 +19,17 @@
  *
  */
 
-#include "libvchan.h"
-#include <xenctrl.h>
-#include <string.h>
+#include <sys/types.h>
+#include <sys/mman.h>
 #include <sys/ioctl.h>
-#include <unistd.h>
 #include <sys/uio.h>
-#include <sys/mman.h>
 #include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <xenctrl.h>
+
+#include "libvchan.h"
 
 #ifndef PAGE_SHIFT
 #define PAGE_SHIFT 12
diff --git a/libvchan/node-select.c b/libvchan/node-select.c
index bfdb938..ce6fa1c 100644
--- a/libvchan/node-select.c
+++ b/libvchan/node-select.c
@@ -19,13 +19,14 @@
  *
  */
 
-#include "libvchan.h"
-#include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
+#include <stdio.h>
 #include <string.h>
-#include <errno.h>
+#include <unistd.h>
 #include <fcntl.h>
+#include <errno.h>
+
+#include "libvchan.h"
 
 void usage(char** argv)
 {
diff --git a/libvchan/node.c b/libvchan/node.c
index cb36826..69c8fb5 100644
--- a/libvchan/node.c
+++ b/libvchan/node.c
@@ -19,12 +19,13 @@
  *
  */
 
-#include "libvchan.h"
-#include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
+#include <stdio.h>
 #include <string.h>
-#include <time.h>
+#include <unistd.h>
+
+#include "libvchan.h"
+
 int libvchan_write_all(struct libvchan *ctrl, char *buf, int size)
 {
 	int written = 0;