diff --git a/openbsc/src/sccp/sccp.c b/openbsc/src/sccp/sccp.c
index f85257d..5671700 100644
--- a/openbsc/src/sccp/sccp.c
+++ b/openbsc/src/sccp/sccp.c
@@ -168,8 +168,8 @@
 static int _sccp_parse_optional_data(const int offset,
 				     struct msgb *msgb, struct sccp_optional_data *data)
 {
-	u_int16_t room = msgb_l2len(msgb) - offset;
-	u_int16_t read = 0;
+	uint16_t room = msgb_l2len(msgb) - offset;
+	uint16_t read = 0;
 
 	while (room > read) {
 		uint8_t type = msgb->l2h[offset + read];
diff --git a/openbsc/tests/sccp/sccp_test.c b/openbsc/tests/sccp/sccp_test.c
index 2594b82..3b9ef4e 100644
--- a/openbsc/tests/sccp/sccp_test.c
+++ b/openbsc/tests/sccp/sccp_test.c
@@ -335,7 +335,7 @@
  */
 int sccp_read_cb(struct msgb *data, unsigned len, void *context)
 {
-	u_int16_t payload_length = test_data[current_test].payload_length;
+	uint16_t payload_length = test_data[current_test].payload_length;
 	const uint8_t *got, *wanted;
 	int i;