From: Alberto Leiva Popper <ydahhrk@gmail.com>
Date: Thu, 11 Sep 2025 23:07:13 +0000 (-0600)
Subject: Review of #includes
X-Git-Tag: 1.6.7~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e6d13647bccbdd75651a31adb34319a54b124d60;p=thirdparty%2FFORT-validator.git

Review of #includes
---

diff --git a/src/algorithm.c b/src/algorithm.c
index edd07fc0..5046457d 100644
--- a/src/algorithm.c
+++ b/src/algorithm.c
@@ -3,6 +3,7 @@
 #include <openssl/asn1.h>
 #include <openssl/obj_mac.h>
 #include <openssl/objects.h>
+#include <string.h>
 
 #include "log.h"
 
diff --git a/src/alloc.c b/src/alloc.c
index e6fd2bd0..d3350373 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -1,5 +1,8 @@
 #include "alloc.h"
 
+#include <stdlib.h>
+#include <string.h>
+
 #include "log.h"
 
 void *
diff --git a/src/alloc.h b/src/alloc.h
index 2f4fd58b..6c9ea7b4 100644
--- a/src/alloc.h
+++ b/src/alloc.h
@@ -2,12 +2,6 @@
 #define SRC_ALLOC_H_
 
 #include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <strings.h>
-#include <sys/types.h>
-#include <unistd.h>
 
 /* malloc(), but panic on allocation failure. */
 void *pmalloc(size_t size);
diff --git a/src/asn1/asn1c/ANY.c b/src/asn1/asn1c/ANY.c
index a8894600..a23ec93c 100644
--- a/src/asn1/asn1c/ANY.c
+++ b/src/asn1/asn1c/ANY.c
@@ -6,6 +6,7 @@
 
 #include <assert.h>
 #include <errno.h>
+#include <string.h>
 
 #include "asn1/asn1c/asn_internal.h"
 #include "asn1/asn1c/ber_decoder.h"
diff --git a/src/asn1/asn1c/BIT_STRING.c b/src/asn1/asn1c/BIT_STRING.c
index 5421ba08..2fea0558 100644
--- a/src/asn1/asn1c/BIT_STRING.c
+++ b/src/asn1/asn1c/BIT_STRING.c
@@ -6,6 +6,7 @@
 #include "asn1/asn1c/BIT_STRING.h"
 
 #include <assert.h>
+#include <string.h>
 
 #include "asn1/asn1c/asn_internal.h"
 #include "asn1/asn1c/xer_encoder.h"
diff --git a/src/asn1/asn1c/BOOLEAN.c b/src/asn1/asn1c/BOOLEAN.c
index ce0a23cc..fccfbdcb 100644
--- a/src/asn1/asn1c/BOOLEAN.c
+++ b/src/asn1/asn1c/BOOLEAN.c
@@ -4,6 +4,8 @@
  */
 #include "asn1/asn1c/BOOLEAN.h"
 
+#include <string.h>
+
 #include "asn1/asn1c/asn_internal.h"
 #include "asn1/asn1c/ber_decoder.h"
 #include "asn1/asn1c/der_encoder.h"
diff --git a/src/asn1/asn1c/GeneralizedTime.c b/src/asn1/asn1c/GeneralizedTime.c
index f61a7527..345e973c 100644
--- a/src/asn1/asn1c/GeneralizedTime.c
+++ b/src/asn1/asn1c/GeneralizedTime.c
@@ -10,6 +10,7 @@
 
 #include <assert.h>
 #include <errno.h>
+#include <string.h>
 
 #include "asn1/asn1c/asn_internal.h"
 #include "asn1/asn1c/xer_encoder.h"
diff --git a/src/asn1/asn1c/INTEGER.c b/src/asn1/asn1c/INTEGER.c
index e2a67e87..84391913 100644
--- a/src/asn1/asn1c/INTEGER.c
+++ b/src/asn1/asn1c/INTEGER.c
@@ -7,6 +7,7 @@
 
 #include <assert.h>
 #include <errno.h>
+#include <string.h>
 
 #include "asn1/asn1c/asn_internal.h"
 #include "json_util.h"
