From a534e71e8da9a7bab55e7e76358a60dcbd3e25d5 Mon Sep 17 00:00:00 2001
From: Alexander Barton <alex@barton.de>
Date: Mon, 17 Mar 2014 18:02:57 +0100
Subject: [PATCH] Re-add #include's for header files of the C file itself

This partially reverts commit b130b35f4, "Update #include's: remove
unused and add missing ones", but fixes the following compiler and
analyzer warnings of Apple Xcode 5:

 "Semantic issue: No previous prototype for function 'yyy'"
---
 src/ngircd/client-cap.c   | 2 ++
 src/ngircd/hash.c         | 2 ++
 src/ngircd/irc-cap.c      | 2 ++
 src/ngircd/irc-channel.c  | 2 ++
 src/ngircd/irc-encoding.c | 2 ++
 src/ngircd/irc-login.c    | 2 ++
 src/ngircd/irc-metadata.c | 2 ++
 src/ngircd/irc-mode.c     | 2 ++
 src/ngircd/irc-op.c       | 2 ++
 src/ngircd/irc-oper.c     | 2 ++
 src/ngircd/irc-server.c   | 2 ++
 src/ngircd/match.c        | 2 ++
 src/ngircd/numeric.c      | 2 ++
 src/ngircd/op.c           | 2 ++
 src/ngircd/resolve.c      | 2 ++
 src/ngircd/sighandlers.c  | 2 ++
 16 files changed, 32 insertions(+)

diff --git a/src/ngircd/client-cap.c b/src/ngircd/client-cap.c
index e6a4eb22..e403da1c 100644
--- a/src/ngircd/client-cap.c
+++ b/src/ngircd/client-cap.c
@@ -23,6 +23,8 @@
 #include "conn.h"
 #include "log.h"
 
