diff --git a/src/ngircd/array.c b/src/ngircd/array.c
index 81569ce0..ad4f8dac 100644
--- a/src/ngircd/array.c
+++ b/src/ngircd/array.c
@@ -17,7 +17,6 @@
 #include "array.h"
 
 #include <assert.h>
-
 #include <stdlib.h>
 #include <string.h>
 
@@ -26,9 +25,9 @@
 /* Enable more Debug messages in alloc / append / memmove code. */
 /* #define DEBUG_ARRAY */
 
-
-
 #define array_UNUSABLE(x)	( !(x)->mem )
+
+
 static bool
 safemult_sizet(size_t a, size_t b, size_t *res)
 {
diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c
index 306f4dee..d1f9c6c9 100644
--- a/src/ngircd/channel.c
+++ b/src/ngircd/channel.c
@@ -9,10 +9,8 @@
  * Please read the file COPYING, README and AUTHORS for more information.
  */
 
-
 #define __channel_c__
 
-
 #include "portab.h"
 
 /**
diff --git a/src/ngircd/channel.h b/src/ngircd/channel.h
index 32623758..f44e1946 100644
--- a/src/ngircd/channel.h
+++ b/src/ngircd/channel.h
@@ -9,7 +9,6 @@
  * Please read the file COPYING, README and AUTHORS for more information.
  */
 
-
 #ifndef __channel_h__
 #define __channel_h__
 
diff --git a/src/ngircd/client.c b/src/ngircd/client.c
index 7a6b275d..0bfe73d3 100644
--- a/src/ngircd/client.c
+++ b/src/ngircd/client.c
@@ -9,10 +9,8 @@
  * Please read the file COPYING, README and AUTHORS for more information.
  */
 
-
 #define __client_c__
 
-
 #include "portab.h"
 
 /**
@@ -46,10 +44,8 @@
 
 #include <exp.h>
 
-
 #define GETID_LEN (CLIENT_NICK_LEN-1) + 1 + (CLIENT_USER_LEN-1) + 1 + (CLIENT_HOST_LEN-1) + 1
 
-
 static CLIENT *This_Server, *My_Clients;
 
 static WHOWAS My_Whowas[MAX_WHOWAS];
diff --git a/src/ngircd/client.h b/src/ngircd/client.h
index 9c7cde41..ff4ff2ff 100644
--- a/src/ngircd/client.h
+++ b/src/ngircd/client.h
@@ -164,8 +164,6 @@ GLOBAL const char *Client_TypeText PARAMS((CLIENT *Client));
 GLOBAL void Client_DebugDump PARAMS((void));
 #endif
 
-
 #endif
 
-
 /* -eof- */
diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c
index c2dde4b7..3ff5ddd8 100644
--- a/src/ngircd/conf.c
+++ b/src/ngircd/conf.c
@@ -9,7 +9,6 @@
  * Please read the file COPYING, README and AUTHORS for more information.
  */
 
-
 #include "portab.h"
 
 /**
diff --git a/src/ngircd/conf.h b/src/ngircd/conf.h
index 07fc1079..7632e2bf 100644
--- a/src/ngircd/conf.h
+++ b/src/ngircd/conf.h
@@ -9,7 +9,6 @@
  * Please read the file COPYING, README and AUTHORS for more information.
  */
 
-
 #ifndef __conf_h__
 #define __conf_h__
 
diff --git a/src/ngircd/conn-func.c b/src/ngircd/conn-func.c
index a50f0daa..8b0b6f71 100644
--- a/src/ngircd/conn-func.c
+++ b/src/ngircd/conn-func.c
@@ -9,7 +9,6 @@
  * Please read the file COPYING, README and AUTHORS for more information.
  */
 
-
 #define CONN_MODULE
 
 #include "portab.h"
diff --git a/src/ngircd/conn-func.h b/src/ngircd/conn-func.h
index 9f23edc8..729860e4 100644
--- a/src/ngircd/conn-func.h
+++ b/src/ngircd/conn-func.h
@@ -9,7 +9,6 @@
  * Please read the file COPYING, README and AUTHORS for more information.
  */
 
-
 #ifndef __conn_func_h__
 #define __conn_func_h__
 
diff --git a/src/ngircd/conn-zip.h b/src/ngircd/conn-zip.h
index 7a5b1c4c..573f45bf 100644
--- a/src/ngircd/conn-zip.h
+++ b/src/ngircd/conn-zip.h
@@ -9,7 +9,6 @@
  * Please read the file COPYING, README and AUTHORS for more information.
  */
 
-
 #ifdef ZLIB
 
 #ifndef __conn_zip_h__
@@ -29,10 +28,8 @@ GLOBAL bool Unzip_Buffer PARAMS(( CONN_ID Idx ));
 GLOBAL long Zip_SendBytes PARAMS(( CONN_ID Idx ));
 GLOBAL long Zip_RecvBytes PARAMS(( CONN_ID Idx ));
 
-
 #endif /* __conn_zip_h__ */
 
 #endif /* ZLIB */
 
-
 /* -eof- */
diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c
index e73dd306..77b25610 100644
--- a/src/ngircd/conn.c
+++ b/src/ngircd/conn.c
@@ -9,7 +9,6 @@
  * Please read the file COPYING, README and AUTHORS for more information.
  */
 
-
 #define CONN_MODULE
 
 #include "portab.h"
diff --git a/src/ngircd/conn.h b/src/ngircd/conn.h
index 8ce5654d..4228c9e4 100644
--- a/src/ngircd/conn.h
+++ b/src/ngircd/conn.h
@@ -9,7 +9,6 @@
  * Please read the file COPYING, README and AUTHORS for more information.
  */
 
-
 #ifndef __conn_h__
 #define __conn_h__
 
@@ -139,5 +138,4 @@ GLOBAL void Conn_DebugDump PARAMS((void));
 
 #endif
 
-
 /* -eof- */
diff --git a/src/ngircd/defines.h b/src/ngircd/defines.h
index ec7bee93..688f2d3a 100644
--- a/src/ngircd/defines.h
+++ b/src/ngircd/defines.h
@@ -9,7 +9,6 @@
  * Please read the file COPYING, README and AUTHORS for more information.
  */
 
-
 #ifndef __defines_h__
 #define __defines_h__
 
@@ -113,5 +112,4 @@
 
 #endif
 
-
 /* -eof- */
diff --git a/src/ngircd/hash.c b/src/ngircd/hash.c
index 9bf42409..eb980d17 100644
--- a/src/ngircd/hash.c
+++ b/src/ngircd/hash.c
@@ -9,7 +9,6 @@
  * Please read the file COPYING, README and AUTHORS for more information.
  */
 
-
 #include "portab.h"
 
 /**
@@ -43,7 +42,6 @@ Hash( const char *String )
 			    (UINT32)strlen(buffer), 42);
 } /* Hash */
 
-
 /*
  * Die hier verwendete Hash-Funktion stammt aus lookup2.c von Bob Jenkins
  * (URL: <http://burtleburtle.net/bob/c/lookup2.c>). Aus dem Header:
@@ -56,7 +54,6 @@ Hash( const char *String )
  * nicht alle seiner Funktionen werden hier genutzt.
  */
 
-
 #define hashsize(n) ((UINT32)1<<(n))
 #define hashmask(n) (hashsize(n)-1)
 
@@ -73,7 +70,6 @@ Hash( const char *String )
 	c -= a; c -= b; c ^= (b>>15); \
 } /* mix */
 
