diff --git a/right/src/buspal/bootloader/bl_context.h b/right/src/buspal/bootloader/bl_context.h
deleted file mode 100644
index 1d9ff0f..0000000
--- a/right/src/buspal/bootloader/bl_context.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef __CONTEXT_H__
-#define __CONTEXT_H__
-
-#include "command.h"
-
-typedef struct _bootloaderContext {
-    const peripheral_descriptor_t *activePeripheral;
-} bootloader_context_t;
-
-extern bootloader_context_t g_bootloaderContext;
-
-#endif
diff --git a/right/src/buspal/bootloader/bootloader.h b/right/src/buspal/bootloader/bootloader.h
index 5a17690..259d1a9 100644
--- a/right/src/buspal/bootloader/bootloader.h
+++ b/right/src/buspal/bootloader/bootloader.h
@@ -1,6 +1,8 @@
 #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),
@@ -10,4 +12,10 @@ enum _bootloader_status {
     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 74f1c35..218ab4d 100644
--- a/right/src/buspal/packet/serial_packet.c
+++ b/right/src/buspal/packet/serial_packet.c
@@ -1,4 +1,3 @@
-#include "bootloader/bl_context.h"
 #include "bootloader/bootloader.h"
 #include "crc16.h"