+#include "client-cap.h"
+
 GLOBAL int
 Client_Cap(CLIENT *Client)
 {
diff --git a/src/ngircd/hash.c b/src/ngircd/hash.c
index 7e5ad9d6..cdac5e8d 100644
--- a/src/ngircd/hash.c
+++ b/src/ngircd/hash.c
@@ -22,6 +22,8 @@
 #include "defines.h"
 #include "tool.h"
 
+#include "hash.h"
+
 static UINT32 jenkins_hash PARAMS((UINT8 *k, UINT32 length, UINT32 initval));
 
 /**
diff --git a/src/ngircd/irc-cap.c b/src/ngircd/irc-cap.c
index 61e47f83..bf4c9cd0 100644
--- a/src/ngircd/irc-cap.c
+++ b/src/ngircd/irc-cap.c
@@ -29,6 +29,8 @@
 #include "messages.h"
 #include "parse.h"
 
+#include "irc-cap.h"
+
 /* Local functions */
 
 /**
diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c
index 3ea82324..c142243a 100644
--- a/src/ngircd/irc-channel.c
+++ b/src/ngircd/irc-channel.c
@@ -35,6 +35,8 @@
 #include "irc-write.h"
 #include "conf.h"
 
+#include "irc-channel.h"
+
 /**
  * Part from all channels.
  *
diff --git a/src/ngircd/irc-encoding.c b/src/ngircd/irc-encoding.c
index 2c6ac597..7b7121b1 100644
--- a/src/ngircd/irc-encoding.c
+++ b/src/ngircd/irc-encoding.c
@@ -29,6 +29,8 @@
 #include "parse.h"
 #include "tool.h"
 
+#include "irc-encoding.h"
+
 /**
  * Handler for the IRC+ "CHARCONV" command.
  *
diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c
index 609b1873..af165cfb 100644
--- a/src/ngircd/irc-login.c
+++ b/src/ngircd/irc-login.c
@@ -34,6 +34,8 @@
 #include "irc-macros.h"
 #include "irc-write.h"
 
+#include "irc-login.h"
+
 static void Change_Nick PARAMS((CLIENT * Origin, CLIENT * Target, char *NewNick,
 				bool InformClient));
 
diff --git a/src/ngircd/irc-metadata.c b/src/ngircd/irc-metadata.c
index 32e04516..efb22017 100644
--- a/src/ngircd/irc-metadata.c
+++ b/src/ngircd/irc-metadata.c
@@ -29,6 +29,8 @@
 #include "messages.h"
 #include "parse.h"
 
+#include "irc-metadata.h"
+
 /**
  * Handler for the IRC+ "METADATA" command.
  *
diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c
index 12a7e30d..6a670079 100644
--- a/src/ngircd/irc-mode.c
+++ b/src/ngircd/irc-mode.c
@@ -31,6 +31,8 @@
 #include "messages.h"
 #include "conf.h"
 
+#include "irc-mode.h"
+
 static bool Client_Mode PARAMS((CLIENT *Client, REQUEST *Req, CLIENT *Origin,
 				CLIENT *Target));
 static bool Channel_Mode PARAMS((CLIENT *Client, REQUEST *Req, CLIENT *Origin,
diff --git a/src/ngircd/irc-op.c b/src/ngircd/irc-op.c
index 82a78ebf..b75841a8 100644
--- a/src/ngircd/irc-op.c
+++ b/src/ngircd/irc-op.c
@@ -28,6 +28,8 @@
 #include "messages.h"
 #include "parse.h"
 
+#include "irc-op.h"
+
 /* Local functions */
 
 static bool
diff --git a/src/ngircd/irc-oper.c b/src/ngircd/irc-oper.c
index f896098c..1d69a6cc 100644
--- a/src/ngircd/irc-oper.c
+++ b/src/ngircd/irc-oper.c
@@ -37,6 +37,8 @@
 #include "messages.h"
 #include "op.h"
 
+#include "irc-oper.h"
+
 /**
  * Handle invalid received OPER command.
  * Log OPER attempt and send error message to client.
diff --git a/src/ngircd/irc-server.c b/src/ngircd/irc-server.c
index 5ac8810f..92186aff 100644
--- a/src/ngircd/irc-server.c
+++ b/src/ngircd/irc-server.c
@@ -35,6 +35,8 @@
 #include "irc-write.h"
 #include "op.h"
 
+#include "irc-server.h"
+
 /**
  * Handler for the IRC "SERVER" command.
  *
diff --git a/src/ngircd/match.c b/src/ngircd/match.c
index 3acae908..93ddc0bc 100644
--- a/src/ngircd/match.c
+++ b/src/ngircd/match.c
@@ -22,6 +22,8 @@
 #include "defines.h"
 #include "tool.h"
 
+#include "match.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
diff --git a/src/ngircd/numeric.c b/src/ngircd/numeric.c
index 5217e14e..da863e4d 100644
--- a/src/ngircd/numeric.c
+++ b/src/ngircd/numeric.c
@@ -31,6 +31,8 @@
 #include "log.h"
 #include "parse.h"
 
+#include "numeric.h"
+
 /**
  * Announce a channel and its users in the network.
  */
diff --git a/src/ngircd/op.c b/src/ngircd/op.c
index 7b7befbb..4a113550 100644
--- a/src/ngircd/op.c
+++ b/src/ngircd/op.c
@@ -26,6 +26,8 @@
 #include "messages.h"
 #include "irc-write.h"
 
+#include "op.h"
+
 /**
  * Return and log a "no privileges" message.
  */
diff --git a/src/ngircd/resolve.c b/src/ngircd/resolve.c
index 01e303ea..be41ec8a 100644
--- a/src/ngircd/resolve.c
+++ b/src/ngircd/resolve.c
@@ -40,6 +40,8 @@
 #include "log.h"
 #include "ng_ipaddr.h"
 
+#include "resolve.h"
+
 static void Do_ResolveAddr PARAMS(( const ng_ipaddr_t *Addr, int Sock, int w_fd ));
 static void Do_ResolveName PARAMS(( const char *Host, int w_fd ));
 
diff --git a/src/ngircd/sighandlers.c b/src/ngircd/sighandlers.c
index e5345dbc..5cde24b0 100644
--- a/src/ngircd/sighandlers.c
+++ b/src/ngircd/sighandlers.c
@@ -33,6 +33,8 @@
 #include "log.h"
 #include "ngircd.h"
 
+#include "sighandlers.h"
+
 static int signalpipe[2];
 
 static const int signals_catch[] = {