diff --git a/left/src/init_peripherials.h b/left/src/init_peripherials.h
index 0a6397a..0f75387 100644
--- a/left/src/init_peripherials.h
+++ b/left/src/init_peripherials.h
@@ -1,5 +1,5 @@
-#ifndef __INIT_H__
-#define __INIT_H__
+#ifndef __INIT_PERIPHERALS_H__
+#define __INIT_PERIPHERALS_H__
 
 // Macros:
 
diff --git a/right/src/action.h b/right/src/action.h
index cead8dd..dad5513 100644
--- a/right/src/action.h
+++ b/right/src/action.h
@@ -1,5 +1,5 @@
-#ifndef __UHK_ACTION_H_
-#define __UHK_ACTION_H_
+#ifndef __ACTION_H__
+#define __ACTION_H__
 
 #include <stdint.h>
 #include "lufa/HIDClassCommon.h"
diff --git a/right/src/current_keymap.h b/right/src/current_keymap.h
index 2f12834..513a682 100644
--- a/right/src/current_keymap.h
+++ b/right/src/current_keymap.h
@@ -1,5 +1,5 @@
-#ifndef __CURRENT_KEYMAP_H_
-#define __CURRENT_KEYMAP_H_
+#ifndef __CURRENT_KEYMAP_H__
+#define __CURRENT_KEYMAP_H__
 
 // Includes:
 
diff --git a/right/src/deserialize.h b/right/src/deserialize.h
index 4989836..0dd3963 100644
--- a/right/src/deserialize.h
+++ b/right/src/deserialize.h
@@ -1,5 +1,5 @@
 #ifndef __DESERIALIZE_H__
-#define __DESERIALIZE_H__ 1
+#define __DESERIALIZE_H__
 
 #include <stdint.h>
 
diff --git a/right/src/i2c_watchdog.h b/right/src/i2c_watchdog.h
index 111f6cd..ef109be 100644
--- a/right/src/i2c_watchdog.h
+++ b/right/src/i2c_watchdog.h
@@ -1,5 +1,5 @@
-#ifndef __I2C_WATCHDOG_H_
-#define __I2C_WATCHDOG_H_
+#ifndef __I2C_WATCHDOG_H__
+#define __I2C_WATCHDOG_H__
 
 // Functions:
 
diff --git a/right/src/init_peripherials.h b/right/src/init_peripherials.h
index 03f702e..f99fa40 100644
--- a/right/src/init_peripherials.h
+++ b/right/src/init_peripherials.h
@@ -1,5 +1,5 @@
-#ifndef __INIT_H__
-#define __INIT_H__
+#ifndef __INIT_PERIPHERALS_H__
+#define __INIT_PERIPHERALS_H__
 
 #include "fsl_common.h"
 
diff --git a/right/src/test_states.h b/right/src/test_states.h
index 3296e9e..6e209cd 100644
--- a/right/src/test_states.h
+++ b/right/src/test_states.h
@@ -1,5 +1,5 @@
-#ifndef __TEST_STATES__
-#define __TEST_STATES__
+#ifndef __TEST_STATES_H__
+#define __TEST_STATES_H__
 
 // Typedefs:
 
diff --git a/right/src/usb_api.h b/right/src/usb_api.h
index 27d9e88..f21546d 100644
--- a/right/src/usb_api.h
+++ b/right/src/usb_api.h
@@ -1,5 +1,5 @@
-#ifndef __USB_REPORT_ITEM_MACROS__
-#define __USB_REPORT_ITEM_MACROS__
+#ifndef __USB_API_H__
+#define __USB_API_H__
 
 // Includes:
 
diff --git a/shared/bridge_protocol.h b/shared/bridge_protocol.h
index 309eef6..b3ec78a 100644
--- a/shared/bridge_protocol.h
+++ b/shared/bridge_protocol.h
@@ -1,5 +1,5 @@
-#ifndef __BRIDGE_PROTOCOL__
-#define __BRIDGE_PROTOCOL__
+#ifndef __BRIDGE_PROTOCOL_H__
+#define __BRIDGE_PROTOCOL_H__
 
 // Macros: