From 55d397fe715502a6dabfa59e735eca32fa9f2f48 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sun, 24 Nov 2024 15:18:25 -0500
Subject: Clean up includes

---
 benchmark/tree_bench.c        | 3 +--
 include/zix/sem.h             | 4 ++--
 src/allocator.c               | 4 ++--
 src/win32/filesystem_win32.c  | 2 +-
 test/cpp/test_headers_cpp.cpp | 1 +
 test/headers/test_headers.c   | 1 +
 test/test_btree.c             | 3 +--
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/benchmark/tree_bench.c b/benchmark/tree_bench.c
index a86140d..5e4b664 100644
--- a/benchmark/tree_bench.c
+++ b/benchmark/tree_bench.c
@@ -1,11 +1,10 @@
 // Copyright 2011-2020 David Robillard <d@drobilla.net>
 // SPDX-License-Identifier: ISC
 
+#include "../test/test_data.h"
 #include "bench.h"
 #include "warnings.h"
 
-#include "../test/test_data.h"
-
 #include <zix/attributes.h>
 #include <zix/btree.h>
 #include <zix/status.h>
diff --git a/include/zix/sem.h b/include/zix/sem.h
index 88f4371..95bdd9b 100644
--- a/include/zix/sem.h
+++ b/include/zix/sem.h
@@ -15,10 +15,10 @@
 #  include <semaphore.h>
 #endif
 
-ZIX_BEGIN_DECLS
-
 #include <stdint.h>
 
+ZIX_BEGIN_DECLS
+
 /**
    @defgroup zix_sem Semaphore
    @ingroup zix_threading
diff --git a/src/allocator.c b/src/allocator.c
index cb05f0d..686322b 100644
--- a/src/allocator.c
+++ b/src/allocator.c
@@ -3,10 +3,10 @@
 
 #include <zix/allocator.h>
 
-#include <zix/attributes.h>
-
 #include "zix_config.h"
 
+#include <zix/attributes.h>
+
 #ifdef _WIN32
 #  define WIN32_LEAN_AND_MEAN
 #  include <malloc.h>
diff --git a/src/win32/filesystem_win32.c b/src/win32/filesystem_win32.c
index 4682f5d..a790264 100644
--- a/src/win32/filesystem_win32.c
+++ b/src/win32/filesystem_win32.c
@@ -1,13 +1,13 @@
 // Copyright 2007-2022 David Robillard <d@drobilla.net>
 // SPDX-License-Identifier: ISC
 
-#include <zix/bump_allocator.h>
 #include <zix/filesystem.h>
 
 #include "../errno_status.h"
 #include "../zix_config.h"
 
 #include <zix/allocator.h>
+#include <zix/bump_allocator.h>
 #include <zix/path.h>
 #include <zix/status.h>
 
diff --git a/test/cpp/test_headers_cpp.cpp b/test/cpp/test_headers_cpp.cpp
index 3676afc..fe367ad 100644
--- a/test/cpp/test_headers_cpp.cpp
+++ b/test/cpp/test_headers_cpp.cpp
@@ -10,6 +10,7 @@
 #include <zix/btree.h>          // IWYU pragma: keep
 #include <zix/bump_allocator.h> // IWYU pragma: keep
 #include <zix/digest.h>         // IWYU pragma: keep
+#include <zix/environment.h>    // IWYU pragma: keep
 #include <zix/filesystem.h>     // IWYU pragma: keep
 #include <zix/hash.h>           // IWYU pragma: keep
 #include <zix/path.h>           // IWYU pragma: keep
diff --git a/test/headers/test_headers.c b/test/headers/test_headers.c
index 2b4d09b..f10d05f 100644
--- a/test/headers/test_headers.c
+++ b/test/headers/test_headers.c
@@ -6,6 +6,7 @@
 #include <zix/btree.h>          // IWYU pragma: keep
 #include <zix/bump_allocator.h> // IWYU pragma: keep
 #include <zix/digest.h>         // IWYU pragma: keep
+#include <zix/environment.h>    // IWYU pragma: keep
 #include <zix/filesystem.h>     // IWYU pragma: keep
 #include <zix/hash.h>           // IWYU pragma: keep
 #include <zix/path.h>           // IWYU pragma: keep
diff --git a/test/test_btree.c b/test/test_btree.c
index 97bd9ba..a340bbf 100644
--- a/test/test_btree.c
+++ b/test/test_btree.c
@@ -3,8 +3,6 @@
 
 #undef NDEBUG
 
-#include <zix/btree.h>
-
 #include "ensure.h"
 #include "failing_allocator.h"
 #include "test_args.h"
@@ -12,6 +10,7 @@
 
 #include <zix/allocator.h>
 #include <zix/attributes.h>
+#include <zix/btree.h>
 #include <zix/status.h>
 
 #include <assert.h>
-- 
cgit v1.2.1