diff --git a/openbsc/include/openbsc/gsm_data.h b/openbsc/include/openbsc/gsm_data.h
index 94a70818a..c3ea45dce 100644
--- a/openbsc/include/openbsc/gsm_data.h
+++ b/openbsc/include/openbsc/gsm_data.h
@@ -416,7 +416,7 @@ struct gsm_network {
 #define SMS_HDR_SIZE	128
 #define SMS_TEXT_SIZE	256
 struct gsm_sms {
-	u_int64_t id;
+	unsigned long long id;
 	struct gsm_subscriber *sender;
 	struct gsm_subscriber *receiver;
 
diff --git a/openbsc/src/db.c b/openbsc/src/db.c
index b86348c55..369505a2c 100644
--- a/openbsc/src/db.c
+++ b/openbsc/src/db.c
@@ -592,7 +592,7 @@ int db_subscriber_alloc_token(struct gsm_subscriber* subscriber, u_int32_t* toke
 }
 
 int db_subscriber_assoc_imei(struct gsm_subscriber* subscriber, char imei[GSM_IMEI_LENGTH]) {
-	u_int64_t equipment_id, watch_id;
+	unsigned long long equipment_id, watch_id;
 	dbi_result result;
 
 	strncpy(subscriber->equipment.imei, imei,