-
 static UINT32
 jenkins_hash( register UINT8 *k, register UINT32 length, register UINT32 initval )
 {
@@ -123,5 +119,4 @@ jenkins_hash( register UINT8 *k, register UINT32 length, register UINT32 initval
 	return c;
 } /* jenkins_hash */
 
-
 /* -eof- */
diff --git a/src/ngircd/hash.h b/src/ngircd/hash.h
index 684eeeee..b28ff4db 100644
--- a/src/ngircd/hash.h
+++ b/src/ngircd/hash.h
@@ -9,7 +9,6 @@
  * Please read the file COPYING, README and AUTHORS for more information.
  */
 
-
 #ifndef __hash_h__
 #define __hash_h__
 
@@ -22,5 +21,4 @@ GLOBAL UINT32 Hash PARAMS((const char *String ));
 
 #endif
 
-
 /* -eof- */
diff --git a/src/ngircd/io.c b/src/ngircd/io.c
index fb39ecdd..7e78e49f 100644
--- a/src/ngircd/io.c
+++ b/src/ngircd/io.c
@@ -6,7 +6,6 @@
  * Please read the file COPYING, README and AUTHORS for more information.
  *
  * Copyright (c) 2005 Florian Westphal (westphal@foo.fh-furtwangen.de)
- *
  */
 
 #include "portab.h"
diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c
index 1b8685d0..a7a273d8 100644
--- a/src/ngircd/irc-channel.c
+++ b/src/ngircd/irc-channel.c
@@ -9,7 +9,6 @@
  * Please read the file COPYING, README and AUTHORS for more information.
  */
 
-
 #include "portab.h"
 
 /**
diff --git a/src/ngircd/irc-channel.h b/src/ngircd/irc-channel.h
index 89bbafef..685ec0c3 100644
--- a/src/ngircd/irc-channel.h
+++ b/src/ngircd/irc-channel.h
@@ -9,7 +9,6 @@
  * Please read the file COPYING, README and AUTHORS for more information.
  */
 
-
 #ifndef __irc_channel_h__
 #define __irc_channel_h__
 
@@ -26,8 +25,6 @@ GLOBAL bool IRC_LIST PARAMS((CLIENT *Client, REQUEST *Req ));
 
 GLOBAL bool IRC_CHANINFO PARAMS((CLIENT *Client, REQUEST *Req ));
 
-
 #endif
 
-
 /* -eof- */
diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c
index de2cd4d9..46e34271 100644
--- a/src/ngircd/irc-info.c
+++ b/src/ngircd/irc-info.c
@@ -9,7 +9,6 @@
  * Please read the file COPYING, README and AUTHORS for more information.
  */
 
-
 #include "portab.h"
 
 /**
diff --git a/src/ngircd/irc-info.h b/src/ngircd/irc-info.h
index 3ed03aa1..6b6124b9 100644
--- a/src/ngircd/irc-info.h
+++ b/src/ngircd/irc-info.h
@@ -9,7 +9,6 @@
  * Please read the file COPYING, README and AUTHORS for more information.
  */
 
-
 #ifndef __irc_info_h__
 #define __irc_info_h__
 
@@ -41,8 +40,6 @@ GLOBAL bool IRC_Send_NAMES PARAMS(( CLIENT *Client, CHANNEL *Chan ));
 GLOBAL bool IRC_Show_MOTD PARAMS(( CLIENT *Client ));
 GLOBAL bool IRC_Send_ISUPPORT PARAMS(( CLIENT *Client ));
 
-
 #endif
 
-
 /* -eof- */
diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c
index b310d8b8..a0f16a98 100644
--- a/src/ngircd/irc-login.c
+++ b/src/ngircd/irc-login.c
@@ -9,7 +9,6 @@
  * Please read the file COPYING, README and AUTHORS for more information.
  */
 
-
 #include "portab.h"
 
 /**
diff --git a/src/ngircd/irc-login.h b/src/ngircd/irc-login.h
index f06a5ffa..7ba53571 100644
--- a/src/ngircd/irc-login.h
+++ b/src/ngircd/irc-login.h
@@ -9,7 +9,6 @@
  * Please read the file COPYING, README and AUTHORS for more information.
  */
 
-
 #ifndef __irc_login_h__
 #define __irc_login_h__
 
@@ -29,5 +28,4 @@ GLOBAL bool IRC_QUIT PARAMS((CLIENT *Client, REQUEST *Req));
 
 #endif
 
-
 /* -eof- */
diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c
index 5639ec18..57af0bf6 100644
--- a/src/ngircd/irc-mode.c
+++ b/src/ngircd/irc-mode.c
@@ -9,7 +9,6 @@
  * Please read the file COPYING, README and AUTHORS for more information.
  */
 
-
 #include "portab.h"
 
 /**
diff --git a/src/ngircd/irc-mode.h b/src/ngircd/irc-mode.h
index 9d13a7eb..4447afb5 100644
--- a/src/ngircd/irc-mode.h
+++ b/src/ngircd/irc-mode.h
@@ -9,7 +9,6 @@
  * Please read the file COPYING, README and AUTHORS for more information.
  */
 
-
 #ifndef __irc_mode_h__
 #define __irc_mode_h__
 
@@ -21,8 +20,6 @@
 GLOBAL bool IRC_MODE PARAMS((CLIENT *Client, REQUEST *Req ));
 GLOBAL bool IRC_AWAY PARAMS((CLIENT *Client, REQUEST *Req ));
 
-
 #endif
 
-
 /* -eof- */
diff --git a/src/ngircd/irc-op.c b/src/ngircd/irc-op.c
index 34b0eb0f..5e36b02b 100644
--- a/src/ngircd/irc-op.c
+++ b/src/ngircd/irc-op.c
@@ -9,7 +9,6 @@
  * Please read the file COPYING, README and AUTHORS for more information.
  */
 
-
 #include "portab.h"
 
 /**
diff --git a/src/ngircd/irc-op.h b/src/ngircd/irc-op.h
index 0c8a0f20..1b551012 100644
--- a/src/ngircd/irc-op.h
+++ b/src/ngircd/irc-op.h
@@ -13,7 +13,6 @@
  * Channel operator commands (header)
  */
 
-
 #ifndef __irc_op_h__
 #define __irc_op_h__
 
@@ -21,8 +20,6 @@
 GLOBAL bool IRC_KICK PARAMS(( CLIENT *Client, REQUEST *Req ));
 GLOBAL bool IRC_INVITE PARAMS(( CLIENT *Client, REQUEST *Req ));
 
-
 #endif
 
-
 /* -eof- */
diff --git a/src/ngircd/irc-oper.c b/src/ngircd/irc-oper.c
index 7887ef60..e8b8d264 100644
--- a/src/ngircd/irc-oper.c
+++ b/src/ngircd/irc-oper.c
@@ -9,7 +9,6 @@
  * Please read the file COPYING, README and AUTHORS for more information.
  */
 
-
 #include "portab.h"
 
 /**
diff --git a/src/ngircd/irc-oper.h b/src/ngircd/irc-oper.h
index 6d7600f9..7d67a0bf 100644
--- a/src/ngircd/irc-oper.h
+++ b/src/ngircd/irc-oper.h
@@ -9,7 +9,6 @@
  * Please read the file COPYING, README and AUTHORS for more information.
  */
 
-
 #ifndef __irc_oper_h__
 #define __irc_oper_h__
 
@@ -26,8 +25,6 @@ GLOBAL bool IRC_CONNECT PARAMS((CLIENT *Client, REQUEST *Req ));
 GLOBAL bool IRC_DISCONNECT PARAMS((CLIENT *Client, REQUEST *Req ));
 GLOBAL bool IRC_WALLOPS PARAMS(( CLIENT *Client, REQUEST *Req ));
 
-
 #endif
 
-
 /* -eof- */
diff --git a/src/ngircd/irc-server.c b/src/ngircd/irc-server.c
index 8877a13c..b592eb9d 100644
--- a/src/ngircd/irc-server.c
+++ b/src/ngircd/irc-server.c
@@ -9,7 +9,6 @@
  * Please read the file COPYING, README and AUTHORS for more information.
  */
 
-
 #include "portab.h"
 
 /**
diff --git a/src/ngircd/irc-server.h b/src/ngircd/irc-server.h
index 072f16cc..39968d0c 100644
--- a/src/ngircd/irc-server.h
+++ b/src/ngircd/irc-server.h
@@ -9,7 +9,6 @@
  * Please read the file COPYING, README and AUTHORS for more information.
  */
 
-
 #ifndef __irc_server_h__
 #define __irc_server_h__
 
@@ -24,8 +23,6 @@ GLOBAL bool IRC_SQUIT PARAMS((CLIENT *Client, REQUEST *Req ));
 
 GLOBAL bool IRC_ENDOFMOTD_Server PARAMS((CLIENT *Client));
 
-
 #endif
 
-
 /* -eof- */
diff --git a/src/ngircd/irc-write.c b/src/ngircd/irc-write.c
index 077b45ef..16aac9a0 100644
--- a/src/ngircd/irc-write.c
+++ b/src/ngircd/irc-write.c
@@ -9,7 +9,6 @@
  * Please read the file COPYING, README and AUTHORS for more information.
  */
 
-
 #include "portab.h"
 
 /**
diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c
index 9e2aaeaf..8dd9bf74 100644
--- a/src/ngircd/irc.c
+++ b/src/ngircd/irc.c
@@ -9,7 +9,6 @@
  * Please read the file COPYING, README and AUTHORS for more information.
  */
 
-
 #include "portab.h"
 
 /**
diff --git a/src/ngircd/lists.c b/src/ngircd/lists.c
index cde928f6..b30326de 100644
--- a/src/ngircd/lists.c
+++ b/src/ngircd/lists.c
@@ -9,7 +9,6 @@
  * Please read the file COPYING, README and AUTHORS for more information.
  */
 
-
 #include "portab.h"
 
 /**
@@ -211,7 +210,6 @@ Lists_MakeMask(const char *Pattern)
 } /* Lists_MakeMask */
 
 
-
 bool
 Lists_Check( struct list_head *header, CLIENT *Client)
 {
diff --git a/src/ngircd/lists.h b/src/ngircd/lists.h
index c39325ea..28f5478d 100644
--- a/src/ngircd/lists.h
+++ b/src/ngircd/lists.h
@@ -9,7 +9,6 @@
  * Please read the file COPYING, README and AUTHORS for more information.
  */
 
-
 #ifndef __lists_h__
 #define __lists_h__
 
@@ -27,7 +26,6 @@ struct list_head {
 	struct list_elem *first;
 };
 
-
 GLOBAL struct list_elem *Lists_GetFirst PARAMS((const struct list_head *));
 GLOBAL struct list_elem *Lists_GetNext PARAMS((const struct list_elem *));
 
@@ -45,4 +43,5 @@ GLOBAL const char *Lists_MakeMask PARAMS((const char *Pattern));
 GLOBAL const char *Lists_GetMask PARAMS(( const struct list_elem *e ));
 
 #endif
+
 /* -eof- */
diff --git a/src/ngircd/log.c b/src/ngircd/log.c
index ea9b367a..d79de269 100644
--- a/src/ngircd/log.c
+++ b/src/ngircd/log.c
@@ -9,7 +9,6 @@
  * Please read the file COPYING, README and AUTHORS for more information.
  */
 
-
 #include "portab.h"
 
 /**
diff --git a/src/ngircd/log.h b/src/ngircd/log.h
index b8546cdd..5222b5d2 100644
--- a/src/ngircd/log.h
+++ b/src/ngircd/log.h
@@ -9,7 +9,6 @@
  * Please read the file COPYING, README and AUTHORS for more information.
  */
 
-
 #ifndef __log_h__
 #define __log_h__
 
@@ -31,10 +30,8 @@
 #	define LOG_DEBUG 7
 #endif
 
-
 #define LOG_snotice 1024
 
-
 GLOBAL void Log_Init PARAMS(( bool Daemon_Mode ));
 GLOBAL void Log_Exit PARAMS(( void ));
 
@@ -57,8 +54,6 @@ GLOBAL void Log_Subprocess PARAMS((const int Level, const char *Format, ...));
 GLOBAL void Log_InitErrorfile PARAMS(( void ));
 #endif
 
-
 #endif
 
-
 /* -eof- */
diff --git a/src/ngircd/match.c b/src/ngircd/match.c
index 6c28938e..162a4f28 100644
--- a/src/ngircd/match.c
+++ b/src/ngircd/match.c
@@ -9,7 +9,6 @@
  * Please read the file COPYING, README and AUTHORS for more information.
  */
 
-
 #include "portab.h"
 
 /**
diff --git a/src/ngircd/match.h b/src/ngircd/match.h
index b092b967..2efe3f5b 100644
--- a/src/ngircd/match.h
+++ b/src/ngircd/match.h
@@ -9,7 +9,6 @@
  * Please read the file COPYING, README and AUTHORS for more information.
  */
 
-
 #ifndef __match_h__
 #define __match_h__
 
@@ -21,8 +20,6 @@
 GLOBAL bool Match PARAMS(( const char *Pattern, const char *String ));
 GLOBAL bool MatchCaseInsensitive PARAMS(( const char *Pattern, const char *searchme ));
 
-
 #endif
 
-
 /* -eof- */
diff --git a/src/ngircd/messages.h b/src/ngircd/messages.h
index 07df4e45..93bef3d7 100644
--- a/src/ngircd/messages.h
+++ b/src/ngircd/messages.h
@@ -9,7 +9,6 @@
  * Please read the file COPYING, README and AUTHORS for more information.
  */
 
-
 #ifndef __messages_h__
 #define __messages_h__
 
@@ -139,8 +138,6 @@
 #define RPL_STATSLINKINFOZIP_MSG	"211 %s %s %d %ld %ld/%ld %ld %ld/%ld :%ld"
 #endif
 
-
 #endif
 
-
 /* -eof- */
diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c
index ac69a753..e595caf0 100644
--- a/src/ngircd/ngircd.c
+++ b/src/ngircd/ngircd.c
@@ -9,7 +9,6 @@
  * Please read the file COPYING, README and AUTHORS for more information.
  */
 
-
 #include "portab.h"
 
 /**
@@ -407,7 +406,7 @@ Fill_Version( void )
 
 	snprintf(NGIRCd_Version, sizeof NGIRCd_Version, "%s %s-%s",
 		 PACKAGE_NAME, PACKAGE_VERSION, NGIRCd_VersionAddition);
-	} /* Fill_Version */
+} /* Fill_Version */
 
 
 /**
@@ -548,8 +547,8 @@ NGIRCd_getNobodyID(uid_t *uid, gid_t *gid )
 	*gid = pwd->pw_gid;
 	endpwent();
 
-	return true;	
-}
+	return true;
+} /* NGIRCd_getNobodyID */
 
 
 static bool
@@ -702,7 +701,7 @@ NGIRCd_Init( bool NGIRCd_NoDaemon )
 	if (fd > 2)
 		close(fd);
 	return false;
-}
+} /* NGIRCd_Init */
 
 
 /* -eof- */
