diff --git a/obexd/plugins/filesystem.c b/obexd/plugins/filesystem.c
index cbed156..f94dd73 100644
--- a/obexd/plugins/filesystem.c
+++ b/obexd/plugins/filesystem.c
@@ -204,7 +204,8 @@ static int filesystem_close(gpointer object)
 	return 0;
 }
 
-static ssize_t filesystem_read(gpointer object, void *buf, size_t count, guint8 *hi)
+static ssize_t filesystem_read(gpointer object, void *buf, size_t count,
+								guint8 *hi)
 {
 	ssize_t ret;
 
@@ -271,7 +272,7 @@ static int capability_exec(const char **argv, int *output, int *err)
 }
 
 static gpointer capability_open(const char *name, int oflag, mode_t mode,
-		gpointer context, size_t *size, int *err)
+				gpointer context, size_t *size, int *err)
 {
 	struct capability_object *object = NULL;
 	gchar *buf;
@@ -435,7 +436,7 @@ failed:
 }
 
 static gpointer folder_open(const char *name, int oflag, mode_t mode,
-			gpointer context, size_t *size, int *err)
+				gpointer context, size_t *size, int *err)
 {
 	GString *object;
 
@@ -485,7 +486,7 @@ ssize_t string_read(gpointer object, void *buf, size_t count, guint8 *hi)
 }
 
 static ssize_t capability_read(gpointer object, void *buf, size_t count,
-							guint8 *hi)
+								guint8 *hi)
 {
 	struct capability_object *obj = object;
 
diff --git a/obexd/plugins/pbap.c b/obexd/plugins/pbap.c
index 0117b8e..f7b7b9b 100644
--- a/obexd/plugins/pbap.c
+++ b/obexd/plugins/pbap.c
@@ -223,7 +223,7 @@ static void set_folder(struct pbap_session *pbap, const gchar *new_folder)
 }
 
 static void phonebook_size_result(const gchar *buffer, size_t bufsize,
-			gint vcards, gint missed, gpointer user_data)
+				gint vcards, gint missed, gpointer user_data)
 {
 	struct pbap_session *pbap = user_data;
 
@@ -232,15 +232,16 @@ static void phonebook_size_result(const gchar *buffer, size_t bufsize,
 	obex_object_set_io_flags(pbap, G_IO_IN, 0);
 }
 
-static void query_result(const gchar *buffer, size_t bufsize,
-		gint vcards, gint missed, gpointer user_data)
+static void query_result(const gchar *buffer, size_t bufsize, gint vcards,
+					gint missed, gpointer user_data)
 {
 	struct pbap_session *pbap = user_data;
 
 	if (!pbap->buffer)
 		pbap->buffer = g_string_new_len(buffer, bufsize);
 	else
-		pbap->buffer = g_string_append_len(pbap->buffer, buffer, bufsize);
+		pbap->buffer = g_string_append_len(pbap->buffer, buffer,
+								bufsize);
 
 	obex_object_set_io_flags(pbap, G_IO_IN, 0);
 }
@@ -336,7 +337,7 @@ static gpointer pbap_connect(struct obex_session *os, int *err)
 }
 
 static int pbap_get(struct obex_session *os, obex_object_t *obj,
-			gboolean *stream, gpointer user_data)
+					gboolean *stream, gpointer user_data)
 {
 	struct pbap_session *pbap = user_data;
 	const gchar *type = obex_get_type(os);
@@ -401,7 +402,7 @@ failed:
 
 
 static int pbap_setpath(struct obex_session *os, obex_object_t *obj,
-		gpointer user_data)
+							gpointer user_data)
 {
 	struct pbap_session *pbap = user_data;
 	const gchar *name;
@@ -432,8 +433,7 @@ static int pbap_setpath(struct obex_session *os, obex_object_t *obj,
 	return 0;
 }
 
-static void pbap_disconnect(struct obex_session *os,
-		gpointer user_data)
+static void pbap_disconnect(struct obex_session *os, gpointer user_data)
 {
 	struct pbap_session *pbap = user_data;
 
@@ -449,8 +449,7 @@ static void pbap_disconnect(struct obex_session *os,
 	g_free(pbap);
 }
 
-static gint pbap_chkput(struct obex_session *os,
-		gpointer user_data)
+static gint pbap_chkput(struct obex_session *os, gpointer user_data)
 {
 	/* Rejects all PUTs */
 	return -EINVAL;
@@ -471,7 +470,7 @@ static struct obex_service_driver pbap = {
 };
 
 static gpointer vobject_pull_open(const char *name, int oflag, mode_t mode,
-		gpointer context, size_t *size, int *err)
+				gpointer context, size_t *size, int *err)
 {
 	struct pbap_session *pbap = context;
 	phonebook_cb cb;
@@ -504,7 +503,7 @@ fail:
 }
 
 static gpointer vobject_list_open(const char *name, int oflag, mode_t mode,
-		gpointer context, size_t *size, int *err)
+				gpointer context, size_t *size, int *err)
 {
 	struct pbap_session *pbap = context;
 	phonebook_cb cb;
@@ -542,7 +541,7 @@ fail:
 
 
 static gpointer vobject_vcard_open(const char *name, int oflag, mode_t mode,
-		gpointer context, size_t *size, int *err)
+				gpointer context, size_t *size, int *err)
 {
 	struct pbap_session *pbap = context;
 	gpointer id;
@@ -576,7 +575,8 @@ fail:
 	return NULL;
 }
 
-static ssize_t vobject_read(gpointer object, void *buf, size_t count, guint8 *hi)
+static ssize_t vobject_read(gpointer object, void *buf, size_t count,
+								guint8 *hi)
 {
 	struct pbap_session *pbap = object;
 	ssize_t ret = -EAGAIN;
diff --git a/obexd/plugins/phonebook-dummy.c b/obexd/plugins/phonebook-dummy.c
index b44bb94..38736a2 100644
--- a/obexd/plugins/phonebook-dummy.c
+++ b/obexd/plugins/phonebook-dummy.c
@@ -64,14 +64,14 @@ static gboolean dummy_result(gpointer data)
 	return FALSE;
 }
 
-int phonebook_set_folder(const gchar *current_folder,
-		const gchar *new_folder, guint8 flags)
+int phonebook_set_folder(const gchar *current_folder, const gchar *new_folder,
+								guint8 flags)
 {
 	return 0;
 }
 
 int phonebook_pull(const gchar *name, const struct apparam_field *params,
-		phonebook_cb cb, gpointer user_data)
+					phonebook_cb cb, gpointer user_data)
 {
 	struct dummy_data *dummy;
 
@@ -86,13 +86,13 @@ int phonebook_pull(const gchar *name, const struct apparam_field *params,
 }
 
 int phonebook_get_entry(const gchar *name, const struct apparam_field *params,
-		phonebook_cb cb, gpointer user_data)
+					phonebook_cb cb, gpointer user_data)
 {
 	return -1;
 }
 
 int phonebook_list(const gchar *name, const struct apparam_field *params,
-		phonebook_cb cb, gpointer user_data)
+					phonebook_cb cb, gpointer user_data)
 {
 	return -1;
 }
