Clean up includes and forward declarations

2 files changed, 4 insertions, 2 deletions

diff --git a/zix/sem.h b/zix/sem.h
index 2de5800..24bc446 100644
--- a/zix/sem.h
+++ b/zix/sem.h
@@ -27,8 +27,8 @@
 #    include <limits.h>
 #    include <windows.h>
 #else
-#    include <semaphore.h>
 #    include <errno.h>
+#    include <semaphore.h>
 #endif
 
 #ifdef __cplusplus
@@ -42,6 +42,8 @@ extern "C" {
    @{
 */
 
+struct ZixSemImpl;
+
 /**
    A counting semaphore.
 
diff --git a/zix/zix.h b/zix/zix.h
index 659bb1b..01d7ea6 100644
--- a/zix/zix.h
+++ b/zix/zix.h
@@ -23,10 +23,10 @@
    @{
 */
 
+#include "zix/btree.h"
 #include "zix/common.h"
 #include "zix/sorted_array.h"
 #include "zix/tree.h"
-#include "zix/btree.h"
 
 /**
    @}