diff --git a/src/ipaddr/ng_ipaddr.h b/src/ipaddr/ng_ipaddr.h
index 8f737600..799aa88f 100644
--- a/src/ipaddr/ng_ipaddr.h
+++ b/src/ipaddr/ng_ipaddr.h
@@ -4,6 +4,7 @@
 
 #ifndef NG_IPADDR_HDR
 #define NG_IPADDR_HDR
+
 #include "portab.h"
 
 /**
diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c
index 6b8d7453..12bd8128 100644
--- a/src/ngircd/channel.c
+++ b/src/ngircd/channel.c
@@ -48,11 +48,9 @@
 #define REMOVE_QUIT 1
 #define REMOVE_KICK 2
 
-
 static CHANNEL *My_Channels;
 static CL2CHAN *My_Cl2Chan;
 
-
 static CL2CHAN *Get_Cl2Chan PARAMS(( CHANNEL *Chan, CLIENT *Client ));
 static CL2CHAN *Add_Client PARAMS(( CHANNEL *Chan, CLIENT *Client ));
 static bool Remove_Client PARAMS(( int Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, const char *Reason, bool InformServer ));
diff --git a/src/ngircd/conn-encoding.c b/src/ngircd/conn-encoding.c
index d0c56306..b827d02a 100644
--- a/src/ngircd/conn-encoding.c
+++ b/src/ngircd/conn-encoding.c
@@ -38,7 +38,6 @@ char Encoding_Buffer[COMMAND_LEN];
 
 char *Convert_Message PARAMS((iconv_t Handle, char *Message));
 
-
 /**
  * Set client character encoding on a connection.
  *
@@ -133,7 +132,7 @@ Convert_Message(iconv_t Handle, char *Message)
 	return Encoding_Buffer;
 }
 
-#endif
+#endif /* ICONV */
 
 /**
  * Convert encoding of a message received from a connection.
diff --git a/src/ngircd/conn-func.c b/src/ngircd/conn-func.c
index b56e0f07..0ba0ff6c 100644
--- a/src/ngircd/conn-func.c
+++ b/src/ngircd/conn-func.c
@@ -29,7 +29,6 @@
 #include "exp.h"
 #include "conn-func.h"
 
-
 /**
  * Update "idle timestamp", the time of the last visible user action
  * (e. g. like sending messages, joining or leaving channels).
@@ -73,7 +72,6 @@ Conn_GetIdle( CONN_ID Idx )
 	return time( NULL ) - My_Connections[Idx].lastprivmsg;
 } /* Conn_GetIdle */
 
-
 GLOBAL time_t
 Conn_LastPing( CONN_ID Idx )
 {
@@ -81,7 +79,6 @@ Conn_LastPing( CONN_ID Idx )
 	return My_Connections[Idx].lastping;
 } /* Conn_LastPing */
 
-
 /**
  * Add "penalty time" for a connection.
  *
@@ -116,7 +113,6 @@ Conn_SetPenalty(CONN_ID Idx, time_t Seconds)
 #endif
 } /* Conn_SetPenalty */
 
-
 GLOBAL void
 Conn_ClearFlags( void )
 {
@@ -125,7 +121,6 @@ Conn_ClearFlags( void )
 	for( i = 0; i < Pool_Size; i++ ) My_Connections[i].flag = 0;
 } /* Conn_ClearFlags */
 
-
 GLOBAL int
 Conn_Flag( CONN_ID Idx )
 {
@@ -133,7 +128,6 @@ Conn_Flag( CONN_ID Idx )
 	return My_Connections[Idx].flag;
 } /* Conn_Flag */
 
-
 GLOBAL void
 Conn_SetFlag( CONN_ID Idx, int Flag )
 {
@@ -141,7 +135,6 @@ Conn_SetFlag( CONN_ID Idx, int Flag )
 	My_Connections[Idx].flag = Flag;
 } /* Conn_SetFlag */
 
-
 GLOBAL CONN_ID
 Conn_First( void )
 {
@@ -154,7 +147,6 @@ Conn_First( void )
 	return NONE;
 } /* Conn_First */
 
-
 GLOBAL CONN_ID
 Conn_Next( CONN_ID Idx )
 {
@@ -169,7 +161,6 @@ Conn_Next( CONN_ID Idx )
 	return NONE;
 } /* Conn_Next */
 
-
 GLOBAL UINT16
 Conn_Options( CONN_ID Idx )
 {
@@ -177,7 +168,6 @@ Conn_Options( CONN_ID Idx )
 	return My_Connections[Idx].options;
 } /* Conn_Options */
 
-
 /**
  * Set connection option.
  */
@@ -188,7 +178,6 @@ Conn_SetOption(CONN_ID Idx, int Option)
 	Conn_OPTION_ADD(&My_Connections[Idx], Option);
 } /* Conn_SetOption */
 
