diff --git a/firmware/controllers/system/efi_gpio.cpp b/firmware/controllers/system/efi_gpio.cpp
index 01446a9d0d..218c3760de 100644
--- a/firmware/controllers/system/efi_gpio.cpp
+++ b/firmware/controllers/system/efi_gpio.cpp
@@ -22,6 +22,16 @@
 
 EXTERN_ENGINE;
 
+// C++ helpers go here
+namespace efi
+{
+template <class T, size_t N>
+constexpr size_t size(const T (&)[N])
+{
+    return N;
+}
+} // namespace efi
+
 #if EFI_ENGINE_SNIFFER
 #include "engine_sniffer.h"
 extern WaveChart waveChart;
diff --git a/firmware/util/efilib.h b/firmware/util/efilib.h
index 620117ed22..41fd325f68 100644
--- a/firmware/util/efilib.h
+++ b/firmware/util/efilib.h
@@ -75,15 +75,15 @@ float expf_taylor(float x);
 #ifdef __cplusplus
 }
 
-// C++ helpers go here
-namespace efi
-{
-template <class T, size_t N>
-constexpr size_t size(const T (&)[N])
-{
-    return N;
-}
-} // namespace efi
+//// C++ helpers go here
+//namespace efi
+//{
+//template <class T, size_t N>
+//constexpr size_t size(const T (&)[N])
+//{
+//    return N;
+//}
+//} // namespace efi
 
 #endif /* __cplusplus */