diff --git a/include/ucore/bitvec.h b/include/ucore/bitvec.h
index acbedaa..be06f4f 100644
--- a/include/ucore/bitvec.h
+++ b/include/ucore/bitvec.h
@@ -1,5 +1,5 @@
-#ifndef BITEVEC_H_
-#define BITEVEC_H_
+#ifndef UC_BITEVEC_H_
+#define UC_BITEVEC_H_
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/ucore/buffer.h b/include/ucore/buffer.h
index f49f339..87b0016 100644
--- a/include/ucore/buffer.h
+++ b/include/ucore/buffer.h
@@ -1,5 +1,5 @@
-#ifndef UCORE_BUFFER_H_
-#define UCORE_BUFFER_H_
+#ifndef UC_BUFFER_H_
+#define uc_BUFFER_H_
 
 #include <stddef.h>
 
diff --git a/include/ucore/dbuf.h b/include/ucore/dbuf.h
index c3c841c..f564c3e 100644
--- a/include/ucore/dbuf.h
+++ b/include/ucore/dbuf.h
@@ -1,5 +1,5 @@
-#ifndef dbuf_H_
-#define dbuf_H_
+#ifndef UC_DBUF_H_
+#define UC_DBUF_H_
 #include <stdlib.h>
 
 #ifdef __cplusplus
diff --git a/include/ucore/fd_utils.h b/include/ucore/fd_utils.h
index 9c8d178..b696e3a 100644
--- a/include/ucore/fd_utils.h
+++ b/include/ucore/fd_utils.h
@@ -1,5 +1,5 @@
-#ifndef FD_UTILS_H_
-#define FD_UTILS_H_
+#ifndef UC_FD_UTILS_H_
+#define UC_FD_UTILS_H_
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/ucore/hash.h b/include/ucore/hash.h
index 6c90469..750b446 100644
--- a/include/ucore/hash.h
+++ b/include/ucore/hash.h
@@ -1,5 +1,5 @@
-#ifndef UCORE_HASH_H_
-#define UCORE_HASH_H_
+#ifndef UC_HASH_H_
+#define UC_HASH_H_
 #include <stddef.h>
 #include <stdint.h>
 
diff --git a/include/ucore/heapsort.h b/include/ucore/heapsort.h
index 2391e84..38947c3 100644
--- a/include/ucore/heapsort.h
+++ b/include/ucore/heapsort.h
@@ -1,5 +1,5 @@
-#ifndef UCORE_HEAPSORT_H_
-#define UCORE_HEAPSORT_H_
+#ifndef UC_HEAPSORT_H_
+#define UC_HEAPSORT_H_
 
 #include <stddef.h>
 