diff --git a/obexd/plugins/phonebook-ebook.c b/obexd/plugins/phonebook-ebook.c
index 0a47f72..c401a28 100644
--- a/obexd/plugins/phonebook-ebook.c
+++ b/obexd/plugins/phonebook-ebook.c
@@ -131,7 +131,7 @@ static gchar *evcard_to_string(EVCard *evcard, guint format, guint64 filter)
 }
 
 static void ebookpull_cb(EBook *book, EBookStatus status, GList *contacts,
-				gpointer user_data)
+							gpointer user_data)
 {
 	struct query_data *data = user_data;
 	GString *string = g_string_new("");
@@ -189,7 +189,7 @@ static gchar *evcard_name_attribute_to_string(EVCard *evcard)
 }
 
 static void ebooklist_cb(EBook *book, EBookStatus status, GList *contacts,
-				gpointer user_data)
+							gpointer user_data)
 {
 	struct query_data *data = user_data;
 	GString *string = g_string_new(VCARD_LISTING_BEGIN);
@@ -318,7 +318,7 @@ gint phonebook_pull(const gchar *name, const struct apparam_field *params,
 }
 
 int phonebook_get_entry(const gchar *name, const struct apparam_field *params,
-		phonebook_cb cb, gpointer user_data)
+					phonebook_cb cb, gpointer user_data)
 {
 	return -1;
 }
@@ -326,7 +326,7 @@ int phonebook_get_entry(const gchar *name, const struct apparam_field *params,
 static EBookQuery *create_query(guint8 attrib, guint8 *searchval)
 {
 	EBookQuery *query;
-	gchar *fam, *given, *str, **values;
+	gchar *fam, *str, **values;
 
 	if (!searchval || strlen((gchar *) searchval) == 0)
 		return e_book_query_any_field_contains("");
@@ -341,8 +341,11 @@ static EBookQuery *create_query(guint8 attrib, guint8 *searchval)
 		fam = (values[0] ? g_strdup_printf(QUERY_FN, values[0]) : NULL);
 
 		if (values[1]) {
-			given =	g_strdup_printf(QUERY_NAME, values[1]);
-			str = (fam ? g_strconcat(fam, " and ", given, NULL) : given);
+			char *given = g_strdup_printf(QUERY_NAME, values[1]);
+
+			str = fam ?
+				g_strconcat(fam, " and ", given, NULL) : given;
+
 			g_free(fam);
 			g_free(given);
 		}
@@ -370,7 +373,7 @@ static EBookQuery *create_query(guint8 attrib, guint8 *searchval)
 }
 
 int phonebook_list(const gchar *name, const struct apparam_field *params,
-		phonebook_cb cb, gpointer user_data)
+					phonebook_cb cb, gpointer user_data)
 {
 	struct query_data *data;
 	EBookQuery *query;