Index: kernel/genarch/include/drivers/am335x/timer.h
===================================================================
--- kernel/genarch/include/drivers/am335x/timer.h	(revision c2b2de7ea7c77612cde2379131a6f1e3b0544307)
+++ kernel/genarch/include/drivers/am335x/timer.h	(revision 150a271898ef7efbc0fcad8d33cfafa0104fdb78)
@@ -34,6 +34,6 @@
  */
 
-#ifndef _AM335X_TIMER_H_
-#define _AM335X_TIMER_H_
+#ifndef _KERN_AM335X_TIMER_H_
+#define _KERN_AM335X_TIMER_H_
 
 #include "timer_regs.h"
Index: kernel/genarch/include/drivers/am335x/timer_regs.h
===================================================================
--- kernel/genarch/include/drivers/am335x/timer_regs.h	(revision c2b2de7ea7c77612cde2379131a6f1e3b0544307)
+++ kernel/genarch/include/drivers/am335x/timer_regs.h	(revision 150a271898ef7efbc0fcad8d33cfafa0104fdb78)
@@ -33,4 +33,7 @@
  * @brief Texas Instruments AM335x DMTIMER memory mapped registers.
  */
+
+#ifndef _KERN_AM335X_TIMER_REGS_H_
+#define _KERN_AM335X_TIMER_REGS_H_
 
 #include <typedefs.h>
@@ -149,4 +152,6 @@
 } am335x_timer_regs_t;
 
+#endif
+
 /**
  * @}
Index: kernel/genarch/include/drivers/am335x/uart.h
===================================================================
--- kernel/genarch/include/drivers/am335x/uart.h	(revision c2b2de7ea7c77612cde2379131a6f1e3b0544307)
+++ kernel/genarch/include/drivers/am335x/uart.h	(revision 150a271898ef7efbc0fcad8d33cfafa0104fdb78)
@@ -34,6 +34,6 @@
  */
 
-#ifndef _AM335x_UART_H_
-#define _AM335x_UART_H_
+#ifndef _KERN_AM335X_UART_H_
+#define _KERN_AM335X_UART_H_
 
 #include "uart_regs.h"
@@ -63,6 +63,4 @@
 #define AM335x_UART5_IRQ             46
 
-#endif
-
 typedef struct {
 	am335x_uart_regs_t *regs;
@@ -76,4 +74,5 @@
 void am335x_uart_input_wire(am335x_uart_t *, indev_t *);
 
+#endif
 
 /**
Index: kernel/genarch/include/drivers/am335x/uart_regs.h
===================================================================
--- kernel/genarch/include/drivers/am335x/uart_regs.h	(revision c2b2de7ea7c77612cde2379131a6f1e3b0544307)
+++ kernel/genarch/include/drivers/am335x/uart_regs.h	(revision 150a271898ef7efbc0fcad8d33cfafa0104fdb78)
@@ -35,6 +35,6 @@
  */
 
-#ifndef KERN_AM335x_UART_H_
-#define KERN_AM335x_UART_H_
+#ifndef _KERN_AM335X_UART_REGS_H_
+#define _KERN_AM335X_UART_REGS_H_
 
 #include <typedefs.h>