diff --git a/src/ngircd/ngircd.h b/src/ngircd/ngircd.h
index bd699e50..fb237946 100644
--- a/src/ngircd/ngircd.h
+++ b/src/ngircd/ngircd.h
@@ -13,7 +13,6 @@
  * Prototypes of the "main module".
  */
 
-
 #ifndef __ngircd_h__
 #define __ngircd_h__
 
@@ -51,5 +50,4 @@ GLOBAL char NGIRCd_ProtoID[COMMAND_LEN];/* Protokoll- und Server-Identifikation
 
 #endif
 
-
 /* -eof- */
diff --git a/src/ngircd/op.c b/src/ngircd/op.c
index 64c7e1e1..7c0737f9 100644
--- a/src/ngircd/op.c
+++ b/src/ngircd/op.c
@@ -9,7 +9,6 @@
  * Please read the file COPYING, README and AUTHORS for more information.
  */
 
-
 #include "portab.h"
 
 /**
@@ -32,6 +31,7 @@
 #include <exp.h>
 #include "op.h"
 
+
 /**
  * Return and log a "no privileges" message.
  */
@@ -82,3 +82,6 @@ Op_Check(CLIENT * Client, REQUEST * Req)
 	 * to trust remote operators. */
 	return true;
 } /* Op_Check */
