diff --git a/firmware/console/binary/serial_can.cpp b/firmware/console/binary/serial_can.cpp
index 3f2360d927..89b09aa6f4 100644
--- a/firmware/console/binary/serial_can.cpp
+++ b/firmware/console/binary/serial_can.cpp
@@ -14,21 +14,21 @@
 #include "os_access.h"
 #include "crc.h"
 
-#if HAL_USE_CAN
+// todo: this file is asking to improve conditional compilation. unit_tests and cypress/kinetis are both special cases
+#if HAL_USE_CAN || EFI_UNIT_TEST
 #include "serial_can.h"
 #include "can.h"
 #include "can_msg_tx.h"
+#endif // HAL_USE_CAN || EFI_UNIT_TEST
 
 
- CanStreamer streamer;
+#if HAL_USE_CAN
+static CanStreamer streamer;
 static CanStreamerState state(&streamer);
 static CanTsListener listener;
 #endif // HAL_USE_CAN
 
 #if HAL_USE_CAN || EFI_UNIT_TEST
-#include "serial_can.h"
-#include "can.h"
-#include "can_msg_tx.h"
 
 int CanStreamerState::sendFrame(const IsoTpFrameHeader & header, const uint8_t *data, int num, can_sysinterval_t timeout) {
 	int dlc = 8; // standard 8 bytes