diff --git a/src/asn1/asn1c/NULL.c b/src/asn1/asn1c/NULL.c
index 77ad15cd..6f96241a 100644
--- a/src/asn1/asn1c/NULL.c
+++ b/src/asn1/asn1c/NULL.c
@@ -4,6 +4,8 @@
  */
 #include "asn1/asn1c/NULL.h"
 
+#include <string.h>
+
 #include "asn1/asn1c/asn_internal.h"
 #include "asn1/asn1c/ber_decoder.h"
 #include "asn1/asn1c/der_encoder.h"
diff --git a/src/asn1/asn1c/OBJECT_IDENTIFIER.c b/src/asn1/asn1c/OBJECT_IDENTIFIER.c
index 53acaaea..c522f057 100644
--- a/src/asn1/asn1c/OBJECT_IDENTIFIER.c
+++ b/src/asn1/asn1c/OBJECT_IDENTIFIER.c
@@ -10,6 +10,7 @@
 #include <openssl/asn1.h>
 #include <openssl/obj_mac.h>
 #include <openssl/objects.h>
+#include <string.h>
 
 #include "asn1/asn1c/INTEGER.h"
 #include "asn1/asn1c/asn_internal.h"
diff --git a/src/asn1/asn1c/OCTET_STRING.c b/src/asn1/asn1c/OCTET_STRING.c
index 39a2746e..c1efb026 100644
--- a/src/asn1/asn1c/OCTET_STRING.c
+++ b/src/asn1/asn1c/OCTET_STRING.c
@@ -7,6 +7,7 @@
 
 #include <assert.h>
 #include <errno.h>
+#include <string.h>
 
 #include "alloc.h"
 #include "asn1/asn1c/BIT_STRING.h"
diff --git a/src/asn1/asn1c/OPEN_TYPE.c b/src/asn1/asn1c/OPEN_TYPE.c
index ca970a8a..2094cf52 100644
--- a/src/asn1/asn1c/OPEN_TYPE.c
+++ b/src/asn1/asn1c/OPEN_TYPE.c
@@ -4,6 +4,8 @@
  */
 #include "asn1/asn1c/OPEN_TYPE.h"
 
