From: Alberto Leiva Popper <ydahhrk@gmail.com>
Date: Tue, 14 Jul 2026 21:42:49 +0000 (-0600)
Subject: Review of #includes
X-Git-Tag: 1.7.0.experimental~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=508789bec5749e82ebda1055924dff7429bf01b1;p=thirdparty%2FFORT-validator.git

Review of #includes
---

diff --git a/src/asn1/asn1c/ASProviderAttestation.c b/src/asn1/asn1c/ASProviderAttestation.c
index ce435fd5..7e383a55 100644
--- a/src/asn1/asn1c/ASProviderAttestation.c
+++ b/src/asn1/asn1c/ASProviderAttestation.c
@@ -7,6 +7,9 @@
 
 #include "asn1/asn1c/ASProviderAttestation.h"
 
+#include "asn1/asn1c/asn_internal.h"
+#include "asn1/asn1c/constr_SEQUENCE.h"
+
 static int asn_DFL_2_cmp_0(const void *sptr) {
 	const INTEGER_t *st = sptr;
 	
@@ -91,4 +94,3 @@ asn_TYPE_descriptor_t asn_DEF_ASProviderAttestation = {
 	3,	/* Elements count */
 	&asn_SPC_ASProviderAttestation_specs_1	/* Additional specs */
 };
-
diff --git a/src/asn1/asn1c/ASProviderAttestation.h b/src/asn1/asn1c/ASProviderAttestation.h
index 2bcae026..ce4d2d3f 100644
--- a/src/asn1/asn1c/ASProviderAttestation.h
+++ b/src/asn1/asn1c/ASProviderAttestation.h
@@ -9,14 +9,7 @@
 #define	_ASProviderAttestation_H_
 
 /* Including external dependencies */
-#include "asn1/asn1c/INTEGER.h"
-#include "asn1/asn1c/ASId.h"
 #include "asn1/asn1c/ProviderASSet.h"
-#include "asn1/asn1c/constr_SEQUENCE.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 /* ASProviderAttestation */
 typedef struct ASProviderAttestation {
@@ -31,9 +24,4 @@ typedef struct ASProviderAttestation {
 /* Implementation */
 extern asn_TYPE_descriptor_t asn_DEF_ASProviderAttestation;
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _ASProviderAttestation_H_ */
-#include "asn1/asn1c/asn_internal.h"
diff --git a/src/asn1/asn1c/ProviderASSet.c b/src/asn1/asn1c/ProviderASSet.c
index 5074d24a..5444945f 100644
--- a/src/asn1/asn1c/ProviderASSet.c
+++ b/src/asn1/asn1c/ProviderASSet.c
@@ -7,6 +7,8 @@
 
 #include "asn1/asn1c/ProviderASSet.h"
 
+#include "asn1/asn1c/constr_SEQUENCE_OF.h"
+
 asn_TYPE_member_t asn_MBR_ProviderASSet_1[] = {
 	{ ATF_POINTER, 0, 0,
 		(ASN_TAG_CLASS_UNIVERSAL | (2 << 2)),
@@ -41,4 +43,3 @@ asn_TYPE_descriptor_t asn_DEF_ProviderASSet = {
 	1,	/* Single element */
 	&asn_SPC_ProviderASSet_specs_1	/* Additional specs */
 };
-
diff --git a/src/asn1/asn1c/ProviderASSet.h b/src/asn1/asn1c/ProviderASSet.h
index 85219337..eb6c1b28 100644
--- a/src/asn1/asn1c/ProviderASSet.h
+++ b/src/asn1/asn1c/ProviderASSet.h
@@ -11,11 +11,7 @@
 /* Including external dependencies */
 #include "asn1/asn1c/ASId.h"
 #include "asn1/asn1c/asn_SEQUENCE_OF.h"
-#include "asn1/asn1c/constr_SEQUENCE_OF.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include "asn1/asn1c/constr_SET_OF.h"
 
 /* ProviderASSet */
 typedef struct ProviderASSet {
@@ -30,9 +26,4 @@ extern asn_TYPE_descriptor_t asn_DEF_ProviderASSet;
 extern asn_SET_OF_specifics_t asn_SPC_ProviderASSet_specs_1;
 extern asn_TYPE_member_t asn_MBR_ProviderASSet_1[1];
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _ProviderASSet_H_ */
-#include "asn1/asn1c/asn_internal.h"
diff --git a/src/libcrypto_util.c b/src/libcrypto_util.c
index 7f95b599..783ab8d1 100644
--- a/src/libcrypto_util.c
+++ b/src/libcrypto_util.c
@@ -3,6 +3,7 @@
 #include <openssl/bio.h>
 #include <openssl/bn.h>
 #include <openssl/buffer.h>
+#include <openssl/crypto.h>
 #include <openssl/objects.h>
 #include <openssl/pem.h>
 #include <time.h>
diff --git a/src/log.c b/src/log.c
index 103468e4..8c0967a0 100644
--- a/src/log.c
+++ b/src/log.c
@@ -8,9 +8,7 @@
 #include <pthread.h>
 #include <signal.h>
 #include <stdarg.h>
-#include <sys/stat.h>
 #include <syslog.h>
-#include <time.h>
 
 #include "config.h"
 #include "thread_var.h"
diff --git a/src/object/aspa.c b/src/object/aspa.c
index 77613fc9..48f05683 100644
--- a/src/object/aspa.c
+++ b/src/object/aspa.c
@@ -2,8 +2,6 @@
 
 #include "asn1/asn1c/ASProviderAttestation.h"
 #include "asn1/decode.h"
-#include "asn1/oid.h"
-#include "asn1/signed_data.h"
 #include "config.h"
 #include "log.h"
 #include "object/signed_object.h"
diff --git a/src/object/certificate.c b/src/object/certificate.c
index a3429341..d1dea19c 100644
--- a/src/object/certificate.c
+++ b/src/object/certificate.c
@@ -9,7 +9,6 @@
 #include <openssl/objects.h>
 #include <openssl/rsa.h>
 #include <syslog.h>
-#include <time.h>
 
 #include "algorithm.h"
 #include "asn1/asn1c/IPAddrBlocks.h"
diff --git a/src/object/certificate.h b/src/object/certificate.h
index 4aa2ace0..de1dc0c9 100644
--- a/src/object/certificate.h
+++ b/src/object/certificate.h
@@ -1,11 +1,7 @@
 #ifndef SRC_OBJECT_CERTIFICATE_H_
 #define SRC_OBJECT_CERTIFICATE_H_
 
-#include "asn1/asn1c/ANY.h"
-#include "asn1/asn1c/SignatureValue.h"
 #include "asn1/signed_data.h"
-#include "certificate_refs.h"
-#include "resource.h"
 
 /* Certificate types in the RPKI */
 enum cert_type {
diff --git a/src/object/tal.c b/src/object/tal.c
index 5a492f64..84414baf 100644
--- a/src/object/tal.c
+++ b/src/object/tal.c
@@ -3,7 +3,6 @@
 #include <errno.h>
 #include <openssl/evp.h>
 #include <sys/queue.h>
-#include <time.h>
 
 #include "common.h"
 #include "config.h"
diff --git a/src/rrdp.c b/src/rrdp.c
index 88a781e1..68244f56 100644
--- a/src/rrdp.c
+++ b/src/rrdp.c
@@ -2,6 +2,7 @@
 
 #include <ctype.h>
 #include <libxml/globals.h>
+#include <openssl/crypto.h>
 #include <openssl/evp.h>
 #include <openssl/sha.h>
 
diff --git a/src/rtr/db/db_table.c b/src/rtr/db/db_table.c
index 1764cdef..e6190d2c 100644
--- a/src/rtr/db/db_table.c
+++ b/src/rtr/db/db_table.c
@@ -1,9 +1,5 @@
 #include "rtr/db/db_table.h"
 
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-
 #include "alloc.h"
 #include "config.h"
 #include "data_structure/common.h"
@@ -11,7 +7,6 @@
 #include "file.h"
 #include "log.h"
 #include "rtr/meta.h"
-#include "types/aspa.h"
 
 struct hashable_roa {
 	struct vrp data;
diff --git a/src/rtr/db/vrps.c b/src/rtr/db/vrps.c
index 724fc8ce..d9e52672 100644
--- a/src/rtr/db/vrps.c
+++ b/src/rtr/db/vrps.c
@@ -1,13 +1,12 @@
 #include "rtr/db/vrps.h"
 
 #include <errno.h>
-#include <time.h>
+#include <sys/stat.h>
 
 #include "config.h"
 #include "log.h"
 #include "object/tal.h"
 #include "output_printer.h"
-#include "rtr/db/db_table.h"
 #include "slurm/slurm_loader.h"
 
 int
diff --git a/src/rtr/meta.c b/src/rtr/meta.c
index d26d8989..31e27e30 100644
--- a/src/rtr/meta.c
+++ b/src/rtr/meta.c
@@ -1,16 +1,9 @@
 #include "rtr/meta.h"
 
-#include <errno.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-
 #include "alloc.h"
-#include "common.h"
 #include "config.h"
-#include "data_structure/common.h"
-#include "log.h"
 #include "file.h"
+#include "log.h"
 
 /* TODO delete in Fort2 */
 char *
diff --git a/src/rtr/meta.h b/src/rtr/meta.h
index 73822148..bf3cd2f4 100644
--- a/src/rtr/meta.h
+++ b/src/rtr/meta.h
@@ -3,7 +3,7 @@
 
 #include <stdio.h>
 #include <time.h>
-#include <sys/queue.h>
+
 #include "types/serial.h"
 
 struct rtr_metadata {
diff --git a/src/rtr/pdu_handler.c b/src/rtr/pdu_handler.c
index ec86a225..d148687d 100644
--- a/src/rtr/pdu_handler.c
+++ b/src/rtr/pdu_handler.c
@@ -1,13 +1,15 @@
 #include "rtr/pdu_handler.h"
 
-#include <stdio.h>
 #include <errno.h>
 #include <string.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <unistd.h>
 
 #include "alloc.h"
 #include "config.h"
-#include "log.h"
 #include "data_structure/common.h"
+#include "log.h"
 #include "rtr/err_pdu.h"
 #include "rtr/pdu_sender.h"
 
diff --git a/src/rtr/pdu_sender.c b/src/rtr/pdu_sender.c
index 1768d110..67d7e8b9 100644
--- a/src/rtr/pdu_sender.c
+++ b/src/rtr/pdu_sender.c
@@ -3,6 +3,7 @@
 #include <errno.h>
 #include <poll.h>
 #include <string.h>
+#include <sys/socket.h>
 #include <unistd.h>
 
 #include "alloc.h"
diff --git a/src/rtr/pdu_sender.h b/src/rtr/pdu_sender.h
index eee62457..309a8d68 100644
--- a/src/rtr/pdu_sender.h
+++ b/src/rtr/pdu_sender.h
@@ -1,11 +1,10 @@
 #ifndef SRC_RTR_PDU_SENDER_H_
 #define SRC_RTR_PDU_SENDER_H_
 
-#include "rtr/pdu.h"
 #include "rtr/meta.h"
+#include "rtr/pdu.h"
 #include "types/aspa.h"
 #include "types/router_key.h"
-#include "types/serial.h"
 #include "types/vrp.h"
 
 #define FLAG_WITHDRAWAL		0
diff --git a/src/rtr/pdu_stream.c b/src/rtr/pdu_stream.c
index 1d6fc1a2..d100f5cf 100644
--- a/src/rtr/pdu_stream.c
+++ b/src/rtr/pdu_stream.c
@@ -3,12 +3,11 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/queue.h>
+#include <sys/socket.h>
 #include <sys/types.h>
 #include <unistd.h>
 
 #include "alloc.h"
-#include "common.h"
 #include "log.h"
 #include "rtr/err_pdu.h"
 
diff --git a/src/rtr/pdu_stream.h b/src/rtr/pdu_stream.h
index 1ddf13af..9a6bcd51 100644
--- a/src/rtr/pdu_stream.h
+++ b/src/rtr/pdu_stream.h
@@ -3,8 +3,8 @@
 
 #include <arpa/inet.h>
 #include <netinet/in.h>
-#include <sys/queue.h>
 #include <stdbool.h>
+#include <sys/queue.h>
 
 #include "rtr/pdu.h"
 
diff --git a/src/rtr/rtr.c b/src/rtr/rtr.c
index fc180a5c..29d0f36a 100644
--- a/src/rtr/rtr.c
+++ b/src/rtr/rtr.c
@@ -5,9 +5,6 @@
 #include <netdb.h>
 #include <poll.h>
 #include <string.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <unistd.h>
 
 #include "common.h"
 #include "config.h"
diff --git a/src/slurm/slurm_loader.c b/src/slurm/slurm_loader.c
index e1f897e6..ad6b6283 100644
--- a/src/slurm/slurm_loader.c
+++ b/src/slurm/slurm_loader.c
@@ -6,6 +6,7 @@
 #include "config.h"
 #include "crypto/hash.h"
 #include "log.h"
+#include "slurm/db_slurm.h"
 #include "slurm/slurm_parser.h"
 
 #define SLURM_FILE_EXTENSION	".slurm"
diff --git a/src/slurm/slurm_loader.h b/src/slurm/slurm_loader.h
index 96face94..2b1bff21 100644
--- a/src/slurm/slurm_loader.h
+++ b/src/slurm/slurm_loader.h
@@ -2,7 +2,6 @@
 #define SRC_SLURM_SLURM_LOADER_H_
 
 #include "rtr/db/db_table.h"
-#include "slurm/db_slurm.h"
 
 /*
  * Load the SLURM file/dir and try to apply it on @db_table.
diff --git a/src/types/aspa.c b/src/types/aspa.c
index 406b7611..4a99bde5 100644
--- a/src/types/aspa.c
+++ b/src/types/aspa.c
@@ -1,7 +1,8 @@
 #include "types/aspa.h"
 
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
+
 #include "data_structure/common.h"
 
 void