diff --git a/include/osmocom/abis/e1_input.h b/include/osmocom/abis/e1_input.h
index 4362f50..a38bab8 100644
--- a/include/osmocom/abis/e1_input.h
+++ b/include/osmocom/abis/e1_input.h
@@ -273,7 +273,7 @@
 /* configure and initialize one timeslot dedicated to TRAU frames. */
 int e1inp_ts_config_trau(struct e1inp_ts *ts, struct e1inp_line *line,
                          int (*trau_rcv_cb)(struct subch_demux *dmx, int ch,
-					uint8_t *data, int len, void *_priv));
+					    const ubit_t *data, int len, void *_priv));
 
 /* configure and initialize one timeslot dedicated to RAW frames */
 int e1inp_ts_config_raw(struct e1inp_ts *ts, struct e1inp_line *line,
diff --git a/include/osmocom/abis/subchan_demux.h b/include/osmocom/abis/subchan_demux.h
index 4e2f464..3978d73 100644
--- a/include/osmocom/abis/subchan_demux.h
+++ b/include/osmocom/abis/subchan_demux.h
@@ -22,6 +22,7 @@
 
 #include <stdint.h>
 #include <osmocom/core/linuxlist.h>
+#include <osmocom/core/bits.h>
 
 /*! \defgroup subchan_demux
  *  \brief E1 sub-channel multiplexer/demultiplexer
@@ -44,7 +45,7 @@
 /*! \brief one subchannel inside the demultplexer */
 struct demux_subch {
 	/*! \brief bit-buffer for output bits */
-	uint8_t out_bitbuf[TRAU_FRAME_BITS];
+	ubit_t out_bitbuf[TRAU_FRAME_BITS];
 	/*! \brief next bit to be written in out_bitbuf */
 	uint16_t out_idx;
 	/*! \brief number of consecutive zeros that we have received (for sync) */
@@ -61,7 +62,7 @@
 	struct demux_subch subch[NR_SUBCH];
 	/*! \brief callback to be called once we have received a
 	 *  complete frame on a given subchannel */
-	int (*out_cb)(struct subch_demux *dmx, int ch, uint8_t *data, int len,
+	int (*out_cb)(struct subch_demux *dmx, int ch, const ubit_t *data, int len,
 		      void *);
 	/*! \brief user-provided data, transparently passed to out_cb() */
 	void *data;
diff --git a/src/e1_input.c b/src/e1_input.c
index 379cc53..b3341e7 100644
--- a/src/e1_input.c
+++ b/src/e1_input.c
@@ -297,7 +297,7 @@
 /* Timeslot */
 int e1inp_ts_config_trau(struct e1inp_ts *ts, struct e1inp_line *line,
 			 int (*trau_rcv_cb)(struct subch_demux *dmx, int ch,
-					uint8_t *data, int len, void *_priv))
+					const ubit_t *data, int len, void *_priv))
 {
 	if (ts->type == E1INP_TS_TYPE_TRAU && ts->line && line)
 		return 0;
diff --git a/src/subchan_demux.c b/src/subchan_demux.c
index d15c4b8..9275fda 100644
--- a/src/subchan_demux.c
+++ b/src/subchan_demux.c
@@ -40,7 +40,7 @@
 
 void *tall_tqe_ctx;
 
-static inline void append_bit(struct demux_subch *sch, uint8_t bit)
+static inline void append_bit(struct demux_subch *sch, ubit_t bit)
 {
 	sch->out_bitbuf[sch->out_idx++] = bit;
 }
diff --git a/src/trau_frame.c b/src/trau_frame.c
index 717bc32..eaced3d 100644
--- a/src/trau_frame.c
+++ b/src/trau_frame.c
@@ -37,7 +37,7 @@
  *  \file trau_frame.c
  */
 
-static uint32_t get_bits(const uint8_t *bitbuf, int offset, int num)
+static uint32_t get_bits(const ubit_t *bitbuf, int offset, int num)
 {
 	int i;
 	uint32_t ret = 0;