+
+
+/* -eof- */
diff --git a/src/ngircd/parse.h b/src/ngircd/parse.h
index ef42be14..3acab7d5 100644
--- a/src/ngircd/parse.h
+++ b/src/ngircd/parse.h
@@ -9,7 +9,6 @@
  * Please read the file COPYING, README and AUTHORS for more information.
  */
 
-
 #ifndef __parse_h__
 #define __parse_h__
 
@@ -38,12 +37,10 @@ typedef struct _COMMAND
 	long bytes;			/* number of bytes created */
 } COMMAND;
 
-
 GLOBAL bool Parse_Request PARAMS((CONN_ID Idx, char *Request ));
 
 GLOBAL COMMAND *Parse_GetCommandStruct PARAMS(( void ));
 
 #endif
 
-
 /* -eof- */
diff --git a/src/ngircd/resolve.c b/src/ngircd/resolve.c
index ce1bf0d5..9aeb68e3 100644
--- a/src/ngircd/resolve.c
+++ b/src/ngircd/resolve.c
@@ -9,7 +9,6 @@
  * Please read the file COPYING, README and AUTHORS for more information.
  */
 
-
 #define RESOLVER_TIMEOUT (Conf_PongTimeout*3)/4
 
 #include "portab.h"
diff --git a/src/ngircd/sighandlers.h b/src/ngircd/sighandlers.h
index 87c693aa..68491d94 100644
--- a/src/ngircd/sighandlers.h
+++ b/src/ngircd/sighandlers.h
@@ -22,3 +22,5 @@ bool Signals_Init PARAMS((void));
 void Signals_Exit PARAMS((void));
 
 #endif
