diff --git a/radio/src/FreeRTOSConfig.h b/radio/src/FreeRTOSConfig.h
index d63a98ebc..55919c462 100644
--- a/radio/src/FreeRTOSConfig.h
+++ b/radio/src/FreeRTOSConfig.h
@@ -22,8 +22,14 @@
 #pragma once
 
 // Avoid using any other header file
+#if defined(__cplusplus)
+extern "C" {
+#endif
 #include <stdint.h>
 extern uint32_t SystemCoreClock;
+#if defined(__cplusplus)
+}
+#endif
 
 #define configUSE_PREEMPTION            1
 #define configUSE_IDLE_HOOK             0
diff --git a/radio/src/thirdparty/FreeRTOS b/radio/src/thirdparty/FreeRTOS
index dbf70559b..3a22924e0 160000
--- a/radio/src/thirdparty/FreeRTOS
+++ b/radio/src/thirdparty/FreeRTOS
@@ -1 +1 @@
-Subproject commit dbf70559b27d39c1fdb68dfb9a32140b6a6777a0
+Subproject commit 3a22924e0a9ddbbc8b0758881c33b3422a5cc20d