diff --git a/include/ucore/iomux.h b/include/ucore/iomux.h
index 78e4ccd..afc746d 100644
--- a/include/ucore/iomux.h
+++ b/include/ucore/iomux.h
@@ -1,5 +1,5 @@
-#ifndef IO_MUX_H_
-#define IO_MUX_H_
+#ifndef UC_IO_MUX_H_
+#define UC_IO_MUX_H_
 
 #include "timers.h"
 /** @addtogroup IOMux
diff --git a/include/ucore/logging.h b/include/ucore/logging.h
index 9efa2d6..6bb0956 100644
--- a/include/ucore/logging.h
+++ b/include/ucore/logging.h
@@ -1,5 +1,5 @@
-#ifndef UCORE_LOGGING_H_
-#define UCORE_LOGGING_H_
+#ifndef UC_LOGGING_H_
+#define UC_LOGGING_H_
 
 /** Logging functions. 
  * All logging functions except uc_log_init are thread safe,
diff --git a/include/ucore/math.h b/include/ucore/math.h
index 8af110a..4d9d6fc 100644
--- a/include/ucore/math.h
+++ b/include/ucore/math.h
@@ -1,5 +1,5 @@
-#ifndef UCORE_MATH_H_
-#define UCORE_MATH_H_
+#ifndef UC_MATH_H_
+#define UC_MATH_H_
 
 #include <stdint.h>
 
diff --git a/include/ucore/mersenne_twister.h b/include/ucore/mersenne_twister.h
index f3fb166..b2604e1 100644
--- a/include/ucore/mersenne_twister.h
+++ b/include/ucore/mersenne_twister.h
@@ -1,5 +1,5 @@
-#ifndef UCORE_MERSENNE_TWISTER_H
-#define UCORE_MERSENNE_TWISTER_H
+#ifndef UC_MERSENNE_TWISTER_H
+#define UC_MERSENNE_TWISTER_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/ucore/pack.h b/include/ucore/pack.h
index ed36852..9c9b742 100644
--- a/include/ucore/pack.h
+++ b/include/ucore/pack.h
@@ -1,5 +1,5 @@
-#ifndef UCORE_PACK_H_
-#define UCORE_PACK_H_
+#ifndef UC_PACK_H_
+#define UC_PACK_H_
 
 #include <stdint.h>
 #ifdef __GNUC__
diff --git a/include/ucore/rbtree.h b/include/ucore/rbtree.h
index edc271d..7b6e16e 100644
--- a/include/ucore/rbtree.h
+++ b/include/ucore/rbtree.h
@@ -1,5 +1,5 @@
-#ifndef RBTREE_H_
-#define RBTREE_H_
+#ifndef UC_RBTREE_H_
+#define UC_RBTREE_H_
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/ucore/read_file.h b/include/ucore/read_file.h
index 173adc8..9e1ea10 100644
--- a/include/ucore/read_file.h
+++ b/include/ucore/read_file.h
@@ -1,5 +1,5 @@
-#ifndef UCORE_READ_FILE_H_
-#define UCORE_READ_FILE_H_y
+#ifndef UC_READ_FILE_H_
+#define UC_READ_FILE_H_y
 
 #include <stddef.h>
 
diff --git a/include/ucore/salloc.h b/include/ucore/salloc.h
index 4632316..d9f5d44 100644
--- a/include/ucore/salloc.h
+++ b/include/ucore/salloc.h
@@ -1,5 +1,5 @@
-#ifndef SALLOC_H_
-#define SALLOC_H_
+#ifndef UC_SALLOC_H_
+#define UC_SALLOC_H_
 
 #include <stddef.h>
 
diff --git a/include/ucore/saturating_math.h b/include/ucore/saturating_math.h
index e10539d..4ef5ff0 100644
--- a/include/ucore/saturating_math.h
+++ b/include/ucore/saturating_math.h
@@ -1,3 +1,5 @@
+#ifndef UC_SATMATH_H_
+#define UC_SATMATH_H_
 #include <stdint.h>
 
 /** Implementation of saturated operation on uintxx_t. 
@@ -79,3 +81,4 @@ static inline uint64_t uc_sat_multu64(uint64_t a, uint64_t b)
     return UC_SAT_MULT(a, b, uint64_t, UINT64_MAX);
 }
 
+#endif
diff --git a/include/ucore/seq.h b/include/ucore/seq.h
index 72f33fb..7d5867b 100644
--- a/include/ucore/seq.h
+++ b/include/ucore/seq.h
@@ -1,5 +1,5 @@
-#ifndef SEQ_H_
-#define SEQ_H_
+#ifndef UC_SEQ_H_
+#define UC_SEQ_H_
 #include <stdint.h>
 
 // Check if a is less than b, taking care of wrap arounds
diff --git a/include/ucore/string.h b/include/ucore/string.h
index 60955a1..fa586bb 100644
--- a/include/ucore/string.h
+++ b/include/ucore/string.h
@@ -1,5 +1,5 @@
-#ifndef UCORE_STRING_H_
-#define UCORE_STRING_H_
+#ifndef UC_STRING_H_
+#define UC_STRING_H_
 
 #include <stddef.h>
 #include <stdint.h>
diff --git a/include/ucore/strvec.h b/include/ucore/strvec.h
index 79fd641..e5ce69e 100644
--- a/include/ucore/strvec.h
+++ b/include/ucore/strvec.h
@@ -1,8 +1,9 @@
-#include <stddef.h>
-
 #ifndef UC_STRVEC_H_
 #define UC_STRVEC_H_
 
+#include <stddef.h>
+
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/ucore/supervisor.h b/include/ucore/supervisor.h
index b33aa2b..d3e4d13 100644
--- a/include/ucore/supervisor.h
+++ b/include/ucore/supervisor.h
@@ -1,5 +1,5 @@
-#ifndef UCORE_SUPERVISOR_H_
-#define UCORE_SUPERVISOR_H_
+#ifndef UC_SUPERVISOR_H_
+#define UC_SUPERVISOR_H_
 
 /** Supervises this process - restart if it dies.
  *
diff --git a/include/ucore/threadqueue.h b/include/ucore/threadqueue.h
index 61cfbb4..c6f546e 100644
--- a/include/ucore/threadqueue.h
+++ b/include/ucore/threadqueue.h
@@ -1,5 +1,5 @@
-#ifndef _THREADQUEUE_H_
-#define _THREADQUEUE_H_ 1
+#ifndef UC_THREADQUEUE_H_
+#define UC_THREADQUEUE_H_ 
 
 #include <pthread.h>
 
diff --git a/include/ucore/timers.h b/include/ucore/timers.h
index 6aa34b5..c202cb0 100644
--- a/include/ucore/timers.h
+++ b/include/ucore/timers.h
@@ -1,5 +1,5 @@
-#ifndef UCORE_TIMERS_H_
-#define UCORE_TIMERS_H_
+#ifndef UC_TIMERS_H_
+#define UC_TIMERS_H_
 
 #include <stddef.h>
 #include <sys/queue.h>
diff --git a/include/ucore/utils.h b/include/ucore/utils.h
index 5f8b0af..0720b46 100644
--- a/include/ucore/utils.h
+++ b/include/ucore/utils.h
@@ -1,5 +1,6 @@
-#ifndef UCORE_UTILS_H_
-#define UCORE_UTILS_H_
+#ifndef UC_UTILS_H_
+#define UC_UTILS_H_
+
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/include/ucore/version.h b/include/ucore/version.h
index 9f9d0b2..23803a1 100644
--- a/include/ucore/version.h
+++ b/include/ucore/version.h
@@ -1,5 +1,5 @@
-#ifndef UCORE_VERSION_H_
-#define UCORE_VERSION_H_
+#ifndef UC_VERSION_H_
+#define UC_VERSION_H_
 /**
  * @mainpage
  *  @htmlonly