diff --git a/lib/APPConvoyLeader/App.cpp b/lib/APPConvoyLeader/App.cpp
index f0c51971..056f76ae 100644
--- a/lib/APPConvoyLeader/App.cpp
+++ b/lib/APPConvoyLeader/App.cpp
@@ -39,7 +39,6 @@
 #include <DifferentialDrive.h>
 #include <Odometry.h>
 #include <Util.h>
-#include <SerialMuxChannels.h>
 
 /******************************************************************************
  * Compiler Switches
diff --git a/lib/APPConvoyLeader/App.h b/lib/APPConvoyLeader/App.h
index a090358d..9b4442d7 100644
--- a/lib/APPConvoyLeader/App.h
+++ b/lib/APPConvoyLeader/App.h
@@ -46,6 +46,7 @@
 #include <StateMachine.h>
 #include <SimpleTimer.h>
 #include <SerialMuxProtServer.hpp>
+#include "SerialMuxChannels.h"
 #include <Arduino.h>
 
 /******************************************************************************
@@ -118,10 +119,9 @@ class App
     /**
      * SerialMuxProt Server Instance
      *
-     * @tparam tMaxChannels set to 10, as App does not require
-     * more channels for external communication.
+     * @tparam tMaxChannels set to MAX_CHANNELS, defined in SerialMuxChannels.h.
      */
-    SerialMuxProtServer<10U> m_smpServer;
+    SerialMuxProtServer<MAX_CHANNELS> m_smpServer;
 
     /**
      * Report the current position and heading of the robot using the Odometry data.
diff --git a/lib/APPConvoyLeader/SerialMuxChannels.h b/lib/APPConvoyLeader/SerialMuxChannels.h
index c93eb0fe..3d8053d0 100644
--- a/lib/APPConvoyLeader/SerialMuxChannels.h
+++ b/lib/APPConvoyLeader/SerialMuxChannels.h
@@ -42,6 +42,9 @@
  * Macros
  *****************************************************************************/
 
+/** Maximum number of SerialMuxProt Channels. */
+#define MAX_CHANNELS (10U)
+
 /** Name of Channel to send Odometry Data to. */
 #define ODOMETRY_CHANNEL_NAME "ODOMETRY"
 
diff --git a/lib/APPRemoteControl/App.cpp b/lib/APPRemoteControl/App.cpp
index 33cd3c89..ae896655 100644
--- a/lib/APPRemoteControl/App.cpp
+++ b/lib/APPRemoteControl/App.cpp
@@ -41,7 +41,6 @@
 #include <Odometry.h>
 #include <Board.h>
 #include <Util.h>
-#include "SerialMuxChannels.h"
 
 /******************************************************************************
  * Compiler Switches
diff --git a/lib/APPRemoteControl/App.h b/lib/APPRemoteControl/App.h
index f856c3ac..cf8acd9b 100644
--- a/lib/APPRemoteControl/App.h
+++ b/lib/APPRemoteControl/App.h
@@ -46,7 +46,7 @@
 #include <StateMachine.h>
 #include <SimpleTimer.h>
 #include <SerialMuxProtServer.hpp>
-
+#include "SerialMuxChannels.h"
 #include "RemoteCtrlState.h"
 
 /******************************************************************************
@@ -111,10 +111,9 @@ class App
     /**
      * SerialMuxProt Server Instance
      *
-     * @tparam tMaxChannels set to 10, as App does not require
-     * more channels for external communication.
+     * @tparam tMaxChannels set to MAX_CHANNELS, defined in SerialMuxChannels.h.
      */
-    SerialMuxProtServer<10U> m_smpServer;
+    SerialMuxProtServer<MAX_CHANNELS> m_smpServer;
 
     /** Channel id sending remote control command responses. */
     uint8_t m_smpChannelIdRemoteCtrlRsp;
diff --git a/lib/APPRemoteControl/SerialMuxChannels.h b/lib/APPRemoteControl/SerialMuxChannels.h
index 47ddab37..d37cccf2 100644
--- a/lib/APPRemoteControl/SerialMuxChannels.h
+++ b/lib/APPRemoteControl/SerialMuxChannels.h
@@ -42,6 +42,9 @@
  * Macros
  *****************************************************************************/
 
+/** Maximum number of SerialMuxProt Channels. */
+#define MAX_CHANNELS (10U)
+
 /** Name of Channel to send Commands to. */
 #define COMMAND_CHANNEL_NAME "CMD"