Merge branch 'refactor/include-what-you-use' into 'master'

Refactor: cleanup includes

See merge request d3tn/ud3tn!263

components/aap/aap_serializer.c

@@ -2,11 +2,9 @@
 #include "aap/aap.h"
 #include "aap/aap_serializer.h"
 
-#include "ud3tn/bundle.h"
 
 #include <stddef.h>
 #include <stdint.h>
-#include <stdlib.h>
 #include <string.h>
 
 static void put_uint64(uint8_t *buffer, uint64_t value)

components/aap2/aap2_agent.c

@@ -22,7 +22,6 @@
 #include "platform/hal_time.h"
 #include "platform/hal_types.h"
 
-#include "platform/posix/pipe_queue_util.h"
 #include "platform/posix/socket_util.h"
 
 #include "ud3tn/agent_manager.h"

components/agents/echo_agent.c

@@ -7,7 +7,6 @@
 #include "ud3tn/agent_manager.h"
 #include "ud3tn/agent_util.h"
 #include "ud3tn/bundle_processor.h"
-#include "ud3tn/common.h"
 #include "ud3tn/eid.h"
 
 #include <stdbool.h>

components/agents/posix/application_agent.c

@@ -7,13 +7,10 @@
 #include "agents/application_agent.h"
 
 #include "bundle7/bundle7.h"
-#include "bundle7/parser.h"
 
 #include "cla/posix/cla_tcp_util.h"
 
 #include "platform/hal_io.h"
-#include "platform/hal_queue.h"
-#include "platform/hal_semaphore.h"
 #include "platform/hal_task.h"
 #include "platform/hal_time.h"
 #include "platform/hal_types.h"

components/agents/storage/sqlite_agent.c

@@ -7,11 +7,8 @@
 #include "platform/hal_io.h"
 #include "platform/hal_queue.h"
 #include "platform/posix/hal_types.h"
-#include "platform/hal_task.h"
 
 #include "ud3tn/bundle_processor.h"
-#include "ud3tn/common.h"
-#include "ud3tn/eid.h"
 #include "ud3tn/result.h"
 
 #include <stdbool.h>

components/bundle6/create.c

@@ -2,7 +2,6 @@
 #include "bundle6/create.h"
 
 #include "ud3tn/bundle.h"
-#include "ud3tn/common.h"
 #include "ud3tn/eid.h"
 
 #include <stdbool.h>

components/bundle6/parser.c

@@ -3,7 +3,6 @@
 
 #include "ud3tn/common.h"
 
-#include <inttypes.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>

components/bundle7/bundle7.c

@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause OR Apache-2.0
 #include "bundle7/bundle7.h"
-#include "bundle7/eid.h"
 
 #include "ud3tn/common.h"
 #include "ud3tn/bundle.h"
@@ -9,7 +8,6 @@
 #include <stddef.h>
 #include <string.h>
 #include <stdio.h>
-#include <inttypes.h>
 #include <limits.h>
 
 #define MAX_VALIDATED_BLOCK_NUMBER UINT8_MAX

components/bundle7/create.c

@@ -3,7 +3,6 @@
 #include "bundle7/create.h"
 
 #include "ud3tn/bundle.h"
-#include "ud3tn/common.h"
 #include "ud3tn/eid.h"
 
 #include <stdbool.h>

components/bundle7/eid.c

@@ -3,13 +3,11 @@
 #include "bundle7/eid.h"
 
 #include "ud3tn/bundle.h"
-#include "ud3tn/common.h"
 #include "ud3tn/eid.h"
 
 #include "cbor.h"
 
 #include <assert.h>
-#include <inttypes.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>

components/bundle7/parser.c

@@ -1,4 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause OR Apache-2.0
+#include "bundle7/eid.h"
 #include "bundle7/parser.h"
 #include "bundle7/timestamp.h"
 

components/bundle7/previousnode.c

@@ -4,10 +4,8 @@
 #include "bundle7/previousnode.h"
 
 #include "ud3tn/bundle.h"
-#include "ud3tn/common.h"
 #include "ud3tn/eid.h"
 
-#include "cbor.h"
 
 #include <stdlib.h>
 

components/bundle7/serializer.c

@@ -5,7 +5,6 @@
 #include "cbor.h"
 #include "compilersupport_p.h" // Private TinyCBOR header, used for endianness
 
-#include <inttypes.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>

components/cla/bibe_proto.c

@@ -4,13 +4,7 @@
 
 #include "cla/bibe_proto.h"
 
