Sort headers per style(9)

10 files changed, 31 insertions, 34 deletions

diff --git a/lib/libc/thread/atfork.c b/lib/libc/thread/atfork.c
index 09e1c1cef5d..7d3222f40bc 100644
--- a/lib/libc/thread/atfork.c
+++ b/lib/libc/thread/atfork.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: atfork.c,v 1.2 2015/11/10 04:14:03 guenther Exp $ */
+/*	$OpenBSD: atfork.c,v 1.3 2017/08/15 06:38:41 guenther Exp $ */
 
 /*
  * Copyright (c) 2008 Kurt Miller <kurt@openbsd.org>
@@ -31,8 +31,8 @@
  */
 
 #include <errno.h>
-#include <stdlib.h>
 #include <pthread.h>
+#include <stdlib.h>
 
 #include "thread_private.h"
 #include "atfork.h"
diff --git a/lib/libc/thread/callbacks.c b/lib/libc/thread/callbacks.c
index 8c4a1af4b96..c76811dd246 100644
--- a/lib/libc/thread/callbacks.c
+++ b/lib/libc/thread/callbacks.c
@@ -14,10 +14,11 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <stdio.h>
 #include <signal.h>
+#include <stdio.h>
 #include <string.h>
 #include <unistd.h>
+
 #include "thread_private.h"
 
 void
diff --git a/lib/libc/thread/rthread.c b/lib/libc/thread/rthread.c
index 5daa0e65f07..7a5645895d2 100644
--- a/lib/libc/thread/rthread.c
+++ b/lib/libc/thread/rthread.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rthread.c,v 1.1 2017/08/15 06:13:24 guenther Exp $ */
+/*	$OpenBSD: rthread.c,v 1.2 2017/08/15 06:38:41 guenther Exp $ */
 /*
  * Copyright (c) 2004,2005 Ted Unangst <tedu@openbsd.org>
  * All Rights Reserved.
@@ -26,16 +26,15 @@
 #pragma weak _DYNAMIC
 #endif
 
-#include <stdlib.h>
-#include <unistd.h>
+#include <dlfcn.h>
+#include <errno.h>
+#include <pthread.h>
 #include <signal.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
-#include <errno.h>
-#include <dlfcn.h>
 #include <tib.h>
-
-#include <pthread.h>
+#include <unistd.h>
 
 #include "cancel.h"		/* in libc/include */
 #include "thread_private.h"
diff --git a/lib/libc/thread/rthread_cond.c b/lib/libc/thread/rthread_cond.c
index 28c4be3fdc3..744608d35db 100644
--- a/lib/libc/thread/rthread_cond.c
+++ b/lib/libc/thread/rthread_cond.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rthread_cond.c,v 1.1 2017/08/15 06:13:24 guenther Exp $ */
+/*	$OpenBSD: rthread_cond.c,v 1.2 2017/08/15 06:38:41 guenther Exp $ */
 /*
  * Copyright (c) 2017 Martin Pieuchot <mpi@openbsd.org>
  * Copyright (c) 2012 Philip Guenther <guenther@openbsd.org>
@@ -17,13 +17,12 @@
  */
 
 #include <assert.h>
+#include <errno.h>
+#include <pthread.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <errno.h>
-
-#include <pthread.h>
 
 #include "rthread.h"
 #include "cancel.h"
diff --git a/lib/libc/thread/rthread_condattr.c b/lib/libc/thread/rthread_condattr.c
index d856a3cf313..3a5d8772b05 100644
--- a/lib/libc/thread/rthread_condattr.c
+++ b/lib/libc/thread/rthread_condattr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rthread_condattr.c,v 1.1 2017/08/15 06:13:24 guenther Exp $ */
+/*	$OpenBSD: rthread_condattr.c,v 1.2 2017/08/15 06:38:41 guenther Exp $ */
 /*
  * Copyright (c) 2004,2005 Ted Unangst <tedu@openbsd.org>
  * Copyright (c) 2012 Philip Guenther <guenther@openbsd.org>
@@ -21,12 +21,11 @@
  */
 
 #include <assert.h>
+#include <errno.h>
+#include <pthread.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <errno.h>
-
-#include <pthread.h>
 
 #include "rthread.h"
 
