diff --git a/android/client/if-pan.c b/android/client/if-pan.c
index fc296a6..e9cfa23 100644
--- a/android/client/if-pan.c
+++ b/android/client/if-pan.c
@@ -47,7 +47,7 @@ static void control_state_cb(btpan_control_state_t state, bt_status_t error,
 	haltest_info("%s: state=%s error=%s local_role=%s ifname=%s\n",
 		       __func__, btpan_control_state_t2str(state),
 		       bt_status_t2str(error), btpan_role_t2str(local_role),
-								       ifname);
+		       ifname);
 }
 
 static char last_used_addr[18];
@@ -79,8 +79,8 @@ static void init_p(int argc, const char **argv)
 
 /* enable */
 
-static void enable_c(int argc, const const char **argv,
-					enum_func *penum_func, void **puser)
+static void enable_c(int argc, const const char **argv, enum_func *penum_func,
+								void **puser)
 {
 	if (argc == 3) {
 		*puser = TYPE_ENUM(btpan_role_t);
@@ -120,8 +120,8 @@ static void get_local_role_p(int argc, const char **argv)
 
 /* connect */
 
-static void connect_c(int argc, const const char **argv,
-					enum_func *penum_func, void **puser)
+static void connect_c(int argc, const const char **argv, enum_func *penum_func,
+								void **puser)
 {
 	if (argc == 3) {
 		*puser = NULL;
diff --git a/android/client/if-sock.c b/android/client/if-sock.c
index f761a0f..f3125f8 100644
--- a/android/client/if-sock.c
+++ b/android/client/if-sock.c
@@ -106,7 +106,7 @@ static void receive_sock_connect_signal(struct pollfd *pollfd)
 
 	if (pollfd->revents & POLLHUP) {
 		haltest_error("Disconnected fd=%d revents=0x%X\n", pollfd->fd,
-				pollfd->revents);
+							pollfd->revents);
 		poll_unregister_fd(pollfd->fd, receive_sock_connect_signal);
 	}
 }
@@ -166,8 +166,8 @@ static void read_accepted(int fd)
 		break;
 	}
 	haltest_info("Incoming connection from %s channel %d status=%d fd=%d\n",
-			bt_bdaddr_t2str(&cs.bd_addr, addr_str), cs.channel,
-							cs.status, accepted_fd);
+					bt_bdaddr_t2str(&cs.bd_addr, addr_str),
+					cs.channel, cs.status, accepted_fd);
 	poll_register_fd(accepted_fd, POLLIN, receive_from_client);
 }
 
@@ -184,8 +184,8 @@ static void client_connected(struct pollfd *pollfd)
 
 /** listen */
 
-static void listen_c(int argc, const char **argv,
-					enum_func *penum_func, void **puser)
+static void listen_c(int argc, const char **argv, enum_func *penum_func,
+								void **puser)
 {
 	if (argc == 3) {
 		*puser = TYPE_ENUM(btsock_type_t);
@@ -323,8 +323,10 @@ static void connect_p(int argc, const char **argv)
 
 /* Methods available in btsock_interface_t */
 static struct method methods[] = {
-	STD_METHODCH(listen, "<sock_type> <srvc_name> <uuid> [<channle>] [<flags>]"),
-	STD_METHODCH(connect, "<addr> <sock_type> <uuid> <channle> [<flags>]"),
+	STD_METHODCH(listen,
+			"<sock_type> <srvc_name> <uuid> [<channle>] [<flags>]"),
+	STD_METHODCH(connect,
+			"<addr> <sock_type> <uuid> <channle> [<flags>]"),
 	END_METHOD
 };