-#include "platform/hal_io.h"
-
-#include "bundle7/create.h"
-#include "bundle7/reports.h"
-
 #include "ud3tn/common.h"
-#include "ud3tn/parser.h"
 #include "cbor.h"
 
 #include <stddef.h>

components/cla/cla.c

@@ -10,13 +10,11 @@
 #include "cla/storage/cla_sqlite.h"
 
 #include "platform/hal_io.h"
-#include "platform/hal_task.h"
 #include "platform/hal_time.h"
 #include "platform/hal_queue.h"
 #include "platform/hal_semaphore.h"
 
 #include "ud3tn/common.h"
-#include "ud3tn/init.h"
 #include "ud3tn/result.h"
 
 #include <unistd.h>

components/cla/cla_contact_rx_task.c

@@ -2,7 +2,6 @@
 #include "cla/blackhole_parser.h"
 #include "cla/cla.h"
 #include "cla/cla_contact_rx_task.h"
-#include "cla/storage/cla_sqlite.h"
 
 #include "bundle6/parser.h"
 #include "bundle7/parser.h"
@@ -16,10 +15,8 @@
 #include "ud3tn/common.h"
 #include "ud3tn/eid.h"
 
-#include <signal.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include <errno.h>
 
 #if defined(CLA_RX_READ_TIMEOUT) && CLA_RX_READ_TIMEOUT != 0
 static const unsigned long CLA_RX_READ_TIMEOUT_MS = CLA_RX_READ_TIMEOUT;

components/cla/cla_contact_tx_task.c

@@ -2,14 +2,13 @@
 #include "cla/cla.h"
 #include "cla/cla_contact_tx_task.h"
 
-#include "bundle6/parser.h"
-#include "bundle7/parser.h"
 #include "bundle7/previousnode.h"
 
 #include "platform/hal_io.h"
 #include "platform/hal_semaphore.h"
 #include "platform/hal_task.h"
 #include "platform/hal_time.h"
+#include "platform/hal_queue.h"
 
 #include "ud3tn/bundle.h"
 #include "ud3tn/bundle_processor.h"

components/cla/posix/cla_bibe.c

@@ -5,23 +5,19 @@
 
 #include "cla/bibe_proto.h"
 #include "cla/cla.h"
-#include "cla/cla_contact_tx_task.h"
 #include "cla/posix/cla_bibe.h"
 #include "cla/posix/cla_tcp_common.h"
 #include "cla/posix/cla_tcp_util.h"
 
-#include "bundle6/parser.h"
 #include "bundle7/parser.h"
 
 #include "platform/hal_io.h"
-#include "platform/hal_queue.h"
 #include "platform/hal_semaphore.h"
 #include "platform/hal_task.h"
 #include "platform/hal_types.h"
 
 #include "ud3tn/bundle.h"
 #include "ud3tn/bundle_processor.h"
-#include "ud3tn/cmdline.h"
 #include "ud3tn/common.h"
 #include "ud3tn/eid.h"
 #include "ud3tn/result.h"

components/cla/posix/cla_mtcp.c

@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause OR Apache-2.0
 #include "cla/cla.h"
-#include "cla/cla_contact_tx_task.h"
 #include "cla/mtcp_proto.h"
 #include "cla/posix/cla_mtcp.h"
 #include "cla/posix/cla_tcp_common.h"
@@ -10,13 +9,11 @@
 #include "bundle7/parser.h"
 
 #include "platform/hal_io.h"
-#include "platform/hal_queue.h"
 #include "platform/hal_semaphore.h"
 #include "platform/hal_task.h"
 #include "platform/hal_types.h"
 
 #include "ud3tn/bundle_processor.h"
-#include "ud3tn/cmdline.h"
 #include "ud3tn/common.h"
 #include "ud3tn/result.h"
 #include "ud3tn/simplehtab.h"

components/cla/posix/cla_smtcp.c

@@ -1,27 +1,20 @@
 // SPDX-License-Identifier: BSD-3-Clause OR Apache-2.0
 #include "cla/cla.h"
-#include "cla/mtcp_proto.h"
 #include "cla/posix/cla_mtcp.h"
 #include "cla/posix/cla_smtcp.h"
 #include "cla/posix/cla_tcp_common.h"
-#include "cla/posix/cla_tcp_util.h"
 
-#include "bundle6/parser.h"
-#include "bundle7/parser.h"
 
 #include "platform/hal_io.h"
 #include "platform/hal_task.h"
 
 #include "ud3tn/bundle_processor.h"
