diff --git a/src/io.c b/src/io.c
index 44589d8..5b2ed8b 100644
--- a/src/io.c
+++ b/src/io.c
@@ -1203,7 +1203,7 @@
     } while (ret && (ret == ERANGE));
 
     if (ret) {
-        ERR(NULL, "Retrieving UID \"%lu\" passwd entry failed (%s).", (unsigned long int)uid, strerror(ret));
+        ERR(NULL, "Retrieving UID \"%lu\" passwd entry failed (%s).", (unsigned long)uid, strerror(ret));
     }
     return pwd;
 }
diff --git a/src/session.c b/src/session.c
index 3e47a47..274c40d 100644
--- a/src/session.c
+++ b/src/session.c
@@ -1399,7 +1399,7 @@
     struct lyd_node_opaq *node;
     int r, ver = -1, flag = 0;
     char *str;
-    long long int id;
+    long long id;
     NC_MSG_TYPE rc = NC_MSG_HELLO;
 
     r = nc_read_msg_poll_io(session, NC_CLIENT_HELLO_TIMEOUT * 1000, &msg);
diff --git a/src/session_client.c b/src/session_client.c
index 7e90fc1..425d457 100644
--- a/src/session_client.c
+++ b/src/session_client.c
@@ -112,6 +112,7 @@
 
 #if defined (NC_ENABLED_SSH) || defined (NC_ENABLED_TLS)
         int i;
+
         for (i = 0; i < c->opts.ch_bind_count; ++i) {
             close(c->opts.ch_binds[i].sock);
             free((char *)c->opts.ch_binds[i].address);
diff --git a/src/session_client_ch.h b/src/session_client_ch.h
index 2532787..909ed85 100644
--- a/src/session_client_ch.h
+++ b/src/session_client_ch.h
@@ -88,6 +88,7 @@
  */
 void nc_client_ssh_ch_get_auth_hostkey_check_clb(int (**auth_hostkey_check)(const char *hostname, ssh_session session, void *priv),
         void **priv);
+
 /**
  * @brief Set SSH Call Home password authentication callback.
  *
diff --git a/src/session_server.c b/src/session_server.c
index cb73b0d..00ec005 100644
--- a/src/session_server.c
+++ b/src/session_server.c
@@ -1945,6 +1945,7 @@
 #ifdef SO_PEERCRED
     struct ucred ucred;
     socklen_t len;
+
     len = sizeof(ucred);
     ret = getsockopt(sock, SOL_SOCKET, SO_PEERCRED, &ucred, &len);
     if (!ret) {
@@ -1967,6 +1968,7 @@
 #if defined (SO_PEERCRED) || defined (HAVE_GETPEEREID)
     struct passwd *pw, pw_buf;
     char *username;
+
     session->ti_type = NC_TI_UNIX;
     uid_t uid = 0;
     char *buf = NULL;