-#ifndef HEADER_16550A_H
-#define HEADER_16550A_H 1
+#ifndef DEVICES_16550A_H
+#define DEVICES_16550A_H
+#include <debug.h>
#include <stdbool.h>
#include <stdint.h>
-#include "lib/debug.h"
/* Register definitions for the 16550A UART used in PCs. This is
a full definition of all the registers and their bits. We
#define MSR_RI 0x40 /* Ring Indicator. */
#define MSR_DCD 0x80 /* Data Carrier Detect. */
-#endif /* 16550a.h */
+#endif /* devices/16550a.h */