diff --git a/plugins/hfp_hf.c b/plugins/hfp_hf.c
index c11525e1..19a362f5 100644
--- a/plugins/hfp_hf.c
+++ b/plugins/hfp_hf.c
@@ -198,7 +198,7 @@ static DBusMessage *hfp_agent_release(DBusConnection *conn,
 	return dbus_message_new_method_return(msg);
 }
 
-static GDBusMethodTable agent_methods[] = {
+static const GDBusMethodTable agent_methods[] = {
 	{ "NewConnection", "hq", "", hfp_agent_new_connection,
 		G_DBUS_METHOD_FLAG_ASYNC },
 	{ "Release", "", "", hfp_agent_release },
diff --git a/plugins/push-notification.c b/plugins/push-notification.c
index 1c19bf22..1b8f7296 100644
--- a/plugins/push-notification.c
+++ b/plugins/push-notification.c
@@ -151,7 +151,7 @@ static DBusMessage *push_notification_unregister_agent(DBusConnection *conn,
 	return dbus_message_new_method_return(msg);
 }
 
-static GDBusMethodTable push_notification_methods[] = {
+static const GDBusMethodTable push_notification_methods[] = {
 	{ "RegisterAgent",    "o",   "",  push_notification_register_agent },
 	{ "UnregisterAgent",  "o",   "",  push_notification_unregister_agent },
 	{ }
diff --git a/plugins/smart-messaging.c b/plugins/smart-messaging.c
index d6d77cf0..6820b20e 100644
--- a/plugins/smart-messaging.c
+++ b/plugins/smart-messaging.c
@@ -268,7 +268,7 @@ static DBusMessage *smart_messaging_send_vcal(DBusConnection *conn,
 	return NULL;
 }
 
-static GDBusMethodTable smart_messaging_methods[] = {
+static const GDBusMethodTable smart_messaging_methods[] = {
 	{ "RegisterAgent",    "o",     "",  smart_messaging_register_agent },
 	{ "UnregisterAgent",  "o",     "",  smart_messaging_unregister_agent },
 	{ "SendBusinessCard", "say",   "o", smart_messaging_send_vcard,
diff --git a/src/audio-settings.c b/src/audio-settings.c
index 77930d94..6388c3e8 100644
--- a/src/audio-settings.c
+++ b/src/audio-settings.c
@@ -117,7 +117,7 @@ static DBusMessage *audio_get_properties(DBusConnection *conn,
 	return audio_get_properties_reply(msg, as);
 }
 
-static GDBusMethodTable audio_methods[] = {
+static const GDBusMethodTable audio_methods[] = {
 	{ "GetProperties", "", "a{sv}", audio_get_properties,
 						G_DBUS_METHOD_FLAG_ASYNC },
 	{ }
diff --git a/src/call-barring.c b/src/call-barring.c
index afb3fceb..952e4c2c 100644
--- a/src/call-barring.c
+++ b/src/call-barring.c
@@ -966,7 +966,7 @@ static DBusMessage *cb_set_passwd(DBusConnection *conn, DBusMessage *msg,
 	return NULL;
 }
 
-static GDBusMethodTable cb_methods[] = {
+static const GDBusMethodTable cb_methods[] = {
 	{ "GetProperties",	"",	"a{sv}",	cb_get_properties,
 							G_DBUS_METHOD_FLAG_ASYNC },
 	{ "SetProperty",	"svs",	"",		cb_set_property,
diff --git a/src/call-forwarding.c b/src/call-forwarding.c
index c0259423..c70d140f 100644
--- a/src/call-forwarding.c
+++ b/src/call-forwarding.c
@@ -881,7 +881,7 @@ static DBusMessage *cf_disable_all(DBusConnection *conn, DBusMessage *msg,
 	return NULL;
 }
 
-static GDBusMethodTable cf_methods[] = {
+static const GDBusMethodTable cf_methods[] = {
 	{ "GetProperties",	"",	"a{sv}",	cf_get_properties,
 						G_DBUS_METHOD_FLAG_ASYNC },
 	{ "SetProperty",	"sv",	"",		cf_set_property,
diff --git a/src/call-meter.c b/src/call-meter.c
index c3ae6f71..fd5edc24 100644
--- a/src/call-meter.c
+++ b/src/call-meter.c
@@ -646,7 +646,7 @@ static DBusMessage *cm_acm_reset(DBusConnection *conn, DBusMessage *msg,
 	return NULL;
 }
 
-static GDBusMethodTable cm_methods[] = {
+static const GDBusMethodTable cm_methods[] = {
 	{ "GetProperties",	"",	"a{sv}",	cm_get_properties,
 							G_DBUS_METHOD_FLAG_ASYNC },
 	{ "SetProperty",	"svs",	"",		cm_set_property,
diff --git a/src/call-settings.c b/src/call-settings.c
index 94e606cd..9d4ff7b1 100644
--- a/src/call-settings.c
+++ b/src/call-settings.c
@@ -1330,7 +1330,7 @@ static DBusMessage *cs_set_property(DBusConnection *conn, DBusMessage *msg,
 	return __ofono_error_invalid_args(msg);
 }
 
-static GDBusMethodTable cs_methods[] = {
+static const GDBusMethodTable cs_methods[] = {
 	{ "GetProperties",	"",	"a{sv}",	cs_get_properties,
 							G_DBUS_METHOD_FLAG_ASYNC },
 	{ "SetProperty",	"sv",	"",		cs_set_property,
diff --git a/src/call-volume.c b/src/call-volume.c
index a1c0392b..81b75646 100644
--- a/src/call-volume.c
+++ b/src/call-volume.c
@@ -301,7 +301,7 @@ static DBusMessage *cv_set_property(DBusConnection *conn, DBusMessage *msg,
 	return __ofono_error_invalid_args(msg);
 }
 
-static GDBusMethodTable cv_methods[] = {
+static const GDBusMethodTable cv_methods[] = {
 	{ "GetProperties",	"",	"a{sv}",	cv_get_properties },
 	{ "SetProperty",	"sv",	"",		cv_set_property,
 							G_DBUS_METHOD_FLAG_ASYNC },
diff --git a/src/cbs.c b/src/cbs.c
index d898823f..1c20cc67 100644
--- a/src/cbs.c
+++ b/src/cbs.c
@@ -540,7 +540,7 @@ static DBusMessage *cbs_set_property(DBusConnection *conn, DBusMessage *msg,
 	return __ofono_error_invalid_args(msg);
 }
 
-static GDBusMethodTable cbs_methods[] = {
+static const GDBusMethodTable cbs_methods[] = {
 	{ "GetProperties",	"",	"a{sv}",	cbs_get_properties },
 	{ "SetProperty",	"sv",	"",		cbs_set_property,
 							G_DBUS_METHOD_FLAG_ASYNC },
diff --git a/src/cdma-connman.c b/src/cdma-connman.c
index 0c8b0614..90652e79 100644
--- a/src/cdma-connman.c
+++ b/src/cdma-connman.c
@@ -517,7 +517,7 @@ static DBusMessage *cdma_connman_set_property(DBusConnection *conn,
 	return __ofono_error_invalid_args(msg);
 }
 
-static GDBusMethodTable cdma_connman_methods[] = {
+static const GDBusMethodTable cdma_connman_methods[] = {
 	{ "GetProperties",	"",	"a{sv}",
 						cdma_connman_get_properties },
 	{ "SetProperty",	"sv",	"",	cdma_connman_set_property,
diff --git a/src/cdma-netreg.c b/src/cdma-netreg.c
index 1a88d331..e6074a83 100644
--- a/src/cdma-netreg.c
+++ b/src/cdma-netreg.c
@@ -107,7 +107,7 @@ static DBusMessage *network_get_properties(DBusConnection *conn,
 	return reply;
 }
 
-static GDBusMethodTable cdma_netreg_manager_methods[] = {
+static const GDBusMethodTable cdma_netreg_manager_methods[] = {
 	{ "GetProperties",  "",  "a{sv}",	network_get_properties },
 	{ }
 };
diff --git a/src/cdma-sms.c b/src/cdma-sms.c
index 12ea57e0..a3681240 100644
--- a/src/cdma-sms.c
+++ b/src/cdma-sms.c
@@ -43,7 +43,7 @@ struct ofono_cdma_sms {
 	struct ofono_atom *atom;
 };
 
-static GDBusMethodTable cdma_sms_manager_methods[] = {
+static const GDBusMethodTable cdma_sms_manager_methods[] = {
 	/* TODO */
 	{ }
 };
diff --git a/src/cdma-voicecall.c b/src/cdma-voicecall.c
index f7e3b670..3d0c55ea 100644
--- a/src/cdma-voicecall.c
+++ b/src/cdma-voicecall.c
@@ -405,7 +405,7 @@ static DBusMessage *voicecall_manager_tone(DBusConnection *conn,
 	return NULL;
 }
 
-static GDBusMethodTable manager_methods[] = {
+static const GDBusMethodTable manager_methods[] = {
 	{ "GetProperties",    "",    "a{sv}",
 					voicecall_manager_get_properties },
 	{ "Dial",             "s",  "o",        voicecall_manager_dial,
diff --git a/src/ctm.c b/src/ctm.c
index 9cece8af..2ff1cca3 100644
--- a/src/ctm.c
+++ b/src/ctm.c
@@ -202,7 +202,7 @@ static DBusMessage *ctm_set_property(DBusConnection *conn, DBusMessage *msg,
 	return __ofono_error_invalid_args(msg);
 }
 
-static GDBusMethodTable ctm_methods[] = {
+static const GDBusMethodTable ctm_methods[] = {
 	{ "GetProperties",  "",    "a{sv}",  ctm_get_properties,
 						G_DBUS_METHOD_FLAG_ASYNC },
 	{ "SetProperty",    "sv",  "",       ctm_set_property,
diff --git a/src/gnss.c b/src/gnss.c
index f4c33113..f622ed19 100644
--- a/src/gnss.c
+++ b/src/gnss.c
@@ -232,7 +232,7 @@ static DBusMessage *gnss_send_element(DBusConnection *conn,
 	return NULL;
 }
 
-static GDBusMethodTable gnss_methods[] = {
+static const GDBusMethodTable gnss_methods[] = {
 	{ "SendPositioningElement",		"s",	"",
 			gnss_send_element, G_DBUS_METHOD_FLAG_ASYNC },
 	{ "RegisterPositioningRequestAgent",	"o",	"",
diff --git a/src/gprs.c b/src/gprs.c
index 0d255061..887422a9 100644
--- a/src/gprs.c
+++ b/src/gprs.c
@@ -1282,7 +1282,7 @@ static DBusMessage *pri_set_property(DBusConnection *conn,
 	return __ofono_error_invalid_args(msg);
 }
 
-static GDBusMethodTable context_methods[] = {
+static const GDBusMethodTable context_methods[] = {
 	{ "GetProperties",	"",	"a{sv}",	pri_get_properties },
 	{ "SetProperty",	"sv",	"",		pri_set_property,
 						G_DBUS_METHOD_FLAG_ASYNC },
@@ -2062,7 +2062,7 @@ static DBusMessage *gprs_get_contexts(DBusConnection *conn,
 	return reply;
 }
 
-static GDBusMethodTable manager_methods[] = {
+static const GDBusMethodTable manager_methods[] = {
 	{ "GetProperties",     "",     "a{sv}",     gprs_get_properties },
 	{ "SetProperty",       "sv",   "",          gprs_set_property },
 	{ "AddContext",        "s",    "o",         gprs_add_context,
diff --git a/src/handsfree.c b/src/handsfree.c
index 66daaf14..2566dd8d 100644
--- a/src/handsfree.c
+++ b/src/handsfree.c
@@ -270,7 +270,7 @@ static DBusMessage *handsfree_request_phone_number(DBusConnection *conn,
 	return NULL;
 }
 
-static GDBusMethodTable handsfree_methods[] = {
+static const GDBusMethodTable handsfree_methods[] = {
 	{ "GetProperties",    "",    "a{sv}", handsfree_get_properties },
 	{ "SetProperty",      "sv",  "", handsfree_set_property,
 		G_DBUS_METHOD_FLAG_ASYNC },
diff --git a/src/location-reporting.c b/src/location-reporting.c
index 40aae66b..d2798148 100644
--- a/src/location-reporting.c
+++ b/src/location-reporting.c
@@ -239,7 +239,7 @@ static DBusMessage *location_reporting_release(DBusConnection *conn,
 	return NULL;
 }
 
-static GDBusMethodTable location_reporting_methods[] = {
+static const GDBusMethodTable location_reporting_methods[] = {
 	{ "GetProperties",  "",    "a{sv}", location_reporting_get_properties },
 	{ "Request",        "",    "h",     location_reporting_request,
 						G_DBUS_METHOD_FLAG_ASYNC },
diff --git a/src/manager.c b/src/manager.c
index 9614527c..783ea768 100644
--- a/src/manager.c
+++ b/src/manager.c
@@ -80,7 +80,7 @@ static DBusMessage *manager_get_modems(DBusConnection *conn,
 	return reply;
 }
 
-static GDBusMethodTable manager_methods[] = {
+static const GDBusMethodTable manager_methods[] = {
 	{ "GetModems",          "",    "a(oa{sv})",  manager_get_modems },
 	{ }
 };
diff --git a/src/message-waiting.c b/src/message-waiting.c
index 328e193c..7bd25766 100644
--- a/src/message-waiting.c
+++ b/src/message-waiting.c
@@ -368,7 +368,7 @@ static DBusMessage *mw_set_property(DBusConnection *conn, DBusMessage *msg,
 	return __ofono_error_invalid_args(msg);
 }
 
-static GDBusMethodTable message_waiting_methods[] = {
+static const GDBusMethodTable message_waiting_methods[] = {
 	{ "GetProperties",	"",	"a{sv}",	mw_get_properties	},
 	{ "SetProperty",	"sv",	"",		mw_set_property,
 							G_DBUS_METHOD_FLAG_ASYNC },
diff --git a/src/message.c b/src/message.c
index 7cc6538d..e0e72800 100644
--- a/src/message.c
+++ b/src/message.c
@@ -103,7 +103,7 @@ static DBusMessage *message_cancel(DBusConnection *conn,
 	}
 }
 
-static GDBusMethodTable message_methods[] = {
+static const GDBusMethodTable message_methods[] = {
 	{ "GetProperties",  "",    "a{sv}",   message_get_properties },
 	{ "Cancel",         "",    "",        message_cancel },
 	{ }
diff --git a/src/modem.c b/src/modem.c
index 43d7e9e3..f9fd37a2 100644
--- a/src/modem.c
+++ b/src/modem.c
@@ -1123,7 +1123,7 @@ static DBusMessage *modem_set_property(DBusConnection *conn,
 	return __ofono_error_invalid_args(msg);
 }
 
-static GDBusMethodTable modem_methods[] = {
+static const GDBusMethodTable modem_methods[] = {
 	{ "GetProperties",	"",	"a{sv}",	modem_get_properties },
 	{ "SetProperty",	"sv",	"",		modem_set_property,
 							G_DBUS_METHOD_FLAG_ASYNC },
diff --git a/src/network.c b/src/network.c
index b8a8cfe4..68749bae 100644
--- a/src/network.c
+++ b/src/network.c
@@ -623,7 +623,7 @@ static DBusMessage *network_operator_register(DBusConnection *conn,
 	return NULL;
 }
 
-static GDBusMethodTable network_operator_methods[] = {
+static const GDBusMethodTable network_operator_methods[] = {
 	{ "GetProperties",  "",  "a{sv}",  network_operator_get_properties },
 	{ "Register",       "",  "",       network_operator_register,
 						G_DBUS_METHOD_FLAG_ASYNC },
@@ -1020,7 +1020,7 @@ static DBusMessage *network_get_operators(DBusConnection *conn,
 	return reply;
 }
 
-static GDBusMethodTable network_registration_methods[] = {
+static const GDBusMethodTable network_registration_methods[] = {
 	{ "GetProperties",  "",  "a{sv}",	network_get_properties },
 	{ "Register",       "",  "",		network_register,
 						G_DBUS_METHOD_FLAG_ASYNC },
diff --git a/src/phonebook.c b/src/phonebook.c
index 6baf7bba..3563cee6 100644
--- a/src/phonebook.c
+++ b/src/phonebook.c
@@ -479,7 +479,7 @@ static DBusMessage *import_entries(DBusConnection *conn, DBusMessage *msg,
 	return NULL;
 }
 
-static GDBusMethodTable phonebook_methods[] = {
+static const GDBusMethodTable phonebook_methods[] = {
 	{ "Import",	"",	"s",	import_entries,
 					G_DBUS_METHOD_FLAG_ASYNC },
 	{ }
diff --git a/src/radio-settings.c b/src/radio-settings.c
index a8637bb6..132fd4a2 100644
--- a/src/radio-settings.c
+++ b/src/radio-settings.c
@@ -601,7 +601,7 @@ static DBusMessage *radio_set_property(DBusConnection *conn, DBusMessage *msg,
 	return __ofono_error_invalid_args(msg);
 }
 
-static GDBusMethodTable radio_methods[] = {
+static const GDBusMethodTable radio_methods[] = {
 	{ "GetProperties",  "",    "a{sv}",  radio_get_properties,
 						G_DBUS_METHOD_FLAG_ASYNC },
 	{ "SetProperty",    "sv",  "",       radio_set_property,
diff --git a/src/sim.c b/src/sim.c
index eb25e073..b979ddd6 100644
--- a/src/sim.c
+++ b/src/sim.c
@@ -1067,7 +1067,7 @@ static DBusMessage *sim_reset_pin(DBusConnection *conn, DBusMessage *msg,
 	return NULL;
 }
 
-static GDBusMethodTable sim_methods[] = {
+static const GDBusMethodTable sim_methods[] = {
 	{ "GetProperties",	"",	"a{sv}",	sim_get_properties },
 	{ "SetProperty",	"sv",	"",		sim_set_property,
 						G_DBUS_METHOD_FLAG_ASYNC },
diff --git a/src/sms.c b/src/sms.c
index 26dbd89e..1f64be91 100644
--- a/src/sms.c
+++ b/src/sms.c
@@ -1103,7 +1103,7 @@ int __ofono_sms_txq_cancel(struct ofono_sms *sms, const struct ofono_uuid *uuid)
 	return 0;
 }
 
-static GDBusMethodTable sms_manager_methods[] = {
+static const GDBusMethodTable sms_manager_methods[] = {
 	{ "GetProperties",    "",    "a{sv}",        sms_get_properties,
 						G_DBUS_METHOD_FLAG_ASYNC },
 	{ "SetProperty",      "sv",  "",             sms_set_property,
diff --git a/src/stk.c b/src/stk.c
index e557e905..61b29bb0 100644
--- a/src/stk.c
+++ b/src/stk.c
@@ -817,7 +817,7 @@ static DBusMessage *stk_select_item(DBusConnection *conn,
 	return NULL;
 }
 
-static GDBusMethodTable stk_methods[] = {
+static const GDBusMethodTable stk_methods[] = {
 	{ "GetProperties",		"",	"a{sv}",stk_get_properties },
 	{ "SelectItem",			"yo",	"",	stk_select_item,
 					G_DBUS_METHOD_FLAG_ASYNC },
diff --git a/src/ussd.c b/src/ussd.c
index d2d36214..25ef61fc 100644
--- a/src/ussd.c
+++ b/src/ussd.c
@@ -728,7 +728,7 @@ static DBusMessage *ussd_get_properties(DBusConnection *conn,
 	return reply;
 }
 
-static GDBusMethodTable ussd_methods[] = {
+static const GDBusMethodTable ussd_methods[] = {
 	{ "Initiate",		"s",	"sv",		ussd_initiate,
 					G_DBUS_METHOD_FLAG_ASYNC },
 	{ "Respond",		"s",	"s",		ussd_respond,
diff --git a/src/voicecall.c b/src/voicecall.c
index 104b6006..73b84b9c 100644
--- a/src/voicecall.c
+++ b/src/voicecall.c
@@ -667,7 +667,7 @@ static DBusMessage *voicecall_answer(DBusConnection *conn,
 	return NULL;
 }
 
-static GDBusMethodTable voicecall_methods[] = {
+static const GDBusMethodTable voicecall_methods[] = {
 	{ "GetProperties",  "",    "a{sv}",   voicecall_get_properties },
 	{ "Deflect",        "s",   "",        voicecall_deflect,
 						G_DBUS_METHOD_FLAG_ASYNC },
@@ -2117,7 +2117,7 @@ static DBusMessage *manager_get_calls(DBusConnection *conn,
 	return reply;
 }
 
-static GDBusMethodTable manager_methods[] = {
+static const GDBusMethodTable manager_methods[] = {
 	{ "GetProperties",     "",    "a{sv}",      manager_get_properties },
 	{ "Dial",              "ss",  "o",          manager_dial,
 						G_DBUS_METHOD_FLAG_ASYNC },