diff --git a/lib/libc/thread/rthread_debug.c b/lib/libc/thread/rthread_debug.c
index ce7d347f83e..18d3a8567d6 100644
--- a/lib/libc/thread/rthread_debug.c
+++ b/lib/libc/thread/rthread_debug.c
@@ -1,11 +1,11 @@
-/* $OpenBSD: rthread_debug.c,v 1.1 2017/08/15 06:13:24 guenther Exp $ */
+/* $OpenBSD: rthread_debug.c,v 1.2 2017/08/15 06:38:41 guenther Exp $ */
 
 /* PUBLIC DOMAIN: No Rights Reserved. Marco S Hyman <marc@snafu.org> */
 
 #include <pthread.h>
 #include <stdarg.h>
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 
 #include "rthread.h"
diff --git a/lib/libc/thread/rthread_file.c b/lib/libc/thread/rthread_file.c
index 48cd5bda5bd..82d096844e6 100644
--- a/lib/libc/thread/rthread_file.c
+++ b/lib/libc/thread/rthread_file.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rthread_file.c,v 1.1 2017/08/15 06:13:24 guenther Exp $	*/
+/*	$OpenBSD: rthread_file.c,v 1.2 2017/08/15 06:38:41 guenther Exp $	*/
 /*
  * Copyright (c) 1995 John Birrell <jb@cimlogic.com.au>.
  * All rights reserved.
@@ -37,11 +37,13 @@
  * level too.
  *
  */
+
+#include <sys/queue.h>
+#include <pthread.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/queue.h>
-#include <pthread.h>
+
 #include "rthread.h"
 #include "rthread_cb.h"
 
diff --git a/lib/libc/thread/rthread_mutex.c b/lib/libc/thread/rthread_mutex.c
index 73a87180086..6fa168e1c8d 100644
--- a/lib/libc/thread/rthread_mutex.c
+++ b/lib/libc/thread/rthread_mutex.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rthread_mutex.c,v 1.1 2017/08/15 06:13:24 guenther Exp $ */
+/*	$OpenBSD: rthread_mutex.c,v 1.2 2017/08/15 06:38:41 guenther Exp $ */
 /*
  * Copyright (c) 2017 Martin Pieuchot <mpi@openbsd.org>
  * Copyright (c) 2012 Philip Guenther <guenther@openbsd.org>
@@ -17,13 +17,12 @@
  */
 
 #include <assert.h>
+#include <errno.h>
+#include <pthread.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <errno.h>
-
-#include <pthread.h>
 
 #include "rthread.h"
 #include "cancel.h"
diff --git a/lib/libc/thread/rthread_sync.c b/lib/libc/thread/rthread_sync.c
index 42f953ffd10..47379156571 100644
--- a/lib/libc/thread/rthread_sync.c
+++ b/lib/libc/thread/rthread_sync.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rthread_sync.c,v 1.1 2017/08/15 06:13:24 guenther Exp $ */
+/*	$OpenBSD: rthread_sync.c,v 1.2 2017/08/15 06:38:41 guenther Exp $ */
 /*
  * Copyright (c) 2004,2005 Ted Unangst <tedu@openbsd.org>
  * Copyright (c) 2012 Philip Guenther <guenther@openbsd.org>
@@ -21,12 +21,11 @@
  */
 
 #include <assert.h>
+#include <errno.h>
+#include <pthread.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <errno.h>
-
-#include <pthread.h>
 
 #include "rthread.h"
 #include "cancel.h"		/* in libc/include */
diff --git a/lib/libc/thread/rthread_tls.c b/lib/libc/thread/rthread_tls.c
index 53e348e4dbd..9178e662291 100644
--- a/lib/libc/thread/rthread_tls.c
+++ b/lib/libc/thread/rthread_tls.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rthread_tls.c,v 1.1 2017/08/15 06:13:24 guenther Exp $ */
+/*	$OpenBSD: rthread_tls.c,v 1.2 2017/08/15 06:38:41 guenther Exp $ */
 /*
  * Copyright (c) 2004,2005 Ted Unangst <tedu@openbsd.org>
  * All Rights Reserved.
@@ -19,10 +19,9 @@
  * thread specific storage
  */
 
-#include <stdlib.h>
 #include <errno.h>
-
 #include <pthread.h>
+#include <stdlib.h>
 
 #include "rthread.h"