diff --git a/include/microkernel/k_chstr.h b/include/microkernel/k_chstr.h
index 2c839208d06..bd63d0e1f3d 100644
--- a/include/microkernel/k_chstr.h
+++ b/include/microkernel/k_chstr.h
@@ -86,69 +86,6 @@ struct chbuff {
 	unsigned char *pEndOrig;
 };
 
-/* exported functions */
-
-void BuffInit(unsigned char *pBuffer, int *piBuffSize, struct chbuff *pChBuff);
-
-void BuffReset(struct chbuff *pBuff);
-
-void BuffGetFreeSpaceTotal(struct chbuff *pBuff, int *piTotalFreeSpace);
-
-void BuffGetFreeSpace(struct chbuff *pBuff,
-		      int *piTotalFreeSpace,
-		      int *piFreeSpaceCont,
-		      int *piFreeSpaceAWA);
-
-void BuffGetAvailDataTotal(struct chbuff *pBuff, int *piAvailDataTotal);
-
-void BuffGetAvailData(struct chbuff *pBuff,
-		      int *piAvailDataTotal,
-		      int *piAvailDataCont,
-		      int *piAvailDataAWA);
-
-int BuffEnQ(struct chbuff *pBuff, int iSize, unsigned char **ppWrite);
-
-int BuffEnQA(struct chbuff *pBuff,
-	     int iSize,
-	     unsigned char **ppWrite,
-	     int *piTransferID);
-
-void BuffEnQA_End(struct chbuff *pBuff, int iTransferID, int iSize /* optional */);
-
-int BuffDeQ(struct chbuff *pBuff, int iSize, unsigned char **ppRead);
-
-int BuffDeQA(struct chbuff *pBuff,
-	     int iSize,
-	     unsigned char **ppRead,
-	     int *piTransferID);
-
-void BuffDeQA_End(struct chbuff *pBuff, int iTransferID, int iSize /* optional */);
-
-/* internal functions */
-
-void WriteMarkersClear(struct chbuff *pBuff);
-void ReadMarkersClear(struct chbuff *pBuff);
-int AsyncEnQRegstr(struct chbuff *pBuff, int iSize);
-int AsyncDeQRegstr(struct chbuff *pBuff, int iSize);
-void AsyncEnQFinished(struct chbuff *pBuff, int iTransferID);
-void AsyncDeQFinished(struct chbuff *pBuff, int iTransferID);
-
-int CalcAvailData(struct chbuff *pBuff, int *piDataAvailCont, int *piDataAvailAWA);
-
-int CalcFreeSpace(struct chbuff *pBuff, int *piFreeSpaceCont, int *piFreeSpaceAWA);
-
-void WriteMarkersClear(struct chbuff *pBuff);
-void ReadMarkersClear(struct chbuff *pBuff);
-int ScanMarkers(struct marker_list *pMarkerList,
-		int *iSizeBWA,
-		int *pisizeAWA,
-		int *piNbrPendingXfers);
-
-int BuffFull(struct chbuff *pBuff);
-int BuffEmpty(struct chbuff *pBuff);
-
-void ChannelCheck4Intrusion(struct chbuff *pChBuff, unsigned char *pBegin, int iSize);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/kernel/microkernel/channel/InitChan.c b/kernel/microkernel/channel/InitChan.c
index 25f0ff6a6be..e7c15665cb5 100644
--- a/kernel/microkernel/channel/InitChan.c
+++ b/kernel/microkernel/channel/InitChan.c
@@ -34,6 +34,7 @@
 #include <kmemcpy.h>
 #include <minik.h>
 #include <kticks.h>
+#include <ch_buff.h>
 
 /****************************************************************************/
 
diff --git a/kernel/microkernel/channel/K_ChProc.c b/kernel/microkernel/channel/K_ChProc.c
index 00d9cdf1c83..e6aaf0e297a 100644
--- a/kernel/microkernel/channel/K_ChProc.c
+++ b/kernel/microkernel/channel/K_ChProc.c
@@ -38,6 +38,7 @@
 #include <toolchain.h>
 #include <sections.h>
 #include <misc/__assert.h>
+#include <ch_buff.h>
 
 /*
 * - artefacts: ???
diff --git a/kernel/microkernel/channel/K_Ch_Mvd.c b/kernel/microkernel/channel/K_Ch_Mvd.c
index 27e7765f66b..5603eed7fa9 100644
--- a/kernel/microkernel/channel/K_Ch_Mvd.c
+++ b/kernel/microkernel/channel/K_Ch_Mvd.c
@@ -40,6 +40,7 @@
 #include <toolchain.h>
 #include <sections.h>
 #include <misc/__assert.h>
+#include <ch_buff.h>
 
 /*******************************************************************************
 *
diff --git a/kernel/microkernel/channel/K_Ch_RO.c b/kernel/microkernel/channel/K_Ch_RO.c
index a7098a3dcfa..62106879b39 100644
--- a/kernel/microkernel/channel/K_Ch_RO.c
+++ b/kernel/microkernel/channel/K_Ch_RO.c
@@ -40,6 +40,7 @@
 #include <toolchain.h>
 #include <sections.h>
 #include <misc/__assert.h>
+#include <ch_buff.h>
 
 /*******************************************************************************
 *
diff --git a/kernel/microkernel/channel/K_Ch_WO.c b/kernel/microkernel/channel/K_Ch_WO.c
index 2316ebf637a..6e0a52768e2 100644
--- a/kernel/microkernel/channel/K_Ch_WO.c
+++ b/kernel/microkernel/channel/K_Ch_WO.c
@@ -40,6 +40,7 @@
 #include <toolchain.h>
 #include <sections.h>
 #include <misc/__assert.h>
+#include <ch_buff.h>
 
 /*******************************************************************************
 *