diff --git a/epicardium/cdcacm.c b/epicardium/cdcacm.c
index 04c16bd8361a75df14dc4baf68d488bca0564299..1cbbb154452a9ac96b9300bdded5071353121260 100644
--- a/epicardium/cdcacm.c
+++ b/epicardium/cdcacm.c
@@ -57,6 +57,7 @@
 #include "cdc_acm.h"
 #include "descriptors.h"
 
+#include "modules/modules.h"
 #include "modules/log.h"
 #include <errno.h>
 
@@ -358,7 +359,6 @@ static int usb_read_callback(void)
 #include "FreeRTOS.h"
 #include "task.h"
 
-extern TaskHandle_t serial_task_id;
 void USB_IRQHandler(void)
 {
 	usb_event_handler();
diff --git a/epicardium/modules/modules.h b/epicardium/modules/modules.h
index 484e951f5c9b9c1e98b181717d4bf8740e1767b5..a6e2dd90bbb7105165b5444393628cedac914769 100644
--- a/epicardium/modules/modules.h
+++ b/epicardium/modules/modules.h
@@ -25,6 +25,7 @@ void return_to_menu(void);
 #define SERIAL_READ_BUFFER_SIZE 128
 void vSerialTask(void *pvParameters);
 void serial_enqueue_char(char chr);
+extern TaskHandle_t serial_task_id;
 
 /* ---------- LED Animation / Personal States ------------------------------ */
 #define PERSONAL_STATE_LED 14
diff --git a/epicardium/support.c b/epicardium/support.c
index 90e14efae767c0a752639c2c757fd97b880cbded..e6925203767dc84ddc44e7c56c9e932f8464f4a1 100644
--- a/epicardium/support.c
+++ b/epicardium/support.c
@@ -6,12 +6,11 @@
 #include "task.h"
 
 #include "api/dispatcher.h"
+#include "modules/modules.h"
 #include "modules/log.h"
 
 #include "card10.h"
 
-extern TaskHandle_t dispatcher_task_id;
-
 /*
  * This hook is called before FreeRTOS enters tickless idle.
  */