diff --git a/firmware/config/chconf_common.h b/firmware/config/chconf_common.h
index baf4858bae..69bac56ebf 100644
--- a/firmware/config/chconf_common.h
+++ b/firmware/config/chconf_common.h
@@ -8,6 +8,19 @@
 #ifndef CONFIG_CHCONF_COMMON_H_
 #define CONFIG_CHCONF_COMMON_H_
 
+#define PORT_IDLE_THREAD_STACK_SIZE     32
+
+// See global_shared.h notes about stack requirements
+// see also http://www.chibios.org/dokuwiki/doku.php?id=chibios:kb:stacks
+#define PORT_INT_REQUIRED_STACK 	128
+
+#define CHPRINTF_USE_FLOAT          	TRUE
+
+#if !defined(ENABLE_PERF_TRACE) || defined(__DOXYGEN__)
+// looks like this value could not be defined in efifeatures.h - please define either externally or just change the value here
+ #define ENABLE_PERF_TRACE TRUE
+#endif /* ENABLE_PERF_TRACE */
+
 #if !defined(_FROM_ASM_)
 #include "obd_error_codes.h"
 #endif /* _FROM_ASM_ */
diff --git a/firmware/config/stm32f4ems/chconf.h b/firmware/config/stm32f4ems/chconf.h
index 98c4071b38..187167d7e2 100644
--- a/firmware/config/stm32f4ems/chconf.h
+++ b/firmware/config/stm32f4ems/chconf.h
@@ -41,18 +41,6 @@
  *
  */
 
-#define PORT_IDLE_THREAD_STACK_SIZE     32
-
-// See global_shared.h notes about stack requirements
-// see also http://www.chibios.org/dokuwiki/doku.php?id=chibios:kb:stacks
-#define PORT_INT_REQUIRED_STACK 	128
-
-#define CHPRINTF_USE_FLOAT          	TRUE
-
-#if !defined(ENABLE_PERF_TRACE) || defined(__DOXYGEN__)
-// looks like this value could not be defined in efifeatures.h - please define either externally or just change the value here
- #define ENABLE_PERF_TRACE TRUE
-#endif /* ENABLE_PERF_TRACE */
 
 #include "chconf_common.h"
 
diff --git a/firmware/config/stm32f7ems/chconf.h b/firmware/config/stm32f7ems/chconf.h
index 0b667297a8..be895edc55 100644
--- a/firmware/config/stm32f7ems/chconf.h
+++ b/firmware/config/stm32f7ems/chconf.h
@@ -41,18 +41,6 @@
  *
  */
 
-#define PORT_IDLE_THREAD_STACK_SIZE     32
-
-// See global_shared.h notes about stack requirements
-// see also http://www.chibios.org/dokuwiki/doku.php?id=chibios:kb:stacks
-#define PORT_INT_REQUIRED_STACK 	128
-
-#define CHPRINTF_USE_FLOAT          	TRUE
-
-#if !defined(ENABLE_PERF_TRACE) || defined(__DOXYGEN__)
-// looks like this value could not be defined in efifeatures.h - please define either externally or just change the value here
- #define ENABLE_PERF_TRACE TRUE
-#endif /* ENABLE_PERF_TRACE */
 
 #include "chconf_common.h"