header cleanup

from Edgar Pettijohn, with a correction from deraadt@

7 files changed, 20 insertions, 12 deletions

diff --git a/bin/stty/cchar.c b/bin/stty/cchar.c
index f585a633ede..fda596ba946 100644
--- a/bin/stty/cchar.c
+++ b/bin/stty/cchar.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cchar.c,v 1.11 2009/10/27 23:59:22 deraadt Exp $	*/
+/*	$OpenBSD: cchar.c,v 1.12 2016/03/23 14:52:42 mmcc Exp $	*/
 /*	$NetBSD: cchar.c,v 1.10 1996/05/07 18:20:05 jtc Exp $	*/
 
 /*-
@@ -31,12 +31,14 @@
  */
 
 #include <sys/types.h>
+#include <sys/ioctl.h>
 
 #include <err.h>
 #include <limits.h>
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
+#include <termios.h>
 
 #include "stty.h"
 #include "extern.h"
diff --git a/bin/stty/gfmt.c b/bin/stty/gfmt.c
index 67f4672f5d5..6682b1e3de1 100644
--- a/bin/stty/gfmt.c
+++ b/bin/stty/gfmt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gfmt.c,v 1.8 2009/10/28 07:12:59 guenther Exp $	*/
+/*	$OpenBSD: gfmt.c,v 1.9 2016/03/23 14:52:42 mmcc Exp $	*/
 /*	$NetBSD: gfmt.c,v 1.10 1996/05/07 18:20:08 jtc Exp $	*/
 
 /*-
@@ -35,6 +35,7 @@
 #include <err.h>
 #include <stdio.h>
 #include <string.h>
+#include <termios.h>
 
 #include "stty.h"
 #include "extern.h"
diff --git a/bin/stty/key.c b/bin/stty/key.c
index 3cae63d5c7a..92af19f9006 100644
--- a/bin/stty/key.c
+++ b/bin/stty/key.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: key.c,v 1.16 2015/11/20 15:57:39 deraadt Exp $	*/
+/*	$OpenBSD: key.c,v 1.17 2016/03/23 14:52:42 mmcc Exp $	*/
 /*	$NetBSD: key.c,v 1.11 1995/09/07 06:57:11 jtc Exp $	*/
 
 /*-
@@ -31,13 +31,15 @@
  */
 
 #include <sys/types.h>
+#include <sys/ioctl.h>
 
 #include <err.h>
 #include <errno.h>
-#include <stdlib.h>
 #include <limits.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
+#include <termios.h>
 
 #include "stty.h"
 #include "extern.h"
diff --git a/bin/stty/modes.c b/bin/stty/modes.c
index fea27dc944f..9e1bc8191f2 100644
--- a/bin/stty/modes.c
+++ b/bin/stty/modes.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: modes.c,v 1.10 2009/10/27 23:59:22 deraadt Exp $	*/
+/*	$OpenBSD: modes.c,v 1.11 2016/03/23 14:52:42 mmcc Exp $	*/
 /*	$NetBSD: modes.c,v 1.9 1996/05/07 18:20:09 jtc Exp $	*/
 
 /*-
@@ -31,8 +31,11 @@
  */
 
 #include <sys/types.h>
+
 #include <stddef.h>
 #include <string.h>
+#include <termios.h>
+
 #include "stty.h"
 #include "extern.h"
 
diff --git a/bin/stty/print.c b/bin/stty/print.c
index a765e714b9a..929e7555e49 100644
--- a/bin/stty/print.c
+++ b/bin/stty/print.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: print.c,v 1.13 2009/10/27 23:59:22 deraadt Exp $	*/
+/*	$OpenBSD: print.c,v 1.14 2016/03/23 14:52:42 mmcc Exp $	*/
 /*	$NetBSD: print.c,v 1.11 1996/05/07 18:20:10 jtc Exp $	*/
 
 /*-
@@ -35,6 +35,7 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <string.h>
+#include <termios.h>
 
 #include "stty.h"
 #include "extern.h"
diff --git a/bin/stty/stty.c b/bin/stty/stty.c
index 80d5baca40b..7de9b8f28e6 100644
--- a/bin/stty/stty.c
+++ b/bin/stty/stty.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stty.c,v 1.18 2015/11/20 15:58:28 deraadt Exp $	*/
+/*	$OpenBSD: stty.c,v 1.19 2016/03/23 14:52:42 mmcc Exp $	*/
 /*	$NetBSD: stty.c,v 1.11 1995/03/21 09:11:30 cgd Exp $	*/
 
 /*-
@@ -31,15 +31,17 @@
  */
 
 #include <sys/types.h>
+#include <sys/ioctl.h>
 
 #include <ctype.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <limits.h>
 #include <string.h>
+#include <termios.h>
 #include <unistd.h>
 
 #include "stty.h"
diff --git a/bin/stty/stty.h b/bin/stty/stty.h
index 1332c73e6ac..a7110fc36b0 100644
--- a/bin/stty/stty.h
+++ b/bin/stty/stty.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stty.h,v 1.4 2003/06/02 23:32:09 millert Exp $	*/
+/*	$OpenBSD: stty.h,v 1.5 2016/03/23 14:52:42 mmcc Exp $	*/
 /*	$NetBSD: stty.h,v 1.7 1996/05/07 18:20:11 jtc Exp $	*/
 
 /*-
@@ -32,9 +32,6 @@
  *	@(#)stty.h	8.1 (Berkeley) 5/31/93
  */
 
-#include <sys/ioctl.h>
-#include <termios.h>
-
 struct info {
 	int fd;					/* file descriptor */
 	int ldisc;				/* line discipline */