-#include "ud3tn/cmdline.h"
-#include "ud3tn/common.h"
 #include "ud3tn/result.h"
 
 #include <sys/socket.h>
 
 #include <stdbool.h>
 #include <stddef.h>
-#include <stdint.h>
 #include <stdlib.h>
 
 static const char *CLA_NAME = "smtcp";

components/cla/posix/cla_tcp_common.c

@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause OR Apache-2.0
 #include "cla/cla.h"
-#include "cla/cla_contact_tx_task.h"
 #include "cla/posix/cla_tcp_common.h"
 #include "cla/posix/cla_tcp_util.h"
 

components/cla/posix/cla_tcp_util.c

@@ -2,7 +2,6 @@
 #include "cla/posix/cla_tcp_util.h"
 
 #include "platform/hal_io.h"
-#include "platform/posix/socket_util.h"
 
 #include "ud3tn/common.h"
 

components/cla/posix/cla_tcpclv3.c

@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause OR Apache-2.0
 #include "cla/cla.h"
-#include "cla/cla_contact_tx_task.h"
 #include "cla/posix/cla_tcp_common.h"
 #include "cla/posix/cla_tcp_util.h"
 #include "cla/posix/cla_tcpclv3.h"
@@ -11,13 +10,11 @@
 #include "bundle7/parser.h"
 
 #include "platform/hal_io.h"
-#include "platform/hal_queue.h"
 #include "platform/hal_semaphore.h"
 #include "platform/hal_task.h"
 
 #include "ud3tn/bundle.h"
 #include "ud3tn/bundle_processor.h"
-#include "ud3tn/cmdline.h"
 #include "ud3tn/common.h"
 #include "ud3tn/eid.h"
 #include "ud3tn/result.h"

components/cla/posix/cla_tcpclv3_proto.c

@@ -5,7 +5,6 @@
 
 #include "platform/hal_io.h"
 
-#include "ud3tn/common.h"
 #include "ud3tn/eid.h"
 #include "ud3tn/parser.h"
 

components/cla/posix/cla_tcpspp.c

@@ -18,7 +18,6 @@
 
 #include "ud3tn/bundle.h"
 #include "ud3tn/bundle_processor.h"
-#include "ud3tn/cmdline.h"
 #include "ud3tn/common.h"
 #include "ud3tn/parser.h"
 #include "ud3tn/result.h"

components/cla/storage/cla_sqlite.c

@@ -3,20 +3,17 @@
 #include "agents/storage/storage_agent.pb.h"
 
 #include "cla/cla.h"
-#include "cla/cla_contact_tx_task.h"
 #include "cla/storage/cla_sqlite.h"
 
 #include "platform/hal_io.h"
 #include "platform/hal_queue.h"
 #include "platform/hal_semaphore.h"
-#include "platform/hal_task.h"
 #include "platform/hal_types.h"
 #include "platform/posix/hal_types.h"
 
 #include "ud3tn/eid.h"
 #include "ud3tn/fib.h"
 #include "ud3tn/result.h"
-#include "ud3tn/simplehtab.h"
 
 #include <stddef.h>
 #include <stdlib.h>

components/platform/posix/hal_io.c

@@ -13,7 +13,6 @@
 #include "ud3tn/result.h"
 
 #include <stdio.h>
-#include <stdlib.h>
 #include <stddef.h>
 #include <stdarg.h>
 #include <stdint.h>

components/platform/posix/hal_platform.c

@@ -9,12 +9,7 @@
 
 #include "platform/hal_io.h"
 #include "platform/hal_platform.h"
-#include "platform/hal_time.h"
-#include "platform/hal_task.h"
 
-#include <errno.h>
-#include <inttypes.h>
-#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

components/platform/posix/hal_queue.c

@@ -14,10 +14,7 @@
 
 #include "ud3tn/result.h"
 
-#include <stdlib.h>
 #include <stdint.h>
