diff --git a/drivers/atmodem/gprs-context.c b/drivers/atmodem/gprs-context.c
index abc68a47..a7923f23 100644
--- a/drivers/atmodem/gprs-context.c
+++ b/drivers/atmodem/gprs-context.c
@@ -44,7 +44,7 @@ static const char *none_prefix[] = { NULL };
 
 struct gprs_context_data {
 	GAtChat *chat;
-	unsigned active_context;
+	unsigned int active_context;
 };
 
 static void at_cgact_down_cb(gboolean ok, GAtResult *result, gpointer user_data)
diff --git a/drivers/hsomodem/gprs-context.c b/drivers/hsomodem/gprs-context.c
index df66ec90..b433bf1c 100644
--- a/drivers/hsomodem/gprs-context.c
+++ b/drivers/hsomodem/gprs-context.c
@@ -55,7 +55,7 @@ enum hso_state {
 
 struct gprs_context_data {
 	GAtChat *chat;
-	unsigned active_context;			/* Currently active */
+	unsigned int active_context;			/* Currently active */
 	enum hso_state hso_state;			/* Are we in req ? */
 	union {
 		ofono_gprs_context_cb_t down_cb;	/* Down callback */
diff --git a/drivers/mbmmodem/gprs-context.c b/drivers/mbmmodem/gprs-context.c
index a6d2aea0..778d3bf6 100644
--- a/drivers/mbmmodem/gprs-context.c
+++ b/drivers/mbmmodem/gprs-context.c
@@ -47,7 +47,7 @@ static const char *none_prefix[] = { NULL };
 
 struct gprs_context_data {
 	GAtChat *chat;
-	unsigned active_context;
+	unsigned int active_context;
 };
 
 static void at_enap_down_cb(gboolean ok, GAtResult *result, gpointer user_data)
diff --git a/include/gprs-context.h b/include/gprs-context.h
index ba026e5e..2f547da1 100644
--- a/include/gprs-context.h
+++ b/include/gprs-context.h
@@ -62,7 +62,8 @@ struct ofono_gprs_context_driver {
 					ofono_gprs_context_cb_t cb, void *data);
 };
 
-void ofono_gprs_context_deactivated(struct ofono_gprs_context *gc, unsigned id);
+void ofono_gprs_context_deactivated(struct ofono_gprs_context *gc,
+					unsigned int id);
 
 int ofono_gprs_context_driver_register(const struct ofono_gprs_context_driver *d);
 void ofono_gprs_context_driver_unregister(const struct ofono_gprs_context_driver *d);
diff --git a/include/types.h b/include/types.h
index 79e6d4cd..9ad31b9b 100644
--- a/include/types.h
+++ b/include/types.h
@@ -83,7 +83,7 @@ struct ofono_phone_number {
 };
 
 struct ofono_call {
-	unsigned id;
+	unsigned int id;
 	int type;
 	int direction;
 	int status;
diff --git a/src/gprs.c b/src/gprs.c
index 5f2959f5..293c318b 100644
--- a/src/gprs.c
+++ b/src/gprs.c
@@ -1389,7 +1389,8 @@ void ofono_gprs_add_context(struct ofono_gprs *gprs,
 	__ofono_atom_register(gc->atom, gprs_context_unregister);
 }
 
-void ofono_gprs_context_deactivated(struct ofono_gprs_context *gc, unsigned cid)
+void ofono_gprs_context_deactivated(struct ofono_gprs_context *gc,
+					unsigned int cid)
 {
 	DBusConnection *conn = ofono_dbus_get_connection();
 	GSList *l;