+
+/* -eof- */
diff --git a/src/portab/exp.h b/src/portab/exp.h
index db6fb7ee..d678b99a 100644
--- a/src/portab/exp.h
+++ b/src/portab/exp.h
@@ -18,5 +18,4 @@
 #undef GLOBAL
 #define GLOBAL
 
-
 /* -eof- */
diff --git a/src/portab/imp.h b/src/portab/imp.h
index 2c26e57d..68b5aeee 100644
--- a/src/portab/imp.h
+++ b/src/portab/imp.h
@@ -18,5 +18,4 @@
 #undef GLOBAL
 #define GLOBAL extern
 
-
 /* -eof- */
diff --git a/src/portab/portab.h b/src/portab/portab.h
index cb00dfaf..a75aa34d 100644
--- a/src/portab/portab.h
+++ b/src/portab/portab.h
@@ -9,7 +9,6 @@
  * Please read the file COPYING, README and AUTHORS for more information.
  */
 
-
 #ifndef __PORTAB__
 #define __PORTAB__
 
diff --git a/src/portab/portabtest.c b/src/portab/portabtest.c
index 2675409a..09afbfd1 100644
--- a/src/portab/portabtest.c
+++ b/src/portab/portabtest.c
@@ -9,7 +9,6 @@
  * Please read the file COPYING, README and AUTHORS for more information.
  */
 
