diff --git a/obexd/plugins/filesystem.c b/obexd/plugins/filesystem.c
index 4b0665f..4d611de 100644
--- a/obexd/plugins/filesystem.c
+++ b/obexd/plugins/filesystem.c
@@ -85,7 +85,7 @@ static const uint8_t FTP_TARGET[TARGET_SIZE] = {
 #define PCSUITE_WHO_SIZE 8
 
 static const uint8_t PCSUITE_WHO[PCSUITE_WHO_SIZE] = {
-			'P','C',' ','S','u','i','t','e' };
+			'P', 'C', ' ', 'S', 'u', 'i', 't', 'e' };
 
 
 static char *file_stat_line(char *filename, struct stat *fstat,
diff --git a/obexd/plugins/ftp.c b/obexd/plugins/ftp.c
index 4cf0135..15cc7fb 100644
--- a/obexd/plugins/ftp.c
+++ b/obexd/plugins/ftp.c
@@ -144,7 +144,7 @@ static const uint8_t FTP_TARGET[TARGET_SIZE] = {
 			0x98, 0x4E, 0x52, 0x54, 0x00, 0xDC, 0x9E, 0x09 };
 
 static const uint8_t PCSUITE_WHO[PCSUITE_WHO_SIZE] = {
-			'P','C',' ','S','u','i','t','e' };
+			'P', 'C', ' ', 'S', 'u', 'i', 't', 'e' };
 
 struct ftp_session {
 	struct obex_session *os;
diff --git a/obexd/plugins/pcsuite.c b/obexd/plugins/pcsuite.c
index 125f25a..d43842f 100644
--- a/obexd/plugins/pcsuite.c
+++ b/obexd/plugins/pcsuite.c
@@ -109,7 +109,7 @@ static const uint8_t FTP_TARGET[TARGET_SIZE] = {
 			0x98, 0x4E, 0x52, 0x54, 0x00, 0xDC, 0x9E, 0x09 };
 
 static const uint8_t PCSUITE_WHO[PCSUITE_WHO_SIZE] = {
-			'P','C',' ','S','u','i','t','e' };
+			'P', 'C', ' ', 'S', 'u', 'i', 't', 'e' };
 
 struct pcsuite_session {
 	struct ftp_session *ftp;
@@ -267,7 +267,7 @@ static struct obex_service_driver pcsuite = {
 	.disconnect = pcsuite_disconnect
 };
 
-struct backup_object{
+struct backup_object {
 	gchar *cmd;
 	int fd;
 	int oflag;
diff --git a/obexd/plugins/phonebook-tracker.c b/obexd/plugins/phonebook-tracker.c
index d396203..52c4746 100644
--- a/obexd/plugins/phonebook-tracker.c
+++ b/obexd/plugins/phonebook-tracker.c
@@ -1020,7 +1020,7 @@ static void contact_add_numbers(struct phonebook_contact *contact,
 	aff_numbers = g_strsplit(reply[COL_PHONE_AFF], MAIN_DELIM, MAX_FIELDS);
 
 	if (aff_numbers)
-		for(i = 0;aff_numbers[i]; ++i)
+		for (i = 0; aff_numbers[i]; ++i)
 			add_aff_number(contact, aff_numbers[i],
 							reply[COL_AFF_TYPE]);
 
@@ -1077,7 +1077,7 @@ static void contact_add_emails(struct phonebook_contact *contact,
 	aff_emails = g_strsplit(reply[COL_EMAIL_AFF], MAIN_DELIM, MAX_FIELDS);
 
 	if (aff_emails)
-		for(i = 0; aff_emails[i] != NULL; ++i)
+		for (i = 0; aff_emails[i] != NULL; ++i)
 			add_aff_field(contact, aff_emails[i], add_email);
 
 	g_strfreev(aff_emails);
@@ -1094,7 +1094,7 @@ static void contact_add_addresses(struct phonebook_contact *contact,
 								MAX_FIELDS);
 
 	if (aff_addr)
-		for(i = 0; aff_addr[i] != NULL; ++i)
+		for (i = 0; aff_addr[i] != NULL; ++i)
 			add_aff_field(contact, aff_addr[i], add_address);
 
 	g_strfreev(aff_addr);
@@ -1110,7 +1110,7 @@ static void contact_add_urls(struct phonebook_contact *contact,
 	aff_url = g_strsplit(reply[COL_URL], MAIN_DELIM, MAX_FIELDS);
 
 	if (aff_url)
-		for(i = 0; aff_url[i] != NULL; ++i)
+		for (i = 0; aff_url[i] != NULL; ++i)
 			add_aff_field(contact, aff_url[i], add_url);
 
 	g_strfreev(aff_url);
@@ -1553,7 +1553,7 @@ int phonebook_pull_read(void *request)
 
 	data->newmissedcalls = 0;
 
-	if (g_strcmp0(data->req_name,"/telecom/mch.vcf") == 0 &&
+	if (g_strcmp0(data->req_name, "/telecom/mch.vcf") == 0 &&
 						data->tracker_index == 0) {
 		/* new missed calls amount should be counted only once - it
 		 * will be done during generating first part of results of
diff --git a/obexd/plugins/vcard.c b/obexd/plugins/vcard.c
index efeba17..d6df360 100644
--- a/obexd/plugins/vcard.c
+++ b/obexd/plugins/vcard.c
@@ -265,7 +265,7 @@ static void vcard_printf_tag(GString *vcards, uint8_t format, const char *tag,
 	if (tag == NULL || strlen(tag) == 0)
 		return;
 
-	if (fld == NULL || strlen(fld) == 0){
+	if (fld == NULL || strlen(fld) == 0) {
 		vcard_printf(vcards, "%s:", tag);
 		return;
 	}
@@ -294,7 +294,7 @@ static void vcard_printf_slash_tag(GString *vcards, uint8_t format,
 	if (tag == NULL || strlen(tag) == 0)
 		return;
 
-	if (fld == NULL || (len = strlen(fld)) == 0){
+	if (fld == NULL || (len = strlen(fld)) == 0) {
 		vcard_printf(vcards, "%s:", tag);
 		return;
 	}
@@ -321,11 +321,11 @@ static void vcard_printf_email(GString *vcards, uint8_t format,
 	char field[LEN_MAX];
 	int len = 0;
 
-	if (!address || !(len = strlen(address))){
+	if (!address || !(len = strlen(address))) {
 		vcard_printf(vcards, "EMAIL:");
 		return;
 	}
-	switch (category){
+	switch (category) {
 	case FIELD_TYPE_HOME:
 		if (format == FORMAT_VCARD21)
 			category_string = "INTERNET;HOME";
@@ -346,7 +346,7 @@ static void vcard_printf_email(GString *vcards, uint8_t format,
 	}
 
 	add_slash(field, address, LEN_MAX, len);
-	vcard_printf(vcards,"EMAIL;%s:%s", category_string, field);
+	vcard_printf(vcards, "EMAIL;%s:%s", category_string, field);
 }
 
 static void vcard_printf_url(GString *vcards, uint8_t format,
@@ -398,7 +398,7 @@ static gboolean org_fields_present(struct phonebook_contact *contact)
 static void vcard_printf_org(GString *vcards,
 					struct phonebook_contact *contact)
 {
-	if (org_fields_present(contact) == FALSE){
+	if (org_fields_present(contact) == FALSE) {
 		vcard_printf(vcards, "ORG:");
 		return;
 	}
@@ -536,7 +536,7 @@ void phonebook_add_contact(GString *vcards, struct phonebook_contact *contact,
 			vcard_printf_email(vcards, format, NULL,
 							FIELD_TYPE_OTHER);
 
-		for (; l; l = l->next){
+		for (; l; l = l->next) {
 			struct phonebook_field *email = l->data;
 			vcard_printf_email(vcards, format, email->text,
 								email->type);
diff --git a/obexd/src/manager.c b/obexd/src/manager.c
index 80140b6..241c9af 100644
--- a/obexd/src/manager.c
+++ b/obexd/src/manager.c
@@ -252,7 +252,7 @@ static char *target2str(const uint8_t *t)
 
 	return g_strdup_printf("%02X%02X%02X%02X-%02X%02X-%02X%02X-"
 				"%02X%02X-%02X%02X%02X%02X%02X%02X",
-				t[0], t[1], t[2], t[3], t[4], t[5], t[6],t[7],
+				t[0], t[1], t[2], t[3], t[4], t[5], t[6], t[7],
 				t[8], t[9], t[10], t[11], t[12], t[13], t[14], t[15]);
 }