-#include <stdio.h>
-
 
 QueueIdentifier_t hal_queue_create(int queue_length, int item_size)
 {

components/platform/posix/hal_semaphore.c

@@ -15,7 +15,6 @@
 
 #include <errno.h>
 #include <stdlib.h>
-#include <stdio.h>
 #include <time.h>
 
 #ifdef __APPLE__

components/platform/posix/hal_task.c

@@ -12,7 +12,6 @@
 
 #include "platform/hal_io.h"
 #include "platform/hal_task.h"
-#include "platform/hal_time.h"
 #include "platform/hal_types.h"
 
 #include <errno.h>

components/platform/posix/hal_time.c

@@ -10,12 +10,10 @@
 #include "platform/hal_time.h"
 #include "platform/hal_semaphore.h"
 
-#include <math.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
-#include <stdlib.h>
 #include <time.h>
 
 static Semaphore_t time_string_semph;

components/platform/posix/pipe_queue_util.c

@@ -6,7 +6,6 @@
 #include <errno.h>
 #include <stddef.h>
 #include <stdint.h>
-#include <stdlib.h>
 
 ssize_t pipeq_read_all(int fd, void *buf, size_t count)
 {

components/platform/posix/simple_queue.c

@@ -21,7 +21,6 @@
 #include <stddef.h>
 #include <string.h>
 #include <stdio.h>
-#include <errno.h>
 
 static char *increment(char *current, char *abs_start, const char *abs_end,
 		       const unsigned int item_size)

components/routing/compat/contact_manager.c

@@ -2,13 +2,10 @@
 #include "routing/compat/contact_manager.h"
 #include "routing/compat/node.h"
 
+#include "ud3tn/bundle_processor.h"
 #include "ud3tn/common.h"
 
-#include "cla/cla.h"
-#include "cla/cla_contact_tx_task.h"
-
 #include "platform/hal_io.h"
-#include "platform/hal_platform.h"
 #include "platform/hal_queue.h"
 #include "platform/hal_semaphore.h"
 #include "platform/hal_task.h"

components/routing/compat/json_config.c

@@ -4,8 +4,6 @@
 #include "routing/compat/node.h"
 #include "routing/compat/router.h"
 
-#include "platform/hal_io.h"
-
 #include "ud3tn/eid.h"
 
 #include "jansson.h"

components/routing/compat/router_agent.c

@@ -3,6 +3,7 @@
 #include "routing/compat/contact_manager.h"
 #include "routing/compat/json_config.h"
 #include "routing/compat/router_agent.h"
+#include "routing/compat/routing_table.h"
 
 #include "ud3tn/agent_manager.h"
 #include "ud3tn/bundle_processor.h"
@@ -17,7 +18,6 @@
 
 #include <stdbool.h>
 #include <stddef.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 

components/ud3tn/agent_util.c

@@ -3,7 +3,6 @@
 #include "bundle7/create.h"
 
 #include "ud3tn/agent_util.h"
-#include "ud3tn/common.h"
 #include "ud3tn/bundle.h"
 #include "ud3tn/bundle_processor.h"
 #include "ud3tn/eid.h"

components/ud3tn/bundle.c

@@ -9,15 +9,12 @@
 // BPv7-bis
 #include "bundle7/bundle7.h"
 #include "bundle7/bundle_age.h"
-#include "bundle7/eid.h"
 #include "bundle7/serializer.h"
 
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include <inttypes.h>
-
 
 static inline void bundle_reset_internal(struct bundle *bundle)
 {

components/ud3tn/bundle_processor.c

@@ -7,10 +7,7 @@
 #include "ud3tn/fib.h"
 #include "ud3tn/report_manager.h"
 #include "ud3tn/result.h"
-#include "ud3tn/simplehtab.h"
 
-#include "bundle6/bundle6.h"
-#include "bundle7/bundle_age.h"
 #include "bundle7/hopcount.h"
 
 #include "cla/cla.h"
@@ -19,11 +16,8 @@
 #include "platform/hal_io.h"
 #include "platform/hal_queue.h"
 #include "platform/hal_semaphore.h"
-#include "platform/hal_task.h"
 #include "platform/hal_time.h"
 
-#include "cbor.h"
-
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>

components/ud3tn/cmdline.c

@@ -6,7 +6,6 @@
 #include "platform/hal_io.h"
 
 #include <errno.h>
-#include <inttypes.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>

components/ud3tn/crc.c

@@ -13,7 +13,6 @@
 #include "ud3tn/crc.h"
 
 #include <stddef.h>
-#include <stdio.h>
 #include <stdint.h>
 
 

components/ud3tn/init.c

@@ -2,7 +2,6 @@
 #include "ud3tn/agent_manager.h"
 #include "ud3tn/bundle_processor.h"
 #include "ud3tn/cmdline.h"
-#include "ud3tn/common.h"
 #include "ud3tn/init.h"
 
 #include "aap2/aap2_agent.h"

components/ud3tn/report_manager.c

@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: BSD-3-Clause OR Apache-2.0
 #include "ud3tn/bundle.h"
 #include "ud3tn/eid.h"
-#include "ud3tn/parser.h"
 #include "ud3tn/report_manager.h"
 
 #include "bundle6/reports.h"

include/aap/aap.h

@@ -2,8 +2,6 @@
 #ifndef AAP_H_INCLUDED
 #define AAP_H_INCLUDED
 
-#include "ud3tn/bundle.h"
-
 #include <stddef.h>
 #include <stdint.h>
 #include <stdbool.h>

include/aap/aap_parser.h

@@ -5,6 +5,7 @@
 #include "aap/aap.h"
 
 #include "ud3tn/parser.h"
+#include "ud3tn/result.h"
 
 #include <stddef.h>
 #include <stdint.h>

include/agents/sqlite_agent.h

@@ -6,8 +6,6 @@
 
 #include "ud3tn/bundle_processor.h"
 
-#include <stdint.h>
-
 // Default Agent IDs.
 #ifndef AGENT_ID_SQLITE_DTN
 #define AGENT_ID_SQLITE_DTN "sqlite"

include/bundle7/bundle7.h

@@ -4,9 +4,7 @@
 
 #include "ud3tn/bundle.h"
 #include "ud3tn/eid.h"
-#include "ud3tn/result.h"
 
-#include <inttypes.h>
 #include <stdbool.h>
 #include <stddef.h>
 

include/bundle7/bundle_age.h

@@ -2,8 +2,6 @@
 #ifndef BUNDLE_AGE_H_INCLUDED
 #define BUNDLE_AGE_H_INCLUDED
 
-#include "ud3tn/bundle.h"
-
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>

include/bundle7/parser.h

@@ -2,8 +2,6 @@
 #ifndef BUNDLE_V7_PARSER_H_INCLUDED
 #define BUNDLE_V7_PARSER_H_INCLUDED
 
-#include "bundle7/eid.h"  // struct bundle7_eid_parser
-
 #include "ud3tn/bundle.h"  // struct bundle
 #include "ud3tn/crc.h"     // struct crc_stream
 #include "ud3tn/parser.h"  // struct parser

include/bundle7/serializer.h

@@ -2,8 +2,6 @@
 #ifndef BUNDLE_V7_SERIALIZER_H_INCLUDED
 #define BUNDLE_V7_SERIALIZER_H_INCLUDED
 
-#include "bundle7/bundle7.h"
-
 #include "ud3tn/bundle.h"
 #include "ud3tn/crc.h"
 #include "ud3tn/result.h"

include/cla/bibe_proto.h

@@ -2,9 +2,7 @@
 #ifndef CLA_BIBE_PROTO_H
 #define CLA_BIBE_PROTO_H
 
-#include "bundle7/reports.h"
-
-#include "ud3tn/parser.h"
+#include "ud3tn/bundle.h"
 
 #include <stddef.h>
 #include <stdint.h>

include/cla/cla.h

@@ -6,11 +6,8 @@
 
 #include "ud3tn/bundle.h"
 #include "ud3tn/bundle_processor.h"
-#include "ud3tn/crc.h"
 #include "ud3tn/result.h"
 
-#include "spp/spp_timecodes.h"
-
 #include "platform/hal_types.h"
 
 #include <stdbool.h>

include/cla/cla_contact_tx_task.h

@@ -6,8 +6,6 @@
 
 #include "ud3tn/bundle.h"
 
-#include "platform/hal_queue.h"
-
 enum cla_contact_tx_task_command_type {
 	TX_COMMAND_UNDEFINED, /* 0x00 */
 	TX_COMMAND_BUNDLE,    /* 0x01 */

include/cla/posix/cla_bibe.h

@@ -6,7 +6,6 @@
 
 #include "cla/cla.h"
 #include "cla/posix/cla_tcp_common.h"
-#include "cla/bibe_proto.h"
 
 #include "ud3tn/bundle.h"
 #include "ud3tn/bundle_processor.h"

include/cla/storage/cla_sqlite.h

@@ -7,7 +7,6 @@
 #include "cla/cla.h"
 
 #include "ud3tn/bundle_processor.h"
-#include "ud3tn/result.h"
 
 #include <stddef.h>
 

include/platform/hal_io.h

@@ -14,7 +14,6 @@
 
 #include <stddef.h>
 #include <stdint.h>
-#include <stdio.h>
 
 extern uint8_t LOG_LEVEL;
 

include/platform/hal_task.h

@@ -10,15 +10,12 @@
 #ifndef HAL_TASK_H_INCLUDED
 #define HAL_TASK_H_INCLUDED
 
-#include "ud3tn/common.h"
 #include "ud3tn/result.h"
 
 #include "platform/hal_types.h"
 
 #include <stdbool.h>
 #include <stddef.h>
-#include <stdio.h>
-#include <stdint.h>
 
 /**
  * @brief hal_task_create Creates a new task in the underlying OS.

include/platform/hal_types.h

@@ -3,4 +3,4 @@
 /* As we want to support simple porting to further platform,
  * platform dependent types may be used here.
  */
-#include "platform/posix/hal_types.h"
+#include "platform/posix/hal_types.h" // IWYU pragma: export

include/platform/posix/pipe_queue_util.h

@@ -3,7 +3,6 @@
 #define PIPE_QUEUE_UTIL_H_INCLUDED
 
 #include <stddef.h>
-#include <stdlib.h>
 #include <sys/types.h>
 
 /**

include/routing/compat/contact_manager.h

@@ -2,14 +2,10 @@
 #ifndef RTCOMPAT_CONTACTMANAGER_H_INCLUDED
 #define RTCOMPAT_CONTACTMANAGER_H_INCLUDED
 
-#include "ud3tn/common.h"
-
 #include "routing/compat/node.h"
 
 #include "platform/hal_types.h"
 
-#include <stdint.h>
-
 // Compat. router: Maximum number of concurrent contacts that can be handled by
 // the Contact Manager.
 #ifndef ROUTER_MAX_CONCURRENT_CONTACTS

include/routing/compat/node.h

@@ -3,8 +3,6 @@
 #define RTCOMPAT_NODE_H_INCLUDED
 
 #include "ud3tn/bundle.h"
-#include "ud3tn/eid.h"
-#include "ud3tn/result.h"
 
 #include <stdint.h>
 

include/routing/compat/router.h

@@ -5,12 +5,9 @@
 #include "platform/hal_types.h"
 
 #include "ud3tn/bundle.h"
-#include "ud3tn/common.h"
 #include "ud3tn/eid.h"
 
-#include "routing/compat/contact_manager.h"
 #include "routing/compat/node.h"
-#include "routing/compat/routing_table.h"
 
 #include <stddef.h>
 #include <stdint.h>

include/routing/compat/router_agent.h

@@ -6,7 +6,6 @@
 
 #include <stdbool.h>
 #include <stddef.h>
-#include <stdint.h>
 
 // Compat. router: Agent ID of the config. agent if using the dtn scheme.
 #ifndef ROUTER_AGENT_ID_CONFIG_DTN

include/spp/spp.h

@@ -5,7 +5,6 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stddef.h>
-#include <time.h>
 
 #define SPP_MAX_APID (0x7ff)
 #define SPP_MAX_SEGMENT_NUMBER (0x3fff)

include/ud3tn/init.h

@@ -7,8 +7,6 @@
 #include "ud3tn/cmdline.h"
 #include "ud3tn/result.h"
 
-#include <stdint.h>
-
 // Default length of the queue toward the BP.
 #ifndef BUNDLE_QUEUE_LENGTH
 #define BUNDLE_QUEUE_LENGTH 4000

test/unit/main.c

@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause OR Apache-2.0
 #include "ud3tn/init.h"
-#include "ud3tn/cmdline.h"
 #include "ud3tn/result.h"
 
 #include "platform/hal_io.h"

test/unit/test_aap_serializer.c

@@ -8,7 +8,6 @@
 
 #include <stddef.h>
 #include <stdint.h>
-#include <string.h>
 
 #define VALID_MSG_COUNT 9
 

test/unit/test_bibe_encoder.c

@@ -1,17 +1,11 @@
 // SPDX-License-Identifier: BSD-3-Clause OR Apache-2.0
-#include "aap/aap.h"
-#include "aap/aap_serializer.h"
-
 #include "cla/bibe_proto.h"
 
-#include "ud3tn/common.h"
-
 #include "testud3tn_unity.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <string.h>
 
 #define EXPECTED_HEADER_LENGTH 31
 

test/unit/test_bibe_parser.c

@@ -1,17 +1,13 @@
 // SPDX-License-Identifier: BSD-3-Clause OR Apache-2.0
 #include "aap/aap.h"
-#include "aap/aap_serializer.h"
 
 #include "cla/bibe_proto.h"
 
-#include "ud3tn/common.h"
-
 #include "testud3tn_unity.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <string.h>
 
 #define ENC_BUNDLE_LEN 90
 #define VALID_BPDU_LEN 95