To ensure that there are no header order dependencies, make sure that
each .c file that has a corresponding .h file includes the
corresponding .h file before any other header.
---
bin/rpki-object/create_object/create_cert.c | 1 +
bin/rpki-object/create_object/create_crl.c | 1 +
bin/rpki-object/create_object/create_manifest.c | 2 ++
bin/rpki-object/create_object/create_object.c | 2 +-
bin/rpki-object/create_object/create_roa.c | 2 ++
bin/rpki-rsync/parse.c | 3 ++-
bin/rpki-rsync/sig_handler.c | 2 ++
bin/rpki-rsync/socket_stuff.c | 2 ++
bin/rpki-rsync/usage.c | 2 ++
bin/rpki-rtr/cache_state.c | 4 ++--
bin/rpki-rtr/connection.c | 3 ++-
bin/rpki-rtr/connection_control.c | 3 ++-
bin/rpki-rtr/db.c | 3 ++-
bin/rpki-rtr/signals.c | 4 ++--
lib/casn/asn.c | 3 ++-
lib/casn/asn_gen/asn_gen.c | 1 +
lib/casn/casn.c | 1 +
lib/config/config.c | 4 ++--
lib/configlib/config_load.c | 3 ++-
lib/configlib/configlib.c | 3 ++-
lib/configlib/types/bool.c | 4 ++--
lib/configlib/types/enum.c | 4 ++--
lib/configlib/types/path.c | 4 ++--
lib/configlib/types/sscanf.c | 3 ++-
lib/db/clients/chaser.c | 3 ++-
lib/db/clients/rtr.c | 3 ++-
lib/db/connect.c | 3 ++-
lib/db/prep-stmt.c | 3 ++-
lib/db/util.c | 3 ++-
lib/rpki-object/certificate.c | 3 ++-
lib/rpki-object/cms/cms.c | 4 ++--
lib/rpki-object/crl.c | 4 ++--
lib/rpki-object/signature.c | 4 ++--
lib/rpki-rtr/pdu.c | 4 ++--
lib/rpki/diru.c | 3 ++-
lib/rpki/err.c | 4 ++--
lib/rpki/myssl.c | 3 ++-
lib/rpki/querySupport.c | 3 ++-
lib/rpki/rpwork.c | 1 +
lib/rpki/sqhl.c | 3 ++-
lib/util/bag.c | 4 ++--
lib/util/cryptlib_compat.c | 4 ++--
lib/util/file.c | 4 ++--
lib/util/hashutils.c | 4 ++--
lib/util/inet.c | 4 ++--
lib/util/path_compat.c | 4 ++--
lib/util/queue.c | 4 ++--
lib/util/semaphore_compat.c | 4 ++--
48 files changed, 90 insertions(+), 57 deletions(-)
diff --git a/bin/rpki-object/create_object/create_cert.c
b/bin/rpki-object/create_object/create_cert.c
index 0c8ffc5..442d90e 100644
--- a/bin/rpki-object/create_object/create_cert.c
+++ b/bin/rpki-object/create_object/create_cert.c
@@ -1,3 +1,4 @@
+#include "create_cert.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/bin/rpki-object/create_object/create_crl.c
b/bin/rpki-object/create_object/create_crl.c
index 47dd527..19a0dfe 100644
--- a/bin/rpki-object/create_object/create_crl.c
+++ b/bin/rpki-object/create_object/create_crl.c
@@ -1,3 +1,4 @@
+#include "create_crl.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/bin/rpki-object/create_object/create_manifest.c
b/bin/rpki-object/create_object/create_manifest.c
index 1e83cde..0da1a37 100644
--- a/bin/rpki-object/create_object/create_manifest.c
+++ b/bin/rpki-object/create_object/create_manifest.c
@@ -1,3 +1,5 @@
+#include "create_manifest.h"
+
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/bin/rpki-object/create_object/create_object.c
b/bin/rpki-object/create_object/create_object.c
index 2a1331a..f6a83cc 100644
--- a/bin/rpki-object/create_object/create_object.c
+++ b/bin/rpki-object/create_object/create_object.c
@@ -1,3 +1,4 @@
+#include "create_object.h"
#include <stdio.h>
#include <stdlib.h>
@@ -14,7 +15,6 @@
#include "casn/casn.h"
#include "casn/asn.h"
#include <time.h>
-#include "create_object.h"
#include "create_cert.h"
#include "create_crl.h"
#include "create_manifest.h"
diff --git a/bin/rpki-object/create_object/create_roa.c
b/bin/rpki-object/create_object/create_roa.c
index 33e8b30..c0d9310 100644
--- a/bin/rpki-object/create_object/create_roa.c
+++ b/bin/rpki-object/create_object/create_roa.c
@@ -1,3 +1,5 @@
+#include "create_roa.h"
+
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/bin/rpki-rsync/parse.c b/bin/rpki-rsync/parse.c
index 4c9eaf4..1662b39 100644
--- a/bin/rpki-rsync/parse.c
+++ b/bin/rpki-rsync/parse.c
@@ -1,6 +1,7 @@
+#include "parse.h"
+
#include <stdio.h>
// #include <linux/limits.h>
-#include "parse.h"
#include "main.h"
#include "util/stringutils.h"
diff --git a/bin/rpki-rsync/sig_handler.c b/bin/rpki-rsync/sig_handler.c
index e09704b..53949e9 100644
--- a/bin/rpki-rsync/sig_handler.c
+++ b/bin/rpki-rsync/sig_handler.c
@@ -13,6 +13,8 @@
* want to introduce more elaborate handling of *
* signals. *
*****************************************************/
+#include "sig_handler.h"
+
#include "main.h"
#include "util/stringutils.h"
diff --git a/bin/rpki-rsync/socket_stuff.c b/bin/rpki-rsync/socket_stuff.c
index 33f6a06..e372d07 100644
--- a/bin/rpki-rsync/socket_stuff.c
+++ b/bin/rpki-rsync/socket_stuff.c
@@ -1,3 +1,5 @@
+#include "socket_stuff.h"
+
#include "main.h"
diff --git a/bin/rpki-rsync/usage.c b/bin/rpki-rsync/usage.c
index ded40ee..e95e0cb 100644
--- a/bin/rpki-rsync/usage.c
+++ b/bin/rpki-rsync/usage.c
@@ -1,3 +1,5 @@
+#include "usage.h"
+
#include "main.h"
/*****************************************************/
diff --git a/bin/rpki-rtr/cache_state.c b/bin/rpki-rtr/cache_state.c
index 0b07e61..b793090 100644
--- a/bin/rpki-rtr/cache_state.c
+++ b/bin/rpki-rtr/cache_state.c
@@ -1,10 +1,10 @@
+#include "cache_state.h"
+
#include <stdlib.h>
#include "util/logging.h"
#include "db/clients/rtr.h"
-#include "cache_state.h"
-
// NOTE: if this returns false, the contents of state are undefined
static bool get_cache_state(
struct cache_state *state,
diff --git a/bin/rpki-rtr/connection.c b/bin/rpki-rtr/connection.c
index 61befd3..a9850ee 100644
--- a/bin/rpki-rtr/connection.c
+++ b/bin/rpki-rtr/connection.c
@@ -1,3 +1,5 @@
+#include "connection.h"
+
#include <errno.h>
#include <sys/types.h>
#include <sys/socket.h>
@@ -15,7 +17,6 @@
#include "signals.h"
#include "rpki-rtr/pdu.h"
-#include "connection.h"
#include "db.h"
diff --git a/bin/rpki-rtr/connection_control.c
b/bin/rpki-rtr/connection_control.c
index cad0c7c..da1392d 100644
--- a/bin/rpki-rtr/connection_control.c
+++ b/bin/rpki-rtr/connection_control.c
@@ -1,3 +1,5 @@
+#include "connection_control.h"
+
#include <assert.h>
#include <errno.h>
#include <pthread.h>
@@ -15,7 +17,6 @@
#include "config.h"
#include "signals.h"
-#include "connection_control.h"
#include "connection.h"
diff --git a/bin/rpki-rtr/db.c b/bin/rpki-rtr/db.c
index 47a0d02..c09f43c 100644
--- a/bin/rpki-rtr/db.c
+++ b/bin/rpki-rtr/db.c
@@ -1,3 +1,5 @@
+#include "db.h"
+
#include <pthread.h>
#include <errno.h>
@@ -8,7 +10,6 @@
#include "config.h"
#include "signals.h"
-#include "db.h"
struct db_request_state {
diff --git a/bin/rpki-rtr/signals.c b/bin/rpki-rtr/signals.c
index 8819fef..c858682 100644
--- a/bin/rpki-rtr/signals.c
+++ b/bin/rpki-rtr/signals.c
@@ -1,10 +1,10 @@
+#include "signals.h"
+
#include <pthread.h>
#include <signal.h>
#include "util/logging.h"
-#include "signals.h"
-
static const int signals[] = { SIGHUP, SIGINT, SIGTERM };
#define NUM_SIGNALS (sizeof(signals) / sizeof(int))
diff --git a/lib/casn/asn.c b/lib/casn/asn.c
index b1022b3..e4e70a9 100644
--- a/lib/casn/asn.c
+++ b/lib/casn/asn.c
@@ -8,11 +8,12 @@
*
*************************************************************************/
+#include "asn.h"
+
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
#include <stdarg.h>
-#include "asn.h"
uchar asn_typ(
uchar **),
diff --git a/lib/casn/asn_gen/asn_gen.c b/lib/casn/asn_gen/asn_gen.c
index d5d7bdd..70e4541 100644
--- a/lib/casn/asn_gen/asn_gen.c
+++ b/lib/casn/asn_gen/asn_gen.c
@@ -11,6 +11,7 @@ Remarks:
*****************************************************************************/
#include "asn_gen.h"
+
#ifdef WIN32
#include <io.h>
#endif
diff --git a/lib/casn/casn.c b/lib/casn/casn.c
index 7d48c08..5c1389d 100644
--- a/lib/casn/casn.c
+++ b/lib/casn/casn.c
@@ -14,6 +14,7 @@ Cambridge, Ma. 02138
*****************************************************************************/
#include "casn.h"
+
#include <stdio.h>
#include "util/logging.h"
diff --git a/lib/config/config.c b/lib/config/config.c
index a8ccbb7..1a4f2b8 100644
--- a/lib/config/config.c
+++ b/lib/config/config.c
@@ -1,3 +1,5 @@
+#include "config.h"
+
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
@@ -10,8 +12,6 @@
#include "util/logging.h"
#include "util/stringutils.h"
-#include "config.h"
-
/** All available config options */
static const struct config_option config_options[] = {
diff --git a/lib/configlib/config_load.c b/lib/configlib/config_load.c
index 7af9b8e..2719be4 100644
--- a/lib/configlib/config_load.c
+++ b/lib/configlib/config_load.c
@@ -1,3 +1,5 @@
+#include "config_load.h"
+
#include <stdio.h>
#include <string.h>
#include <errno.h>
@@ -8,7 +10,6 @@
#include "util/logging.h"
#include "configlib.h"
-#include "config_load.h"
// special values of options
diff --git a/lib/configlib/configlib.c b/lib/configlib/configlib.c
index 98b7020..24959ea 100644
--- a/lib/configlib/configlib.c
+++ b/lib/configlib/configlib.c
@@ -1,3 +1,5 @@
+#include "configlib.h"
+
#include <stdio.h>
#include <stdarg.h>
#include <stdlib.h>
@@ -8,7 +10,6 @@
#include "util/logging.h"
#include "util/stringutils.h"
-#include "configlib.h"
#include "config_load.h"
diff --git a/lib/configlib/types/bool.c b/lib/configlib/types/bool.c
index e0ace01..057d7f5 100644
--- a/lib/configlib/types/bool.c
+++ b/lib/configlib/types/bool.c
@@ -1,7 +1,7 @@
-#include <string.h>
-
#include "bool.h"
+#include <string.h>
+
static char const *const true_names[] = {
"true",
"True",
diff --git a/lib/configlib/types/enum.c b/lib/configlib/types/enum.c
index 501a09e..123e7ee 100644
--- a/lib/configlib/types/enum.c
+++ b/lib/configlib/types/enum.c
@@ -1,8 +1,8 @@
+#include "enum.h"
+
#include <syslog.h>
#include <string.h>
-#include "enum.h"
-
bool config_type_enum_converter(
const struct config_context *context,
void *usr_arg,
diff --git a/lib/configlib/types/path.c b/lib/configlib/types/path.c
index 586297c..dfad091 100644
--- a/lib/configlib/types/path.c
+++ b/lib/configlib/types/path.c
@@ -1,3 +1,5 @@
+#include "path.h"
+
#include <limits.h>
#include <stdlib.h>
#include <string.h>
@@ -8,8 +10,6 @@
#include "util/path_compat.h"
#include "util/stringutils.h"
-#include "path.h"
-
/**
Try to do as much realpath() normalization as possible, given that the
diff --git a/lib/configlib/types/sscanf.c b/lib/configlib/types/sscanf.c
index 93ac9a8..db80f58 100644
--- a/lib/configlib/types/sscanf.c
+++ b/lib/configlib/types/sscanf.c
@@ -1,7 +1,8 @@
+#include "sscanf.h"
+
#include <stdio.h>
#include <inttypes.h>
-#include "sscanf.h"
#include "util/stringutils.h"
bool config_type_sscanf_converter(
diff --git a/lib/db/clients/chaser.c b/lib/db/clients/chaser.c
index be57966..097b92b 100644
--- a/lib/db/clients/chaser.c
+++ b/lib/db/clients/chaser.c
@@ -2,13 +2,14 @@
Functions to access the database for chaser.
*/
+#include "chaser.h"
+
#include <inttypes.h>
#include <stdio.h>
#include <my_global.h>
#include <mysql.h>
-#include "chaser.h"
#include "db/connect.h"
#include "db/db-internal.h"
#include "util/logging.h"
diff --git a/lib/db/clients/rtr.c b/lib/db/clients/rtr.c
index 0450609..4473b8d 100644
--- a/lib/db/clients/rtr.c
+++ b/lib/db/clients/rtr.c
@@ -2,6 +2,8 @@
Functions used for accessing the RTR database.
*/
+#include "rtr.h"
+
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
@@ -20,7 +22,6 @@
#include "util/logging.h"
#include "util/macros.h"
#include "db/prep-stmt.h"
-#include "rtr.h"
#include "db/util.h"
diff --git a/lib/db/connect.c b/lib/db/connect.c
index 656e077..511c4c1 100644
--- a/lib/db/connect.c
+++ b/lib/db/connect.c
@@ -1,3 +1,5 @@
+#include "connect.h"
+
#include <ctype.h>
#include <inttypes.h>
#include <stdarg.h>
@@ -10,7 +12,6 @@
#include "config/config.h"
-#include "connect.h"
#include "db-internal.h"
#include "util/logging.h"
#include "prep-stmt.h"
diff --git a/lib/db/prep-stmt.c b/lib/db/prep-stmt.c
index 45c8409..3708a32 100644
--- a/lib/db/prep-stmt.c
+++ b/lib/db/prep-stmt.c
@@ -1,10 +1,11 @@
+#include "prep-stmt.h"
+
#include <my_global.h>
#include <mysql.h>
#include "connect.h"
#include "db-internal.h"
#include "util/logging.h"
-#include "prep-stmt.h"
#include "util.h"
diff --git a/lib/db/util.c b/lib/db/util.c
index 0405d7a..a3a7e0c 100644
--- a/lib/db/util.c
+++ b/lib/db/util.c
@@ -1,3 +1,5 @@
+#include "util.h"
+
#include <ctype.h>
#include <inttypes.h>
#include <stdarg.h>
@@ -15,7 +17,6 @@
#include "db-internal.h"
#include "util/logging.h"
-#include "util.h"
/*==============================================================================
diff --git a/lib/rpki-object/certificate.c b/lib/rpki-object/certificate.c
index 2e22c96..d27b98d 100644
--- a/lib/rpki-object/certificate.c
+++ b/lib/rpki-object/certificate.c
@@ -1,10 +1,11 @@
+#include "rpki-object/certificate.h"
+
#include <string.h>
#include "util/cryptlib_compat.h"
#include "util/hashutils.h"
#include "util/logging.h"
#include "rpki-asn1/cms.h"
-#include "rpki-object/certificate.h"
struct Extension *find_extension(
diff --git a/lib/rpki-object/cms/cms.c b/lib/rpki-object/cms/cms.c
index 5e6308d..5744830 100644
--- a/lib/rpki-object/cms/cms.c
+++ b/lib/rpki-object/cms/cms.c
@@ -1,3 +1,5 @@
+#include "cms.h"
+
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
@@ -10,8 +12,6 @@
#include <rpki-asn1/certificate.h>
#include <rpki-asn1/extensions.h>
-#include "cms.h"
-
// find the SID for this CMS and return it
static struct casn *findSID(
struct CMS *cmsp)
diff --git a/lib/rpki-object/crl.c b/lib/rpki-object/crl.c
index 12f14c3..b18785c 100644
--- a/lib/rpki-object/crl.c
+++ b/lib/rpki-object/crl.c
@@ -1,10 +1,10 @@
+#include "crl.h"
+
#include <stdbool.h>
#include "util/cryptlib_compat.h"
#include "rpki-asn1/cms.h"
-#include "crl.h"
-
const char *signCRL(
struct CertificateRevocationList *crlp,
diff --git a/lib/rpki-object/signature.c b/lib/rpki-object/signature.c
index c8c0b2a..1d01a8c 100644
--- a/lib/rpki-object/signature.c
+++ b/lib/rpki-object/signature.c
@@ -1,9 +1,9 @@
+#include "signature.h"
+
#include "util/cryptlib_compat.h"
#include "util/logging.h"
#include "rpki-asn1/cms.h"
-#include "signature.h"
-
bool set_signature(
struct casn *content,
struct casn *signature,
diff --git a/lib/rpki-rtr/pdu.c b/lib/rpki-rtr/pdu.c
index f55e303..52d66ad 100644
--- a/lib/rpki-rtr/pdu.c
+++ b/lib/rpki-rtr/pdu.c
@@ -1,3 +1,5 @@
+#include "pdu.h"
+
#include <assert.h>
#include <string.h>
#include <stdbool.h>
@@ -6,8 +8,6 @@
#include <inttypes.h>
#include <ctype.h>
-#include "pdu.h"
-
// based on RFC 1982, Section 3.2
bool serial_number_greater(
diff --git a/lib/rpki/diru.c b/lib/rpki/diru.c
index 7aa9543..4030dfb 100644
--- a/lib/rpki/diru.c
+++ b/lib/rpki/diru.c
@@ -1,3 +1,5 @@
+#include "diru.h"
+
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@@ -6,7 +8,6 @@
#include <sys/stat.h>
#include <limits.h>
-#include "diru.h"
#include "err.h"
#include "util/stringutils.h"
diff --git a/lib/rpki/err.c b/lib/rpki/err.c
index f184546..282f7d5 100644
--- a/lib/rpki/err.c
+++ b/lib/rpki/err.c
@@ -1,7 +1,7 @@
-#include <stdio.h>
-
#include "err.h"
+#include <stdio.h>
+
static char *errs[-(ERR_SCM_MAXERR) + 1] = {
"No error", /* ERR_SCM_NOERR */
"Cannot open file", /* ERR_SCM_COFILE */
diff --git a/lib/rpki/myssl.c b/lib/rpki/myssl.c
index 038b8eb..1caa45b 100644
--- a/lib/rpki/myssl.c
+++ b/lib/rpki/myssl.c
@@ -1,5 +1,7 @@
/** @file */
+#include "myssl.h"
+
#include <inttypes.h>
#include <stdio.h>
#include <stdlib.h>
@@ -16,7 +18,6 @@
#include "globals.h"
#include "util/hashutils.h"
-#include "myssl.h"
#include "scm.h"
#include "scmf.h"
#include "sqhl.h"
diff --git a/lib/rpki/querySupport.c b/lib/rpki/querySupport.c
index 8ffd834..32db50f 100644
--- a/lib/rpki/querySupport.c
+++ b/lib/rpki/querySupport.c
@@ -2,6 +2,8 @@
* Functions and flags shared by query and server code
****************/
+#include "querySupport.h"
+
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@@ -16,7 +18,6 @@
#include "scmf.h"
#include "sqhl.h"
#include "cms/roa_utils.h"
-#include "querySupport.h"
#include "err.h"
#include "myssl.h"
#include "util/logging.h"
diff --git a/lib/rpki/rpwork.c b/lib/rpki/rpwork.c
index 4790592..4bb3ee7 100644
--- a/lib/rpki/rpwork.c
+++ b/lib/rpki/rpwork.c
@@ -1,4 +1,5 @@
#include "rpwork.h"
+
#include <time.h>
#include <fcntl.h>
#include "util/logging.h"
diff --git a/lib/rpki/sqhl.c b/lib/rpki/sqhl.c
index 5f8bcf4..fdfd3fe 100644
--- a/lib/rpki/sqhl.c
+++ b/lib/rpki/sqhl.c
@@ -1,3 +1,5 @@
+#include "sqhl.h"
+
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@@ -13,7 +15,6 @@
#include "globals.h"
#include "scm.h"
#include "scmf.h"
-#include "sqhl.h"
#include "diru.h"
#include "myssl.h"
#include "err.h"
diff --git a/lib/util/bag.c b/lib/util/bag.c
index 7ffbc43..fcf3baa 100644
--- a/lib/util/bag.c
+++ b/lib/util/bag.c
@@ -1,10 +1,10 @@
+#include "bag.h"
+
#include <pthread.h>
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
-#include "bag.h"
-
#ifndef DEBUG
#define NDEBUG
#endif
diff --git a/lib/util/cryptlib_compat.c b/lib/util/cryptlib_compat.c
index 57864c3..4db9df8 100644
--- a/lib/util/cryptlib_compat.c
+++ b/lib/util/cryptlib_compat.c
@@ -1,8 +1,8 @@
-#include <pthread.h>
-
#define COMPAT_NO_CLOBBER
#include "cryptlib_compat.h"
+#include <pthread.h>
+
static pthread_once_t cryptInit_called = PTHREAD_ONCE_INIT;
static volatile C_RET cryptInit_ret;
diff --git a/lib/util/file.c b/lib/util/file.c
index c401230..19b5d4a 100644
--- a/lib/util/file.c
+++ b/lib/util/file.c
@@ -1,3 +1,5 @@
+#include "file.h"
+
#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
@@ -6,8 +8,6 @@
#include <string.h>
#include <stdlib.h>
-#include "file.h"
-
bool mkdir_recursive(
const char *pathname,
mode_t mode)
diff --git a/lib/util/hashutils.c b/lib/util/hashutils.c
index 3e1b308..b4dba52 100644
--- a/lib/util/hashutils.c
+++ b/lib/util/hashutils.c
@@ -1,11 +1,11 @@
+#include "hashutils.h"
+
#include <stdio.h>
#include <util/cryptlib_compat.h>
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
-#include "hashutils.h"
-
int gen_hash(
unsigned char *inbufp,
int bsize,
diff --git a/lib/util/inet.c b/lib/util/inet.c
index a59b2e4..7975391 100644
--- a/lib/util/inet.c
+++ b/lib/util/inet.c
@@ -1,10 +1,10 @@
+#include "inet.h"
+
#include <arpa/inet.h>
#include <ctype.h>
#include <string.h>
#include <stdio.h>
-#include "inet.h"
-
#define CVTV_BODY_COMMON(addrstrlen, ip_type, number_func, separators, family)
\
char ipstr[addrstrlen]; \
diff --git a/lib/util/path_compat.c b/lib/util/path_compat.c
index baa0795..6dc92f9 100644
--- a/lib/util/path_compat.c
+++ b/lib/util/path_compat.c
@@ -1,9 +1,9 @@
-#include <errno.h>
-
#define PATH_COMPAT_NO_CLOBBER
#include "path_compat.h"
#undef PATH_COMPAT_NO_CLOBBER
+#include <errno.h>
+
#ifdef __NetBSD__
diff --git a/lib/util/queue.c b/lib/util/queue.c
index 76799d9..05904f5 100644
--- a/lib/util/queue.c
+++ b/lib/util/queue.c
@@ -1,9 +1,9 @@
+#include "queue.h"
+
#include <pthread.h>
#include <stdlib.h>
#include <sys/types.h>
-#include "queue.h"
-
#ifdef DEBUG
#include <assert.h>
diff --git a/lib/util/semaphore_compat.c b/lib/util/semaphore_compat.c
index 1a391b2..df6272f 100644
--- a/lib/util/semaphore_compat.c
+++ b/lib/util/semaphore_compat.c
@@ -1,3 +1,5 @@
+#include "semaphore_compat.h"
+
#include <errno.h>
#include <sys/time.h>
#include <time.h>
@@ -8,8 +10,6 @@
#include "util/logging.h"
-#include "semaphore_compat.h"
-
#define SEM_OPEN_MAX_TRIES 256
/*
--
2.4.5
------------------------------------------------------------------------------
Don't Limit Your Business. Reach for the Cloud.
GigeNET's Cloud Solutions provide you with the tools and support that
you need to offload your IT needs and focus on growing your business.
Configured For All Businesses. Start Your Cloud Today.
https://www.gigenetcloud.com/
_______________________________________________
rpstir-devel mailing list
rpstir-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/rpstir-devel
