diff --git a/right/src/buspal/bootloader/bootloader.h b/right/src/buspal/bootloader/bootloader.h
deleted file mode 100644
index 259d1a9..0000000
--- a/right/src/buspal/bootloader/bootloader.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef __BOOTLOADER_H__
-#define __BOOTLOADER_H__
-
-#include "command.h"
-
-enum _bootloader_status {
-    kStatus_UnknownCommand = MAKE_STATUS(kStatusGroup_Bootloader, 0),
-    kStatus_SecurityViolation = MAKE_STATUS(kStatusGroup_Bootloader, 1),
-    kStatus_AbortDataPhase = MAKE_STATUS(kStatusGroup_Bootloader, 2),
-    kStatus_Ping = MAKE_STATUS(kStatusGroup_Bootloader, 3),
-    kStatus_NoResponse = MAKE_STATUS(kStatusGroup_Bootloader, 4),
-    kStatus_NoResponseExpected = MAKE_STATUS(kStatusGroup_Bootloader, 5),
-};
-
-typedef struct _bootloaderContext {
-    const peripheral_descriptor_t *activePeripheral;
-} bootloader_context_t;
-
-extern bootloader_context_t g_bootloaderContext;
-
-#endif
diff --git a/right/src/buspal/packet/serial_packet.c b/right/src/buspal/packet/serial_packet.c
index 218ab4d..cf561b3 100644
--- a/right/src/buspal/packet/serial_packet.c
+++ b/right/src/buspal/packet/serial_packet.c
@@ -1,6 +1,21 @@
-#include "bootloader/bootloader.h"
+#include "command.h"
 #include "crc16.h"
 
+enum _bootloader_status {
+    kStatus_UnknownCommand = MAKE_STATUS(kStatusGroup_Bootloader, 0),
+    kStatus_SecurityViolation = MAKE_STATUS(kStatusGroup_Bootloader, 1),
+    kStatus_AbortDataPhase = MAKE_STATUS(kStatusGroup_Bootloader, 2),
+    kStatus_Ping = MAKE_STATUS(kStatusGroup_Bootloader, 3),
+    kStatus_NoResponse = MAKE_STATUS(kStatusGroup_Bootloader, 4),
+    kStatus_NoResponseExpected = MAKE_STATUS(kStatusGroup_Bootloader, 5),
+};
+
+typedef struct _bootloaderContext {
+    const peripheral_descriptor_t *activePeripheral;
+} bootloader_context_t;
+
+extern bootloader_context_t g_bootloaderContext;
+
 ////////////////////////////////////////////////////////////////////////////////
 // Prototypes
 ////////////////////////////////////////////////////////////////////////////////