diff --git a/runtime/include/arch/aarch64/context.h b/runtime/include/arch/aarch64/context.h
index f8404c94..365b1dd3 100644
--- a/runtime/include/arch/aarch64/context.h
+++ b/runtime/include/arch/aarch64/context.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <stdint.h>
 #include <unistd.h>
 #include <ucontext.h>
 
diff --git a/runtime/include/arch/x86_64/context.h b/runtime/include/arch/x86_64/context.h
index 70c2bc5b..4e763c67 100644
--- a/runtime/include/arch/x86_64/context.h
+++ b/runtime/include/arch/x86_64/context.h
@@ -1,10 +1,11 @@
 #pragma once
 
 #include <assert.h>
+#include <stdbool.h>
+#include <stdint.h>
 #include <string.h>
 #include <ucontext.h>
 #include <unistd.h>
-#include <stdbool.h>
 
 #define ARCH_NREGS       (16 /* GP registers */ + 1 /* for IP */)
 #define ARCH_SIG_JMP_OFF 8
diff --git a/runtime/include/global_request_scheduler.h b/runtime/include/global_request_scheduler.h
index d9f1a316..0972e1c7 100644
--- a/runtime/include/global_request_scheduler.h
+++ b/runtime/include/global_request_scheduler.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <sandbox_request.h>
+#include "sandbox_request.h"
 
 /* Returns pointer back if successful, null otherwise */
 typedef sandbox_request_t *(*global_request_scheduler_add_fn_t)(void *);
diff --git a/runtime/include/global_request_scheduler_deque.h b/runtime/include/global_request_scheduler_deque.h
index 1e1757eb..1dbe4afa 100644
--- a/runtime/include/global_request_scheduler_deque.h
+++ b/runtime/include/global_request_scheduler_deque.h
@@ -1,5 +1,5 @@
 #pragma once
 
-#include <global_request_scheduler.h>
+#include "global_request_scheduler.h"
 
 void global_request_scheduler_deque_initialize();
diff --git a/runtime/include/global_request_scheduler_minheap.h b/runtime/include/global_request_scheduler_minheap.h
index 5c391707..5202014e 100644
--- a/runtime/include/global_request_scheduler_minheap.h
+++ b/runtime/include/global_request_scheduler_minheap.h
@@ -1,5 +1,5 @@
 #pragma once
 
-#include <global_request_scheduler.h>
+#include "global_request_scheduler.h"
 
 void global_request_scheduler_minheap_initialize();
