diff --git a/src/device.c b/src/device.c
index 1236698..75a5984 100644
--- a/src/device.c
+++ b/src/device.c
@@ -82,7 +82,7 @@
 #endif
 
 static DBusConnection *dbus_conn = NULL;
-unsigned service_state_cb_id;
+static unsigned service_state_cb_id;
 
 struct btd_disconnect_data {
 	guint id;
diff --git a/src/gatt-client.c b/src/gatt-client.c
index f6ef810..a12c656 100644
--- a/src/gatt-client.c
+++ b/src/gatt-client.c
@@ -705,7 +705,7 @@ struct chrc_prop_data {
 	char *str;
 };
 
-struct chrc_prop_data chrc_props[] = {
+static struct chrc_prop_data chrc_props[] = {
 	/* Default Properties */
 	{ BT_GATT_CHRC_PROP_BROADCAST,		"broadcast" },
 	{ BT_GATT_CHRC_PROP_READ,		"read" },
@@ -717,7 +717,7 @@ struct chrc_prop_data chrc_props[] = {
 	{ BT_GATT_CHRC_PROP_EXT_PROP,		"extended-properties" }
 };
 
-struct chrc_prop_data chrc_ext_props[] = {
+static struct chrc_prop_data chrc_ext_props[] = {
 	/* Extended Properties */
 	{ BT_GATT_CHRC_EXT_PROP_RELIABLE_WRITE,	"reliable-write" },
 	{ BT_GATT_CHRC_EXT_PROP_WRITABLE_AUX,	"writable-auxiliaries" }