-
 /**
  * Get the start time of the connection.
  * The result is the start time in seconds since 1970-01-01, as reported
@@ -224,7 +213,6 @@ Conn_SendQ( CONN_ID Idx )
 	return array_bytes(&My_Connections[Idx].wbuf);
 } /* Conn_SendQ */
 
-
 /**
  * return number of messages sent on this connection so far
  */
@@ -236,7 +224,6 @@ Conn_SendMsg( CONN_ID Idx )
 	return My_Connections[Idx].msg_out;
 } /* Conn_SendMsg */
 
-
 /**
  * return number of (uncompressed) bytes sent
  * on this connection so far
@@ -248,7 +235,6 @@ Conn_SendBytes( CONN_ID Idx )
 	return My_Connections[Idx].bytes_out;
 } /* Conn_SendBytes */
 
-
 /**
  * return number of bytes pending in read buffer
  */
@@ -264,7 +250,6 @@ Conn_RecvQ( CONN_ID Idx )
 	return array_bytes(&My_Connections[Idx].rbuf);
 } /* Conn_RecvQ */
 
-
 /**
  * return number of messages received on this connection so far
  */
@@ -275,7 +260,6 @@ Conn_RecvMsg( CONN_ID Idx )
 	return My_Connections[Idx].msg_in;
 } /* Conn_RecvMsg */
 
-
 /**
  * return number of (uncompressed) bytes received on this
  * connection so far
@@ -297,19 +281,16 @@ Conn_IPA(CONN_ID Idx)
 	return ng_ipaddr_tostr(&My_Connections[Idx].addr);
 }
 
-
 GLOBAL void
 Conn_ResetWCounter( void )
 {
 	WCounter = 0;
 } /* Conn_ResetWCounter */
 
-
 GLOBAL long
 Conn_WCounter( void )
 {
 	return WCounter;
 } /* Conn_WCounter */
 
-
 /* -eof- */
diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c
index fef568e4..6056355f 100644
--- a/src/ngircd/conn.c
+++ b/src/ngircd/conn.c
@@ -84,7 +84,6 @@
 
 #define SD_LISTEN_FDS_START 3
 
-
 static bool Handle_Write PARAMS(( CONN_ID Idx ));
 static bool Conn_Write PARAMS(( CONN_ID Idx, char *Data, size_t Len ));
 static int New_Connection PARAMS(( int Sock, bool IsSSL ));
@@ -100,7 +99,6 @@ static void Simple_Message PARAMS(( int Sock, const char *Msg ));
 static int NewListener PARAMS(( const char *listen_addr, UINT16 Port ));
 static void Account_Connection PARAMS((void));
 
-
 static array My_Listeners;
 static array My_ConnArray;
 static size_t NumConnections, NumConnectionsMax, NumConnectionsAccepted;
diff --git a/src/ngircd/log.c b/src/ngircd/log.c
index 18fb6fa3..32cf6cfd 100644
--- a/src/ngircd/log.c
+++ b/src/ngircd/log.c
@@ -43,7 +43,6 @@
 #include "exp.h"
 #include "log.h"
 
-
 static bool Is_Daemon;
 
 
diff --git a/src/ngircd/match.c b/src/ngircd/match.c
index bc26e755..88872f0d 100644
--- a/src/ngircd/match.c
+++ b/src/ngircd/match.c
@@ -25,18 +25,15 @@
 #include "defines.h"
 #include "tool.h"
 
-
 /*
  * The pattern matching functions [Matche(), Matche_After_Star()] are based
  * on code of J. Kercheval. Version 1.1 has been released on 1991-03-12 as
  * "public domain": <http://c.snippets.org/snip_lister.php?fname=match.c>
  */
 
-
 static int Matche PARAMS(( const char *p, const char *t ));
 static int Matche_After_Star PARAMS(( const char *p, const char *t ));
 
-
 #define MATCH_PATTERN	6	/**< bad pattern */
 #define MATCH_LITERAL	5	/**< match failure on literal match */
 #define MATCH_RANGE	4	/**< match failure on [..] construct */
@@ -44,7 +41,6 @@ static int Matche_After_Star PARAMS(( const char *p, const char *t ));
 #define MATCH_END	2	/**< premature end of pattern string */
 #define MATCH_VALID	1	/**< valid match */
 
-
 /**
  * Match string with pattern.
  *
@@ -59,7 +55,6 @@ Match( const char *Pattern, const char *String )
 	else return false;
 } /* Match */
 
-
 /**
  * Match string with pattern case-insensitive.
  *
@@ -76,7 +71,6 @@ MatchCaseInsensitive(const char *Pattern, const char *String)
 	return Match(Pattern, ngt_LowerStr(haystack));
 } /* MatchCaseInsensitive */
 
-
 /**
  * Match string with pattern case-insensitive.
  *
@@ -105,7 +99,6 @@ MatchCaseInsensitiveList(const char *Pattern, const char *String,
 	return false;
 } /* MatchCaseInsensitive */
 
-
 static int
 Matche( const char *p, const char *t )
 {
@@ -136,7 +129,6 @@ Matche( const char *p, const char *t )
 	else return MATCH_VALID;
 } /* Matche */
 
