diff --git a/src/ngircd/irc-cap.c b/src/ngircd/irc-cap.c
index af34c38c..39d1b3c2 100644
--- a/src/ngircd/irc-cap.c
+++ b/src/ngircd/irc-cap.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2012 Alexander Barton (alex@barton.de) and Contributors.
+ * Copyright (c)2001-2013 Alexander Barton (alex@barton.de) and Contributors.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,192 +33,14 @@
 #include "exp.h"
 #include "irc-cap.h"
 
-bool Handle_CAP_LS PARAMS((CLIENT *Client, char *Arg));
-bool Handle_CAP_LIST PARAMS((CLIENT *Client, char *Arg));
-bool Handle_CAP_REQ PARAMS((CLIENT *Client, char *Arg));
-bool Handle_CAP_ACK PARAMS((CLIENT *Client, char *Arg));
-bool Handle_CAP_CLEAR PARAMS((CLIENT *Client));
-bool Handle_CAP_END PARAMS((CLIENT *Client));
-
-void Set_CAP_Negotiation PARAMS((CLIENT *Client));
-
-int Parse_CAP PARAMS((int Capabilities, char *Args));
-char *Get_CAP_String PARAMS((int Capabilities));
-
-/**
- * Handler for the IRCv3 "CAP" command.
- *
- * @param Client The client from which this command has been received.
- * @param Req Request structure with prefix and all parameters.
- * @returns CONNECTED or DISCONNECTED.
- */
-GLOBAL bool
-IRC_CAP(CLIENT *Client, REQUEST *Req)
-{
-	assert(Client != NULL);
-	assert(Req != NULL);
-
-	/* Bad number of prameters? */
-	if (Req->argc < 1 || Req->argc > 2)
-		return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
-					  Client_ID(Client), Req->command);
-
-	LogDebug("Got \"%s %s\" command from \"%s\" ...",
-		 Req->command, Req->argv[0], Client_ID(Client));
-
-	if (Req->argc == 1) {
-		if (strcasecmp(Req->argv[0], "CLEAR") == 0)
-			return Handle_CAP_CLEAR(Client);
-		if (strcasecmp(Req->argv[0], "END") == 0)
-			return Handle_CAP_END(Client);
-	}
-	if (Req->argc >= 1 && Req->argc <= 2) {
-		if (strcasecmp(Req->argv[0], "LS") == 0)
-			return Handle_CAP_LS(Client, Req->argv[1]);
-		if (strcasecmp(Req->argv[0], "LIST") == 0)
-			return Handle_CAP_LIST(Client, Req->argv[1]);
-	}
-	if (Req->argc == 2) {
-		if (strcasecmp(Req->argv[0], "REQ") == 0)
-			return Handle_CAP_REQ(Client, Req->argv[1]);
-		if (strcasecmp(Req->argv[0], "ACK") == 0)
-			return Handle_CAP_ACK(Client, Req->argv[1]);
-	}
-
-	return IRC_WriteStrClient(Client, ERR_INVALIDCAP_MSG,
-				  Client_ID(Client), Req->argv[0]);
-}
-
-/**
- * Handler for the "CAP LS" command.
- *
- * @param Client The client from which this command has been received.
- * @param Arg Command argument or NULL.
- * @returns CONNECTED or DISCONNECTED.
- */
-bool
-Handle_CAP_LS(CLIENT *Client, UNUSED char *Arg)
-{
-	assert(Client != NULL);
-
-	Set_CAP_Negotiation(Client);
-
-	return IRC_WriteStrClient(Client,
-				  "CAP %s LS :multi-prefix",
-				  Client_ID(Client));
-}
-
-/**
- * Handler for the "CAP LIST" command.
- *
- * @param Client The client from which this command has been received.
- * @param Arg Command argument or NULL.
- * @returns CONNECTED or DISCONNECTED.
- */
-bool
-Handle_CAP_LIST(CLIENT *Client, UNUSED char *Arg)
-{
-	assert(Client != NULL);
-
-	return IRC_WriteStrClient(Client, "CAP %s LIST :%s", Client_ID(Client),
-				  Get_CAP_String(Client_Cap(Client)));
-}
-
-/**
- * Handler for the "CAP REQ" command.
- *
- * @param Client The client from which this command has been received.
- * @param Arg Command argument.
- * @returns CONNECTED or DISCONNECTED.
- */
-bool
-Handle_CAP_REQ(CLIENT *Client, char *Arg)
-{
-	int new_cap;
-
-	assert(Client != NULL);
-	assert(Arg != NULL);
-
-	Set_CAP_Negotiation(Client);
-
-	new_cap = Parse_CAP(Client_Cap(Client), Arg);
-
-	if (new_cap < 0)
-		return IRC_WriteStrClient(Client, "CAP %s NAK :%s",
-					  Client_ID(Client), Arg);
-
-	Client_CapSet(Client, new_cap);
-	return IRC_WriteStrClient(Client, "CAP %s ACK :%s",
-				  Client_ID(Client), Arg);
-}
-
-/**
- * Handler for the "CAP ACK" command.
- *
- * @param Client The client from which this command has been received.
- * @param Arg Command argument.
- * @returns CONNECTED or DISCONNECTED.
- */
-bool
-Handle_CAP_ACK(UNUSED CLIENT *Client, UNUSED char *Arg)
-{
-	assert(Client != NULL);
-	assert(Arg != NULL);
-
-	return CONNECTED;
-}
-
-/**
- * Handler for the "CAP CLEAR" command.
- *
- * @param Client The client from which this command has been received.
- * @returns CONNECTED or DISCONNECTED.
- */
-bool
-Handle_CAP_CLEAR(CLIENT *Client)
-{
-	int cap_old;
-
-	assert(Client != NULL);
-
-	cap_old = Client_Cap(Client);
-	if (cap_old & CLIENT_CAP_MULTI_PREFIX)
-		Client_CapDel(Client, CLIENT_CAP_MULTI_PREFIX);
-
-	return IRC_WriteStrClient(Client, "CAP %s ACK :%s", Client_ID(Client),
-				  Get_CAP_String(cap_old));
-}
-
-/**
- * Handler for the "CAP END" command.
- *
- * @param Client The client from which this command has been received.
- * @returns CONNECTED or DISCONNECTED.
- */
-bool
-Handle_CAP_END(CLIENT *Client)
-{
-	assert(Client != NULL);
-
-	if (Client_Type(Client) != CLIENT_USER) {
-		/* User is still logging in ... */
-		Client_CapDel(Client, CLIENT_CAP_PENDING);
-
-		if (Client_Type(Client) == CLIENT_WAITCAPEND) {
-			/* Only "CAP END" was missing: log in! */
-			return Login_User(Client);
-		}
-	}
-
-	return CONNECTED;
-}
+/* Local functions */
 
 /**
  * Set CAP negotiation status and mark client as "supports capabilities".
  *
  * @param Client The client to handle.
  */