diff --git a/runtime/include/http_request.h b/runtime/include/http_request.h
index 4bdbbeb3..f82b5ab9 100644
--- a/runtime/include/http_request.h
+++ b/runtime/include/http_request.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <types.h>
+#include "types.h"
 
 /* all in-memory ptrs.. don't mess around with that! */
 struct http_header {
diff --git a/runtime/include/http_response.h b/runtime/include/http_response.h
index e8c2ffc6..b738e5bf 100644
--- a/runtime/include/http_response.h
+++ b/runtime/include/http_response.h
@@ -1,9 +1,10 @@
 #pragma once
 
 #include <http_parser.h>
-#include <types.h>
 #include <sys/uio.h>
 
+#include "types.h"
+
 /* Conditionally load libuv */
 #ifdef USE_HTTP_UVIO
 #include <uv.h>
diff --git a/runtime/include/libuv_callbacks.h b/runtime/include/libuv_callbacks.h
index aa90d8f4..1162b3c5 100644
--- a/runtime/include/libuv_callbacks.h
+++ b/runtime/include/libuv_callbacks.h
@@ -1,14 +1,14 @@
 #pragma once
 
 #include <assert.h>
-#include <runtime.h>
-#include <sandbox.h>
 #include <sys/mman.h>
 #include <pthread.h>
 #include <signal.h>
 #include <uv.h>
-#include <http_request.h>
 
+#include "http_request.h"
+#include "runtime.h"
+#include "sandbox.h"
 /**
  * Parses data read by the libuv stream chunk-by-chunk until the message is complete
  * Then stops the stream and wakes up the sandbox
diff --git a/runtime/include/local_runqueue.h b/runtime/include/local_runqueue.h
index c7ab3d75..dace39e4 100644
--- a/runtime/include/local_runqueue.h
+++ b/runtime/include/local_runqueue.h
@@ -1,7 +1,8 @@
 #pragma once
 
 #include <stdbool.h>
-#include <sandbox.h>
+
+#include "sandbox.h"
 
 /* Returns pointer back if successful, null otherwise */
 typedef struct sandbox *(*local_runqueue_add_fn_t)(struct sandbox *);
diff --git a/runtime/include/module.h b/runtime/include/module.h
index 45fd48c6..a617338f 100644
--- a/runtime/include/module.h
+++ b/runtime/include/module.h
@@ -1,7 +1,8 @@
 #pragma once
 
 #include <uv.h>
-#include <types.h>
+
+#include "types.h"
 
 struct module {
 	char                        name[MODULE_MAX_NAME_LENGTH];
diff --git a/runtime/include/sandbox.h b/runtime/include/sandbox.h
index d875475f..90c80467 100644
--- a/runtime/include/sandbox.h
+++ b/runtime/include/sandbox.h
@@ -7,8 +7,8 @@
 
 #include "arch/context.h"
 #include "deque.h"
-#include <http_request.h>
-#include <http_response.h>
+#include "http_request.h"
+#include "http_response.h"
 #include "module.h"
 #include "ps_list.h"
 #include "software_interrupt.h"
diff --git a/runtime/include/software_interrupt.h b/runtime/include/software_interrupt.h
index b340a037..a0467687 100644
--- a/runtime/include/software_interrupt.h
+++ b/runtime/include/software_interrupt.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <stdbool.h>
 #include <assert.h>
 #include <signal.h>
+#include <stdbool.h>
 
 /************
  * Externs  *
diff --git a/runtime/include/types.h b/runtime/include/types.h
index 67a3ac06..a8f50f56 100644
--- a/runtime/include/types.h
+++ b/runtime/include/types.h
@@ -11,11 +11,11 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
+#include <sys/stat.h>
+#include <sys/uio.h>
 #include <time.h>
 #include <unistd.h>
 
-#include <sys/stat.h>
-#include <sys/uio.h>
 
 #define EXPORT __attribute__((visibility("default")))
 #define IMPORT __attribute__((visibility("default")))
diff --git a/runtime/include/worker_thread.h b/runtime/include/worker_thread.h
index 33c85863..381a28db 100644
--- a/runtime/include/worker_thread.h
+++ b/runtime/include/worker_thread.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <uv.h>
+
 #include "types.h"
 
 extern __thread uv_loop_t worker_thread_uvio_handle;
diff --git a/runtime/src/arch/aarch64/env.c b/runtime/src/arch/aarch64/env.c
index 3949e821..9d5ade10 100644
--- a/runtime/src/arch/aarch64/env.c
+++ b/runtime/src/arch/aarch64/env.c
@@ -1,6 +1,6 @@
 #if defined(AARCH64) || defined(aarch64)
 
-#include <runtime.h>
+#include "runtime.h"
 
 unsigned long long int
 __getcycles(void)
diff --git a/runtime/src/arch/x86_64/env.c b/runtime/src/arch/x86_64/env.c
index 3ec3dcd1..8a66844e 100644
--- a/runtime/src/arch/x86_64/env.c
+++ b/runtime/src/arch/x86_64/env.c
@@ -1,17 +1,17 @@
 #if defined(X86_64) || defined(x86_64)
 
-#include <runtime.h>
+#include "runtime.h"
 
 unsigned long long int
 __getcycles(void)
 {
-        unsigned long long int cpu_time_in_cycles = 0;
-        unsigned int           cycles_lo;
-        unsigned int           cycles_hi;
-        __asm__ volatile("rdtsc" : "=a"(cycles_lo), "=d"(cycles_hi));
-        cpu_time_in_cycles = (unsigned long long int)cycles_hi << 32 | cycles_lo;
+	unsigned long long int cpu_time_in_cycles = 0;
+	unsigned int           cycles_lo;
+	unsigned int           cycles_hi;
+	__asm__ volatile("rdtsc" : "=a"(cycles_lo), "=d"(cycles_hi));
+	cpu_time_in_cycles = (unsigned long long int)cycles_hi << 32 | cycles_lo;
 
-        return cpu_time_in_cycles;
+	return cpu_time_in_cycles;
 }
 
 #endif
diff --git a/runtime/src/env.c b/runtime/src/env.c
index f139f681..5b970e5f 100644
--- a/runtime/src/env.c
+++ b/runtime/src/env.c
@@ -1,8 +1,9 @@
 /* https://github.com/gwsystems/silverfish/blob/master/runtime/libc/libc_backing.c */
-#include <runtime.h>
-#include <worker_thread.h>
 #include <ck_pr.h>
 
+#include "runtime.h"
+#include "worker_thread.h"
+
 extern i32 inner_syscall_handler(i32 n, i32 a, i32 b, i32 c, i32 d, i32 e, i32 f);
 
 i32
diff --git a/runtime/src/global_request_scheduler.c b/runtime/src/global_request_scheduler.c
index 435d9589..0198e2d5 100644
--- a/runtime/src/global_request_scheduler.c
+++ b/runtime/src/global_request_scheduler.c
@@ -1,4 +1,4 @@
-#include <global_request_scheduler.h>
+#include "global_request_scheduler.h"
 
 
 /* The global of our polymorphic interface */
diff --git a/runtime/src/global_request_scheduler_deque.c b/runtime/src/global_request_scheduler_deque.c
index 4577b9ba..7ee14b92 100644
--- a/runtime/src/global_request_scheduler_deque.c
+++ b/runtime/src/global_request_scheduler_deque.c
@@ -1,4 +1,4 @@
-#include <global_request_scheduler.h>
+#include "global_request_scheduler.h"
 
 static struct deque_sandbox *global_request_scheduler_deque;
 static pthread_mutex_t       global_request_scheduler_deque_mutex = PTHREAD_MUTEX_INITIALIZER;
diff --git a/runtime/src/global_request_scheduler_minheap.c b/runtime/src/global_request_scheduler_minheap.c
index d2fad901..af86c237 100644
--- a/runtime/src/global_request_scheduler_minheap.c
+++ b/runtime/src/global_request_scheduler_minheap.c
@@ -1,4 +1,4 @@
-#include <global_request_scheduler.h>
+#include "global_request_scheduler.h"
 #include "priority_queue.h"
 
 static struct priority_queue global_request_scheduler_minheap;
diff --git a/runtime/src/http_parser_settings.c b/runtime/src/http_parser_settings.c
index 171a11a7..ee0f2966 100644
--- a/runtime/src/http_parser_settings.c
+++ b/runtime/src/http_parser_settings.c
@@ -1,9 +1,10 @@
-#include <http_request.h>
-#include <http_response.h>
-#include <http_parser_settings.h>
-#include <sandbox.h>
 #include <uv.h>
 
+#include "http_request.h"
+#include "http_response.h"
+#include "http_parser_settings.h"
+#include "sandbox.h"
+
 static http_parser_settings runtime_http_parser_settings;
 
 /***********************************************************************
diff --git a/runtime/src/http_request.c b/runtime/src/http_request.c
index d8650988..a53e4036 100644
--- a/runtime/src/http_request.c
+++ b/runtime/src/http_request.c
@@ -1,4 +1,4 @@
-#include <http_request.h>
+#include "http_request.h"
 
 /***************************************************
  * General HTTP Request Functions                  *
diff --git a/runtime/src/http_response.c b/runtime/src/http_response.c
index 013141c8..d2dbb7f2 100644
--- a/runtime/src/http_response.c
+++ b/runtime/src/http_response.c
@@ -1,4 +1,4 @@
-#include <http_response.h>
+#include "http_response.h"
 
 #ifdef USE_HTTP_UVIO
 #include <uv.h>
diff --git a/runtime/src/local_runqueue.c b/runtime/src/local_runqueue.c
index 183bd8b5..3983c7ef 100644
--- a/runtime/src/local_runqueue.c
+++ b/runtime/src/local_runqueue.c
@@ -1,4 +1,4 @@
-#include <local_runqueue.h>
+#include "local_runqueue.h"
 
 static struct local_runqueue_config local_runqueue;
 
diff --git a/runtime/src/main.c b/runtime/src/main.c
index 6f71f009..fd9c0331 100644
--- a/runtime/src/main.c
+++ b/runtime/src/main.c
@@ -1,18 +1,18 @@
 #include <ctype.h>
 #include <dlfcn.h>
+#include <pthread.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <pthread.h>
 #include <sched.h>
 #include <sys/resource.h>
 #include <sys/time.h>
 #include <unistd.h>
 
-#include <module.h>
-#include <runtime.h>
-#include <sandbox.h>
-#include <software_interrupt.h>
-#include <worker_thread.h>
+#include "module.h"
+#include "runtime.h"
+#include "sandbox.h"
+#include "software_interrupt.h"
+#include "worker_thread.h"
 
 /* Conditionally used by debuglog when DEBUG is set */
 #ifdef DEBUG
diff --git a/runtime/src/module.c b/runtime/src/module.c
index d0ae976e..6a26638f 100644
--- a/runtime/src/module.c
+++ b/runtime/src/module.c
@@ -4,10 +4,10 @@
 #include <stdlib.h>
 #include <uv.h>
 
-#include "types.h"
 #include "module.h"
 #include "module_database.h"
 #include "runtime.h"
+#include "types.h"
 
 /*************************
  * Private Static Inline *
diff --git a/runtime/src/module_database.c b/runtime/src/module_database.c
index 9a5f604c..9519627f 100644
--- a/runtime/src/module_database.c
+++ b/runtime/src/module_database.c
@@ -1,5 +1,4 @@
-#include <module_database.h>
-
+#include "module_database.h"
 
 /*******************
  * Module Database *
diff --git a/runtime/src/runtime.c b/runtime/src/runtime.c
index 58efc3dc..64fb5f44 100644
--- a/runtime/src/runtime.c
+++ b/runtime/src/runtime.c
@@ -1,27 +1,18 @@
-/* Something is not idempotent with this or some other include. If placed in Local Includes, error is triggered that
- * memset was implicitly declared */
-#include <runtime.h>
-
-/***************************
- * External Includes       *
- **************************/
 #include <pthread.h>
 #include <signal.h>
-#include <sched.h>    /* Wasmception. Included as submodule */
-#include <sys/mman.h> /* Wasmception. Included as submodule */
+#include <sched.h>
+#include <sys/mman.h>
 #include <uv.h>
 
-/***************************
- * Local Includes          *
- **************************/
-#include <arch/context.h>
-#include <http_parser_settings.h>
-#include <module.h>
-#include <sandbox_request.h>
-#include <global_request_scheduler_deque.h>
-#include <global_request_scheduler_minheap.h>
-#include <software_interrupt.h>
-#include <types.h>
+#include "arch/context.h"
+#include "global_request_scheduler_deque.h"
+#include "global_request_scheduler_minheap.h"
+#include "http_parser_settings.h"
+#include "module.h"
+#include "runtime.h"
+#include "sandbox_request.h"
+#include "software_interrupt.h"
+#include "types.h"
 
 /***************************
  * Shared Process State    *
diff --git a/runtime/src/sandbox.c b/runtime/src/sandbox.c
index 6d1800e3..07216d4b 100644
--- a/runtime/src/sandbox.c
+++ b/runtime/src/sandbox.c
@@ -1,7 +1,7 @@
 #include <assert.h>
-#include <sys/mman.h>
 #include <pthread.h>
 #include <signal.h>
+#include <sys/mman.h>
 #include <uv.h>
 
 #include "current_sandbox.h"
diff --git a/runtime/src/software_interrupt.c b/runtime/src/software_interrupt.c
index 464ea8ca..82ec709f 100644
--- a/runtime/src/software_interrupt.c
+++ b/runtime/src/software_interrupt.c
@@ -1,19 +1,19 @@
+#include <errno.h>
 #include <pthread.h>
 #include <signal.h>
 #include <sys/time.h>
-#include <errno.h>
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <ucontext.h>
 
-#include <types.h>
-#include <sandbox.h>
-#include <module.h>
-#include <arch/context.h>
-#include <software_interrupt.h>
-#include <current_sandbox.h>
+#include "arch/context.h"
+#include "current_sandbox.h"
 #include "local_runqueue.h"
+#include "module.h"
+#include "sandbox.h"
+#include "software_interrupt.h"
+#include "types.h"
 
 /*******************
  * Process Globals *
diff --git a/runtime/src/worker_thread.c b/runtime/src/worker_thread.c
index d74a5f84..e9f84ec4 100644
--- a/runtime/src/worker_thread.c
+++ b/runtime/src/worker_thread.c
@@ -1,27 +1,18 @@
-/* Something is not idempotent with this or some other include.
-If placed in Local Includes, error is triggered that memset was implicitly declared */
-#include <runtime.h>
-
-/***************************
- * External Includes       *
- **************************/
 #include <pthread.h>
 #include <signal.h>
-#include <sched.h>    /* Wasmception. Included as submodule */
-#include <sys/mman.h> /* Wasmception. Included as submodule */
+#include <sched.h>
+#include <sys/mman.h>
 #include <uv.h>
 
-/***************************
- * Local Includes          *
- **************************/
-#include <current_sandbox.h>
-#include <global_request_scheduler.h>
-#include <local_completion_queue.h>
-#include <local_runqueue.h>
-#include <local_runqueue_list.h>
-#include <local_runqueue_minheap.h>
-#include <types.h>
-#include <worker_thread.h>
+#include "current_sandbox.h"
+#include "global_request_scheduler.h"
+#include "local_completion_queue.h"
+#include "local_runqueue.h"
+#include "local_runqueue_list.h"
+#include "local_runqueue_minheap.h"
+#include "runtime.h"
+#include "types.h"
+#include "worker_thread.h"
 
 /***************************
  * Worker Thread State     *