-
 static int
 Matche_After_Star( const char *p, const char *t )
 {
@@ -186,5 +178,4 @@ Matche_After_Star( const char *p, const char *t )
 	return match;
 } /* Matche_After_Star */
 
-
 /* -eof- */
diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c
index 05f7a719..d8762330 100644
--- a/src/ngircd/ngircd.c
+++ b/src/ngircd/ngircd.c
@@ -52,7 +52,6 @@
 #include "exp.h"
 #include "ngircd.h"
 
-
 static void Show_Version PARAMS(( void ));
 static void Show_Help PARAMS(( void ));
 
diff --git a/src/ngircd/numeric.c b/src/ngircd/numeric.c
index ad7e0429..c5bf4bd3 100644
--- a/src/ngircd/numeric.c
+++ b/src/ngircd/numeric.c
@@ -117,7 +117,6 @@ Announce_Channel(CLIENT *Client, CHANNEL *Chan)
 	return CONNECTED;
 } /* Announce_Channel */
 
-
 /**
  * Announce new server in the network
  * @param Client New server
@@ -149,7 +148,6 @@ Announce_Server(CLIENT * Client, CLIENT * Server)
 		Client_MyToken(Server), Client_Info(Server));
 } /* Announce_Server */
 
-
 #ifdef IRCPLUS
 
 /**
@@ -210,7 +208,6 @@ Synchronize_Lists(CLIENT * Client)
 	return CONNECTED;
 }
 
-
 /**
  * Send CHANINFO commands to a new server (inform it about existing channels).
  * @param Client New server
@@ -255,7 +252,6 @@ Send_CHANINFO(CLIENT * Client, CHANNEL * Chan)
 
 #endif /* IRCPLUS */
 
-
 /**
  * Handle ENDOFMOTD (376) numeric and login remote server.
  * The peer is either an IRC server (no IRC+ protocol), or we got the
@@ -349,7 +345,6 @@ IRC_Num_ENDOFMOTD(CLIENT * Client, UNUSED REQUEST * Req)
 	return CONNECTED;
 } /* IRC_Num_ENDOFMOTD */
 
-
 /**
  * Handle ISUPPORT (005) numeric.
  */
@@ -385,5 +380,4 @@ IRC_Num_ISUPPORT(CLIENT * Client, REQUEST * Req)
 	return CONNECTED;
 } /* IRC_Num_ISUPPORT */
 
-
 /* -eof- */
diff --git a/src/ngircd/op.c b/src/ngircd/op.c
index 868c17ae..6738d535 100644
--- a/src/ngircd/op.c
+++ b/src/ngircd/op.c
@@ -56,7 +56,6 @@ Op_NoPrivileges(CLIENT * Client, REQUEST * Req)
 	}
 } /* Op_NoPrivileges */
 
-
 /**
  * Check that the originator of a request is an IRC operator and allowed
  * to administer this server.
@@ -94,5 +93,4 @@ Op_Check(CLIENT * Client, REQUEST * Req)
 	return c;
 } /* Op_Check */
 
-
 /* -eof- */
diff --git a/src/portab/portab.h b/src/portab/portab.h
index a968a3b9..e30262d8 100644
--- a/src/portab/portab.h
+++ b/src/portab/portab.h
@@ -63,7 +63,6 @@
 # endif
 #endif
 
-
 /* datatypes */
 
 #ifndef PROTOTYPES
@@ -109,14 +108,12 @@ typedef unsigned char bool;
 #undef GLOBAL
 #define GLOBAL
 
-
 /* SPLint */
 
 #ifdef S_SPLINT_S
 #include "splint.h"
 #endif
 
-
 /* target constants  */
 
 #ifndef HOST_OS
@@ -182,8 +179,6 @@ extern int vsnprintf PARAMS(( char *str, size_t count, const char *fmt, va_list
 #define PACKAGE_VERSION VERSION
 #endif
 
-
 #endif
 
-
 /* -eof- */
diff --git a/src/portab/strlcpy.c b/src/portab/strlcpy.c
index ae2018bc..ce90a423 100644
--- a/src/portab/strlcpy.c
+++ b/src/portab/strlcpy.c
@@ -52,7 +52,6 @@ strlcat( char *dst, const char *src, size_t size )
 
 #endif
 
-
 #ifndef HAVE_STRLCPY
 
 GLOBAL size_t
@@ -74,5 +73,4 @@ strlcpy( char *dst, const char *src, size_t size )
 
 #endif
 
-
 /* -eof- */
diff --git a/src/portab/strndup.c b/src/portab/strndup.c
index d6e01c94..578f324c 100644
--- a/src/portab/strndup.c
+++ b/src/portab/strndup.c
@@ -30,8 +30,8 @@ strndup(const char *s, size_t maxlen)
 	dup = malloc(len);
 	if (dup)
 		strlcpy(dup, s, len);
+
 	return dup;
 }
 
 #endif
-