diff --git a/include/osmocore/protocol/gsm_08_08.h b/include/osmocore/protocol/gsm_08_08.h
index 9c29ba9..6b8f935 100644
--- a/include/osmocore/protocol/gsm_08_08.h
+++ b/include/osmocore/protocol/gsm_08_08.h
@@ -30,14 +30,14 @@
 };
 
 struct bssmap_header {
-	u_int8_t type;
-	u_int8_t length;
+	uint8_t type;
+	uint8_t length;
 } __attribute__((packed));
 
 struct dtap_header {
-	u_int8_t type;
-	u_int8_t link_id;
-	u_int8_t length;
+	uint8_t type;
+	uint8_t link_id;
+	uint8_t length;
 } __attribute__((packed));
 
 
diff --git a/src/gsm0808.c b/src/gsm0808.c
index 9f6f005..7a7eb3a 100644
--- a/src/gsm0808.c
+++ b/src/gsm0808.c
@@ -150,7 +150,7 @@
 	return msg;
 }
 
-struct msgb *gsm0808_create_classmark_update(const uint8_t *classmark_data, u_int8_t length)
+struct msgb *gsm0808_create_classmark_update(const uint8_t *classmark_data, uint8_t length)
 {
 	struct msgb *msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM,
 					       "classmark-update");
@@ -191,7 +191,7 @@
 						 uint8_t chosen_channel, uint8_t encr_alg_id,
 						 uint8_t speech_mode)
 {
-	u_int8_t *data;
+	uint8_t *data;
 
 	struct msgb *msg = msgb_alloc(35, "bssmap: ass compl");
 	if (!msg)