From 3daadfc83361cf4f31017a7fed5a5910cd8c4ce9 Mon Sep 17 00:00:00 2001
From: Xin LI <delphij@FreeBSD.org>
Date: Fri, 11 Dec 2009 23:23:57 +0000
Subject: [PATCH] Move unistd.h includes to individual .c files and remove
 unnecessary includes.

---
 usr.bin/talk/ctl_transact.c | 1 -
 usr.bin/talk/display.c      | 1 +
 usr.bin/talk/get_addrs.c    | 1 +
 usr.bin/talk/get_iface.c    | 1 +
 usr.bin/talk/get_names.c    | 1 +
 usr.bin/talk/invite.c       | 1 +
 usr.bin/talk/look_up.c      | 1 +
 usr.bin/talk/talk.c         | 1 +
 usr.bin/talk/talk.h         | 1 -
 9 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/usr.bin/talk/ctl_transact.c b/usr.bin/talk/ctl_transact.c
index 9c8665dab0dc..ff5b4622411d 100644
--- a/usr.bin/talk/ctl_transact.c
+++ b/usr.bin/talk/ctl_transact.c
@@ -42,7 +42,6 @@ static const char sccsid[] = "@(#)ctl_transact.c	8.1 (Berkeley) 6/6/93";
 #include <arpa/inet.h>
 
 #include <errno.h>
-#include <string.h>
 
 #include "talk.h"
 #include "talk_ctl.h"
diff --git a/usr.bin/talk/display.c b/usr.bin/talk/display.c
index f565354b3e90..11f5c809c1c1 100644
--- a/usr.bin/talk/display.c
+++ b/usr.bin/talk/display.c
@@ -44,6 +44,7 @@ static const char sccsid[] = "@(#)display.c	8.1 (Berkeley) 6/6/93";
  * displaying of text
  */
 #include <ctype.h>
+#include <unistd.h>
 
 #include "talk.h"
 
diff --git a/usr.bin/talk/get_addrs.c b/usr.bin/talk/get_addrs.c
index 2923021aa551..fbd415b5b1c9 100644
--- a/usr.bin/talk/get_addrs.c
+++ b/usr.bin/talk/get_addrs.c
@@ -42,6 +42,7 @@ static const char sccsid[] = "@(#)get_addrs.c	8.1 (Berkeley) 6/6/93";
 #include <err.h>
 #include <netdb.h>
 #include <string.h>
+#include <unistd.h>
 
 #include "talk.h"
 #include "talk_ctl.h"
diff --git a/usr.bin/talk/get_iface.c b/usr.bin/talk/get_iface.c
index ebf08bd48a17..96d3d6edabb5 100644
--- a/usr.bin/talk/get_iface.c
+++ b/usr.bin/talk/get_iface.c
@@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$");
 
 #include <errno.h>
 #include <string.h>
+#include <unistd.h>
 
 #include "talk.h"
 
diff --git a/usr.bin/talk/get_names.c b/usr.bin/talk/get_names.c
index b3e0f7b661e7..a4ea39df5b91 100644
--- a/usr.bin/talk/get_names.c
+++ b/usr.bin/talk/get_names.c
@@ -45,6 +45,7 @@ static const char sccsid[] = "@(#)get_names.c	8.1 (Berkeley) 6/6/93";
 #include <pwd.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 #include "talk.h"
 
diff --git a/usr.bin/talk/invite.c b/usr.bin/talk/invite.c
index 99c251435494..d94362b379ae 100644
--- a/usr.bin/talk/invite.c
+++ b/usr.bin/talk/invite.c
@@ -47,6 +47,7 @@ static const char sccsid[] = "@(#)invite.c	8.1 (Berkeley) 6/6/93";
 #include <errno.h>
 #include <setjmp.h>
 #include <signal.h>
+#include <unistd.h>
 
 #include "talk_ctl.h"
 #include "talk.h"
diff --git a/usr.bin/talk/look_up.c b/usr.bin/talk/look_up.c
index 1ccf23c652f0..7a66e6fbe03f 100644
--- a/usr.bin/talk/look_up.c
+++ b/usr.bin/talk/look_up.c
@@ -45,6 +45,7 @@ static const char sccsid[] = "@(#)look_up.c	8.1 (Berkeley) 6/6/93";
 
 #include <errno.h>
 #include <string.h>
+#include <unistd.h>
 
 #include "talk_ctl.h"
 #include "talk.h"
diff --git a/usr.bin/talk/talk.c b/usr.bin/talk/talk.c
index 5fc8337322d3..578e370bb189 100644
--- a/usr.bin/talk/talk.c
+++ b/usr.bin/talk/talk.c
@@ -46,6 +46,7 @@ static const char copyright[] =
 #endif
 
 #include <locale.h>
+#include <unistd.h>
 
 #include "talk.h"
 
diff --git a/usr.bin/talk/talk.h b/usr.bin/talk/talk.h
index e20c8ecc3700..47cbbaeaefd8 100644
--- a/usr.bin/talk/talk.h
+++ b/usr.bin/talk/talk.h
@@ -42,7 +42,6 @@
 #include <arpa/inet.h>
 #include <protocols/talkd.h>
 #include <curses.h>
-#include <unistd.h>
 
 extern	int sockt;
 extern	int curses_initialized;