-void
+static void
 Set_CAP_Negotiation(CLIENT *Client)
 {
 	assert(Client != NULL);
@@ -234,7 +56,7 @@ Set_CAP_Negotiation(CLIENT *Client)
  * @param Args The string containing space-separated capability names.
  * @return Changed capability flags or 0 on error.
  */
-int
+static int
 Parse_CAP(int Capabilities, char *Args)
 {
 	static char tmp[COMMAND_LEN];
@@ -275,7 +97,7 @@ Parse_CAP(int Capabilities, char *Args)
  * @param Capabilities Capability flags (bitmask).
  * @return Pointer to textual representation.
  */
-char *
+static char *
 Get_CAP_String(int Capabilities)
 {
 	static char txt[COMMAND_LEN];
@@ -288,4 +110,174 @@ Get_CAP_String(int Capabilities)
 	return txt;
 }
 
+/**
+ * Handler for the "CAP LS" command.
+ *
+ * @param Client The client from which this command has been received.
+ * @param Arg Command argument or NULL.
+ * @returns CONNECTED or DISCONNECTED.
+ */
+static bool
+Handle_CAP_LS(CLIENT *Client, UNUSED char *Arg)
+{
+	assert(Client != NULL);
+
+	Set_CAP_Negotiation(Client);
+
+	return IRC_WriteStrClient(Client,
+				  "CAP %s LS :multi-prefix",
+				  Client_ID(Client));
+}
+
+/**
+ * Handler for the "CAP LIST" command.
+ *
+ * @param Client The client from which this command has been received.
+ * @param Arg Command argument or NULL.
+ * @returns CONNECTED or DISCONNECTED.
+ */
+static bool
+Handle_CAP_LIST(CLIENT *Client, UNUSED char *Arg)
+{
+	assert(Client != NULL);
+
+	return IRC_WriteStrClient(Client, "CAP %s LIST :%s", Client_ID(Client),
+				  Get_CAP_String(Client_Cap(Client)));
+}
+
+/**
+ * Handler for the "CAP REQ" command.
+ *
+ * @param Client The client from which this command has been received.
+ * @param Arg Command argument.
+ * @returns CONNECTED or DISCONNECTED.
+ */
+static bool
+Handle_CAP_REQ(CLIENT *Client, char *Arg)
+{
+	int new_cap;
+
+	assert(Client != NULL);
+	assert(Arg != NULL);
+
+	Set_CAP_Negotiation(Client);
+
+	new_cap = Parse_CAP(Client_Cap(Client), Arg);
+
+	if (new_cap < 0)
+		return IRC_WriteStrClient(Client, "CAP %s NAK :%s",
+					  Client_ID(Client), Arg);
+
+	Client_CapSet(Client, new_cap);
+	return IRC_WriteStrClient(Client, "CAP %s ACK :%s",
+				  Client_ID(Client), Arg);
+}
+
+/**
+ * Handler for the "CAP ACK" command.
+ *
+ * @param Client The client from which this command has been received.
+ * @param Arg Command argument.
+ * @returns CONNECTED or DISCONNECTED.
+ */
+static bool
+Handle_CAP_ACK(UNUSED CLIENT *Client, UNUSED char *Arg)
+{
+	assert(Client != NULL);
+	assert(Arg != NULL);
+
+	return CONNECTED;
+}
+
+/**
+ * Handler for the "CAP CLEAR" command.
+ *
+ * @param Client The client from which this command has been received.
+ * @returns CONNECTED or DISCONNECTED.
+ */
+static bool
+Handle_CAP_CLEAR(CLIENT *Client)
+{
+	int cap_old;
+
+	assert(Client != NULL);
+
+	cap_old = Client_Cap(Client);
+	if (cap_old & CLIENT_CAP_MULTI_PREFIX)
+		Client_CapDel(Client, CLIENT_CAP_MULTI_PREFIX);
+
+	return IRC_WriteStrClient(Client, "CAP %s ACK :%s", Client_ID(Client),
+				  Get_CAP_String(cap_old));
+}
+
+/**
+ * Handler for the "CAP END" command.
+ *
+ * @param Client The client from which this command has been received.
+ * @returns CONNECTED or DISCONNECTED.
+ */
+static bool
+Handle_CAP_END(CLIENT *Client)
+{
+	assert(Client != NULL);
+
+	if (Client_Type(Client) != CLIENT_USER) {
+		/* User is still logging in ... */
+		Client_CapDel(Client, CLIENT_CAP_PENDING);
+
+		if (Client_Type(Client) == CLIENT_WAITCAPEND) {
+			/* Only "CAP END" was missing: log in! */
+			return Login_User(Client);
+		}
+	}
+
+	return CONNECTED;
+}
+
+/* Global functions */
+
+/**
+ * Handler for the IRCv3 command "CAP".
+ *
+ * @param Client The client from which this command has been received.
+ * @param Req Request structure with prefix and all parameters.
+ * @return CONNECTED or DISCONNECTED.
+ */
+GLOBAL bool
+IRC_CAP(CLIENT *Client, REQUEST *Req)
+{
+	assert(Client != NULL);
+	assert(Req != NULL);
+
+	/* Bad number of prameters? */
+	if (Req->argc < 1 || Req->argc > 2)
+		return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
+					  Client_ID(Client), Req->command);
+
+	LogDebug("Got \"%s %s\" command from \"%s\" ...",
+		 Req->command, Req->argv[0], Client_ID(Client));
+
+	if (Req->argc == 1) {
+		if (strcasecmp(Req->argv[0], "CLEAR") == 0)
+			return Handle_CAP_CLEAR(Client);
+		if (strcasecmp(Req->argv[0], "END") == 0)
+			return Handle_CAP_END(Client);
+	}
+	if (Req->argc >= 1 && Req->argc <= 2) {
+		if (strcasecmp(Req->argv[0], "LS") == 0)
+			return Handle_CAP_LS(Client, Req->argv[1]);
+		if (strcasecmp(Req->argv[0], "LIST") == 0)
+			return Handle_CAP_LIST(Client, Req->argv[1]);
+	}
+	if (Req->argc == 2) {
+		if (strcasecmp(Req->argv[0], "REQ") == 0)
+			return Handle_CAP_REQ(Client, Req->argv[1]);
+		if (strcasecmp(Req->argv[0], "ACK") == 0)
+			return Handle_CAP_ACK(Client, Req->argv[1]);
+	}
+
+	return IRC_WriteStrClient(Client, ERR_INVALIDCAP_MSG,
+				  Client_ID(Client), Req->argv[0]);
+}
+
 /* -eof- */