diff --git a/lib/blacklist.h b/lib/blacklist.h
index 5604171..80a44fc 100644
--- a/lib/blacklist.h
+++ b/lib/blacklist.h
@@ -1,7 +1,7 @@
 #include <stdint.h>
 
-#ifndef _BLACKLIST_H
-#define _BLACKLIST_H
+#ifndef BLACKLIST_H
+#define BLACKLIST_H
 
 int blacklist_is_allowed(uint32_t s_addr);
 void blacklist_prefix(char *ip, int prefix_len);
diff --git a/lib/constraint.h b/lib/constraint.h
index 3e914a3..2170f8f 100644
--- a/lib/constraint.h
+++ b/lib/constraint.h
@@ -1,5 +1,5 @@
-#ifndef _CONSTRAINT_H
-#define _CONSTRAINT_H
+#ifndef CONSTRAINT_H
+#define CONSTRAINT_H
 
 typedef struct _constraint constraint_t;
 typedef int value_t;
diff --git a/lib/logger.h b/lib/logger.h
index 8cf2a9f..a961ac3 100644
--- a/lib/logger.h
+++ b/lib/logger.h
@@ -1,8 +1,8 @@
 #include <stdio.h>
 #include <stdarg.h>
 
-#ifndef _LOGGER_H
-#define _LOGGER_H
+#ifndef LOGGER_H
+#define LOGGER_H
 
 enum LogLevel { LOG_FATAL, LOG_ERROR, LOG_WARN, LOG_INFO, LOG_DEBUG, LOG_TRACE,
 					NUM_LOGLEVELS };
diff --git a/lib/random.h b/lib/random.h
index d83b14d..b05a5d6 100644
--- a/lib/random.h
+++ b/lib/random.h
@@ -1,8 +1,8 @@
 #include <stdlib.h>
 #include <stdint.h>
 
-#ifndef _RANDOM_H
-#define _RANDOM_H
+#ifndef RANDOM_H
+#define RANDOM_H
 
 int random_bytes(void *dst, size_t n);
 
diff --git a/lib/redis.h b/lib/redis.h
index 51a1a7f..229136c 100644
--- a/lib/redis.h
+++ b/lib/redis.h
@@ -2,8 +2,8 @@
 #include <unistd.h>
 #include <hiredis/hiredis.h>
 
-#ifndef _REDIS_ZHELPERS_H
-#define _REDIS_ZHELPERS_H
+#ifndef REDIS_ZHELPERS_H
+#define REDIS_ZHELPERS_H
 
 int redis_init(void);
 
diff --git a/lib/rijndael-alg-fst.h b/lib/rijndael-alg-fst.h
index 2c3396e..4a8bd5a 100644
--- a/lib/rijndael-alg-fst.h
+++ b/lib/rijndael-alg-fst.h
@@ -23,8 +23,8 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef __RIJNDAEL_ALG_FST_H
-#define __RIJNDAEL_ALG_FST_H
+#ifndef RIJNDAEL_ALG_FST_H
+#define RIJNDAEL_ALG_FST_H
 
 #define MAXKC	(256/32)
 #define MAXKB	(256/8)
@@ -44,4 +44,4 @@ void rijndaelEncryptRound(const u32 rk[/*4*(Nr + 1)*/], int Nr, u8 block[16], in
 void rijndaelDecryptRound(const u32 rk[/*4*(Nr + 1)*/], int Nr, u8 block[16], int rounds);
 #endif /* INTERMEDIATE_VALUE_KAT */
 
-#endif /* __RIJNDAEL_ALG_FST_H */
+#endif /* RIJNDAEL_ALG_FST_H */