6 files changed, 12 insertions, 12 deletions
diff --git a/src/cpu/irq.h b/src/cpu/irq.h
index f0a2656..0403038 100644
--- a/src/cpu/irq.h
+++ b/src/cpu/irq.h
@@ -1,5 +1,5 @@
-#ifndef IRQ_H
-#define IRQ_H
+#ifndef CPU_IRQ_H
+#define CPU_IRQ_H
 
 void c_irq_handler(void);
 
diff --git a/src/drivers/uart.a.h b/src/drivers/uart.a.h
index d4bf199..cd4498e 100644
--- a/src/drivers/uart.a.h
+++ b/src/drivers/uart.a.h
@@ -1,5 +1,5 @@
-#ifndef UART_AH
-#define UART_AH
+#ifndef DRIVERS_UART_A_H
+#define DRIVERS_UART_A_H
 
 extern void uart_char(unsigned char c);
 extern void uart_hex(unsigned long data);
diff --git a/src/drivers/uart.h b/src/drivers/uart.h
index c78398b..9f1319b 100644
--- a/src/drivers/uart.h
+++ b/src/drivers/uart.h
@@ -1,5 +1,5 @@
-#ifndef UART_H
-#define UART_H
+#ifndef DRIVERS_UART_H
+#define DRIVERS_UART_H
 
 void uart_hexn(unsigned long);
 void uart_10(unsigned long);
diff --git a/src/sys/core.h b/src/sys/core.h
index 517b090..d720e17 100644
--- a/src/sys/core.h
+++ b/src/sys/core.h
@@ -1,5 +1,5 @@
-#ifndef CORE_H
-#define CORE_H
+#ifndef SYS_CORE_H
+#define SYS_CORE_H
 
 extern unsigned long cntfrq;
 
diff --git a/src/util/mutex.h b/src/util/mutex.h
index 8c9a097..37def4b 100644
--- a/src/util/mutex.h
+++ b/src/util/mutex.h
@@ -1,5 +1,5 @@
-#ifndef SYS_MUTEX_H
-#define SYS_MUTEX_H
+#ifndef UTIL_MUTEX_H
+#define UTIL_MUTEX_H
 
 #define NULL_PID 0
 #define SCHED_PID 1
diff --git a/src/util/time.h b/src/util/time.h
index 1fb3906..aa74896 100644
--- a/src/util/time.h
+++ b/src/util/time.h
@@ -1,5 +1,5 @@
-#ifndef TIME_H
-#define TIME_H
+#ifndef UTIL_TIME_H
+#define UTIL_TIME_H
 
 void routing_core0cntv_to_core0irq(void);
 unsigned long read_core0timer_pending(void);