8 files changed, 38 insertions, 35 deletions
diff --git a/runtime/Intrinsic/klee_div_zero_check.c b/runtime/Intrinsic/klee_div_zero_check.c
index 3fde1af5..36cf8807 100644
--- a/runtime/Intrinsic/klee_div_zero_check.c
+++ b/runtime/Intrinsic/klee_div_zero_check.c
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <klee/klee.h>
+#include "klee/klee.h"
 
 void klee_div_zero_check(long long z) {
   if (z == 0)
diff --git a/runtime/Intrinsic/klee_overshift_check.c b/runtime/Intrinsic/klee_overshift_check.c
index c0cb6102..0a910172 100644
--- a/runtime/Intrinsic/klee_overshift_check.c
+++ b/runtime/Intrinsic/klee_overshift_check.c
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <klee/klee.h>
+#include "klee/klee.h"
 
 /* This instrumentation call is used to check for overshifting.
  * If we do try to do x << y or x >> y
diff --git a/runtime/Intrinsic/klee_range.c b/runtime/Intrinsic/klee_range.c
index 5da6a7a5..7b0b91b3 100644
--- a/runtime/Intrinsic/klee_range.c
+++ b/runtime/Intrinsic/klee_range.c
@@ -7,8 +7,9 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "klee/klee.h"
+
 #include <assert.h>
-#include <klee/klee.h>
 
 int klee_range(int start, int end, const char* name) {
   int x;
diff --git a/runtime/POSIX/fd.c b/runtime/POSIX/fd.c
index 5a3faa16..a2cbe0ab 100644
--- a/runtime/POSIX/fd.c
+++ b/runtime/POSIX/fd.c
@@ -10,27 +10,28 @@
 #define _LARGEFILE64_SOURCE
 #include "fd.h"
 
-#include <string.h>
+#include "klee/klee.h"
+
+#include <assert.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <errno.h>
-#include <sys/syscall.h>
+#include <string.h>
 #include <sys/stat.h>
+#include <sys/syscall.h>
 #include <sys/types.h>
-#include <fcntl.h>
-#include <stdarg.h>
-#include <assert.h>
 #ifndef __FreeBSD__
 #include <sys/vfs.h>
 #endif
-#include <unistd.h>
 #include <dirent.h>
 #include <sys/ioctl.h>
 #include <sys/mtio.h>
-#include <termios.h>
 #include <sys/select.h>
-#include <klee/klee.h>
 #include <sys/time.h>
+#include <termios.h>
+#include <unistd.h>
 
 /* Returns pointer to the symbolic file structure fs the pathname is symbolic */
 static exe_disk_file_t *__get_sym_file(const char *pathname) {
diff --git a/runtime/POSIX/fd_64.c b/runtime/POSIX/fd_64.c
index 3bf48f5e..61d9dc6f 100644
--- a/runtime/POSIX/fd_64.c
+++ b/runtime/POSIX/fd_64.c
@@ -15,32 +15,32 @@
 #endif
 #endif
 
-
-#include "klee/Config/Version.h"
 #define _LARGEFILE64_SOURCE
 #define _FILE_OFFSET_BITS 64
 #include "fd.h"
 
-#include <string.h>
+#include "klee/Config/Version.h"
+#include "klee/klee.h"
+
+#include <assert.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <errno.h>
-#include <sys/syscall.h>
+#include <string.h>
 #include <sys/stat.h>
+#include <sys/syscall.h>
 #include <sys/types.h>
-#include <fcntl.h>
-#include <stdarg.h>
-#include <assert.h>
 #ifndef __FreeBSD__
 #include <sys/vfs.h>
 #endif
-#include <unistd.h>
 #include <dirent.h>
 #include <sys/ioctl.h>
 #include <sys/mtio.h>
-#include <termios.h>
 #include <sys/select.h>
-#include <klee/klee.h>
+#include <termios.h>
+#include <unistd.h>
 
 /*** Forward to actual implementations ***/
 
diff --git a/runtime/POSIX/fd_init.c b/runtime/POSIX/fd_init.c
index 327ddb53..8845fc9c 100644
--- a/runtime/POSIX/fd_init.c
+++ b/runtime/POSIX/fd_init.c
@@ -10,17 +10,17 @@
 #define _LARGEFILE64_SOURCE
 #define _FILE_OFFSET_BITS 64
 #include "fd.h"
-#include <klee/klee.h>
 
-#include <string.h>
+#include "klee/klee.h"
+
+#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <assert.h>
+#include <string.h>
 #include <sys/stat.h>
 #include <sys/syscall.h>
 #include <unistd.h>
 
-
 exe_file_system_t __exe_fs;
 
 /* NOTE: It is important that these are statically initialized
diff --git a/runtime/POSIX/illegal.c b/runtime/POSIX/illegal.c
index 8b8c0134..8ded0987 100644
--- a/runtime/POSIX/illegal.c
+++ b/runtime/POSIX/illegal.c
@@ -7,14 +7,14 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <stdio.h>
+#include "klee/klee.h"
+
 #include <errno.h>
-#include <unistd.h>
-#include <signal.h>
 #include <setjmp.h>
+#include <signal.h>
+#include <stdio.h>
 #include <sys/types.h>
-
-#include <klee/klee.h>
+#include <unistd.h>
 
 void klee_warning(const char*);
 void klee_warning_once(const char*);
diff --git a/runtime/POSIX/misc.c b/runtime/POSIX/misc.c
index 7335dee2..94c495f5 100644
--- a/runtime/POSIX/misc.c
+++ b/runtime/POSIX/misc.c
@@ -7,13 +7,14 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "klee/klee.h"
+
 #include <assert.h>
-#include <unistd.h>
-#include <sys/syscall.h>
 #include <errno.h>
 #include <stdlib.h>
-#include <klee/klee.h>
 #include <string.h>
+#include <sys/syscall.h>
+#include <unistd.h>
 
 #if 0
 #define MAX_SYM_ENV_SIZE 32