diff --git a/bsp_q7s/boardtest/Q7STestTask.h b/bsp_q7s/boardtest/Q7STestTask.h
index ee26118c..b7aa791e 100644
--- a/bsp_q7s/boardtest/Q7STestTask.h
+++ b/bsp_q7s/boardtest/Q7STestTask.h
@@ -3,6 +3,8 @@
 
 #include "test/testtasks/TestTask.h"
 
+class CoreController;
+
 class Q7STestTask : public TestTask {
  public:
   Q7STestTask(object_id_t objectId);
diff --git a/mission/tmtc/VirtualChannel.h b/mission/tmtc/VirtualChannel.h
index c6d999ef..62953dcb 100644
--- a/mission/tmtc/VirtualChannel.h
+++ b/mission/tmtc/VirtualChannel.h
@@ -1,12 +1,16 @@
 #ifndef VIRTUALCHANNEL_H_
 #define VIRTUALCHANNEL_H_
 
-#include <fsfw/ipc/MessageQueueIF.h>
-#include <linux/obc/PtmeIF.h>
 
 #include "OBSWConfig.h"
+
+#include "linux/obc/PtmeIF.h"
+
 #include "fsfw/returnvalues/HasReturnvaluesIF.h"
 #include "fsfw/tmtcservices/AcceptsTelemetryIF.h"
+#include "fsfw/ipc/MessageQueueIF.h"
+
+class StorageManagerIF;
 
 /**
  * @brief   This class represents a virtual channel. Sending a tm message to an object of this class