-
 #include "portab.h"
 
 /**
diff --git a/src/portab/splint.h b/src/portab/splint.h
index 74dd120f..be33e475 100644
--- a/src/portab/splint.h
+++ b/src/portab/splint.h
@@ -10,7 +10,6 @@
  * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
  */
 
-
 #ifndef __splint__
 #define __splint__
 
@@ -37,8 +36,6 @@
 
 #define WNOHANG 0
 
-
 #endif
 
-
 /* -eof- */
diff --git a/src/portab/strtok_r.c b/src/portab/strtok_r.c
index 043898e9..4d00772f 100644
--- a/src/portab/strtok_r.c
+++ b/src/portab/strtok_r.c
@@ -34,4 +34,3 @@ strtok_r(char *str, const char *delim, char **saveptr)
 }
 
 #endif
-
diff --git a/src/portab/vsnprintf.c b/src/portab/vsnprintf.c
index 081152e1..c97a53e8 100644
--- a/src/portab/vsnprintf.c
+++ b/src/portab/vsnprintf.c
@@ -9,7 +9,6 @@
  * Please read the file COPYING, README and AUTHORS for more information.
  */
 
-
 #include "portab.h"
 
 /**
diff --git a/src/tool/tool.h b/src/tool/tool.h
index ba52f66b..60a65379 100644
--- a/src/tool/tool.h
+++ b/src/tool/tool.h
@@ -9,7 +9,6 @@
  * Please read the file COPYING, README and AUTHORS for more information.
  */
 
-
 #ifndef __tool_h__
 #define __tool_h__
 
@@ -40,5 +39,4 @@ GLOBAL int ngt_SyslogFacilityID PARAMS((char *Name, int DefaultFacility));
 
 #endif
 
-
 /* -eof- */