5 files changed, 30 insertions, 36 deletions
diff --git a/libexec/talkd/announce.c b/libexec/talkd/announce.c
index 421b9663fa9..c5cd96989c7 100644
--- a/libexec/talkd/announce.c
+++ b/libexec/talkd/announce.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: announce.c,v 1.23 2015/01/16 06:39:51 deraadt Exp $	*/
+/*	$OpenBSD: announce.c,v 1.24 2016/02/01 07:25:51 mestre Exp $	*/
 
 /*
  * Copyright (c) 1983 Regents of the University of California.
@@ -29,21 +29,16 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
 #include <protocols/talkd.h>
-#include <errno.h>
-#include <syslog.h>
-#include <unistd.h>
+
 #include <limits.h>
+#include <paths.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 #include <vis.h>
-#include <paths.h>
+
 #include "talkd.h"
 
 static void	print_mesg(FILE *,CTL_MSG *,char *);
diff --git a/libexec/talkd/print.c b/libexec/talkd/print.c
index 9a2dadc34c6..2fe75c5678f 100644
--- a/libexec/talkd/print.c
+++ b/libexec/talkd/print.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: print.c,v 1.11 2009/10/27 23:59:31 deraadt Exp $	*/
+/*	$OpenBSD: print.c,v 1.12 2016/02/01 07:25:51 mestre Exp $	*/
 
 /*
  * Copyright (c) 1983 Regents of the University of California.
@@ -31,12 +31,11 @@
 
 /* debug print routines */
 
-#include <sys/types.h>
 #include <sys/socket.h>
 #include <protocols/talkd.h>
-#include <syslog.h>
+
 #include <stdio.h>
-#include "talkd.h"
+#include <syslog.h>
 
 static	char *types[] = {
 	"leave_invite", "look_up", "delete", "announce"
diff --git a/libexec/talkd/process.c b/libexec/talkd/process.c
index 91b10ee4818..f53d485bb02 100644
--- a/libexec/talkd/process.c
+++ b/libexec/talkd/process.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: process.c,v 1.21 2015/01/16 06:39:51 deraadt Exp $	*/
+/*	$OpenBSD: process.c,v 1.22 2016/02/01 07:25:51 mestre Exp $	*/
 
 /*
  * Copyright (c) 1983 Regents of the University of California.
@@ -37,18 +37,20 @@
  *		  in the table for the local user
  *	DELETE - delete invitation
  */
-#include <sys/stat.h>
 #include <sys/socket.h>
-#include <netinet/in.h>
+#include <sys/stat.h>
 #include <arpa/inet.h>
 #include <protocols/talkd.h>
+
+#include <ctype.h>
+#include <limits.h>
 #include <netdb.h>
-#include <syslog.h>
+#include <paths.h>
 #include <stdio.h>
 #include <string.h>
-#include <ctype.h>
-#include <paths.h>
-#include <limits.h>
+#include <syslog.h>
+#include <utmp.h>
+
 #include "talkd.h"
 
 #define	satosin(sa)	((struct sockaddr_in *)(sa))
@@ -180,8 +182,6 @@ do_announce(CTL_MSG *mp, CTL_RESPONSE *rp)
 	}
 }
 
-#include <utmp.h>
-
 /*
  * Search utmp for the local user
  */
diff --git a/libexec/talkd/table.c b/libexec/talkd/table.c
index 556ddfd4d66..b341ba2908b 100644
--- a/libexec/talkd/table.c
+++ b/libexec/talkd/table.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: table.c,v 1.16 2015/01/16 06:39:51 deraadt Exp $	*/
+/*	$OpenBSD: table.c,v 1.17 2016/02/01 07:25:51 mestre Exp $	*/
 
 /*
  * Copyright (c) 1983 Regents of the University of California.
@@ -37,15 +37,15 @@
  *
  * Consider this a mis-guided attempt at modularity
  */
-#include <sys/time.h>
-#include <sys/socket.h>
 #include <sys/queue.h>
+#include <sys/socket.h>
 #include <protocols/talkd.h>
-#include <syslog.h>
-#include <unistd.h>
-#include <stdio.h>
+
 #include <stdlib.h>
 #include <string.h>
+#include <syslog.h>
+#include <unistd.h>
+
 #include "talkd.h"
 
 #define MAX_ID 16000	/* << 2^15 so I don't have sign troubles */
diff --git a/libexec/talkd/talkd.c b/libexec/talkd/talkd.c
index f28d7acf071..14135d67754 100644
--- a/libexec/talkd/talkd.c
+++ b/libexec/talkd/talkd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: talkd.c,v 1.23 2015/01/16 06:39:51 deraadt Exp $	*/
+/*	$OpenBSD: talkd.c,v 1.24 2016/02/01 07:25:51 mestre Exp $	*/
 
 /*
  * Copyright (c) 1983 Regents of the University of California.
@@ -35,19 +35,19 @@
  * disconnect all descriptors and ttys, and then endless
  * loop on waiting for and processing requests
  */
-#include <sys/types.h>
 #include <sys/socket.h>
 #include <protocols/talkd.h>
-#include <signal.h>
-#include <syslog.h>
-#include <time.h>
+
 #include <errno.h>
-#include <unistd.h>
 #include <limits.h>
+#include <paths.h>
+#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <paths.h>
+#include <syslog.h>
+#include <unistd.h>
+
 #include "talkd.h"
 
 int	debug = 0;