Index: share/man/man9/style.9
===================================================================
--- share/man/man9/style.9
+++ share/man/man9/style.9
@@ -26,7 +26,7 @@
 .\"	From: @(#)style	1.14 (Berkeley) 4/28/95
 .\" $FreeBSD$
 .\"
-.Dd December 5, 2015
+.Dd September 20, 2016
 .Dt STYLE 9
 .Os
 .Sh NAME
@@ -114,20 +114,26 @@
 __FBSDID("$FreeBSD$");
 .Ed
 .Pp
-Leave another blank line before the header files.
+Leave one blank line before the header files.
 .Pp
-Kernel include files (i.e.\&
+Kernel include files (i.e.,\&
 .Pa sys/*.h )
-come first sorted alphabetically where possible.
-Include
-.In sys/types.h
-OR
-.In sys/param.h ,
-but not both and include it first.
+come first.
+If
+.In sys/cdefs.h
+is needed (e.g., for
+.Fn __FBSDID ) ,
+include it first.
+If one of
 .In sys/types.h
+or
+.In sys/param.h
+is needed, it should be included next, before any others.
+.In ( sys/param.h
 includes
-.In sys/cdefs.h ,
-and it is okay to depend on that.
+.In sys/types.h ;
+do not include both.)
+The remaining kernel headers should be sorted alphabetically.
 .Bd -literal
 #include <sys/types.h>	/* Non-local includes in angle brackets. */
 #include <sys/endian.h>
@@ -144,7 +150,7 @@
 #include <protocols/rwhod.h>
 .Ed
 .Pp
-Do not use files in
+Do not include files in
 .Pa /usr/include
 for files in the kernel.
 .Pp
@@ -166,7 +172,7 @@
 #include <paths.h>
 .Ed
 .Pp
-Leave another blank line before the user include files.
+Leave another blank line before the local include files.
 .Bd -literal
 #include "pathnames.h"		/* Local includes in double quotes. */
 .Ed