+#include <string.h>
+
 #include "asn1/asn1c/asn_internal.h"
 
 asn_TYPE_operation_t asn_OP_OPEN_TYPE = {
diff --git a/src/asn1/asn1c/UTCTime.c b/src/asn1/asn1c/UTCTime.c
index 7382879a..dfd05eae 100644
--- a/src/asn1/asn1c/UTCTime.c
+++ b/src/asn1/asn1c/UTCTime.c
@@ -7,6 +7,7 @@
 
 #include <assert.h>
 #include <errno.h>
+#include <string.h>
 
 #include "asn1/asn1c/GeneralizedTime.h"
 #include "asn1/asn1c/asn_internal.h"
diff --git a/src/asn1/asn1c/asn_codecs.h b/src/asn1/asn1c/asn_codecs.h
index cd720108..0c7e0a19 100644
--- a/src/asn1/asn1c/asn_codecs.h
+++ b/src/asn1/asn1c/asn_codecs.h
@@ -6,10 +6,6 @@
 #define	ASN_CODECS_H
 
 #include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <strings.h>
 #include <sys/types.h>
 #include <unistd.h>
 
diff --git a/src/asn1/asn1c/asn_codecs_prim.c b/src/asn1/asn1c/asn_codecs_prim.c
index 51062230..24f03044 100644
--- a/src/asn1/asn1c/asn_codecs_prim.c
+++ b/src/asn1/asn1c/asn_codecs_prim.c
@@ -5,6 +5,7 @@
 #include "asn1/asn1c/asn_codecs_prim.h"
 
 #include <assert.h>
+#include <string.h>
 
 #include "asn1/asn1c/asn_internal.h"
 #include "asn1/asn1c/ber_decoder.h"
diff --git a/src/asn1/asn1c/asn_internal.h b/src/asn1/asn1c/asn_internal.h
index d60826fb..fa2951ab 100644
--- a/src/asn1/asn1c/asn_internal.h
+++ b/src/asn1/asn1c/asn_internal.h
@@ -10,6 +10,8 @@
 #ifndef __EXTENSIONS__
 #define __EXTENSIONS__          /* for Sun */
 #endif
+#include <stdlib.h>
+
 #include "asn1/asn1c/asn_codecs.h"
 #include "asn1/asn1c/asn_system.h"
 
diff --git a/src/asn1/asn1c/asn_system.h b/src/asn1/asn1c/asn_system.h
index 82b493ab..df38e80e 100644
--- a/src/asn1/asn1c/asn_system.h
+++ b/src/asn1/asn1c/asn_system.h
@@ -14,9 +14,6 @@
 #include <netinet/in.h>
 #include <stddef.h>
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <strings.h>
 #include <sys/types.h>
 #include <unistd.h>
 
diff --git a/src/asn1/asn1c/ber_tlv_tag.h b/src/asn1/asn1c/ber_tlv_tag.h
index a5d44e93..5ba0fe77 100644
--- a/src/asn1/asn1c/ber_tlv_tag.h
+++ b/src/asn1/asn1c/ber_tlv_tag.h
@@ -9,9 +9,6 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <strings.h>
 #include <sys/types.h>
 #include <unistd.h>
 
diff --git a/src/asn1/asn1c/constr_CHOICE.c b/src/asn1/asn1c/constr_CHOICE.c
index f74a14fe..e50b8b12 100644
--- a/src/asn1/asn1c/constr_CHOICE.c
+++ b/src/asn1/asn1c/constr_CHOICE.c
@@ -5,6 +5,7 @@
 #include "asn1/asn1c/constr_CHOICE.h"
 
 #include <assert.h>
+#include <string.h>
 
 #include "asn1/asn1c/asn_internal.h"
 #include "asn1/asn1c/ber_decoder.h"
diff --git a/src/asn1/asn1c/constr_SEQUENCE.c b/src/asn1/asn1c/constr_SEQUENCE.c
index 5702b238..dbf112ba 100644
--- a/src/asn1/asn1c/constr_SEQUENCE.c
+++ b/src/asn1/asn1c/constr_SEQUENCE.c
@@ -7,6 +7,7 @@
 #include "asn1/asn1c/constr_SEQUENCE.h"
 
 #include <assert.h>
+#include <string.h>
 
 #include "asn1/asn1c/OPEN_TYPE.h"
 #include "asn1/asn1c/asn_internal.h"
diff --git a/src/asn1/asn1c/constr_SEQUENCE_OF.c b/src/asn1/asn1c/constr_SEQUENCE_OF.c
index 4e6e9915..34eb7b37 100644
--- a/src/asn1/asn1c/constr_SEQUENCE_OF.c
+++ b/src/asn1/asn1c/constr_SEQUENCE_OF.c
@@ -5,6 +5,8 @@
  */
 #include "asn1/asn1c/constr_SEQUENCE_OF.h"
 
+#include <string.h>
+
 #include "asn1/asn1c/asn_SEQUENCE_OF.h"
 #include "asn1/asn1c/asn_internal.h"
 #include "asn1/asn1c/der_encoder.h"
diff --git a/src/asn1/asn1c/constr_SET_OF.c b/src/asn1/asn1c/constr_SET_OF.c
index d58a731a..aef8f45f 100644
--- a/src/asn1/asn1c/constr_SET_OF.c
+++ b/src/asn1/asn1c/constr_SET_OF.c
@@ -7,6 +7,7 @@
 #include "asn1/asn1c/constr_SET_OF.h"
 
 #include <assert.h>
+#include <string.h>
 
 #include "asn1/asn1c/asn_SET_OF.h"
 #include "asn1/asn1c/asn_internal.h"
diff --git a/src/asn1/asn1c/constraints.c b/src/asn1/asn1c/constraints.c
index f96883e4..ddf83578 100644
--- a/src/asn1/asn1c/constraints.c
+++ b/src/asn1/asn1c/constraints.c
@@ -1,6 +1,7 @@
 #include "asn1/asn1c/constraints.h"
 
 #include <stdarg.h>
+#include <string.h>
 
 int
 asn_generic_no_constraint(const asn_TYPE_descriptor_t *type_descriptor,
diff --git a/src/asn1/asn1c/der_encoder.c b/src/asn1/asn1c/der_encoder.c
index b3aa0e7e..0586403b 100644
--- a/src/asn1/asn1c/der_encoder.c
+++ b/src/asn1/asn1c/der_encoder.c
@@ -5,6 +5,7 @@
 #include "asn1/asn1c/der_encoder.h"
 
 #include <assert.h>
+#include <string.h>
 
 #include "asn1/asn1c/asn_internal.h"
 
diff --git a/src/asn1/asn1c/xer_encoder.c b/src/asn1/asn1c/xer_encoder.c
index a3d189d3..8ba3121a 100644
--- a/src/asn1/asn1c/xer_encoder.c
+++ b/src/asn1/asn1c/xer_encoder.c
@@ -4,6 +4,8 @@
  */
 #include "asn1/asn1c/xer_encoder.h"
 
+#include <string.h>
+
 #include "asn1/asn1c/asn_internal.h"
 
 /*
diff --git a/src/asn1/oid.c b/src/asn1/oid.c
index a57dda89..9738e5c4 100644
--- a/src/asn1/oid.c
+++ b/src/asn1/oid.c
@@ -1,6 +1,8 @@
 #include "asn1/oid.h"
 
 #include <errno.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "alloc.h"
 #include "log.h"
diff --git a/src/common.c b/src/common.c
index f022e66b..46deb10a 100644
--- a/src/common.c
+++ b/src/common.c
@@ -3,7 +3,9 @@
 #include <dirent.h>
 #include <errno.h>
 #include <limits.h>
+#include <string.h>
 #include <time.h>
+#include <unistd.h>
 
 #include "alloc.h"
 #include "config.h"
diff --git a/src/config.c b/src/config.c
index a8b4361c..c11b2e2b 100644
--- a/src/config.c
+++ b/src/config.c
@@ -2,8 +2,8 @@
 
 #include <errno.h>
 #include <getopt.h>
-#include <microhttpd.h>
 #include <libxml/xmlreader.h>
+#include <microhttpd.h>
 #include <openssl/opensslv.h>
 #include <syslog.h>
 
diff --git a/src/config/boolean.c b/src/config/boolean.c
index 1c2c0841..e3e4f028 100644
--- a/src/config/boolean.c
+++ b/src/config/boolean.c
@@ -1,6 +1,7 @@
 #include "config/boolean.h"
 
 #include <getopt.h>
+#include <string.h>
 
 #include "log.h"
 
diff --git a/src/config/curl_offset.c b/src/config/curl_offset.c
index 441463a5..f1012119 100644
--- a/src/config/curl_offset.c
+++ b/src/config/curl_offset.c
@@ -3,6 +3,7 @@
 #include <curl/curl.h>
 #include <errno.h>
 #include <getopt.h>
+#include <string.h>
 
 #include "log.h"
 
diff --git a/src/config/file_type.c b/src/config/file_type.c
index f74e52b6..7c85b8cc 100644
--- a/src/config/file_type.c
+++ b/src/config/file_type.c
@@ -1,6 +1,7 @@
 #include "config/file_type.h"
 
 #include <getopt.h>
+#include <string.h>
 
 #include "config/str.h"
 #include "log.h"
diff --git a/src/config/filename_format.c b/src/config/filename_format.c
index 9dc4caa9..b06fc702 100644
--- a/src/config/filename_format.c
+++ b/src/config/filename_format.c
@@ -1,6 +1,7 @@
 #include "config/filename_format.h"
 
 #include <getopt.h>
+#include <string.h>
 
 #include "config/str.h"
 #include "log.h"
diff --git a/src/config/log_conf.c b/src/config/log_conf.c
index 29ecf301..8402cdae 100644
--- a/src/config/log_conf.c
+++ b/src/config/log_conf.c
@@ -5,6 +5,7 @@
 #include <netdb.h>
 #include <netinet/in.h>
 #include <stdint.h>
+#include <string.h>
 #include <syslog.h>
 
 #include "config/str.h"
diff --git a/src/config/mode.c b/src/config/mode.c
index 8483cc1d..7eb930fe 100644
--- a/src/config/mode.c
+++ b/src/config/mode.c
@@ -1,6 +1,7 @@
 #include "config/mode.h"
 
 #include <getopt.h>
+#include <string.h>
 
 #include "config/str.h"
 #include "log.h"
diff --git a/src/config/output_format.c b/src/config/output_format.c
index 34d9365a..a9c5ff6e 100644
--- a/src/config/output_format.c
+++ b/src/config/output_format.c
@@ -1,6 +1,7 @@
 #include "config/output_format.h"
 
 #include <getopt.h>
+#include <string.h>
 
 #include "config/str.h"
 #include "log.h"
diff --git a/src/config/str.c b/src/config/str.c
index a43d0a6f..2b32ee34 100644
--- a/src/config/str.c
+++ b/src/config/str.c
@@ -1,6 +1,7 @@
 #include "config/str.h"
 
 #include <getopt.h>
+#include <string.h>
 
 #include "alloc.h"
 #include "log.h"
diff --git a/src/config/string_array.c b/src/config/string_array.c
index 7293b7f8..a8645e2d 100644
--- a/src/config/string_array.c
+++ b/src/config/string_array.c
@@ -1,6 +1,7 @@
 #include "config/string_array.h"
 
 #include <getopt.h>
+#include <string.h>
 
 #include "alloc.h"
 #include "config/str.h"
diff --git a/src/config/types.h b/src/config/types.h
index f2dc0bc7..50152797 100644
--- a/src/config/types.h
+++ b/src/config/types.h
@@ -4,12 +4,7 @@
 #include <jansson.h>
 #include <stdbool.h>
 #include <stddef.h>
-#include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
-#include <strings.h>
-#include <sys/types.h>
-#include <unistd.h>
 
 struct option_field;
 struct group_fields;
diff --git a/src/config/uint.c b/src/config/uint.c
index 1edee763..5de90b68 100644
--- a/src/config/uint.c
+++ b/src/config/uint.c
@@ -2,6 +2,7 @@
 
 #include <errno.h>
 #include <getopt.h>
+#include <string.h>
 
 #include "log.h"
 
diff --git a/src/crypto/base64.c b/src/crypto/base64.c
index ee807e26..27103a69 100644
--- a/src/crypto/base64.c
+++ b/src/crypto/base64.c
@@ -3,6 +3,8 @@
 #include <openssl/buffer.h>
 #include <openssl/err.h>
 #include <openssl/evp.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "alloc.h"
 
diff --git a/src/crypto/base64.h b/src/crypto/base64.h
index 20e78276..d7a71d4c 100644
--- a/src/crypto/base64.h
+++ b/src/crypto/base64.h
@@ -4,12 +4,6 @@
 #include <openssl/bio.h>
 #include <stdbool.h>
 #include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <strings.h>
-#include <sys/types.h>
-#include <unistd.h>
 
 bool base64_decode(BIO *, unsigned char *, bool, size_t, size_t *);
 bool base64url_decode(char const *, unsigned char **, size_t *);
diff --git a/src/data_structure/array_list.h b/src/data_structure/array_list.h
index 4d027b38..1bec8769 100644
--- a/src/data_structure/array_list.h
+++ b/src/data_structure/array_list.h
@@ -1,6 +1,9 @@
 #ifndef SRC_DATA_STRUCTURE_ARRAY_LIST_H_
 #define SRC_DATA_STRUCTURE_ARRAY_LIST_H_
 
+#include <stdlib.h>
+#include <strings.h>
+
 #include "alloc.h"
 #include "data_structure/common.h"
 
diff --git a/src/data_structure/common.h b/src/data_structure/common.h
index f1ffa8f5..ff5cdc73 100644
--- a/src/data_structure/common.h
+++ b/src/data_structure/common.h
@@ -2,12 +2,6 @@
 #define SRC_DATA_STRUCTURE_COMMON_H_
 
 #include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <strings.h>
-#include <sys/types.h>
-#include <unistd.h>
 
 typedef size_t array_index;
 
diff --git a/src/data_structure/path_builder.h b/src/data_structure/path_builder.h
index 3f922ffc..3ad55176 100644
--- a/src/data_structure/path_builder.h
+++ b/src/data_structure/path_builder.h
@@ -7,12 +7,6 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <strings.h>
-#include <sys/types.h>
-#include <unistd.h>
 
 struct path_builder {
 	char *string;
diff --git a/src/data_structure/uthash.h b/src/data_structure/uthash.h
index 0013ed37..e8e3dbe2 100644
--- a/src/data_structure/uthash.h
+++ b/src/data_structure/uthash.h
@@ -34,8 +34,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
-#include <sys/types.h>
 #include <unistd.h>
 
 #if !defined(DECLTYPE) && !defined(NO_DECLTYPE)
diff --git a/src/file.h b/src/file.h
index 0379a424..f334dd22 100644
--- a/src/file.h
+++ b/src/file.h
@@ -5,9 +5,7 @@
 #include <errno.h>
 #include <stddef.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
diff --git a/src/incidence/incidence.c b/src/incidence/incidence.c
index 7b0c13e1..15f07ec8 100644
--- a/src/incidence/incidence.c
+++ b/src/incidence/incidence.c
@@ -1,6 +1,7 @@
 #include "incidence/incidence.h"
 
 #include <assert.h>
+#include <string.h>
 
 #include "common.h"
 #include "data_structure/common.h"
diff --git a/src/json_handler.c b/src/json_handler.c
index 5c56c2a1..18b9f0f7 100644
--- a/src/json_handler.c
+++ b/src/json_handler.c
@@ -1,6 +1,7 @@
 #include "json_handler.h"
 
 #include <errno.h>
+#include <string.h>
 
 #include "alloc.h"
 #include "config.h"
diff --git a/src/json_util.c b/src/json_util.c
index 858c3e0c..58d9f2a1 100644
--- a/src/json_util.c
+++ b/src/json_util.c
@@ -2,6 +2,7 @@
 
 #include <errno.h>
 #include <limits.h>
+#include <string.h>
 #include <time.h>
 
 #include "log.h"
diff --git a/src/json_util.h b/src/json_util.h
index 23afc304..dcd22dbf 100644
--- a/src/json_util.h
+++ b/src/json_util.h
@@ -8,13 +8,8 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <strings.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <unistd.h>
 
 /*
  * Contract of get functions:
diff --git a/src/line_file.c b/src/line_file.c
index 8dc44c40..1ec2613d 100644
--- a/src/line_file.c
+++ b/src/line_file.c
@@ -1,5 +1,7 @@
 #include "line_file.h"
 
+#include <stdlib.h>
+
 #include "alloc.h"
 #include "file.h"
 #include "log.h"
diff --git a/src/line_file.h b/src/line_file.h
index 4152550b..01103137 100644
--- a/src/line_file.h
+++ b/src/line_file.h
@@ -10,11 +10,6 @@
 
 #include <stddef.h>
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <strings.h>
-#include <sys/types.h>
-#include <unistd.h>
 
 struct line_file;
 
diff --git a/src/main.c b/src/main.c
index e8a8989c..676cdba0 100644
--- a/src/main.c
+++ b/src/main.c
@@ -7,8 +7,8 @@
 #include "nid.h"
 #include "print_file.h"
 #include "prometheus.h"
-#include "stats.h"
 #include "rtr/rtr.h"
+#include "stats.h"
 #include "thread_var.h"
 #include "xml/relax_ng.h"
 
diff --git a/src/object/vcard.c b/src/object/vcard.c
index 45687db9..797930ee 100644
--- a/src/object/vcard.c
+++ b/src/object/vcard.c
@@ -1,6 +1,9 @@
 #include "object/vcard.h"
 
 #include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <strings.h>
 
 #include "alloc.h"
 #include "log.h"
diff --git a/src/prometheus.c b/src/prometheus.c
index 093cc7ed..e3f6052f 100644
--- a/src/prometheus.c
+++ b/src/prometheus.c
@@ -1,8 +1,9 @@
 #include "prometheus.h"
 
-#include <stdio.h>
-#include <string.h>
 #include <microhttpd.h>
+#include <string.h>
+#include <sys/socket.h>
+#include <sys/types.h>
 
 #include "config.h"
 #include "log.h"
@@ -65,7 +66,7 @@ set_content_type(struct MHD_Connection *conn, struct MHD_Response *res)
 	char const *ct;
 	MHD_RESULT ret;
 
-	accept = MHD_lookup_connection_value (conn, MHD_HEADER_KIND,
+	accept = MHD_lookup_connection_value(conn, MHD_HEADER_KIND,
 	    MHD_HTTP_HEADER_ACCEPT);
 	if (accept != NULL) {
 		om_q = find_q(accept, "application/openmetrics-text");
diff --git a/src/resource/ip6.c b/src/resource/ip6.c
index aad0aaa1..c2d8fc8c 100644
--- a/src/resource/ip6.c
+++ b/src/resource/ip6.c
@@ -1,5 +1,7 @@
 #include "resource/ip6.h"
 
+#include <string.h>
+
 #include "sorted_array.h"
 
 static int
diff --git a/src/rrdp.c b/src/rrdp.c
index 28e6b801..4d5355b6 100644
--- a/src/rrdp.c
+++ b/src/rrdp.c
@@ -1,6 +1,7 @@
 #include "rrdp.h"
 
 #include <ctype.h>
+#include <libxml/globals.h>
 #include <openssl/evp.h>
 #include <openssl/sha.h>
 
diff --git a/src/rsync/rsync.c b/src/rsync/rsync.c
index 28f2ed0f..7c331563 100644
--- a/src/rsync/rsync.c
+++ b/src/rsync/rsync.c
@@ -4,8 +4,10 @@
 #include <fcntl.h>
 #include <poll.h>
 #include <signal.h>
+#include <string.h>
 #include <sys/wait.h>
 #include <syslog.h>
+#include <unistd.h>
 
 #include "alloc.h"
 #include "common.h"
diff --git a/src/rtr/db/delta.c b/src/rtr/db/delta.c
index c5611bca..bd625748 100644
--- a/src/rtr/db/delta.c
+++ b/src/rtr/db/delta.c
@@ -1,6 +1,7 @@
 #include "rtr/db/delta.h"
 
 #include <stdatomic.h>
+#include <string.h>
 
 #include "data_structure/array_list.h"
 #include "log.h"
diff --git a/src/rtr/err_pdu.c b/src/rtr/err_pdu.c
index 6af11313..5387d815 100644
--- a/src/rtr/err_pdu.c
+++ b/src/rtr/err_pdu.c
@@ -1,6 +1,7 @@
 #include "rtr/err_pdu.h"
 
 #include <errno.h>
+#include <stdlib.h>
 
 #include "alloc.h"
 #include "rtr/pdu_sender.h"
diff --git a/src/rtr/pdu.h b/src/rtr/pdu.h
index 3a364b09..35ded498 100644
--- a/src/rtr/pdu.h
+++ b/src/rtr/pdu.h
@@ -6,12 +6,6 @@
 #include <netinet/in.h>
 #include <stddef.h>
 #include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <strings.h>
-#include <sys/types.h>
-#include <unistd.h>
 
 enum rtr_version {
 	RTR_V0			= 0,
diff --git a/src/rtr/pdu_sender.c b/src/rtr/pdu_sender.c
index 41e10e6b..2e50c23d 100644
--- a/src/rtr/pdu_sender.c
+++ b/src/rtr/pdu_sender.c
@@ -2,6 +2,7 @@
 
 #include <errno.h>
 #include <poll.h>
+#include <string.h>
 
 #include "alloc.h"
 #include "config.h"
diff --git a/src/rtr/pdu_stream.c b/src/rtr/pdu_stream.c
index 416dc05d..6ae29915 100644
--- a/src/rtr/pdu_stream.c
+++ b/src/rtr/pdu_stream.c
@@ -1,6 +1,10 @@
 #include "rtr/pdu_stream.h"
 
 #include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <unistd.h>
 
 #include "alloc.h"
 #include "log.h"
diff --git a/src/rtr/rtr.c b/src/rtr/rtr.c
index d52e0d9e..9757b9cb 100644
--- a/src/rtr/rtr.c
+++ b/src/rtr/rtr.c
@@ -3,15 +3,16 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <poll.h>
+#include <string.h>
 
 #include "common.h"
 #include "config.h"
 #include "data_structure/array_list.h"
 #include "log.h"
-#include "stats.h"
 #include "rtr/db/vrps.h"
 #include "rtr/pdu_handler.h"
 #include "rtr/pdu_sender.h"
+#include "stats.h"
 #include "thread/thread_pool.h"
 
 struct rtr_server {
diff --git a/src/slurm/db_slurm.c b/src/slurm/db_slurm.c
index ab9329e7..910fedd6 100644
--- a/src/slurm/db_slurm.c
+++ b/src/slurm/db_slurm.c
@@ -1,6 +1,7 @@
 #include "slurm/db_slurm.h"
 
 #include <errno.h>
+#include <string.h>
 #include <time.h>
 
 #include "common.h"
diff --git a/src/slurm/slurm_parser.c b/src/slurm/slurm_parser.c
index 690106f7..44fcd38e 100644
--- a/src/slurm/slurm_parser.c
+++ b/src/slurm/slurm_parser.c
@@ -2,6 +2,9 @@
 
 #include <errno.h>
 #include <openssl/asn1.h>
+#include <stdlib.h>
+#include <string.h>
+#include <strings.h>
 
 #include "algorithm.h"
 #include "alloc.h"
diff --git a/src/sorted_array.c b/src/sorted_array.c
index c5447e60..e6d10bf1 100644
--- a/src/sorted_array.c
+++ b/src/sorted_array.c
@@ -1,5 +1,9 @@
 #include "sorted_array.h"
 
+#include <stdlib.h>
+#include <string.h>
+#include <strings.h>
+
 #include "alloc.h"
 #include "log.h"
 
diff --git a/src/sorted_array.h b/src/sorted_array.h
index 12db6c98..b06a685d 100644
--- a/src/sorted_array.h
+++ b/src/sorted_array.h
@@ -3,12 +3,6 @@
 
 #include <stdbool.h>
 #include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <strings.h>
-#include <sys/types.h>
-#include <unistd.h>
 
 /*
  * This implementation is not a generic sorted array; It's intended to store RFC
diff --git a/src/stats.c b/src/stats.c
index c23f0b4a..6f2d391d 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -1,11 +1,12 @@
 #include "stats.h"
 
-#include <pthread.h>
+#include <stdarg.h>
+#include <time.h>
 
 #include "alloc.h"
 #include "common.h"
-#include "log.h"
 #include "data_structure/uthash.h"
+#include "log.h"
 
 struct stats_gauge {
 	char *name;
diff --git a/src/str_token.c b/src/str_token.c
index 9f01dc8a..05e4fcb4 100644
--- a/src/str_token.c
+++ b/src/str_token.c
@@ -2,6 +2,7 @@
 
 #include <openssl/bio.h>
 #include <stdint.h>
+#include <string.h>
 
 #include "alloc.h"
 #include "log.h"
diff --git a/src/str_token.h b/src/str_token.h
index aaaf10dd..016f6e79 100644
--- a/src/str_token.h
+++ b/src/str_token.h
@@ -5,12 +5,6 @@
 #include <openssl/bn.h>
 #include <stdbool.h>
 #include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <strings.h>
-#include <sys/types.h>
-#include <unistd.h>
 
 int ia5s2string(ASN1_IA5STRING *, char **);
 int BN2string(BIGNUM *, char **);
diff --git a/src/thread/thread_pool.c b/src/thread/thread_pool.c
index 7ec30d10..e84a53e7 100644
--- a/src/thread/thread_pool.c
+++ b/src/thread/thread_pool.c
@@ -1,5 +1,7 @@
 #include "thread/thread_pool.h"
 
+#include <stdlib.h>
+#include <string.h>
 #include <sys/queue.h>
 
 #include "alloc.h"
diff --git a/src/types/bio_seq.c b/src/types/bio_seq.c
index 6af91572..1cc5d759 100644
--- a/src/types/bio_seq.c
+++ b/src/types/bio_seq.c
@@ -1,5 +1,7 @@
 #include "types/bio_seq.h"
 
+#include <stdlib.h>
+
 #include "alloc.h"
 #include "log.h"
 
diff --git a/src/types/uri.h b/src/types/uri.h
index 9eb27915..c5886ec8 100644
--- a/src/types/uri.h
+++ b/src/types/uri.h
@@ -2,6 +2,7 @@
 #define SRC_TYPES_URI_H_
 
 #include <stdbool.h>
+#include <string.h>
 
 #include "asn1/asn1c/IA5String.h"
 #include "data_structure/array_list.h"