diff --git a/firmware/controllers/core/common_headers.h b/firmware/controllers/core/common_headers.h
index 46afd2af92..eb657892e9 100644
--- a/firmware/controllers/core/common_headers.h
+++ b/firmware/controllers/core/common_headers.h
@@ -30,6 +30,7 @@
 #ifdef __cplusplus
 #include "datalogging.h"
 #include "loggingcentral.h"
+#include "cli_registry.h"
 #endif /* __cplusplus */
 
 /**
diff --git a/firmware/global.h b/firmware/global.h
index c34f61684c..1e7e18d260 100644
--- a/firmware/global.h
+++ b/firmware/global.h
@@ -37,8 +37,6 @@ typedef unsigned int time_t;
 #endif
 
 #ifdef __cplusplus
-#include "cli_registry.h"
-
 #include "eficonsole.h"
 #endif /* __cplusplus */