gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] [gnunet] branch master updated (32cd2c4a4 -> e3cb893de)


From: gnunet
Subject: [GNUnet-SVN] [gnunet] branch master updated (32cd2c4a4 -> e3cb893de)
Date: Wed, 16 Jan 2019 18:56:32 +0100

This is an automated email from the git hooks/post-receive script.

ng0 pushed a change to branch master
in repository gnunet.

    from 32cd2c4a4 dedup
     new 31adcb0e0 src: for every AGPL3.0 file, add SPDX identifier.
     new 1e9181264 2 more spdx identifiers
     new 750d28183 More spdx identifiers. For openrc service file, adjust the 
header to reflect changes in Gentoo (->Foundation=>Authors).
     new e3cb893de Merge branch 'license/spdx'

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 configure.ac                                                       | 1 +
 contrib/apparmor/usr.bin.gnunet-helper-nat-server                  | 2 ++
 contrib/benchmark/collect.awk                                      | 3 ++-
 contrib/scripts/gnunet-chk.py.in                                   | 2 ++
 contrib/scripts/gnunet_janitor.py.in                               | 2 ++
 contrib/scripts/gnunet_pyexpect.py.in                              | 2 ++
 contrib/scripts/terminate.py.in                                    | 2 ++
 contrib/services/openrc/gnunet.initd                               | 4 +++-
 contrib/test_gnunet_prefix.c                                       | 2 ++
 doc/handbook/gendocs.sh                                            | 2 ++
 src/abe/abe.c                                                      | 2 ++
 src/abe/test_cpabe.c                                               | 2 ++
 src/arm/arm.h                                                      | 2 ++
 src/arm/arm_api.c                                                  | 2 ++
 src/arm/arm_monitor_api.c                                          | 2 ++
 src/arm/gnunet-arm.c                                               | 2 ++
 src/arm/gnunet-service-arm.c                                       | 2 ++
 src/arm/mockup-service.c                                           | 2 ++
 src/arm/test_arm_api.c                                             | 2 ++
 src/arm/test_exponential_backoff.c                                 | 2 ++
 src/arm/test_gnunet_service_arm.c                                  | 2 ++
 src/ats-tests/ats-testing-experiment.c                             | 2 ++
 src/ats-tests/ats-testing-log.c                                    | 2 ++
 src/ats-tests/ats-testing-preferences.c                            | 2 ++
 src/ats-tests/ats-testing-traffic.c                                | 2 ++
 src/ats-tests/ats-testing.c                                        | 2 ++
 src/ats-tests/ats-testing.h                                        | 2 ++
 src/ats-tests/gnunet-ats-sim.c                                     | 2 ++
 src/ats-tests/gnunet-solver-eval.c                                 | 2 ++
 src/ats-tests/perf_ats.c                                           | 2 ++
 src/ats-tests/perf_ats.h                                           | 2 ++
 src/ats-tests/perf_ats_logging.c                                   | 2 ++
 src/ats-tool/gnunet-ats.c                                          | 2 ++
 src/ats/ats.h                                                      | 2 ++
 src/ats/ats2.h                                                     | 2 ++
 src/ats/ats_api2_application.c                                     | 2 ++
 src/ats/ats_api2_transport.c                                       | 2 ++
 src/ats/ats_api_connectivity.c                                     | 2 ++
 src/ats/ats_api_performance.c                                      | 2 ++
 src/ats/ats_api_scanner.c                                          | 2 ++
 src/ats/ats_api_scheduling.c                                       | 2 ++
 src/ats/gnunet-ats-solver-eval.c                                   | 2 ++
 src/ats/gnunet-ats-solver-eval.h                                   | 2 ++
 src/ats/gnunet-service-ats-new.c                                   | 2 ++
 src/ats/gnunet-service-ats.c                                       | 2 ++
 src/ats/gnunet-service-ats.h                                       | 2 ++
 src/ats/gnunet-service-ats_addresses.c                             | 2 ++
 src/ats/gnunet-service-ats_addresses.h                             | 2 ++
 src/ats/gnunet-service-ats_connectivity.c                          | 2 ++
 src/ats/gnunet-service-ats_connectivity.h                          | 2 ++
 src/ats/gnunet-service-ats_normalization.c                         | 2 ++
 src/ats/gnunet-service-ats_normalization.h                         | 2 ++
 src/ats/gnunet-service-ats_performance.c                           | 2 ++
 src/ats/gnunet-service-ats_performance.h                           | 2 ++
 src/ats/gnunet-service-ats_plugins.c                               | 2 ++
 src/ats/gnunet-service-ats_plugins.h                               | 2 ++
 src/ats/gnunet-service-ats_preferences.c                           | 2 ++
 src/ats/gnunet-service-ats_preferences.h                           | 2 ++
 src/ats/gnunet-service-ats_reservations.c                          | 2 ++
 src/ats/gnunet-service-ats_reservations.h                          | 2 ++
 src/ats/gnunet-service-ats_scheduling.c                            | 2 ++
 src/ats/gnunet-service-ats_scheduling.h                            | 2 ++
 src/ats/perf_ats_solver.c                                          | 2 ++
 src/ats/plugin_ats2_common.c                                       | 2 ++
 src/ats/plugin_ats2_simple.c                                       | 2 ++
 src/ats/plugin_ats_mlp.c                                           | 2 ++
 src/ats/plugin_ats_proportional.c                                  | 2 ++
 src/ats/plugin_ats_ril.c                                           | 2 ++
 src/ats/test_ats_api.c                                             | 2 ++
 src/ats/test_ats_lib.c                                             | 2 ++
 src/ats/test_ats_lib.h                                             | 2 ++
 src/ats/test_ats_reservation_api.c                                 | 2 ++
 src/auction/auction.h                                              | 2 ++
 src/auction/gnunet-auction-create.c                                | 2 ++
 src/auction/gnunet-auction-info.c                                  | 2 ++
 src/auction/gnunet-auction-join.c                                  | 2 ++
 src/auction/gnunet-service-auction.c                               | 2 ++
 src/auction/test_auction_api.c                                     | 2 ++
 src/block/bg_bf.c                                                  | 2 ++
 src/block/block.c                                                  | 2 ++
 src/block/plugin_block_template.c                                  | 2 ++
 src/block/plugin_block_test.c                                      | 2 ++
 src/cadet/cadet.h                                                  | 2 ++
 src/cadet/cadet_api.c                                              | 2 ++
 src/cadet/cadet_protocol.h                                         | 2 ++
 src/cadet/cadet_test_lib.c                                         | 2 ++
 src/cadet/cadet_test_lib.h                                         | 2 ++
 src/cadet/gnunet-cadet-profiler.c                                  | 2 ++
 src/cadet/gnunet-cadet.c                                           | 2 ++
 src/cadet/gnunet-service-cadet.c                                   | 2 ++
 src/cadet/gnunet-service-cadet.h                                   | 2 ++
 src/cadet/gnunet-service-cadet_channel.c                           | 2 ++
 src/cadet/gnunet-service-cadet_channel.h                           | 2 ++
 src/cadet/gnunet-service-cadet_connection.c                        | 2 ++
 src/cadet/gnunet-service-cadet_connection.h                        | 2 ++
 src/cadet/gnunet-service-cadet_core.c                              | 2 ++
 src/cadet/gnunet-service-cadet_core.h                              | 2 ++
 src/cadet/gnunet-service-cadet_dht.c                               | 2 ++
 src/cadet/gnunet-service-cadet_dht.h                               | 2 ++
 src/cadet/gnunet-service-cadet_hello.c                             | 2 ++
 src/cadet/gnunet-service-cadet_hello.h                             | 2 ++
 src/cadet/gnunet-service-cadet_paths.c                             | 2 ++
 src/cadet/gnunet-service-cadet_paths.h                             | 2 ++
 src/cadet/gnunet-service-cadet_peer.c                              | 2 ++
 src/cadet/gnunet-service-cadet_peer.h                              | 2 ++
 src/cadet/gnunet-service-cadet_tunnels.c                           | 2 ++
 src/cadet/gnunet-service-cadet_tunnels.h                           | 2 ++
 src/cadet/test_cadet.c                                             | 2 ++
 src/cadet/test_cadet_flow.c                                        | 2 ++
 src/cadet/test_cadet_local_mq.c                                    | 2 ++
 src/consensus/consensus-simulation.py.in                           | 2 ++
 src/consensus/consensus.h                                          | 2 ++
 src/consensus/consensus_api.c                                      | 2 ++
 src/consensus/consensus_protocol.h                                 | 2 ++
 src/consensus/gnunet-consensus-profiler.c                          | 2 ++
 src/consensus/gnunet-service-consensus.c                           | 2 ++
 src/consensus/plugin_block_consensus.c                             | 2 ++
 src/consensus/test_consensus_api.c                                 | 2 ++
 src/conversation/conversation.h                                    | 2 ++
 src/conversation/conversation_api.c                                | 2 ++
 src/conversation/conversation_api_call.c                           | 2 ++
 src/conversation/gnunet-conversation-test.c                        | 2 ++
 src/conversation/gnunet-conversation.c                             | 2 ++
 src/conversation/gnunet-helper-audio-playback-gst.c                | 2 ++
 src/conversation/gnunet-helper-audio-playback.c                    | 2 ++
 src/conversation/gnunet-helper-audio-record-gst.c                  | 2 ++
 src/conversation/gnunet-helper-audio-record.c                      | 2 ++
 src/conversation/gnunet-service-conversation.c                     | 2 ++
 src/conversation/gnunet_gst.c                                      | 2 ++
 src/conversation/gnunet_gst.h                                      | 2 ++
 src/conversation/gnunet_gst_def.h                                  | 2 ++
 src/conversation/gnunet_gst_test.c                                 | 2 ++
 src/conversation/microphone.c                                      | 2 ++
 src/conversation/plugin_gnsrecord_conversation.c                   | 2 ++
 src/conversation/speaker.c                                         | 2 ++
 src/conversation/test_conversation_api.c                           | 2 ++
 src/conversation/test_conversation_api_reject.c                    | 2 ++
 src/conversation/test_conversation_api_twocalls.c                  | 2 ++
 src/core/core.h                                                    | 2 ++
 src/core/core_api.c                                                | 2 ++
 src/core/core_api_monitor_peers.c                                  | 2 ++
 src/core/gnunet-core.c                                             | 2 ++
 src/core/gnunet-service-core.c                                     | 2 ++
 src/core/gnunet-service-core.h                                     | 2 ++
 src/core/gnunet-service-core_kx.c                                  | 2 ++
 src/core/gnunet-service-core_kx.h                                  | 2 ++
 src/core/gnunet-service-core_sessions.c                            | 2 ++
 src/core/gnunet-service-core_sessions.h                            | 2 ++
 src/core/gnunet-service-core_typemap.c                             | 2 ++
 src/core/gnunet-service-core_typemap.h                             | 2 ++
 src/core/test_core_api.c                                           | 2 ++
 src/core/test_core_api_reliability.c                               | 2 ++
 src/core/test_core_api_send_to_self.c                              | 2 ++
 src/core/test_core_api_start_only.c                                | 2 ++
 src/core/test_core_quota_compliance.c                              | 2 ++
 src/credential/credential.h                                        | 2 ++
 src/credential/credential_api.c                                    | 2 ++
 src/credential/credential_misc.c                                   | 2 ++
 src/credential/credential_misc.h                                   | 2 ++
 src/credential/credential_serialization.c                          | 2 ++
 src/credential/credential_serialization.h                          | 2 ++
 src/credential/gnunet-credential.c                                 | 2 ++
 src/credential/gnunet-service-credential.c                         | 2 ++
 src/credential/plugin_gnsrecord_credential.c                       | 2 ++
 src/curl/curl.c                                                    | 2 ++
 src/curl/curl_reschedule.c                                         | 2 ++
 src/datacache/datacache.c                                          | 2 ++
 src/datacache/perf_datacache.c                                     | 2 ++
 src/datacache/plugin_datacache_heap.c                              | 2 ++
 src/datacache/plugin_datacache_postgres.c                          | 2 ++
 src/datacache/plugin_datacache_sqlite.c                            | 2 ++
 src/datacache/plugin_datacache_template.c                          | 2 ++
 src/datacache/test_datacache.c                                     | 2 ++
 src/datacache/test_datacache_quota.c                               | 2 ++
 src/datastore/datastore.h                                          | 2 ++
 src/datastore/datastore_api.c                                      | 2 ++
 src/datastore/gnunet-datastore.c                                   | 2 ++
 src/datastore/gnunet-service-datastore.c                           | 2 ++
 src/datastore/perf_datastore_api.c                                 | 2 ++
 src/datastore/perf_plugin_datastore.c                              | 2 ++
 src/datastore/plugin_datastore_heap.c                              | 2 ++
 src/datastore/plugin_datastore_mysql.c                             | 2 ++
 src/datastore/plugin_datastore_postgres.c                          | 2 ++
 src/datastore/plugin_datastore_sqlite.c                            | 2 ++
 src/datastore/plugin_datastore_template.c                          | 2 ++
 src/datastore/test_datastore_api.c                                 | 2 ++
 src/datastore/test_datastore_api_management.c                      | 2 ++
 src/datastore/test_plugin_datastore.c                              | 2 ++
 src/dht/dht.h                                                      | 2 ++
 src/dht/dht_api.c                                                  | 2 ++
 src/dht/dht_test_lib.c                                             | 2 ++
 src/dht/dht_test_lib.h                                             | 2 ++
 src/dht/gnunet-dht-get.c                                           | 2 ++
 src/dht/gnunet-dht-monitor.c                                       | 2 ++
 src/dht/gnunet-dht-put.c                                           | 2 ++
 src/dht/gnunet-service-dht.c                                       | 2 ++
 src/dht/gnunet-service-dht.h                                       | 2 ++
 src/dht/gnunet-service-dht_clients.c                               | 2 ++
 src/dht/gnunet-service-dht_datacache.c                             | 2 ++
 src/dht/gnunet-service-dht_datacache.h                             | 2 ++
 src/dht/gnunet-service-dht_hello.c                                 | 2 ++
 src/dht/gnunet-service-dht_hello.h                                 | 2 ++
 src/dht/gnunet-service-dht_neighbours.c                            | 2 ++
 src/dht/gnunet-service-dht_neighbours.h                            | 2 ++
 src/dht/gnunet-service-dht_nse.c                                   | 2 ++
 src/dht/gnunet-service-dht_nse.h                                   | 2 ++
 src/dht/gnunet-service-dht_routing.c                               | 2 ++
 src/dht/gnunet-service-dht_routing.h                               | 2 ++
 src/dht/gnunet_dht_profiler.c                                      | 2 ++
 src/dht/plugin_block_dht.c                                         | 2 ++
 src/dht/test_dht_api.c                                             | 2 ++
 src/dht/test_dht_monitor.c                                         | 2 ++
 src/dht/test_dht_topo.c                                            | 2 ++
 src/dns/dns.h                                                      | 2 ++
 src/dns/dns_api.c                                                  | 2 ++
 src/dns/gnunet-dns-monitor.c                                       | 2 ++
 src/dns/gnunet-dns-redirector.c                                    | 2 ++
 src/dns/gnunet-helper-dns.c                                        | 2 ++
 src/dns/gnunet-service-dns.c                                       | 2 ++
 src/dns/gnunet-zonewalk.c                                          | 2 ++
 src/dns/plugin_block_dns.c                                         | 2 ++
 src/dv/dv.h                                                        | 2 ++
 src/dv/dv_api.c                                                    | 2 ++
 src/dv/gnunet-dv.c                                                 | 2 ++
 src/dv/gnunet-service-dv.c                                         | 2 ++
 src/dv/plugin_transport_dv.c                                       | 2 ++
 src/dv/test_transport_blacklist.c                                  | 2 ++
 src/dv/test_transport_dv.c                                         | 2 ++
 src/exit/exit.h                                                    | 2 ++
 src/exit/gnunet-daemon-exit.c                                      | 2 ++
 src/exit/gnunet-helper-exit-windows.c                              | 2 ++
 src/exit/gnunet-helper-exit.c                                      | 2 ++
 src/fragmentation/defragmentation.c                                | 2 ++
 src/fragmentation/fragmentation.c                                  | 2 ++
 src/fragmentation/fragmentation.h                                  | 2 ++
 src/fragmentation/test_fragmentation.c                             | 2 ++
 src/fragmentation/test_fragmentation_parallel.c                    | 2 ++
 src/fs/fs.h                                                        | 2 ++
 src/fs/fs_api.c                                                    | 2 ++
 src/fs/fs_api.h                                                    | 2 ++
 src/fs/fs_directory.c                                              | 2 ++
 src/fs/fs_dirmetascan.c                                            | 2 ++
 src/fs/fs_download.c                                               | 2 ++
 src/fs/fs_file_information.c                                       | 2 ++
 src/fs/fs_getopt.c                                                 | 2 ++
 src/fs/fs_list_indexed.c                                           | 2 ++
 src/fs/fs_misc.c                                                   | 2 ++
 src/fs/fs_namespace.c                                              | 2 ++
 src/fs/fs_publish.c                                                | 2 ++
 src/fs/fs_publish_ksk.c                                            | 2 ++
 src/fs/fs_publish_ublock.c                                         | 2 ++
 src/fs/fs_publish_ublock.h                                         | 2 ++
 src/fs/fs_search.c                                                 | 2 ++
 src/fs/fs_sharetree.c                                              | 2 ++
 src/fs/fs_test_lib.c                                               | 2 ++
 src/fs/fs_test_lib.h                                               | 2 ++
 src/fs/fs_tree.c                                                   | 2 ++
 src/fs/fs_tree.h                                                   | 2 ++
 src/fs/fs_unindex.c                                                | 2 ++
 src/fs/fs_uri.c                                                    | 2 ++
 src/fs/gnunet-auto-share.c                                         | 2 ++
 src/fs/gnunet-daemon-fsprofiler.c                                  | 2 ++
 src/fs/gnunet-directory.c                                          | 2 ++
 src/fs/gnunet-download-manager.scm                                 | 2 ++
 src/fs/gnunet-download.c                                           | 2 ++
 src/fs/gnunet-fs-profiler.c                                        | 2 ++
 src/fs/gnunet-fs.c                                                 | 2 ++
 src/fs/gnunet-helper-fs-publish.c                                  | 2 ++
 src/fs/gnunet-publish.c                                            | 2 ++
 src/fs/gnunet-search.c                                             | 2 ++
 src/fs/gnunet-service-fs.c                                         | 2 ++
 src/fs/gnunet-service-fs.h                                         | 2 ++
 src/fs/gnunet-service-fs_cadet.h                                   | 2 ++
 src/fs/gnunet-service-fs_cadet_client.c                            | 2 ++
 src/fs/gnunet-service-fs_cadet_server.c                            | 2 ++
 src/fs/gnunet-service-fs_cp.c                                      | 2 ++
 src/fs/gnunet-service-fs_cp.h                                      | 2 ++
 src/fs/gnunet-service-fs_indexing.c                                | 2 ++
 src/fs/gnunet-service-fs_indexing.h                                | 2 ++
 src/fs/gnunet-service-fs_pe.c                                      | 2 ++
 src/fs/gnunet-service-fs_pe.h                                      | 2 ++
 src/fs/gnunet-service-fs_pr.c                                      | 2 ++
 src/fs/gnunet-service-fs_pr.h                                      | 2 ++
 src/fs/gnunet-service-fs_push.c                                    | 2 ++
 src/fs/gnunet-service-fs_push.h                                    | 2 ++
 src/fs/gnunet-service-fs_put.c                                     | 2 ++
 src/fs/gnunet-service-fs_put.h                                     | 2 ++
 src/fs/gnunet-unindex.c                                            | 2 ++
 src/fs/perf_gnunet_service_fs_p2p.c                                | 2 ++
 src/fs/perf_gnunet_service_fs_p2p_respect.c                        | 2 ++
 src/fs/plugin_block_fs.c                                           | 2 ++
 src/fs/test_fs.c                                                   | 2 ++
 src/fs/test_fs_directory.c                                         | 2 ++
 src/fs/test_fs_download.c                                          | 2 ++
 src/fs/test_fs_download_persistence.c                              | 2 ++
 src/fs/test_fs_file_information.c                                  | 2 ++
 src/fs/test_fs_getopt.c                                            | 2 ++
 src/fs/test_fs_list_indexed.c                                      | 2 ++
 src/fs/test_fs_namespace.c                                         | 2 ++
 src/fs/test_fs_namespace_list_updateable.c                         | 2 ++
 src/fs/test_fs_publish.c                                           | 2 ++
 src/fs/test_fs_publish_persistence.c                               | 2 ++
 src/fs/test_fs_search.c                                            | 2 ++
 src/fs/test_fs_search_persistence.c                                | 2 ++
 src/fs/test_fs_search_probes.c                                     | 2 ++
 src/fs/test_fs_search_with_and.c                                   | 2 ++
 src/fs/test_fs_start_stop.c                                        | 2 ++
 src/fs/test_fs_test_lib.c                                          | 2 ++
 src/fs/test_fs_unindex.c                                           | 2 ++
 src/fs/test_fs_unindex_persistence.c                               | 2 ++
 src/fs/test_fs_uri.c                                               | 2 ++
 src/fs/test_gnunet_fs_idx.py.in                                    | 2 ++
 src/fs/test_gnunet_fs_psd.py.in                                    | 2 ++
 src/fs/test_gnunet_fs_rec.py.in                                    | 2 ++
 src/fs/test_gnunet_service_fs_migration.c                          | 2 ++
 src/fs/test_gnunet_service_fs_p2p.c                                | 2 ++
 src/fs/test_plugin_block_fs.c                                      | 2 ++
 src/gns/gns.h                                                      | 2 ++
 src/gns/gns_api.c                                                  | 2 ++
 src/gns/gns_api.h                                                  | 2 ++
 src/gns/gns_tld_api.c                                              | 2 ++
 src/gns/gnunet-bcd.c                                               | 2 ++
 src/gns/gnunet-dns2gns.c                                           | 2 ++
 src/gns/gnunet-gns-benchmark.c                                     | 2 ++
 src/gns/gnunet-gns-helper-service-w32.c                            | 2 ++
 src/gns/gnunet-gns-import.c                                        | 2 ++
 src/gns/gnunet-gns-proxy.c                                         | 2 ++
 src/gns/gnunet-gns.c                                               | 2 ++
 src/gns/gnunet-service-gns.c                                       | 2 ++
 src/gns/gnunet-service-gns.h                                       | 2 ++
 src/gns/gnunet-service-gns_interceptor.c                           | 2 ++
 src/gns/gnunet-service-gns_interceptor.h                           | 2 ++
 src/gns/gnunet-service-gns_resolver.c                              | 2 ++
 src/gns/gnunet-service-gns_resolver.h                              | 2 ++
 src/gns/nss/nss_gns_query.c                                        | 2 ++
 src/gns/nss/nss_gns_query.h                                        | 2 ++
 src/gns/plugin_block_gns.c                                         | 2 ++
 src/gns/plugin_gnsrecord_gns.c                                     | 2 ++
 src/gns/test_gns_proxy.c                                           | 2 ++
 src/gns/w32nsp-install.c                                           | 2 ++
 src/gns/w32nsp-resolve.c                                           | 2 ++
 src/gns/w32nsp.c                                                   | 2 ++
 src/gns/w32resolver.h                                              | 2 ++
 src/gnsrecord/gnsrecord.c                                          | 2 ++
 src/gnsrecord/gnsrecord_crypto.c                                   | 2 ++
 src/gnsrecord/gnsrecord_misc.c                                     | 2 ++
 src/gnsrecord/gnsrecord_serialization.c                            | 2 ++
 src/gnsrecord/perf_gnsrecord_crypto.c                              | 2 ++
 src/gnsrecord/plugin_gnsrecord_dns.c                               | 2 ++
 src/gnsrecord/test_gnsrecord_block_expiration.c                    | 2 ++
 src/gnsrecord/test_gnsrecord_crypto.c                              | 2 ++
 src/gnsrecord/test_gnsrecord_serialization.c                       | 2 ++
 src/hello/address.c                                                | 2 ++
 src/hello/gnunet-hello.c                                           | 2 ++
 src/hello/hello-ng.c                                               | 2 ++
 src/hello/hello.c                                                  | 2 ++
 src/hello/test_friend_hello.c                                      | 2 ++
 src/hello/test_hello.c                                             | 2 ++
 src/hostlist/gnunet-daemon-hostlist.c                              | 2 ++
 src/hostlist/gnunet-daemon-hostlist.h                              | 2 ++
 src/hostlist/gnunet-daemon-hostlist_client.c                       | 2 ++
 src/hostlist/gnunet-daemon-hostlist_client.h                       | 2 ++
 src/hostlist/gnunet-daemon-hostlist_server.c                       | 2 ++
 src/hostlist/gnunet-daemon-hostlist_server.h                       | 2 ++
 src/hostlist/test_gnunet_daemon_hostlist.c                         | 2 ++
 src/hostlist/test_gnunet_daemon_hostlist_learning.c                | 2 ++
 src/hostlist/test_gnunet_daemon_hostlist_reconnect.c               | 2 ++
 src/identity/gnunet-identity.c                                     | 2 ++
 src/identity/gnunet-service-identity.c                             | 2 ++
 src/identity/identity.h                                            | 2 ++
 src/identity/identity_api.c                                        | 2 ++
 src/identity/identity_api_lookup.c                                 | 2 ++
 src/identity/test_identity.c                                       | 2 ++
 src/identity/test_identity_defaults.c                              | 2 ++
 src/include/block_dns.h                                            | 2 ++
 src/include/block_fs.h                                             | 2 ++
 src/include/block_regex.h                                          | 2 ++
 src/include/gnunet_abe_lib.h                                       | 2 ++
 src/include/gnunet_applications.h                                  | 2 ++
 src/include/gnunet_arm_service.h                                   | 2 ++
 src/include/gnunet_ats_application_service.h                       | 2 ++
 src/include/gnunet_ats_plugin.h                                    | 2 ++
 src/include/gnunet_ats_plugin_new.h                                | 2 ++
 src/include/gnunet_ats_service.h                                   | 2 ++
 src/include/gnunet_ats_transport_service.h                         | 2 ++
 src/include/gnunet_bandwidth_lib.h                                 | 2 ++
 src/include/gnunet_bio_lib.h                                       | 2 ++
 src/include/gnunet_block_group_lib.h                               | 2 ++
 src/include/gnunet_block_lib.h                                     | 2 ++
 src/include/gnunet_block_plugin.h                                  | 2 ++
 src/include/gnunet_cadet_service.h                                 | 2 ++
 src/include/gnunet_client_lib.h                                    | 2 ++
 src/include/gnunet_common.h                                        | 2 ++
 src/include/gnunet_configuration_lib.h                             | 2 ++
 src/include/gnunet_consensus_service.h                             | 2 ++
 src/include/gnunet_constants.h                                     | 2 ++
 src/include/gnunet_container_lib.h                                 | 2 ++
 src/include/gnunet_conversation_service.h                          | 2 ++
 src/include/gnunet_core_service.h                                  | 2 ++
 src/include/gnunet_credential_service.h                            | 2 ++
 src/include/gnunet_crypto_lib.h                                    | 2 ++
 src/include/gnunet_curl_lib.h                                      | 2 ++
 src/include/gnunet_datacache_lib.h                                 | 2 ++
 src/include/gnunet_datacache_plugin.h                              | 2 ++
 src/include/gnunet_datastore_plugin.h                              | 2 ++
 src/include/gnunet_datastore_service.h                             | 2 ++
 src/include/gnunet_db_lib.h                                        | 2 ++
 src/include/gnunet_dht_service.h                                   | 2 ++
 src/include/gnunet_disk_lib.h                                      | 2 ++
 src/include/gnunet_dns_service.h                                   | 2 ++
 src/include/gnunet_dnsparser_lib.h                                 | 2 ++
 src/include/gnunet_dnsstub_lib.h                                   | 2 ++
 src/include/gnunet_dv_service.h                                    | 2 ++
 src/include/gnunet_fragmentation_lib.h                             | 2 ++
 src/include/gnunet_friends_lib.h                                   | 2 ++
 src/include/gnunet_fs_service.h                                    | 2 ++
 src/include/gnunet_getopt_lib.h                                    | 2 ++
 src/include/gnunet_gns_service.h                                   | 2 ++
 src/include/gnunet_gnsrecord_lib.h                                 | 2 ++
 src/include/gnunet_gnsrecord_plugin.h                              | 2 ++
 src/include/gnunet_hello_lib.h                                     | 2 ++
 src/include/gnunet_helper_lib.h                                    | 2 ++
 src/include/gnunet_identity_service.h                              | 2 ++
 src/include/gnunet_json_lib.h                                      | 2 ++
 src/include/gnunet_load_lib.h                                      | 2 ++
 src/include/gnunet_microphone_lib.h                                | 2 ++
 src/include/gnunet_mq_lib.h                                        | 2 ++
 src/include/gnunet_mst_lib.h                                       | 2 ++
 src/include/gnunet_multicast_service.h                             | 2 ++
 src/include/gnunet_my_lib.h                                        | 2 ++
 src/include/gnunet_mysql_lib.h                                     | 2 ++
 src/include/gnunet_namecache_plugin.h                              | 2 ++
 src/include/gnunet_namecache_service.h                             | 2 ++
 src/include/gnunet_namestore_plugin.h                              | 2 ++
 src/include/gnunet_namestore_service.h                             | 2 ++
 src/include/gnunet_nat_auto_service.h                              | 2 ++
 src/include/gnunet_nat_service.h                                   | 2 ++
 src/include/gnunet_nc_lib.h                                        | 2 ++
 src/include/gnunet_network_lib.h                                   | 2 ++
 src/include/gnunet_nse_service.h                                   | 2 ++
 src/include/gnunet_nt_lib.h                                        | 2 ++
 src/include/gnunet_op_lib.h                                        | 2 ++
 src/include/gnunet_os_lib.h                                        | 2 ++
 src/include/gnunet_peer_lib.h                                      | 2 ++
 src/include/gnunet_peerinfo_service.h                              | 2 ++
 src/include/gnunet_peerstore_plugin.h                              | 2 ++
 src/include/gnunet_peerstore_service.h                             | 2 ++
 src/include/gnunet_plugin_lib.h                                    | 2 ++
 src/include/gnunet_pq_lib.h                                        | 2 ++
 src/include/gnunet_program_lib.h                                   | 2 ++
 src/include/gnunet_protocols.h                                     | 2 ++
 src/include/gnunet_psyc_env.h                                      | 2 ++
 src/include/gnunet_psyc_message.h                                  | 2 ++
 src/include/gnunet_psyc_service.h                                  | 2 ++
 src/include/gnunet_psyc_slicer.h                                   | 2 ++
 src/include/gnunet_psyc_util_lib.h                                 | 2 ++
 src/include/gnunet_psycstore_plugin.h                              | 2 ++
 src/include/gnunet_psycstore_service.h                             | 2 ++
 src/include/gnunet_reclaim_attribute_lib.h                         | 2 ++
 src/include/gnunet_reclaim_attribute_plugin.h                      | 2 ++
 src/include/gnunet_reclaim_plugin.h                                | 2 ++
 src/include/gnunet_reclaim_service.h                               | 2 ++
 src/include/gnunet_regex_service.h                                 | 2 ++
 src/include/gnunet_resolver_service.h                              | 2 ++
 src/include/gnunet_rest_lib.h                                      | 2 ++
 src/include/gnunet_rest_plugin.h                                   | 2 ++
 src/include/gnunet_revocation_service.h                            | 2 ++
 src/include/gnunet_rps_service.h                                   | 2 ++
 src/include/gnunet_scalarproduct_service.h                         | 2 ++
 src/include/gnunet_scheduler_lib.h                                 | 2 ++
 src/include/gnunet_secretsharing_service.h                         | 2 ++
 src/include/gnunet_sensor_service.h                                | 2 ++
 src/include/gnunet_sensor_util_lib.h                               | 2 ++
 src/include/gnunet_sensordashboard_service.h                       | 2 ++
 src/include/gnunet_service_lib.h                                   | 2 ++
 src/include/gnunet_set_service.h                                   | 2 ++
 src/include/gnunet_signal_lib.h                                    | 2 ++
 src/include/gnunet_signatures.h                                    | 2 ++
 src/include/gnunet_social_service.h                                | 2 ++
 src/include/gnunet_socks.h                                         | 2 ++
 src/include/gnunet_speaker_lib.h                                   | 2 ++
 src/include/gnunet_sq_lib.h                                        | 2 ++
 src/include/gnunet_statistics_service.h                            | 2 ++
 src/include/gnunet_strings_lib.h                                   | 2 ++
 src/include/gnunet_testbed_logger_service.h                        | 2 ++
 src/include/gnunet_testbed_service.h                               | 2 ++
 src/include/gnunet_testing_lib.h                                   | 2 ++
 src/include/gnunet_time_lib.h                                      | 2 ++
 src/include/gnunet_transport_communication_service.h               | 2 ++
 src/include/gnunet_transport_core_service.h                        | 2 ++
 src/include/gnunet_transport_hello_service.h                       | 2 ++
 src/include/gnunet_transport_manipulation_service.h                | 2 ++
 src/include/gnunet_transport_monitor_service.h                     | 2 ++
 src/include/gnunet_transport_plugin.h                              | 2 ++
 src/include/gnunet_transport_service.h                             | 2 ++
 src/include/gnunet_tun_lib.h                                       | 2 ++
 src/include/gnunet_util_lib.h                                      | 2 ++
 src/include/gnunet_util_taler_wallet_lib.h                         | 2 ++
 src/include/gnunet_vpn_service.h                                   | 2 ++
 src/include/platform.h                                             | 2 ++
 src/include/winproc.h                                              | 2 ++
 src/integration-tests/gnunet_pyexpect.py.in                        | 2 ++
 src/integration-tests/gnunet_testing.py.in                         | 2 ++
 src/integration-tests/test_integration_bootstrap_and_connect.py.in | 2 ++
 src/integration-tests/test_integration_clique.py.in                | 2 ++
 src/integration-tests/test_integration_disconnect.py.in            | 2 ++
 src/integration-tests/test_integration_disconnect_nat.py.in        | 2 ++
 src/integration-tests/test_integration_reconnect.py.in             | 2 ++
 src/integration-tests/test_integration_reconnect_nat.py.in         | 2 ++
 src/json/json.c                                                    | 2 ++
 src/json/json_generator.c                                          | 2 ++
 src/json/json_gnsrecord.c                                          | 2 ++
 src/json/json_helper.c                                             | 2 ++
 src/json/json_mhd.c                                                | 2 ++
 src/json/test_json.c                                               | 2 ++
 src/multicast/gnunet-multicast.c                                   | 2 ++
 src/multicast/gnunet-service-multicast.c                           | 2 ++
 src/multicast/multicast.h                                          | 2 ++
 src/multicast/multicast_api.c                                      | 2 ++
 src/multicast/test_multicast.c                                     | 2 ++
 src/multicast/test_multicast_2peers.c                              | 2 ++
 src/multicast/test_multicast_multipeer.c                           | 2 ++
 src/my/my.c                                                        | 2 ++
 src/my/my_query_helper.c                                           | 2 ++
 src/my/my_result_helper.c                                          | 2 ++
 src/my/test_my.c                                                   | 2 ++
 src/mysql/mysql.c                                                  | 2 ++
 src/namecache/gnunet-namecache.c                                   | 2 ++
 src/namecache/gnunet-service-namecache.c                           | 2 ++
 src/namecache/namecache.h                                          | 2 ++
 src/namecache/namecache_api.c                                      | 2 ++
 src/namecache/plugin_namecache_flat.c                              | 2 ++
 src/namecache/plugin_namecache_postgres.c                          | 2 ++
 src/namecache/plugin_namecache_sqlite.c                            | 2 ++
 src/namecache/test_namecache_api_cache_block.c                     | 2 ++
 src/namecache/test_plugin_namecache.c                              | 2 ++
 src/namestore/gnunet-namestore-fcfsd.c                             | 2 ++
 src/namestore/gnunet-namestore.c                                   | 2 ++
 src/namestore/gnunet-service-namestore.c                           | 2 ++
 src/namestore/gnunet-zoneimport.c                                  | 2 ++
 src/namestore/namestore.h                                          | 2 ++
 src/namestore/namestore_api.c                                      | 2 ++
 src/namestore/namestore_api_monitor.c                              | 2 ++
 src/namestore/perf_namestore_api_zone_iteration.c                  | 2 ++
 src/namestore/plugin_namestore_heap.c                              | 2 ++
 src/namestore/plugin_namestore_postgres.c                          | 2 ++
 src/namestore/plugin_namestore_sqlite.c                            | 2 ++
 src/namestore/test_namestore_api_lookup_nick.c                     | 2 ++
 src/namestore/test_namestore_api_lookup_private.c                  | 2 ++
 src/namestore/test_namestore_api_lookup_public.c                   | 2 ++
 src/namestore/test_namestore_api_lookup_shadow.c                   | 2 ++
 src/namestore/test_namestore_api_lookup_shadow_filter.c            | 2 ++
 src/namestore/test_namestore_api_monitoring.c                      | 2 ++
 src/namestore/test_namestore_api_monitoring_existing.c             | 2 ++
 src/namestore/test_namestore_api_remove.c                          | 2 ++
 src/namestore/test_namestore_api_remove_not_existing_record.c      | 2 ++
 src/namestore/test_namestore_api_store.c                           | 2 ++
 src/namestore/test_namestore_api_store_update.c                    | 2 ++
 src/namestore/test_namestore_api_zone_iteration.c                  | 2 ++
 src/namestore/test_namestore_api_zone_iteration_nick.c             | 2 ++
 src/namestore/test_namestore_api_zone_iteration_specific_zone.c    | 2 ++
 src/namestore/test_namestore_api_zone_iteration_stop.c             | 2 ++
 src/namestore/test_namestore_api_zone_to_name.c                    | 2 ++
 src/namestore/test_plugin_namestore.c                              | 2 ++
 src/nat-auto/gnunet-nat-auto.c                                     | 2 ++
 src/nat-auto/gnunet-nat-auto_legacy.c                              | 2 ++
 src/nat-auto/gnunet-nat-server.c                                   | 2 ++
 src/nat-auto/gnunet-service-nat-auto.c                             | 2 ++
 src/nat-auto/gnunet-service-nat-auto_legacy.c                      | 2 ++
 src/nat-auto/nat-auto.h                                            | 2 ++
 src/nat-auto/nat_auto_api.c                                        | 2 ++
 src/nat-auto/nat_auto_api_test.c                                   | 2 ++
 src/nat/gnunet-helper-nat-client-windows.c                         | 2 ++
 src/nat/gnunet-helper-nat-client.c                                 | 2 ++
 src/nat/gnunet-helper-nat-server-windows.c                         | 2 ++
 src/nat/gnunet-helper-nat-server.c                                 | 2 ++
 src/nat/gnunet-nat.c                                               | 2 ++
 src/nat/gnunet-service-nat.c                                       | 2 ++
 src/nat/gnunet-service-nat.h                                       | 2 ++
 src/nat/gnunet-service-nat_externalip.c                            | 2 ++
 src/nat/gnunet-service-nat_externalip.h                            | 2 ++
 src/nat/gnunet-service-nat_helper.c                                | 2 ++
 src/nat/gnunet-service-nat_helper.h                                | 2 ++
 src/nat/gnunet-service-nat_mini.c                                  | 2 ++
 src/nat/gnunet-service-nat_mini.h                                  | 2 ++
 src/nat/gnunet-service-nat_stun.c                                  | 2 ++
 src/nat/gnunet-service-nat_stun.h                                  | 2 ++
 src/nat/nat.h                                                      | 2 ++
 src/nat/nat_api.c                                                  | 2 ++
 src/nat/nat_api_stun.c                                             | 2 ++
 src/nat/nat_stun.h                                                 | 2 ++
 src/nat/test_nat.c                                                 | 2 ++
 src/nat/test_nat_mini.c                                            | 2 ++
 src/nat/test_nat_test.c                                            | 2 ++
 src/nat/test_stun.c                                                | 2 ++
 src/nse/gnunet-nse-profiler.c                                      | 2 ++
 src/nse/gnunet-nse.c                                               | 2 ++
 src/nse/gnunet-service-nse.c                                       | 2 ++
 src/nse/nse.h                                                      | 2 ++
 src/nse/nse_api.c                                                  | 2 ++
 src/nse/perf_kdf.c                                                 | 2 ++
 src/nse/test_nse_api.c                                             | 2 ++
 src/nse/test_nse_multipeer.c                                       | 2 ++
 src/nt/nt.c                                                        | 2 ++
 src/peerinfo-tool/gnunet-peerinfo.c                                | 2 ++
 src/peerinfo-tool/gnunet-peerinfo_plugins.c                        | 2 ++
 src/peerinfo-tool/gnunet-peerinfo_plugins.h                        | 2 ++
 src/peerinfo-tool/test_gnunet_peerinfo.py.in                       | 2 ++
 src/peerinfo/gnunet-service-peerinfo.c                             | 2 ++
 src/peerinfo/peerinfo.h                                            | 2 ++
 src/peerinfo/peerinfo_api.c                                        | 2 ++
 src/peerinfo/peerinfo_api_notify.c                                 | 2 ++
 src/peerinfo/perf_peerinfo_api.c                                   | 2 ++
 src/peerinfo/test_peerinfo_api.c                                   | 2 ++
 src/peerinfo/test_peerinfo_api_friend_only.c                       | 2 ++
 src/peerinfo/test_peerinfo_api_notify_friend_only.c                | 2 ++
 src/peerinfo/test_peerinfo_shipped_hellos.c                        | 2 ++
 src/peerstore/gnunet-peerstore.c                                   | 2 ++
 src/peerstore/gnunet-service-peerstore.c                           | 2 ++
 src/peerstore/peerstore.h                                          | 2 ++
 src/peerstore/peerstore_api.c                                      | 2 ++
 src/peerstore/peerstore_common.c                                   | 2 ++
 src/peerstore/peerstore_common.h                                   | 2 ++
 src/peerstore/perf_peerstore_store.c                               | 2 ++
 src/peerstore/plugin_peerstore_flat.c                              | 2 ++
 src/peerstore/plugin_peerstore_sqlite.c                            | 2 ++
 src/peerstore/test_peerstore_api_iterate.c                         | 2 ++
 src/peerstore/test_peerstore_api_store.c                           | 2 ++
 src/peerstore/test_peerstore_api_sync.c                            | 2 ++
 src/peerstore/test_peerstore_api_watch.c                           | 2 ++
 src/peerstore/test_plugin_peerstore.c                              | 2 ++
 src/pq/pq.c                                                        | 2 ++
 src/pq/pq_connect.c                                                | 2 ++
 src/pq/pq_eval.c                                                   | 2 ++
 src/pq/pq_exec.c                                                   | 2 ++
 src/pq/pq_prepare.c                                                | 2 ++
 src/pq/pq_query_helper.c                                           | 2 ++
 src/pq/pq_result_helper.c                                          | 2 ++
 src/pq/test_pq.c                                                   | 2 ++
 src/psyc/gnunet-service-psyc.c                                     | 2 ++
 src/psyc/psyc.h                                                    | 2 ++
 src/psyc/psyc_api.c                                                | 2 ++
 src/psyc/psyc_test_lib.h                                           | 2 ++
 src/psyc/test_psyc.c                                               | 2 ++
 src/psyc/test_psyc2.c                                              | 2 ++
 src/psyc/test_psyc_api_join.c                                      | 2 ++
 src/psycstore/gnunet-service-psycstore.c                           | 2 ++
 src/psycstore/plugin_psycstore_mysql.c                             | 2 ++
 src/psycstore/plugin_psycstore_postgres.c                          | 2 ++
 src/psycstore/plugin_psycstore_sqlite.c                            | 2 ++
 src/psycstore/psycstore.h                                          | 2 ++
 src/psycstore/psycstore_api.c                                      | 2 ++
 src/psycstore/test_plugin_psycstore.c                              | 2 ++
 src/psycstore/test_psycstore.c                                     | 2 ++
 src/psycutil/psyc_env.c                                            | 2 ++
 src/psycutil/psyc_message.c                                        | 2 ++
 src/psycutil/psyc_slicer.c                                         | 2 ++
 src/psycutil/test_psyc_env.c                                       | 2 ++
 src/pt/gnunet-daemon-pt.c                                          | 2 ++
 src/pt/test_gns_vpn.c                                              | 2 ++
 src/pt/test_gnunet_vpn.c                                           | 2 ++
 src/reclaim-attribute/plugin_reclaim_attribute_gnuid.c             | 2 ++
 src/reclaim-attribute/reclaim_attribute.c                          | 2 ++
 src/reclaim-attribute/reclaim_attribute.h                          | 2 ++
 src/reclaim/gnunet-reclaim.c                                       | 2 ++
 src/reclaim/gnunet-service-reclaim.c                               | 2 ++
 src/reclaim/plugin_gnsrecord_reclaim.c                             | 2 ++
 src/reclaim/plugin_reclaim_sqlite.c                                | 2 ++
 src/reclaim/reclaim.h                                              | 2 ++
 src/reclaim/reclaim_api.c                                          | 2 ++
 src/regex/gnunet-daemon-regexprofiler.c                            | 2 ++
 src/regex/gnunet-regex-profiler.c                                  | 2 ++
 src/regex/gnunet-regex-simulation-profiler.c                       | 2 ++
 src/regex/gnunet-service-regex.c                                   | 2 ++
 src/regex/perf-regex.c                                             | 2 ++
 src/regex/plugin_block_regex.c                                     | 2 ++
 src/regex/regex_api_announce.c                                     | 2 ++
 src/regex/regex_api_search.c                                       | 2 ++
 src/regex/regex_block_lib.c                                        | 2 ++
 src/regex/regex_block_lib.h                                        | 2 ++
 src/regex/regex_internal.c                                         | 2 ++
 src/regex/regex_internal.h                                         | 2 ++
 src/regex/regex_internal_dht.c                                     | 2 ++
 src/regex/regex_internal_lib.h                                     | 2 ++
 src/regex/regex_ipc.h                                              | 2 ++
 src/regex/regex_test_graph.c                                       | 2 ++
 src/regex/regex_test_lib.c                                         | 2 ++
 src/regex/regex_test_lib.h                                         | 2 ++
 src/regex/regex_test_random.c                                      | 2 ++
 src/regex/test_regex_api.c                                         | 2 ++
 src/regex/test_regex_eval_api.c                                    | 2 ++
 src/regex/test_regex_graph_api.c                                   | 2 ++
 src/regex/test_regex_integration.c                                 | 2 ++
 src/regex/test_regex_iterate_api.c                                 | 2 ++
 src/regex/test_regex_proofs.c                                      | 2 ++
 src/rest-plugins/json_reclaim.c                                    | 2 ++
 src/rest-plugins/json_reclaim.h                                    | 2 ++
 src/rest-plugins/oidc_helper.c                                     | 2 ++
 src/rest-plugins/oidc_helper.h                                     | 2 ++
 src/rest-plugins/plugin_rest_copying.c                             | 2 ++
 src/rest-plugins/plugin_rest_credential.c                          | 2 ++
 src/rest-plugins/plugin_rest_gns.c                                 | 2 ++
 src/rest-plugins/plugin_rest_identity.c                            | 2 ++
 src/rest-plugins/plugin_rest_namestore.c                           | 2 ++
 src/rest-plugins/plugin_rest_openid_connect.c                      | 2 ++
 src/rest-plugins/plugin_rest_peerinfo.c                            | 2 ++
 src/rest-plugins/plugin_rest_reclaim.c                             | 2 ++
 src/rest/gnunet-rest-server.c                                      | 2 ++
 src/rest/rest.c                                                    | 2 ++
 src/revocation/gnunet-revocation.c                                 | 2 ++
 src/revocation/gnunet-service-revocation.c                         | 2 ++
 src/revocation/plugin_block_revocation.c                           | 2 ++
 src/revocation/revocation.h                                        | 2 ++
 src/revocation/revocation_api.c                                    | 2 ++
 src/revocation/test_local_revocation.py.in                         | 2 ++
 src/revocation/test_revocation.c                                   | 2 ++
 src/rps/gnunet-rps-profiler.c                                      | 2 ++
 src/rps/gnunet-rps.c                                               | 2 ++
 src/rps/gnunet-service-rps.c                                       | 2 ++
 src/rps/gnunet-service-rps_custommap.c                             | 2 ++
 src/rps/gnunet-service-rps_custommap.h                             | 2 ++
 src/rps/gnunet-service-rps_sampler.c                               | 2 ++
 src/rps/gnunet-service-rps_sampler.h                               | 2 ++
 src/rps/gnunet-service-rps_sampler_elem.c                          | 2 ++
 src/rps/gnunet-service-rps_sampler_elem.h                          | 2 ++
 src/rps/gnunet-service-rps_view.c                                  | 2 ++
 src/rps/gnunet-service-rps_view.h                                  | 2 ++
 src/rps/rps-sampler_client.c                                       | 2 ++
 src/rps/rps-sampler_client.h                                       | 2 ++
 src/rps/rps-sampler_common.c                                       | 2 ++
 src/rps/rps-sampler_common.h                                       | 2 ++
 src/rps/rps-test_util.c                                            | 2 ++
 src/rps/rps-test_util.h                                            | 2 ++
 src/rps/rps.h                                                      | 2 ++
 src/rps/rps_api.c                                                  | 2 ++
 src/rps/test_rps.c                                                 | 2 ++
 src/rps/test_rps_api.c                                             | 2 ++
 src/rps/test_service_rps_custommap.c                               | 2 ++
 src/rps/test_service_rps_sampler_elem.c                            | 2 ++
 src/rps/test_service_rps_view.c                                    | 2 ++
 src/scalarproduct/gnunet-scalarproduct.c                           | 2 ++
 src/scalarproduct/gnunet-service-scalarproduct-ecc.h               | 2 ++
 src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c         | 2 ++
 src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c           | 2 ++
 src/scalarproduct/gnunet-service-scalarproduct.h                   | 2 ++
 src/scalarproduct/gnunet-service-scalarproduct_alice.c             | 2 ++
 src/scalarproduct/gnunet-service-scalarproduct_bob.c               | 2 ++
 src/scalarproduct/scalarproduct.h                                  | 2 ++
 src/scalarproduct/scalarproduct_api.c                              | 2 ++
 src/scalarproduct/test_ecc_scalarproduct.c                         | 2 ++
 src/secretsharing/gnunet-secretsharing-profiler.c                  | 2 ++
 src/secretsharing/gnunet-service-secretsharing.c                   | 2 ++
 src/secretsharing/secretsharing.h                                  | 2 ++
 src/secretsharing/secretsharing_api.c                              | 2 ++
 src/secretsharing/secretsharing_common.c                           | 2 ++
 src/secretsharing/secretsharing_protocol.h                         | 2 ++
 src/secretsharing/test_secretsharing_api.c                         | 2 ++
 src/set/gnunet-service-set.c                                       | 2 ++
 src/set/gnunet-service-set.h                                       | 2 ++
 src/set/gnunet-service-set_intersection.c                          | 2 ++
 src/set/gnunet-service-set_intersection.h                          | 2 ++
 src/set/gnunet-service-set_protocol.h                              | 2 ++
 src/set/gnunet-service-set_union.c                                 | 2 ++
 src/set/gnunet-service-set_union.h                                 | 2 ++
 src/set/gnunet-service-set_union_strata_estimator.c                | 2 ++
 src/set/gnunet-service-set_union_strata_estimator.h                | 2 ++
 src/set/gnunet-set-ibf-profiler.c                                  | 2 ++
 src/set/gnunet-set-profiler.c                                      | 2 ++
 src/set/ibf.c                                                      | 2 ++
 src/set/ibf.h                                                      | 2 ++
 src/set/ibf_sim.c                                                  | 2 ++
 src/set/plugin_block_set_test.c                                    | 2 ++
 src/set/set.h                                                      | 2 ++
 src/set/set_api.c                                                  | 2 ++
 src/set/test_set_api.c                                             | 2 ++
 src/set/test_set_intersection_result_full.c                        | 2 ++
 src/set/test_set_union_copy.c                                      | 2 ++
 src/set/test_set_union_result_symmetric.c                          | 2 ++
 src/social/gnunet-service-social.c                                 | 2 ++
 src/social/gnunet-social.c                                         | 2 ++
 src/social/social.h                                                | 2 ++
 src/social/social_api.c                                            | 2 ++
 src/social/test_social.c                                           | 2 ++
 src/sq/sq.c                                                        | 2 ++
 src/sq/sq_exec.c                                                   | 2 ++
 src/sq/sq_prepare.c                                                | 2 ++
 src/sq/sq_query_helper.c                                           | 2 ++
 src/sq/sq_result_helper.c                                          | 2 ++
 src/sq/test_sq.c                                                   | 2 ++
 src/statistics/gnunet-service-statistics.c                         | 2 ++
 src/statistics/gnunet-statistics.c                                 | 2 ++
 src/statistics/statistics.h                                        | 2 ++
 src/statistics/statistics_api.c                                    | 2 ++
 src/statistics/test_statistics_api.c                               | 2 ++
 src/statistics/test_statistics_api_loop.c                          | 2 ++
 src/statistics/test_statistics_api_watch.c                         | 2 ++
 src/statistics/test_statistics_api_watch_zero_value.c              | 2 ++
 src/template/gnunet-service-template.c                             | 2 ++
 src/template/gnunet-template.c                                     | 2 ++
 src/template/test_template_api.c                                   | 2 ++
 src/testbed-logger/gnunet-service-testbed-logger.c                 | 2 ++
 src/testbed-logger/test_testbed_logger_api.c                       | 2 ++
 src/testbed-logger/testbed_logger_api.c                            | 2 ++
 src/testbed/buildvars.py.in                                        | 2 ++
 src/testbed/generate-underlay-topology.c                           | 2 ++
 src/testbed/gnunet-daemon-latency-logger.c                         | 2 ++
 src/testbed/gnunet-daemon-testbed-blacklist.c                      | 2 ++
 src/testbed/gnunet-daemon-testbed-underlay.c                       | 2 ++
 src/testbed/gnunet-helper-testbed.c                                | 2 ++
 src/testbed/gnunet-service-test-barriers.c                         | 2 ++
 src/testbed/gnunet-service-testbed.c                               | 2 ++
 src/testbed/gnunet-service-testbed.h                               | 2 ++
 src/testbed/gnunet-service-testbed_barriers.c                      | 2 ++
 src/testbed/gnunet-service-testbed_barriers.h                      | 2 ++
 src/testbed/gnunet-service-testbed_cache.c                         | 2 ++
 src/testbed/gnunet-service-testbed_connectionpool.c                | 2 ++
 src/testbed/gnunet-service-testbed_connectionpool.h                | 2 ++
 src/testbed/gnunet-service-testbed_cpustatus.c                     | 2 ++
 src/testbed/gnunet-service-testbed_links.c                         | 2 ++
 src/testbed/gnunet-service-testbed_links.h                         | 2 ++
 src/testbed/gnunet-service-testbed_meminfo.c                       | 2 ++
 src/testbed/gnunet-service-testbed_meminfo.h                       | 2 ++
 src/testbed/gnunet-service-testbed_oc.c                            | 2 ++
 src/testbed/gnunet-service-testbed_peers.c                         | 2 ++
 src/testbed/gnunet-testbed-profiler.c                              | 2 ++
 src/testbed/test_gnunet_helper_testbed.c                           | 2 ++
 src/testbed/test_testbed_api.c                                     | 2 ++
 src/testbed/test_testbed_api_2peers_1controller.c                  | 2 ++
 src/testbed/test_testbed_api_3peers_3controllers.c                 | 2 ++
 src/testbed/test_testbed_api_barriers.c                            | 2 ++
 src/testbed/test_testbed_api_controllerlink.c                      | 2 ++
 src/testbed/test_testbed_api_hosts.c                               | 2 ++
 src/testbed/test_testbed_api_operations.c                          | 2 ++
 src/testbed/test_testbed_api_peer_reconfiguration.c                | 2 ++
 src/testbed/test_testbed_api_peers_manage_services.c               | 2 ++
 src/testbed/test_testbed_api_sd.c                                  | 2 ++
 src/testbed/test_testbed_api_statistics.c                          | 2 ++
 src/testbed/test_testbed_api_test.c                                | 2 ++
 src/testbed/test_testbed_api_test_timeout.c                        | 2 ++
 src/testbed/test_testbed_api_testbed_run.c                         | 2 ++
 src/testbed/test_testbed_api_topology.c                            | 2 ++
 src/testbed/test_testbed_api_topology_clique.c                     | 2 ++
 src/testbed/test_testbed_underlay.c                                | 2 ++
 src/testbed/testbed.h                                              | 2 ++
 src/testbed/testbed_api.c                                          | 2 ++
 src/testbed/testbed_api.h                                          | 2 ++
 src/testbed/testbed_api_barriers.c                                 | 2 ++
 src/testbed/testbed_api_hosts.c                                    | 2 ++
 src/testbed/testbed_api_hosts.h                                    | 2 ++
 src/testbed/testbed_api_operations.c                               | 2 ++
 src/testbed/testbed_api_operations.h                               | 2 ++
 src/testbed/testbed_api_peers.c                                    | 2 ++
 src/testbed/testbed_api_peers.h                                    | 2 ++
 src/testbed/testbed_api_sd.c                                       | 2 ++
 src/testbed/testbed_api_sd.h                                       | 2 ++
 src/testbed/testbed_api_services.c                                 | 2 ++
 src/testbed/testbed_api_statistics.c                               | 2 ++
 src/testbed/testbed_api_test.c                                     | 2 ++
 src/testbed/testbed_api_testbed.c                                  | 2 ++
 src/testbed/testbed_api_topology.c                                 | 2 ++
 src/testbed/testbed_api_topology.h                                 | 2 ++
 src/testbed/testbed_api_underlay.c                                 | 2 ++
 src/testbed/testbed_helper.h                                       | 2 ++
 src/testing/gnunet-testing.c                                       | 2 ++
 src/testing/test_testing_peerstartup.c                             | 2 ++
 src/testing/test_testing_peerstartup2.c                            | 2 ++
 src/testing/test_testing_portreservation.c                         | 2 ++
 src/testing/test_testing_servicestartup.c                          | 2 ++
 src/testing/test_testing_sharedservices.c                          | 2 ++
 src/testing/testing.c                                              | 2 ++
 src/topology/friends.c                                             | 2 ++
 src/topology/gnunet-daemon-topology.c                              | 2 ++
 src/topology/test_gnunet_daemon_topology.c                         | 2 ++
 src/transport/communicator.h                                       | 2 ++
 src/transport/gnunet-communicator-unix.c                           | 2 ++
 src/transport/gnunet-helper-transport-bluetooth.c                  | 2 ++
 src/transport/gnunet-helper-transport-wlan-dummy.c                 | 2 ++
 src/transport/gnunet-helper-transport-wlan.c                       | 2 ++
 src/transport/gnunet-service-tng.c                                 | 2 ++
 src/transport/gnunet-service-transport.c                           | 2 ++
 src/transport/gnunet-service-transport.h                           | 2 ++
 src/transport/gnunet-service-transport_ats.c                       | 2 ++
 src/transport/gnunet-service-transport_ats.h                       | 2 ++
 src/transport/gnunet-service-transport_hello.c                     | 2 ++
 src/transport/gnunet-service-transport_hello.h                     | 2 ++
 src/transport/gnunet-service-transport_manipulation.c              | 2 ++
 src/transport/gnunet-service-transport_manipulation.h              | 2 ++
 src/transport/gnunet-service-transport_neighbours.c                | 2 ++
 src/transport/gnunet-service-transport_neighbours.h                | 2 ++
 src/transport/gnunet-service-transport_plugins.c                   | 2 ++
 src/transport/gnunet-service-transport_plugins.h                   | 2 ++
 src/transport/gnunet-service-transport_validation.c                | 2 ++
 src/transport/gnunet-service-transport_validation.h                | 2 ++
 src/transport/gnunet-transport-certificate-creation.c              | 2 ++
 src/transport/gnunet-transport-profiler.c                          | 2 ++
 src/transport/gnunet-transport-wlan-receiver.c                     | 2 ++
 src/transport/gnunet-transport-wlan-sender.c                       | 2 ++
 src/transport/gnunet-transport.c                                   | 2 ++
 src/transport/plugin_transport_http.h                              | 2 ++
 src/transport/plugin_transport_http_client.c                       | 2 ++
 src/transport/plugin_transport_http_common.c                       | 2 ++
 src/transport/plugin_transport_http_common.h                       | 2 ++
 src/transport/plugin_transport_http_server.c                       | 2 ++
 src/transport/plugin_transport_smtp.c                              | 2 ++
 src/transport/plugin_transport_tcp.c                               | 2 ++
 src/transport/plugin_transport_template.c                          | 2 ++
 src/transport/plugin_transport_udp.c                               | 2 ++
 src/transport/plugin_transport_udp.h                               | 2 ++
 src/transport/plugin_transport_udp_broadcasting.c                  | 2 ++
 src/transport/plugin_transport_unix.c                              | 2 ++
 src/transport/plugin_transport_wlan.c                              | 2 ++
 src/transport/plugin_transport_wlan.h                              | 2 ++
 src/transport/plugin_transport_xt.c                                | 2 ++
 src/transport/plugin_transport_xu.c                                | 2 ++
 src/transport/plugin_transport_xu.h                                | 2 ++
 src/transport/tcp_connection_legacy.c                              | 2 ++
 src/transport/tcp_server_legacy.c                                  | 2 ++
 src/transport/tcp_server_mst_legacy.c                              | 2 ++
 src/transport/tcp_service_legacy.c                                 | 2 ++
 src/transport/test_http_common.c                                   | 2 ++
 src/transport/test_plugin_transport.c                              | 2 ++
 src/transport/test_quota_compliance.c                              | 2 ++
 src/transport/test_transport_address_switch.c                      | 2 ++
 src/transport/test_transport_api.c                                 | 2 ++
 src/transport/test_transport_api_blacklisting.c                    | 2 ++
 src/transport/test_transport_api_disconnect.c                      | 2 ++
 src/transport/test_transport_api_limited_sockets.c                 | 2 ++
 src/transport/test_transport_api_manipulation_cfg.c                | 2 ++
 src/transport/test_transport_api_manipulation_recv_tcp.c           | 2 ++
 src/transport/test_transport_api_manipulation_send_tcp.c           | 2 ++
 src/transport/test_transport_api_monitor_peers.c                   | 2 ++
 src/transport/test_transport_api_reliability.c                     | 2 ++
 src/transport/test_transport_api_restart_reconnect.c               | 2 ++
 src/transport/test_transport_api_timeout.c                         | 2 ++
 src/transport/test_transport_blacklisting.c                        | 2 ++
 src/transport/test_transport_testing_restart.c                     | 2 ++
 src/transport/test_transport_testing_startstop.c                   | 2 ++
 src/transport/transport-testing-filenames.c                        | 2 ++
 src/transport/transport-testing-loggers.c                          | 2 ++
 src/transport/transport-testing-main.c                             | 2 ++
 src/transport/transport-testing-send.c                             | 2 ++
 src/transport/transport-testing.c                                  | 2 ++
 src/transport/transport-testing.h                                  | 2 ++
 src/transport/transport.h                                          | 2 ++
 src/transport/transport_api2_communication.c                       | 2 ++
 src/transport/transport_api2_core.c                                | 2 ++
 src/transport/transport_api2_monitor.c                             | 2 ++
 src/transport/transport_api_address_to_string.c                    | 2 ++
 src/transport/transport_api_blacklist.c                            | 2 ++
 src/transport/transport_api_core.c                                 | 2 ++
 src/transport/transport_api_hello_get.c                            | 2 ++
 src/transport/transport_api_manipulation.c                         | 2 ++
 src/transport/transport_api_monitor_peers.c                        | 2 ++
 src/transport/transport_api_monitor_plugins.c                      | 2 ++
 src/transport/transport_api_offer_hello.c                          | 2 ++
 src/util/bandwidth.c                                               | 2 ++
 src/util/benchmark.c                                               | 2 ++
 src/util/benchmark.h                                               | 2 ++
 src/util/bio.c                                                     | 2 ++
 src/util/client.c                                                  | 2 ++
 src/util/common_allocation.c                                       | 2 ++
 src/util/common_endian.c                                           | 2 ++
 src/util/common_logging.c                                          | 2 ++
 src/util/configuration.c                                           | 2 ++
 src/util/configuration_loader.c                                    | 2 ++
 src/util/container_bloomfilter.c                                   | 2 ++
 src/util/container_heap.c                                          | 2 ++
 src/util/container_meta_data.c                                     | 2 ++
 src/util/container_multihashmap.c                                  | 2 ++
 src/util/container_multihashmap32.c                                | 2 ++
 src/util/container_multipeermap.c                                  | 2 ++
 src/util/container_multishortmap.c                                 | 2 ++
 src/util/crypto_abe.c                                              | 2 ++
 src/util/crypto_crc.c                                              | 2 ++
 src/util/crypto_ecc.c                                              | 2 ++
 src/util/crypto_ecc_dlog.c                                         | 2 ++
 src/util/crypto_ecc_setup.c                                        | 2 ++
 src/util/crypto_hash.c                                             | 2 ++
 src/util/crypto_hash_file.c                                        | 2 ++
 src/util/crypto_kdf.c                                              | 2 ++
 src/util/crypto_mpi.c                                              | 2 ++
 src/util/crypto_paillier.c                                         | 2 ++
 src/util/crypto_random.c                                           | 2 ++
 src/util/crypto_rsa.c                                              | 2 ++
 src/util/crypto_symmetric.c                                        | 2 ++
 src/util/disk.c                                                    | 2 ++
 src/util/disk.h                                                    | 2 ++
 src/util/dnsparser.c                                               | 2 ++
 src/util/dnsstub.c                                                 | 2 ++
 src/util/getopt_helpers.c                                          | 2 ++
 src/util/gnunet-config.c                                           | 2 ++
 src/util/gnunet-ecc.c                                              | 2 ++
 src/util/gnunet-helper-w32-console.c                               | 2 ++
 src/util/gnunet-helper-w32-console.h                               | 2 ++
 src/util/gnunet-resolver.c                                         | 2 ++
 src/util/gnunet-scrypt.c                                           | 2 ++
 src/util/gnunet-service-resolver.c                                 | 2 ++
 src/util/gnunet-timeout-w32.c                                      | 2 ++
 src/util/gnunet-timeout.c                                          | 2 ++
 src/util/gnunet-uri.c                                              | 2 ++
 src/util/helper.c                                                  | 2 ++
 src/util/load.c                                                    | 2 ++
 src/util/mq.c                                                      | 2 ++
 src/util/mst.c                                                     | 2 ++
 src/util/nc.c                                                      | 2 ++
 src/util/network.c                                                 | 2 ++
 src/util/op.c                                                      | 2 ++
 src/util/os_installation.c                                         | 2 ++
 src/util/os_network.c                                              | 2 ++
 src/util/os_priority.c                                             | 2 ++
 src/util/peer.c                                                    | 2 ++
 src/util/perf_crypto_asymmetric.c                                  | 2 ++
 src/util/perf_crypto_ecc_dlog.c                                    | 2 ++
 src/util/perf_crypto_hash.c                                        | 2 ++
 src/util/perf_crypto_paillier.c                                    | 2 ++
 src/util/perf_crypto_rsa.c                                         | 2 ++
 src/util/perf_crypto_symmetric.c                                   | 2 ++
 src/util/perf_malloc.c                                             | 2 ++
 src/util/plugin.c                                                  | 2 ++
 src/util/program.c                                                 | 2 ++
 src/util/regex.c                                                   | 2 ++
 src/util/resolver.h                                                | 2 ++
 src/util/resolver_api.c                                            | 2 ++
 src/util/scheduler.c                                               | 2 ++
 src/util/service.c                                                 | 2 ++
 src/util/signal.c                                                  | 2 ++
 src/util/socks.c                                                   | 2 ++
 src/util/speedup.c                                                 | 2 ++
 src/util/speedup.h                                                 | 2 ++
 src/util/strings.c                                                 | 2 ++
 src/util/test_bio.c                                                | 2 ++
 src/util/test_client.c                                             | 2 ++
 src/util/test_common_allocation.c                                  | 2 ++
 src/util/test_common_endian.c                                      | 2 ++
 src/util/test_common_logging.c                                     | 2 ++
 src/util/test_common_logging_dummy.c                               | 2 ++
 src/util/test_common_logging_runtime_loglevels.c                   | 2 ++
 src/util/test_configuration.c                                      | 2 ++
 src/util/test_container_bloomfilter.c                              | 2 ++
 src/util/test_container_dll.c                                      | 2 ++
 src/util/test_container_heap.c                                     | 2 ++
 src/util/test_container_meta_data.c                                | 2 ++
 src/util/test_container_multihashmap.c                             | 2 ++
 src/util/test_container_multihashmap32.c                           | 2 ++
 src/util/test_container_multipeermap.c                             | 2 ++
 src/util/test_crypto_crc.c                                         | 2 ++
 src/util/test_crypto_ecc_dlog.c                                    | 2 ++
 src/util/test_crypto_ecdh_eddsa.c                                  | 2 ++
 src/util/test_crypto_ecdhe.c                                       | 2 ++
 src/util/test_crypto_ecdsa.c                                       | 2 ++
 src/util/test_crypto_eddsa.c                                       | 2 ++
 src/util/test_crypto_hash.c                                        | 2 ++
 src/util/test_crypto_hash_context.c                                | 2 ++
 src/util/test_crypto_paillier.c                                    | 2 ++
 src/util/test_crypto_random.c                                      | 2 ++
 src/util/test_crypto_rsa.c                                         | 2 ++
 src/util/test_crypto_symmetric.c                                   | 2 ++
 src/util/test_disk.c                                               | 2 ++
 src/util/test_getopt.c                                             | 2 ++
 src/util/test_hexcoder.c                                           | 2 ++
 src/util/test_mq.c                                                 | 2 ++
 src/util/test_os_network.c                                         | 2 ++
 src/util/test_os_start_process.c                                   | 2 ++
 src/util/test_peer.c                                               | 2 ++
 src/util/test_plugin.c                                             | 2 ++
 src/util/test_plugin_plug.c                                        | 2 ++
 src/util/test_program.c                                            | 2 ++
 src/util/test_regex.c                                              | 2 ++
 src/util/test_resolver_api.c                                       | 2 ++
 src/util/test_scheduler.c                                          | 2 ++
 src/util/test_scheduler_delay.c                                    | 2 ++
 src/util/test_service.c                                            | 2 ++
 src/util/test_socks.c                                              | 2 ++
 src/util/test_speedup.c                                            | 2 ++
 src/util/test_strings.c                                            | 2 ++
 src/util/test_strings_to_data.c                                    | 2 ++
 src/util/test_time.c                                               | 2 ++
 src/util/test_tun.c                                                | 2 ++
 src/util/time.c                                                    | 2 ++
 src/util/tun.c                                                     | 2 ++
 src/util/w32cat.c                                                  | 2 ++
 src/util/win.c                                                     | 2 ++
 src/util/winproc.c                                                 | 2 ++
 src/vpn/gnunet-helper-vpn-windows.c                                | 2 ++
 src/vpn/gnunet-helper-vpn.c                                        | 2 ++
 src/vpn/gnunet-service-vpn.c                                       | 2 ++
 src/vpn/gnunet-vpn.c                                               | 2 ++
 src/vpn/vpn.h                                                      | 2 ++
 src/vpn/vpn_api.c                                                  | 2 ++
 src/zonemaster/gnunet-service-zonemaster-monitor.c                 | 2 ++
 src/zonemaster/gnunet-service-zonemaster.c                         | 2 ++
 1091 files changed, 2182 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 5d570ddad..4295ce0ba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,6 +14,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+# SPDX-License-Identifier: AGPL3.0-or-later
 #
 # Process this file with autoconf to produce a configure script.
 #
diff --git a/contrib/apparmor/usr.bin.gnunet-helper-nat-server 
b/contrib/apparmor/usr.bin.gnunet-helper-nat-server
index d590021d5..637c9aa7c 100644
--- a/contrib/apparmor/usr.bin.gnunet-helper-nat-server
+++ b/contrib/apparmor/usr.bin.gnunet-helper-nat-server
@@ -6,6 +6,8 @@
 #  modify it under the terms of version 2 of the GNU General Public
 #  License published by the Free Software Foundation.
 #
+#  SPDX-License-Identifier: GPL2.0
+#
 #  This should be placed in /etc/apparmor.d/usr.sbin.gnunet-helper-nat-server
 #  This profile may be a reasonable starting point for other NAT helpers.
 #
diff --git a/contrib/benchmark/collect.awk b/contrib/benchmark/collect.awk
index 16f2e700c..264f2113e 100644
--- a/contrib/benchmark/collect.awk
+++ b/contrib/benchmark/collect.awk
@@ -13,7 +13,8 @@
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
+#
+# SPDX-License-Identfier: AGPL3.0-or-later
 
 # Aggregate benchmarking data from multiple threads/processes
 # generated by util/benchmark.c.
diff --git a/contrib/scripts/gnunet-chk.py.in b/contrib/scripts/gnunet-chk.py.in
index cabaef6c4..c60211556 100755
--- a/contrib/scripts/gnunet-chk.py.in
+++ b/contrib/scripts/gnunet-chk.py.in
@@ -15,6 +15,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+# SPDX-License-Identifier: AGPL3.0-or-later
+#
 # File:    gnunet-chk.py
 # Brief:   Computes GNUNET style Content Hash Key for a given file
 # Author:  Sree Harsha Totakura
diff --git a/contrib/scripts/gnunet_janitor.py.in 
b/contrib/scripts/gnunet_janitor.py.in
index cbe96a8eb..4ae9ad124 100644
--- a/contrib/scripts/gnunet_janitor.py.in
+++ b/contrib/scripts/gnunet_janitor.py.in
@@ -15,6 +15,8 @@
 #    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+#    SPDX-License-Identifier: AGPL3.0-or-later
+#
 # Finds any gnunet processes still running in the system and kills them
 #
 # gnunet janitor can be used by invoking `make' like this:
diff --git a/contrib/scripts/gnunet_pyexpect.py.in 
b/contrib/scripts/gnunet_pyexpect.py.in
index f155db5be..810d5b321 100644
--- a/contrib/scripts/gnunet_pyexpect.py.in
+++ b/contrib/scripts/gnunet_pyexpect.py.in
@@ -15,6 +15,8 @@
 #    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+#    SPDX-License-Identifier: AGPL3.0-or-later
+#
 # Testcase for gnunet-peerinfo
 from __future__ import print_function
 import os
diff --git a/contrib/scripts/terminate.py.in b/contrib/scripts/terminate.py.in
index 30f5dc97f..161b4db61 100644
--- a/contrib/scripts/terminate.py.in
+++ b/contrib/scripts/terminate.py.in
@@ -15,6 +15,8 @@
 #    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+#    SPDX-License-Identifier: AGPL3.0-or-later
+#
 # Utility module that implements safe process termination for W32.
 # For other platforms it's equivalent to Popen.kill ()
 # Requires pywin32 on W32.
diff --git a/contrib/services/openrc/gnunet.initd 
b/contrib/services/openrc/gnunet.initd
index c042e3de1..cdf296ebd 100644
--- a/contrib/services/openrc/gnunet.initd
+++ b/contrib/services/openrc/gnunet.initd
@@ -1,6 +1,8 @@
 #!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Authors
+# Copyright 2016 - 2019 ng0, lynX 
 # Distributed under the terms of the GNU General Public License v2
+# SPDX-License-Identifier: GPL2.0
 
 if [ -d /run ] ; then
        PIDFILE=${PIDFILE:-/run/gnunet/arm-service.pid}
diff --git a/contrib/test_gnunet_prefix.c b/contrib/test_gnunet_prefix.c
index 4614ee9e2..1a3c9a7ba 100644
--- a/contrib/test_gnunet_prefix.c
+++ b/contrib/test_gnunet_prefix.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/doc/handbook/gendocs.sh b/doc/handbook/gendocs.sh
index 3b71b36a2..79c92c9ad 100755
--- a/doc/handbook/gendocs.sh
+++ b/doc/handbook/gendocs.sh
@@ -19,6 +19,8 @@ scriptversion=2016-12-31.18
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+# SPDX-License-Identifier: GPL3.0-or-later
+#
 # Original author: Mohit Agarwal.
 # Send bug reports and any other correspondence to address@hidden
 #
diff --git a/src/abe/abe.c b/src/abe/abe.c
index be9e95bee..091ba0ced 100644
--- a/src/abe/abe.c
+++ b/src/abe/abe.c
@@ -15,6 +15,8 @@
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+     SPDX-License-Identifier: AGPL3.0-or-later
+
 */
 
 /**
diff --git a/src/abe/test_cpabe.c b/src/abe/test_cpabe.c
index 7b433c474..e2c86e986 100644
--- a/src/abe/test_cpabe.c
+++ b/src/abe/test_cpabe.c
@@ -15,6 +15,8 @@
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+     SPDX-License-Identifier: AGPL3.0-or-later
+
 */
 /**
  * @author Martin Schanzenbach
diff --git a/src/arm/arm.h b/src/arm/arm.h
index 251ec58e7..937cca1e7 100644
--- a/src/arm/arm.h
+++ b/src/arm/arm.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/arm/arm_api.c b/src/arm/arm_api.c
index 571b837d2..c8103c877 100644
--- a/src/arm/arm_api.c
+++ b/src/arm/arm_api.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/arm/arm_monitor_api.c b/src/arm/arm_monitor_api.c
index fbc59a5b1..15f91c036 100644
--- a/src/arm/arm_monitor_api.c
+++ b/src/arm/arm_monitor_api.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/arm/gnunet-arm.c b/src/arm/gnunet-arm.c
index fa0374bc5..80b5ca3e2 100644
--- a/src/arm/gnunet-arm.c
+++ b/src/arm/gnunet-arm.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/arm/gnunet-service-arm.c b/src/arm/gnunet-service-arm.c
index c9c9b3638..17304d3b3 100644
--- a/src/arm/gnunet-service-arm.c
+++ b/src/arm/gnunet-service-arm.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/arm/mockup-service.c b/src/arm/mockup-service.c
index 2d9b1f72f..c9f00b5dd 100644
--- a/src/arm/mockup-service.c
+++ b/src/arm/mockup-service.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 #include <stdlib.h>
diff --git a/src/arm/test_arm_api.c b/src/arm/test_arm_api.c
index 05c3a8a4e..f851595b0 100644
--- a/src/arm/test_arm_api.c
+++ b/src/arm/test_arm_api.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file arm/test_arm_api.c
diff --git a/src/arm/test_exponential_backoff.c 
b/src/arm/test_exponential_backoff.c
index f15bca2db..e3c2a399a 100644
--- a/src/arm/test_exponential_backoff.c
+++ b/src/arm/test_exponential_backoff.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file arm/test_exponential_backoff.c
diff --git a/src/arm/test_gnunet_service_arm.c 
b/src/arm/test_gnunet_service_arm.c
index fd5244ec2..700e7ca19 100644
--- a/src/arm/test_gnunet_service_arm.c
+++ b/src/arm/test_gnunet_service_arm.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file arm/test_gnunet_service_arm.c
diff --git a/src/ats-tests/ats-testing-experiment.c 
b/src/ats-tests/ats-testing-experiment.c
index 05ee83373..b91c652b0 100644
--- a/src/ats-tests/ats-testing-experiment.c
+++ b/src/ats-tests/ats-testing-experiment.c
@@ -14,6 +14,8 @@
 
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file ats-tests/ats-testing-experiment.c
diff --git a/src/ats-tests/ats-testing-log.c b/src/ats-tests/ats-testing-log.c
index 1099a4b36..8624904a5 100644
--- a/src/ats-tests/ats-testing-log.c
+++ b/src/ats-tests/ats-testing-log.c
@@ -14,6 +14,8 @@
 
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file ats-tests/ats-testing-log.c
diff --git a/src/ats-tests/ats-testing-preferences.c 
b/src/ats-tests/ats-testing-preferences.c
index fa119d7c7..ba2f133b9 100644
--- a/src/ats-tests/ats-testing-preferences.c
+++ b/src/ats-tests/ats-testing-preferences.c
@@ -14,6 +14,8 @@
 
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file ats-tests/ats-testing-preferences.c
diff --git a/src/ats-tests/ats-testing-traffic.c 
b/src/ats-tests/ats-testing-traffic.c
index f52ed4a2f..3756596c9 100644
--- a/src/ats-tests/ats-testing-traffic.c
+++ b/src/ats-tests/ats-testing-traffic.c
@@ -14,6 +14,8 @@
 
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file ats-tests/ats-testing-traffic.c
diff --git a/src/ats-tests/ats-testing.c b/src/ats-tests/ats-testing.c
index 967f6213d..2d714d2be 100644
--- a/src/ats-tests/ats-testing.c
+++ b/src/ats-tests/ats-testing.c
@@ -14,6 +14,8 @@
 
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file ats-tests/ats-testing.c
diff --git a/src/ats-tests/ats-testing.h b/src/ats-tests/ats-testing.h
index 123ada03d..9c4353b52 100644
--- a/src/ats-tests/ats-testing.h
+++ b/src/ats-tests/ats-testing.h
@@ -14,6 +14,8 @@
 
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file ats-tests/ats-testing.h
diff --git a/src/ats-tests/gnunet-ats-sim.c b/src/ats-tests/gnunet-ats-sim.c
index 98a433873..af0eff534 100644
--- a/src/ats-tests/gnunet-ats-sim.c
+++ b/src/ats-tests/gnunet-ats-sim.c
@@ -14,6 +14,8 @@
 
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file ats-tests/gnunet-ats-sim.c
diff --git a/src/ats-tests/gnunet-solver-eval.c 
b/src/ats-tests/gnunet-solver-eval.c
index 381f0f431..cb1946448 100644
--- a/src/ats-tests/gnunet-solver-eval.c
+++ b/src/ats-tests/gnunet-solver-eval.c
@@ -14,6 +14,8 @@
 
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file ats-tests/ats-testing-experiment.c
diff --git a/src/ats-tests/perf_ats.c b/src/ats-tests/perf_ats.c
index 85b57ddb9..91c58e9a9 100644
--- a/src/ats-tests/perf_ats.c
+++ b/src/ats-tests/perf_ats.c
@@ -14,6 +14,8 @@
 
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file ats/perf_ats.c
diff --git a/src/ats-tests/perf_ats.h b/src/ats-tests/perf_ats.h
index 1d1dfd73f..4b52d4482 100644
--- a/src/ats-tests/perf_ats.h
+++ b/src/ats-tests/perf_ats.h
@@ -14,6 +14,8 @@
 
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file ats/perf_ats.c
diff --git a/src/ats-tests/perf_ats_logging.c b/src/ats-tests/perf_ats_logging.c
index c7ac9383d..4b59515d3 100644
--- a/src/ats-tests/perf_ats_logging.c
+++ b/src/ats-tests/perf_ats_logging.c
@@ -14,6 +14,8 @@
 
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file ats/perf_ats_logging.c
diff --git a/src/ats-tool/gnunet-ats.c b/src/ats-tool/gnunet-ats.c
index 0d26ba5d9..88c3c41e9 100644
--- a/src/ats-tool/gnunet-ats.c
+++ b/src/ats-tool/gnunet-ats.c
@@ -14,6 +14,8 @@
 
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/ats/ats.h b/src/ats/ats.h
index 09542f240..7c9559495 100644
--- a/src/ats/ats.h
+++ b/src/ats/ats.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file ats/ats.h
diff --git a/src/ats/ats2.h b/src/ats/ats2.h
index 0882c5f20..ad9b0a3da 100644
--- a/src/ats/ats2.h
+++ b/src/ats/ats2.h
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file ats/ats2.h
diff --git a/src/ats/ats_api2_application.c b/src/ats/ats_api2_application.c
index 37198392c..444ac3ae3 100644
--- a/src/ats/ats_api2_application.c
+++ b/src/ats/ats_api2_application.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file ats/ats_api2_application.c
diff --git a/src/ats/ats_api2_transport.c b/src/ats/ats_api2_transport.c
index 5ad9fb40e..e73b2daa8 100644
--- a/src/ats/ats_api2_transport.c
+++ b/src/ats/ats_api2_transport.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file ats/ats_api2_transport.c
diff --git a/src/ats/ats_api_connectivity.c b/src/ats/ats_api_connectivity.c
index 875b3021b..d1295d04d 100644
--- a/src/ats/ats_api_connectivity.c
+++ b/src/ats/ats_api_connectivity.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file ats/ats_api_connectivity.c
diff --git a/src/ats/ats_api_performance.c b/src/ats/ats_api_performance.c
index 11e71e94e..12dec776e 100644
--- a/src/ats/ats_api_performance.c
+++ b/src/ats/ats_api_performance.c
@@ -14,6 +14,8 @@
 
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file ats/ats_api_performance.c
diff --git a/src/ats/ats_api_scanner.c b/src/ats/ats_api_scanner.c
index 7fb125e6f..e23b4de8a 100644
--- a/src/ats/ats_api_scanner.c
+++ b/src/ats/ats_api_scanner.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file ats/ats_api_scanner.c
diff --git a/src/ats/ats_api_scheduling.c b/src/ats/ats_api_scheduling.c
index 2ce6aed3d..3c8ad9b9a 100644
--- a/src/ats/ats_api_scheduling.c
+++ b/src/ats/ats_api_scheduling.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file ats/ats_api_scheduling.c
diff --git a/src/ats/gnunet-ats-solver-eval.c b/src/ats/gnunet-ats-solver-eval.c
index e1a01207d..62e09533f 100644
--- a/src/ats/gnunet-ats-solver-eval.c
+++ b/src/ats/gnunet-ats-solver-eval.c
@@ -14,6 +14,8 @@
 
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file ats-tests/ats-testing-experiment.c
diff --git a/src/ats/gnunet-ats-solver-eval.h b/src/ats/gnunet-ats-solver-eval.h
index 92693bd38..d5a68c5b0 100644
--- a/src/ats/gnunet-ats-solver-eval.h
+++ b/src/ats/gnunet-ats-solver-eval.h
@@ -14,6 +14,8 @@
 
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file ats-tests/ats-testing-experiment.c
diff --git a/src/ats/gnunet-service-ats-new.c b/src/ats/gnunet-service-ats-new.c
index fa8c07a1a..30e265b44 100644
--- a/src/ats/gnunet-service-ats-new.c
+++ b/src/ats/gnunet-service-ats-new.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file ats/gnunet-service-ats-new.c
diff --git a/src/ats/gnunet-service-ats.c b/src/ats/gnunet-service-ats.c
index f8bd6adec..2dc3edea6 100644
--- a/src/ats/gnunet-service-ats.c
+++ b/src/ats/gnunet-service-ats.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file ats/gnunet-service-ats.c
diff --git a/src/ats/gnunet-service-ats.h b/src/ats/gnunet-service-ats.h
index 90916fbd5..521a460ff 100644
--- a/src/ats/gnunet-service-ats.h
+++ b/src/ats/gnunet-service-ats.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/ats/gnunet-service-ats_addresses.c 
b/src/ats/gnunet-service-ats_addresses.c
index 345409d54..dd5cee96f 100644
--- a/src/ats/gnunet-service-ats_addresses.c
+++ b/src/ats/gnunet-service-ats_addresses.c
@@ -14,6 +14,8 @@
 
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/ats/gnunet-service-ats_addresses.h 
b/src/ats/gnunet-service-ats_addresses.h
index 7b9472a67..c9ad9a45d 100644
--- a/src/ats/gnunet-service-ats_addresses.h
+++ b/src/ats/gnunet-service-ats_addresses.h
@@ -14,6 +14,8 @@
 
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/ats/gnunet-service-ats_connectivity.c 
b/src/ats/gnunet-service-ats_connectivity.c
index 6719a92b2..3853aeb0e 100644
--- a/src/ats/gnunet-service-ats_connectivity.c
+++ b/src/ats/gnunet-service-ats_connectivity.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/ats/gnunet-service-ats_connectivity.h 
b/src/ats/gnunet-service-ats_connectivity.h
index 2a9a94477..891a923db 100644
--- a/src/ats/gnunet-service-ats_connectivity.h
+++ b/src/ats/gnunet-service-ats_connectivity.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file ats/gnunet-service-ats_connectivity.h
diff --git a/src/ats/gnunet-service-ats_normalization.c 
b/src/ats/gnunet-service-ats_normalization.c
index e70be018e..f68e6ec11 100644
--- a/src/ats/gnunet-service-ats_normalization.c
+++ b/src/ats/gnunet-service-ats_normalization.c
@@ -14,6 +14,8 @@
 
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/ats/gnunet-service-ats_normalization.h 
b/src/ats/gnunet-service-ats_normalization.h
index 36debebb3..4435c4ae6 100644
--- a/src/ats/gnunet-service-ats_normalization.h
+++ b/src/ats/gnunet-service-ats_normalization.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/ats/gnunet-service-ats_performance.c 
b/src/ats/gnunet-service-ats_performance.c
index e3a863f2a..94a22d378 100644
--- a/src/ats/gnunet-service-ats_performance.c
+++ b/src/ats/gnunet-service-ats_performance.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file ats/gnunet-service-ats_performance.c
diff --git a/src/ats/gnunet-service-ats_performance.h 
b/src/ats/gnunet-service-ats_performance.h
index 4fe4f68b7..e7ba3b554 100644
--- a/src/ats/gnunet-service-ats_performance.h
+++ b/src/ats/gnunet-service-ats_performance.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/ats/gnunet-service-ats_plugins.c 
b/src/ats/gnunet-service-ats_plugins.c
index 1ca39ff15..0b0e5ec4b 100644
--- a/src/ats/gnunet-service-ats_plugins.c
+++ b/src/ats/gnunet-service-ats_plugins.c
@@ -14,6 +14,8 @@
 
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/ats/gnunet-service-ats_plugins.h 
b/src/ats/gnunet-service-ats_plugins.h
index 00fb910cc..70ae1d597 100644
--- a/src/ats/gnunet-service-ats_plugins.h
+++ b/src/ats/gnunet-service-ats_plugins.h
@@ -14,6 +14,8 @@
 
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/ats/gnunet-service-ats_preferences.c 
b/src/ats/gnunet-service-ats_preferences.c
index e1a786359..26929ea7c 100644
--- a/src/ats/gnunet-service-ats_preferences.c
+++ b/src/ats/gnunet-service-ats_preferences.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file ats/gnunet-service-ats_preferences.c
diff --git a/src/ats/gnunet-service-ats_preferences.h 
b/src/ats/gnunet-service-ats_preferences.h
index 4857e0a0a..e0c7aa2e3 100644
--- a/src/ats/gnunet-service-ats_preferences.h
+++ b/src/ats/gnunet-service-ats_preferences.h
@@ -14,6 +14,8 @@
 
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file ats/gnunet-service-ats_preferences.h
diff --git a/src/ats/gnunet-service-ats_reservations.c 
b/src/ats/gnunet-service-ats_reservations.c
index a272170b7..41de442c7 100644
--- a/src/ats/gnunet-service-ats_reservations.c
+++ b/src/ats/gnunet-service-ats_reservations.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file ats/gnunet-service-ats_reservations.c
diff --git a/src/ats/gnunet-service-ats_reservations.h 
b/src/ats/gnunet-service-ats_reservations.h
index 7ffe5ed63..525236e8c 100644
--- a/src/ats/gnunet-service-ats_reservations.h
+++ b/src/ats/gnunet-service-ats_reservations.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/ats/gnunet-service-ats_scheduling.c 
b/src/ats/gnunet-service-ats_scheduling.c
index aeea162cc..870912dc7 100644
--- a/src/ats/gnunet-service-ats_scheduling.c
+++ b/src/ats/gnunet-service-ats_scheduling.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/ats/gnunet-service-ats_scheduling.h 
b/src/ats/gnunet-service-ats_scheduling.h
index 73f35d21e..30cceb97b 100644
--- a/src/ats/gnunet-service-ats_scheduling.h
+++ b/src/ats/gnunet-service-ats_scheduling.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/ats/perf_ats_solver.c b/src/ats/perf_ats_solver.c
index 73871c053..33180a953 100644
--- a/src/ats/perf_ats_solver.c
+++ b/src/ats/perf_ats_solver.c
@@ -14,6 +14,8 @@
 
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file ats/perf_ats_solver.c
diff --git a/src/ats/plugin_ats2_common.c b/src/ats/plugin_ats2_common.c
index 6911ba44d..faa2f0edf 100644
--- a/src/ats/plugin_ats2_common.c
+++ b/src/ats/plugin_ats2_common.c
@@ -14,6 +14,8 @@
 
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file ats/plugin_ats2_common.c
diff --git a/src/ats/plugin_ats2_simple.c b/src/ats/plugin_ats2_simple.c
index 6faf8ad7c..23907f669 100644
--- a/src/ats/plugin_ats2_simple.c
+++ b/src/ats/plugin_ats2_simple.c
@@ -14,6 +14,8 @@
 
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file ats/plugin_ats2_simple.c
diff --git a/src/ats/plugin_ats_mlp.c b/src/ats/plugin_ats_mlp.c
index 8d2a872ab..8e7880793 100644
--- a/src/ats/plugin_ats_mlp.c
+++ b/src/ats/plugin_ats_mlp.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/ats/plugin_ats_proportional.c 
b/src/ats/plugin_ats_proportional.c
index b3299b9f0..3fab09fb3 100644
--- a/src/ats/plugin_ats_proportional.c
+++ b/src/ats/plugin_ats_proportional.c
@@ -14,6 +14,8 @@
 
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file ats/plugin_ats_proportional.c
diff --git a/src/ats/plugin_ats_ril.c b/src/ats/plugin_ats_ril.c
index 44c60d1dd..6e55f3a1c 100644
--- a/src/ats/plugin_ats_ril.c
+++ b/src/ats/plugin_ats_ril.c
@@ -14,6 +14,8 @@
 
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/ats/test_ats_api.c b/src/ats/test_ats_api.c
index e049ebe16..f04b4b08b 100644
--- a/src/ats/test_ats_api.c
+++ b/src/ats/test_ats_api.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file ats/test_ats_api.c
diff --git a/src/ats/test_ats_lib.c b/src/ats/test_ats_lib.c
index c9f88a660..21eca18e9 100644
--- a/src/ats/test_ats_lib.c
+++ b/src/ats/test_ats_lib.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file ats/test_ats_lib.c
diff --git a/src/ats/test_ats_lib.h b/src/ats/test_ats_lib.h
index 15b3dec1e..cc9f8ec73 100644
--- a/src/ats/test_ats_lib.h
+++ b/src/ats/test_ats_lib.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file ats/test_ats_lib.h
diff --git a/src/ats/test_ats_reservation_api.c 
b/src/ats/test_ats_reservation_api.c
index d175aff48..e7791343e 100644
--- a/src/ats/test_ats_reservation_api.c
+++ b/src/ats/test_ats_reservation_api.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file ats/test_ats_reservation_api.c
diff --git a/src/auction/auction.h b/src/auction/auction.h
index 1d21855a8..74da53fdb 100644
--- a/src/auction/auction.h
+++ b/src/auction/auction.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/auction/gnunet-auction-create.c 
b/src/auction/gnunet-auction-create.c
index e5d48fe9e..a094d2a56 100644
--- a/src/auction/gnunet-auction-create.c
+++ b/src/auction/gnunet-auction-create.c
@@ -14,6 +14,8 @@
   
    You should have received a copy of the GNU Affero General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
    */
 
 /**
diff --git a/src/auction/gnunet-auction-info.c 
b/src/auction/gnunet-auction-info.c
index 0fa34a31a..58639a57c 100644
--- a/src/auction/gnunet-auction-info.c
+++ b/src/auction/gnunet-auction-info.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/auction/gnunet-auction-join.c 
b/src/auction/gnunet-auction-join.c
index 0fa34a31a..58639a57c 100644
--- a/src/auction/gnunet-auction-join.c
+++ b/src/auction/gnunet-auction-join.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/auction/gnunet-service-auction.c 
b/src/auction/gnunet-service-auction.c
index 17a72d95e..a5518b0f3 100644
--- a/src/auction/gnunet-service-auction.c
+++ b/src/auction/gnunet-service-auction.c
@@ -14,6 +14,8 @@
   
    You should have received a copy of the GNU Affero General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
    */
 
 /**
diff --git a/src/auction/test_auction_api.c b/src/auction/test_auction_api.c
index 745125884..56b2a8192 100644
--- a/src/auction/test_auction_api.c
+++ b/src/auction/test_auction_api.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file auction/test_auction_api.c
diff --git a/src/block/bg_bf.c b/src/block/bg_bf.c
index 0fde5aa5b..20aa59bbc 100644
--- a/src/block/bg_bf.c
+++ b/src/block/bg_bf.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file block/bg_bf.c
diff --git a/src/block/block.c b/src/block/block.c
index f669ed9e3..ecc98f88d 100644
--- a/src/block/block.c
+++ b/src/block/block.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/block/plugin_block_template.c 
b/src/block/plugin_block_template.c
index 5817f69f3..1918f00aa 100644
--- a/src/block/plugin_block_template.c
+++ b/src/block/plugin_block_template.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/block/plugin_block_test.c b/src/block/plugin_block_test.c
index f3d4e9dd8..4543847aa 100644
--- a/src/block/plugin_block_test.c
+++ b/src/block/plugin_block_test.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/cadet/cadet.h b/src/cadet/cadet.h
index bac4bc49d..226288284 100644
--- a/src/cadet/cadet.h
+++ b/src/cadet/cadet.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/cadet/cadet_api.c b/src/cadet/cadet_api.c
index 23ea46e59..f9b81a82b 100644
--- a/src/cadet/cadet_api.c
+++ b/src/cadet/cadet_api.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file cadet/cadet_api.c
diff --git a/src/cadet/cadet_protocol.h b/src/cadet/cadet_protocol.h
index 4b4cfbf52..762babb8a 100644
--- a/src/cadet/cadet_protocol.h
+++ b/src/cadet/cadet_protocol.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/cadet/cadet_test_lib.c b/src/cadet/cadet_test_lib.c
index 1a1c15f48..7d83f496a 100644
--- a/src/cadet/cadet_test_lib.c
+++ b/src/cadet/cadet_test_lib.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file cadet/cadet_test_lib.c
diff --git a/src/cadet/cadet_test_lib.h b/src/cadet/cadet_test_lib.h
index 3a43d3ded..69c519d07 100644
--- a/src/cadet/cadet_test_lib.h
+++ b/src/cadet/cadet_test_lib.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file cadet/cadet_test_lib.h
diff --git a/src/cadet/gnunet-cadet-profiler.c 
b/src/cadet/gnunet-cadet-profiler.c
index 784ee662a..920d8d830 100644
--- a/src/cadet/gnunet-cadet-profiler.c
+++ b/src/cadet/gnunet-cadet-profiler.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file cadet/gnunet-cadet-profiler.c
diff --git a/src/cadet/gnunet-cadet.c b/src/cadet/gnunet-cadet.c
index 13b04b885..ccc757d7e 100644
--- a/src/cadet/gnunet-cadet.c
+++ b/src/cadet/gnunet-cadet.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/cadet/gnunet-service-cadet.c b/src/cadet/gnunet-service-cadet.c
index 4568d2733..4f9fda82b 100644
--- a/src/cadet/gnunet-service-cadet.c
+++ b/src/cadet/gnunet-service-cadet.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/cadet/gnunet-service-cadet.h b/src/cadet/gnunet-service-cadet.h
index 5587755d1..3daeeff74 100644
--- a/src/cadet/gnunet-service-cadet.h
+++ b/src/cadet/gnunet-service-cadet.h
@@ -15,6 +15,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/cadet/gnunet-service-cadet_channel.c 
b/src/cadet/gnunet-service-cadet_channel.c
index 8ef598132..25b408a0b 100644
--- a/src/cadet/gnunet-service-cadet_channel.c
+++ b/src/cadet/gnunet-service-cadet_channel.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file cadet/gnunet-service-cadet_channel.c
diff --git a/src/cadet/gnunet-service-cadet_channel.h 
b/src/cadet/gnunet-service-cadet_channel.h
index b9d09b8d1..2eb28262d 100644
--- a/src/cadet/gnunet-service-cadet_channel.h
+++ b/src/cadet/gnunet-service-cadet_channel.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/cadet/gnunet-service-cadet_connection.c 
b/src/cadet/gnunet-service-cadet_connection.c
index b4f1d3734..4f1e5be8e 100644
--- a/src/cadet/gnunet-service-cadet_connection.c
+++ b/src/cadet/gnunet-service-cadet_connection.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/cadet/gnunet-service-cadet_connection.h 
b/src/cadet/gnunet-service-cadet_connection.h
index fe59ebb77..7cdbc9dee 100644
--- a/src/cadet/gnunet-service-cadet_connection.h
+++ b/src/cadet/gnunet-service-cadet_connection.h
@@ -15,6 +15,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/cadet/gnunet-service-cadet_core.c 
b/src/cadet/gnunet-service-cadet_core.c
index 64c86d7d4..275785b57 100644
--- a/src/cadet/gnunet-service-cadet_core.c
+++ b/src/cadet/gnunet-service-cadet_core.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/cadet/gnunet-service-cadet_core.h 
b/src/cadet/gnunet-service-cadet_core.h
index b528961b0..ec676c679 100644
--- a/src/cadet/gnunet-service-cadet_core.h
+++ b/src/cadet/gnunet-service-cadet_core.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/cadet/gnunet-service-cadet_dht.c 
b/src/cadet/gnunet-service-cadet_dht.c
index b4fed66c0..0b87eeab7 100644
--- a/src/cadet/gnunet-service-cadet_dht.c
+++ b/src/cadet/gnunet-service-cadet_dht.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file cadet/gnunet-service-cadet_dht.c
diff --git a/src/cadet/gnunet-service-cadet_dht.h 
b/src/cadet/gnunet-service-cadet_dht.h
index 7fe1f0c0b..03f045938 100644
--- a/src/cadet/gnunet-service-cadet_dht.h
+++ b/src/cadet/gnunet-service-cadet_dht.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/cadet/gnunet-service-cadet_hello.c 
b/src/cadet/gnunet-service-cadet_hello.c
index 0061bddc2..2c06006f4 100644
--- a/src/cadet/gnunet-service-cadet_hello.c
+++ b/src/cadet/gnunet-service-cadet_hello.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file cadet/gnunet-service-cadet_hello.c
diff --git a/src/cadet/gnunet-service-cadet_hello.h 
b/src/cadet/gnunet-service-cadet_hello.h
index be7fdf1ce..821cd4ff4 100644
--- a/src/cadet/gnunet-service-cadet_hello.h
+++ b/src/cadet/gnunet-service-cadet_hello.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/cadet/gnunet-service-cadet_paths.c 
b/src/cadet/gnunet-service-cadet_paths.c
index 7769a6043..a061c5685 100644
--- a/src/cadet/gnunet-service-cadet_paths.c
+++ b/src/cadet/gnunet-service-cadet_paths.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file cadet/gnunet-service-cadet_paths.c
diff --git a/src/cadet/gnunet-service-cadet_paths.h 
b/src/cadet/gnunet-service-cadet_paths.h
index 2625253fb..ca2c79ca4 100644
--- a/src/cadet/gnunet-service-cadet_paths.h
+++ b/src/cadet/gnunet-service-cadet_paths.h
@@ -15,6 +15,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/cadet/gnunet-service-cadet_peer.c 
b/src/cadet/gnunet-service-cadet_peer.c
index b375d51ca..8d55e6386 100644
--- a/src/cadet/gnunet-service-cadet_peer.c
+++ b/src/cadet/gnunet-service-cadet_peer.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/cadet/gnunet-service-cadet_peer.h 
b/src/cadet/gnunet-service-cadet_peer.h
index 3b8b31b9a..4eee7e9e8 100644
--- a/src/cadet/gnunet-service-cadet_peer.h
+++ b/src/cadet/gnunet-service-cadet_peer.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/cadet/gnunet-service-cadet_tunnels.c 
b/src/cadet/gnunet-service-cadet_tunnels.c
index 874c7e706..ad4ed6e96 100644
--- a/src/cadet/gnunet-service-cadet_tunnels.c
+++ b/src/cadet/gnunet-service-cadet_tunnels.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file cadet/gnunet-service-cadet_tunnels.c
diff --git a/src/cadet/gnunet-service-cadet_tunnels.h 
b/src/cadet/gnunet-service-cadet_tunnels.h
index 492eb6d24..c1bf2fcd5 100644
--- a/src/cadet/gnunet-service-cadet_tunnels.h
+++ b/src/cadet/gnunet-service-cadet_tunnels.h
@@ -15,6 +15,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/cadet/test_cadet.c b/src/cadet/test_cadet.c
index 76ff258e0..72c18cf9c 100644
--- a/src/cadet/test_cadet.c
+++ b/src/cadet/test_cadet.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file cadet/test_cadet.c
diff --git a/src/cadet/test_cadet_flow.c b/src/cadet/test_cadet_flow.c
index 4645ea840..552d0fdb3 100644
--- a/src/cadet/test_cadet_flow.c
+++ b/src/cadet/test_cadet_flow.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file cadet/test_cadet_flow.c
diff --git a/src/cadet/test_cadet_local_mq.c b/src/cadet/test_cadet_local_mq.c
index 2e9cfa918..fc5561044 100644
--- a/src/cadet/test_cadet_local_mq.c
+++ b/src/cadet/test_cadet_local_mq.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/consensus/consensus-simulation.py.in 
b/src/consensus/consensus-simulation.py.in
index 3ce44cd91..38e29230a 100644
--- a/src/consensus/consensus-simulation.py.in
+++ b/src/consensus/consensus-simulation.py.in
@@ -14,6 +14,8 @@
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# SPDX-License-Identifier: AGPL3.0-or-later
 
 from __future__ import absolute_import
 from __future__ import print_function
diff --git a/src/consensus/consensus.h b/src/consensus/consensus.h
index 19bf3e8ad..683e16104 100644
--- a/src/consensus/consensus.h
+++ b/src/consensus/consensus.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/consensus/consensus_api.c b/src/consensus/consensus_api.c
index 3f0087b0f..4a584a410 100644
--- a/src/consensus/consensus_api.c
+++ b/src/consensus/consensus_api.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/consensus/consensus_protocol.h 
b/src/consensus/consensus_protocol.h
index 68505eb28..77641e2b4 100644
--- a/src/consensus/consensus_protocol.h
+++ b/src/consensus/consensus_protocol.h
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 
diff --git a/src/consensus/gnunet-consensus-profiler.c 
b/src/consensus/gnunet-consensus-profiler.c
index 4928f04b4..e088904aa 100644
--- a/src/consensus/gnunet-consensus-profiler.c
+++ b/src/consensus/gnunet-consensus-profiler.c
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/consensus/gnunet-service-consensus.c 
b/src/consensus/gnunet-service-consensus.c
index afbefdc5a..04e71afd9 100644
--- a/src/consensus/gnunet-service-consensus.c
+++ b/src/consensus/gnunet-service-consensus.c
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/consensus/plugin_block_consensus.c 
b/src/consensus/plugin_block_consensus.c
index a1cbaa35f..ca19b7c8d 100644
--- a/src/consensus/plugin_block_consensus.c
+++ b/src/consensus/plugin_block_consensus.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/consensus/test_consensus_api.c 
b/src/consensus/test_consensus_api.c
index 9c257f2e9..46e582afe 100644
--- a/src/consensus/test_consensus_api.c
+++ b/src/consensus/test_consensus_api.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/conversation/conversation.h b/src/conversation/conversation.h
index 0a71fd723..69f868e6c 100644
--- a/src/conversation/conversation.h
+++ b/src/conversation/conversation.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/conversation/conversation_api.c 
b/src/conversation/conversation_api.c
index b7f1af0cf..cd777c285 100644
--- a/src/conversation/conversation_api.c
+++ b/src/conversation/conversation_api.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/conversation/conversation_api_call.c 
b/src/conversation/conversation_api_call.c
index dee4a6095..5353c3e2d 100644
--- a/src/conversation/conversation_api_call.c
+++ b/src/conversation/conversation_api_call.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/conversation/gnunet-conversation-test.c 
b/src/conversation/gnunet-conversation-test.c
index 2c9ed715b..201156f7f 100644
--- a/src/conversation/gnunet-conversation-test.c
+++ b/src/conversation/gnunet-conversation-test.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/conversation/gnunet-conversation.c 
b/src/conversation/gnunet-conversation.c
index bb4946720..6c3db2184 100644
--- a/src/conversation/gnunet-conversation.c
+++ b/src/conversation/gnunet-conversation.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file conversation/gnunet-conversation.c
diff --git a/src/conversation/gnunet-helper-audio-playback-gst.c 
b/src/conversation/gnunet-helper-audio-playback-gst.c
index b3656417e..51450af90 100644
--- a/src/conversation/gnunet-helper-audio-playback-gst.c
+++ b/src/conversation/gnunet-helper-audio-playback-gst.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file conversation/gnunet-helper-audio-playback-gst.c
diff --git a/src/conversation/gnunet-helper-audio-playback.c 
b/src/conversation/gnunet-helper-audio-playback.c
index 093b08ec3..e86bb6508 100644
--- a/src/conversation/gnunet-helper-audio-playback.c
+++ b/src/conversation/gnunet-helper-audio-playback.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file conversation/gnunet-helper-audio-playback.c
diff --git a/src/conversation/gnunet-helper-audio-record-gst.c 
b/src/conversation/gnunet-helper-audio-record-gst.c
index fbba7da39..78c94c83e 100644
--- a/src/conversation/gnunet-helper-audio-record-gst.c
+++ b/src/conversation/gnunet-helper-audio-record-gst.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file conversation/gnunet-helper-audio-record-gst.c
diff --git a/src/conversation/gnunet-helper-audio-record.c 
b/src/conversation/gnunet-helper-audio-record.c
index 89800faa2..f3f51e681 100644
--- a/src/conversation/gnunet-helper-audio-record.c
+++ b/src/conversation/gnunet-helper-audio-record.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file conversation/gnunet-helper-audio-record.c
diff --git a/src/conversation/gnunet-service-conversation.c 
b/src/conversation/gnunet-service-conversation.c
index 059bb158b..ad449a309 100644
--- a/src/conversation/gnunet-service-conversation.c
+++ b/src/conversation/gnunet-service-conversation.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file conversation/gnunet-service-conversation.c
diff --git a/src/conversation/gnunet_gst.c b/src/conversation/gnunet_gst.c
index 279c5522b..c08468996 100644
--- a/src/conversation/gnunet_gst.c
+++ b/src/conversation/gnunet_gst.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file conversation/gnunet_gst.c
diff --git a/src/conversation/gnunet_gst.h b/src/conversation/gnunet_gst.h
index 69ac0933c..88e2dc100 100644
--- a/src/conversation/gnunet_gst.h
+++ b/src/conversation/gnunet_gst.h
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file conversation/gnunet_gst.c
diff --git a/src/conversation/gnunet_gst_def.h 
b/src/conversation/gnunet_gst_def.h
index 225bb2dc5..131dc4f7d 100644
--- a/src/conversation/gnunet_gst_def.h
+++ b/src/conversation/gnunet_gst_def.h
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file conversation/gnunet_gst_def.h
diff --git a/src/conversation/gnunet_gst_test.c 
b/src/conversation/gnunet_gst_test.c
index 46073ebe3..f52130fa4 100644
--- a/src/conversation/gnunet_gst_test.c
+++ b/src/conversation/gnunet_gst_test.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file conversation/gnunet_gst_test.c
diff --git a/src/conversation/microphone.c b/src/conversation/microphone.c
index 7df436217..57588f05a 100644
--- a/src/conversation/microphone.c
+++ b/src/conversation/microphone.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/conversation/plugin_gnsrecord_conversation.c 
b/src/conversation/plugin_gnsrecord_conversation.c
index 1825c6d4b..41c09ade9 100644
--- a/src/conversation/plugin_gnsrecord_conversation.c
+++ b/src/conversation/plugin_gnsrecord_conversation.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/conversation/speaker.c b/src/conversation/speaker.c
index 7f336d632..e2ace9115 100644
--- a/src/conversation/speaker.c
+++ b/src/conversation/speaker.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/conversation/test_conversation_api.c 
b/src/conversation/test_conversation_api.c
index f96a6e79f..0e3dd975b 100644
--- a/src/conversation/test_conversation_api.c
+++ b/src/conversation/test_conversation_api.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file conversation/test_conversation_api.c
diff --git a/src/conversation/test_conversation_api_reject.c 
b/src/conversation/test_conversation_api_reject.c
index 301574c2f..dc4785258 100644
--- a/src/conversation/test_conversation_api_reject.c
+++ b/src/conversation/test_conversation_api_reject.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file conversation/test_conversation_api_reject.c
diff --git a/src/conversation/test_conversation_api_twocalls.c 
b/src/conversation/test_conversation_api_twocalls.c
index 499eaba88..0b19f4783 100644
--- a/src/conversation/test_conversation_api_twocalls.c
+++ b/src/conversation/test_conversation_api_twocalls.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file conversation/test_conversation_api_twocalls.c
diff --git a/src/core/core.h b/src/core/core.h
index 2ce77244e..bc9638706 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/core/core_api.c b/src/core/core_api.c
index d9e98303d..6adaadabf 100644
--- a/src/core/core_api.c
+++ b/src/core/core_api.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file core/core_api.c
diff --git a/src/core/core_api_monitor_peers.c 
b/src/core/core_api_monitor_peers.c
index d9b59c71a..8820b44d1 100644
--- a/src/core/core_api_monitor_peers.c
+++ b/src/core/core_api_monitor_peers.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/core/gnunet-core.c b/src/core/gnunet-core.c
index a6d7def83..7180754a9 100644
--- a/src/core/gnunet-core.c
+++ b/src/core/gnunet-core.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/core/gnunet-service-core.c b/src/core/gnunet-service-core.c
index a033f9fac..e26bb4d5c 100644
--- a/src/core/gnunet-service-core.c
+++ b/src/core/gnunet-service-core.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/core/gnunet-service-core.h b/src/core/gnunet-service-core.h
index fd1a88e75..00461c5ab 100644
--- a/src/core/gnunet-service-core.h
+++ b/src/core/gnunet-service-core.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/core/gnunet-service-core_kx.c 
b/src/core/gnunet-service-core_kx.c
index c017e0c23..bfd855285 100644
--- a/src/core/gnunet-service-core_kx.c
+++ b/src/core/gnunet-service-core_kx.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/core/gnunet-service-core_kx.h 
b/src/core/gnunet-service-core_kx.h
index 2ffdf339b..d27c3687a 100644
--- a/src/core/gnunet-service-core_kx.h
+++ b/src/core/gnunet-service-core_kx.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/core/gnunet-service-core_sessions.c 
b/src/core/gnunet-service-core_sessions.c
index 16f9a092d..4f678c784 100644
--- a/src/core/gnunet-service-core_sessions.c
+++ b/src/core/gnunet-service-core_sessions.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/core/gnunet-service-core_sessions.h 
b/src/core/gnunet-service-core_sessions.h
index be862b71f..9f5070d57 100644
--- a/src/core/gnunet-service-core_sessions.h
+++ b/src/core/gnunet-service-core_sessions.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/core/gnunet-service-core_typemap.c 
b/src/core/gnunet-service-core_typemap.c
index 3b4512f23..b73267544 100644
--- a/src/core/gnunet-service-core_typemap.c
+++ b/src/core/gnunet-service-core_typemap.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/core/gnunet-service-core_typemap.h 
b/src/core/gnunet-service-core_typemap.h
index bf164cdea..7b4f8d0f1 100644
--- a/src/core/gnunet-service-core_typemap.h
+++ b/src/core/gnunet-service-core_typemap.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/core/test_core_api.c b/src/core/test_core_api.c
index 67af9fb99..0cf88a324 100644
--- a/src/core/test_core_api.c
+++ b/src/core/test_core_api.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file core/test_core_api.c
diff --git a/src/core/test_core_api_reliability.c 
b/src/core/test_core_api_reliability.c
index c7c71f1f1..a2f7c0cf0 100644
--- a/src/core/test_core_api_reliability.c
+++ b/src/core/test_core_api_reliability.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file core/test_core_api_reliability.c
diff --git a/src/core/test_core_api_send_to_self.c 
b/src/core/test_core_api_send_to_self.c
index a1e61fcb7..703a635e3 100644
--- a/src/core/test_core_api_send_to_self.c
+++ b/src/core/test_core_api_send_to_self.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/core/test_core_api_start_only.c 
b/src/core/test_core_api_start_only.c
index 2f6110b5b..03edffe8e 100644
--- a/src/core/test_core_api_start_only.c
+++ b/src/core/test_core_api_start_only.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file transport/test_core_api_start_only.c
diff --git a/src/core/test_core_quota_compliance.c 
b/src/core/test_core_quota_compliance.c
index caff045f0..c661ff3e5 100644
--- a/src/core/test_core_quota_compliance.c
+++ b/src/core/test_core_quota_compliance.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file core/test_core_quota_compliance.c
diff --git a/src/credential/credential.h b/src/credential/credential.h
index dbb73d3f6..23db51e99 100644
--- a/src/credential/credential.h
+++ b/src/credential/credential.h
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file credential/credential.h
diff --git a/src/credential/credential_api.c b/src/credential/credential_api.c
index 0c4105085..84c32a724 100644
--- a/src/credential/credential_api.c
+++ b/src/credential/credential_api.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file credential/credential_api.c
diff --git a/src/credential/credential_misc.c b/src/credential/credential_misc.c
index ce22e8d17..ae208f31f 100644
--- a/src/credential/credential_misc.c
+++ b/src/credential/credential_misc.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 
diff --git a/src/credential/credential_misc.h b/src/credential/credential_misc.h
index 236e8913d..fbcd70c32 100644
--- a/src/credential/credential_misc.h
+++ b/src/credential/credential_misc.h
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file credential/credential_misc.h
diff --git a/src/credential/credential_serialization.c 
b/src/credential/credential_serialization.c
index fc5ef4304..5ee3cfb07 100644
--- a/src/credential/credential_serialization.c
+++ b/src/credential/credential_serialization.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 
diff --git a/src/credential/credential_serialization.h 
b/src/credential/credential_serialization.h
index 15dc81967..90ec0f56f 100644
--- a/src/credential/credential_serialization.h
+++ b/src/credential/credential_serialization.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 
diff --git a/src/credential/gnunet-credential.c 
b/src/credential/gnunet-credential.c
index 0f4fdbd77..7873e4230 100644
--- a/src/credential/gnunet-credential.c
+++ b/src/credential/gnunet-credential.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file gnunet-credential.c
diff --git a/src/credential/gnunet-service-credential.c 
b/src/credential/gnunet-service-credential.c
index a6468c47e..56c29b8b4 100644
--- a/src/credential/gnunet-service-credential.c
+++ b/src/credential/gnunet-service-credential.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file credential/gnunet-service-credential.c
diff --git a/src/credential/plugin_gnsrecord_credential.c 
b/src/credential/plugin_gnsrecord_credential.c
index 72f174fca..1e1c0ff92 100644
--- a/src/credential/plugin_gnsrecord_credential.c
+++ b/src/credential/plugin_gnsrecord_credential.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/curl/curl.c b/src/curl/curl.c
index f02bf9411..3443525e3 100644
--- a/src/curl/curl.c
+++ b/src/curl/curl.c
@@ -14,6 +14,8 @@
 
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file curl/curl.c
diff --git a/src/curl/curl_reschedule.c b/src/curl/curl_reschedule.c
index cc3c1db95..feb3c463a 100644
--- a/src/curl/curl_reschedule.c
+++ b/src/curl/curl_reschedule.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file curl/curl_reschedule.c
diff --git a/src/datacache/datacache.c b/src/datacache/datacache.c
index 2a83e07a7..7dcd54fcf 100644
--- a/src/datacache/datacache.c
+++ b/src/datacache/datacache.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file datacache/datacache.c
diff --git a/src/datacache/perf_datacache.c b/src/datacache/perf_datacache.c
index 7f699f2af..f33e62bae 100644
--- a/src/datacache/perf_datacache.c
+++ b/src/datacache/perf_datacache.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /*
  * @file datacache/perf_datacache.c
diff --git a/src/datacache/plugin_datacache_heap.c 
b/src/datacache/plugin_datacache_heap.c
index 494d1ae17..ff4893e99 100644
--- a/src/datacache/plugin_datacache_heap.c
+++ b/src/datacache/plugin_datacache_heap.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/datacache/plugin_datacache_postgres.c 
b/src/datacache/plugin_datacache_postgres.c
index ea87acc1f..bf4ef108a 100644
--- a/src/datacache/plugin_datacache_postgres.c
+++ b/src/datacache/plugin_datacache_postgres.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/datacache/plugin_datacache_sqlite.c 
b/src/datacache/plugin_datacache_sqlite.c
index dc4236a8b..07a72957a 100644
--- a/src/datacache/plugin_datacache_sqlite.c
+++ b/src/datacache/plugin_datacache_sqlite.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/datacache/plugin_datacache_template.c 
b/src/datacache/plugin_datacache_template.c
index 25f5957d8..4775968c3 100644
--- a/src/datacache/plugin_datacache_template.c
+++ b/src/datacache/plugin_datacache_template.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/datacache/test_datacache.c b/src/datacache/test_datacache.c
index 50e45012d..e647ae833 100644
--- a/src/datacache/test_datacache.c
+++ b/src/datacache/test_datacache.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /*
  * @file datacache/test_datacache.c
diff --git a/src/datacache/test_datacache_quota.c 
b/src/datacache/test_datacache_quota.c
index 21e373608..117d8be4e 100644
--- a/src/datacache/test_datacache_quota.c
+++ b/src/datacache/test_datacache_quota.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /*
  * @file datacache/test_datacache_quota.c
diff --git a/src/datastore/datastore.h b/src/datastore/datastore.h
index 5ce2fef45..c2a20b9d3 100644
--- a/src/datastore/datastore.h
+++ b/src/datastore/datastore.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/datastore/datastore_api.c b/src/datastore/datastore_api.c
index 00258d7f9..636dbdd1a 100644
--- a/src/datastore/datastore_api.c
+++ b/src/datastore/datastore_api.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/datastore/gnunet-datastore.c b/src/datastore/gnunet-datastore.c
index 1c86cb096..cd089071c 100644
--- a/src/datastore/gnunet-datastore.c
+++ b/src/datastore/gnunet-datastore.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/datastore/gnunet-service-datastore.c 
b/src/datastore/gnunet-service-datastore.c
index 58f839efd..70a946ca5 100644
--- a/src/datastore/gnunet-service-datastore.c
+++ b/src/datastore/gnunet-service-datastore.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/datastore/perf_datastore_api.c 
b/src/datastore/perf_datastore_api.c
index 6a0ff231b..939e60e4d 100644
--- a/src/datastore/perf_datastore_api.c
+++ b/src/datastore/perf_datastore_api.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /*
  * @file datastore/perf_datastore_api.c
diff --git a/src/datastore/perf_plugin_datastore.c 
b/src/datastore/perf_plugin_datastore.c
index 151a3d845..9ba8fa1b0 100644
--- a/src/datastore/perf_plugin_datastore.c
+++ b/src/datastore/perf_plugin_datastore.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /*
  * @file perf_plugin_datastore.c
diff --git a/src/datastore/plugin_datastore_heap.c 
b/src/datastore/plugin_datastore_heap.c
index a45bd84b1..30d271202 100644
--- a/src/datastore/plugin_datastore_heap.c
+++ b/src/datastore/plugin_datastore_heap.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/datastore/plugin_datastore_mysql.c 
b/src/datastore/plugin_datastore_mysql.c
index 3568ebe8f..02900429d 100644
--- a/src/datastore/plugin_datastore_mysql.c
+++ b/src/datastore/plugin_datastore_mysql.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/datastore/plugin_datastore_postgres.c 
b/src/datastore/plugin_datastore_postgres.c
index d5b1f70bd..94db6e116 100644
--- a/src/datastore/plugin_datastore_postgres.c
+++ b/src/datastore/plugin_datastore_postgres.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/datastore/plugin_datastore_sqlite.c 
b/src/datastore/plugin_datastore_sqlite.c
index fc1706400..d548935ea 100644
--- a/src/datastore/plugin_datastore_sqlite.c
+++ b/src/datastore/plugin_datastore_sqlite.c
@@ -14,6 +14,8 @@
   *
   * You should have received a copy of the GNU Affero General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
   */
 
 /**
diff --git a/src/datastore/plugin_datastore_template.c 
b/src/datastore/plugin_datastore_template.c
index 40f248e5d..d2e42a170 100644
--- a/src/datastore/plugin_datastore_template.c
+++ b/src/datastore/plugin_datastore_template.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/datastore/test_datastore_api.c 
b/src/datastore/test_datastore_api.c
index ad13ecd02..fa96ea9b7 100644
--- a/src/datastore/test_datastore_api.c
+++ b/src/datastore/test_datastore_api.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /*
  * @file datastore/test_datastore_api.c
diff --git a/src/datastore/test_datastore_api_management.c 
b/src/datastore/test_datastore_api_management.c
index e44fbfa05..d592ccc80 100644
--- a/src/datastore/test_datastore_api_management.c
+++ b/src/datastore/test_datastore_api_management.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /*
  * @file datastore/test_datastore_api_management.c
diff --git a/src/datastore/test_plugin_datastore.c 
b/src/datastore/test_plugin_datastore.c
index 150b4ecc5..4b054314c 100644
--- a/src/datastore/test_plugin_datastore.c
+++ b/src/datastore/test_plugin_datastore.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /*
  * @file test_plugin_datastore.c
diff --git a/src/dht/dht.h b/src/dht/dht.h
index 35d9e7cdb..46fad3669 100644
--- a/src/dht/dht.h
+++ b/src/dht/dht.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/dht/dht_api.c b/src/dht/dht_api.c
index ec5da3b0a..69ac041cc 100644
--- a/src/dht/dht_api.c
+++ b/src/dht/dht_api.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/dht/dht_test_lib.c b/src/dht/dht_test_lib.c
index f9bd2c9e3..b4afa3516 100644
--- a/src/dht/dht_test_lib.c
+++ b/src/dht/dht_test_lib.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file dht/dht_test_lib.c
diff --git a/src/dht/dht_test_lib.h b/src/dht/dht_test_lib.h
index 2bdcf0158..c60cc7d1e 100644
--- a/src/dht/dht_test_lib.h
+++ b/src/dht/dht_test_lib.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file dht/dht_test_lib.h
diff --git a/src/dht/gnunet-dht-get.c b/src/dht/gnunet-dht-get.c
index 2d9d76585..b42326fc5 100644
--- a/src/dht/gnunet-dht-get.c
+++ b/src/dht/gnunet-dht-get.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file dht/gnunet-dht-get.c
diff --git a/src/dht/gnunet-dht-monitor.c b/src/dht/gnunet-dht-monitor.c
index b08521c7b..52a57473b 100644
--- a/src/dht/gnunet-dht-monitor.c
+++ b/src/dht/gnunet-dht-monitor.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file dht/gnunet-dht-monitor.c
diff --git a/src/dht/gnunet-dht-put.c b/src/dht/gnunet-dht-put.c
index fd784871d..4c26f98a5 100644
--- a/src/dht/gnunet-dht-put.c
+++ b/src/dht/gnunet-dht-put.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file dht/gnunet-dht-put.c
diff --git a/src/dht/gnunet-service-dht.c b/src/dht/gnunet-service-dht.c
index f9d705873..705ffb86c 100644
--- a/src/dht/gnunet-service-dht.c
+++ b/src/dht/gnunet-service-dht.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/dht/gnunet-service-dht.h b/src/dht/gnunet-service-dht.h
index fa5aa7a55..8b41c648c 100644
--- a/src/dht/gnunet-service-dht.h
+++ b/src/dht/gnunet-service-dht.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/dht/gnunet-service-dht_clients.c 
b/src/dht/gnunet-service-dht_clients.c
index 332bc1eda..7e2440841 100644
--- a/src/dht/gnunet-service-dht_clients.c
+++ b/src/dht/gnunet-service-dht_clients.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/dht/gnunet-service-dht_datacache.c 
b/src/dht/gnunet-service-dht_datacache.c
index 7ad9aa728..da71e3fb7 100644
--- a/src/dht/gnunet-service-dht_datacache.c
+++ b/src/dht/gnunet-service-dht_datacache.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file dht/gnunet-service-dht_datacache.c
diff --git a/src/dht/gnunet-service-dht_datacache.h 
b/src/dht/gnunet-service-dht_datacache.h
index 6f65982a5..bbbeb386e 100644
--- a/src/dht/gnunet-service-dht_datacache.h
+++ b/src/dht/gnunet-service-dht_datacache.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/dht/gnunet-service-dht_hello.c 
b/src/dht/gnunet-service-dht_hello.c
index 142d44bcc..fd1003bd2 100644
--- a/src/dht/gnunet-service-dht_hello.c
+++ b/src/dht/gnunet-service-dht_hello.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/dht/gnunet-service-dht_hello.h 
b/src/dht/gnunet-service-dht_hello.h
index 41351da34..0927c89ee 100644
--- a/src/dht/gnunet-service-dht_hello.h
+++ b/src/dht/gnunet-service-dht_hello.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/dht/gnunet-service-dht_neighbours.c 
b/src/dht/gnunet-service-dht_neighbours.c
index 56639448f..3c5b52539 100644
--- a/src/dht/gnunet-service-dht_neighbours.c
+++ b/src/dht/gnunet-service-dht_neighbours.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/dht/gnunet-service-dht_neighbours.h 
b/src/dht/gnunet-service-dht_neighbours.h
index fb740c766..dae854fb8 100644
--- a/src/dht/gnunet-service-dht_neighbours.h
+++ b/src/dht/gnunet-service-dht_neighbours.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/dht/gnunet-service-dht_nse.c b/src/dht/gnunet-service-dht_nse.c
index 446ae2dbd..d59d46dd3 100644
--- a/src/dht/gnunet-service-dht_nse.c
+++ b/src/dht/gnunet-service-dht_nse.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/dht/gnunet-service-dht_nse.h b/src/dht/gnunet-service-dht_nse.h
index a5e259cba..4402bb860 100644
--- a/src/dht/gnunet-service-dht_nse.h
+++ b/src/dht/gnunet-service-dht_nse.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/dht/gnunet-service-dht_routing.c 
b/src/dht/gnunet-service-dht_routing.c
index 0098ce096..ab4e859b5 100644
--- a/src/dht/gnunet-service-dht_routing.c
+++ b/src/dht/gnunet-service-dht_routing.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/dht/gnunet-service-dht_routing.h 
b/src/dht/gnunet-service-dht_routing.h
index d9c0345b6..e7f707296 100644
--- a/src/dht/gnunet-service-dht_routing.h
+++ b/src/dht/gnunet-service-dht_routing.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/dht/gnunet_dht_profiler.c b/src/dht/gnunet_dht_profiler.c
index a729d1b01..a8f5a3aca 100644
--- a/src/dht/gnunet_dht_profiler.c
+++ b/src/dht/gnunet_dht_profiler.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/dht/plugin_block_dht.c b/src/dht/plugin_block_dht.c
index d4b19677e..44f4b9226 100644
--- a/src/dht/plugin_block_dht.c
+++ b/src/dht/plugin_block_dht.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/dht/test_dht_api.c b/src/dht/test_dht_api.c
index 9097a0011..38adbc219 100644
--- a/src/dht/test_dht_api.c
+++ b/src/dht/test_dht_api.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file dht/test_dht_api.c
diff --git a/src/dht/test_dht_monitor.c b/src/dht/test_dht_monitor.c
index 33467e89c..9d0462c87 100644
--- a/src/dht/test_dht_monitor.c
+++ b/src/dht/test_dht_monitor.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file dht/test_dht_monitor.c
diff --git a/src/dht/test_dht_topo.c b/src/dht/test_dht_topo.c
index e09a3be67..2ff0e7a59 100644
--- a/src/dht/test_dht_topo.c
+++ b/src/dht/test_dht_topo.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file dht/test_dht_topo.c
diff --git a/src/dns/dns.h b/src/dns/dns.h
index 334818565..af86bbaed 100644
--- a/src/dns/dns.h
+++ b/src/dns/dns.h
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/dns/dns_api.c b/src/dns/dns_api.c
index d7c9a7509..e34f02ef0 100644
--- a/src/dns/dns_api.c
+++ b/src/dns/dns_api.c
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/dns/gnunet-dns-monitor.c b/src/dns/gnunet-dns-monitor.c
index c5425de29..e822b3211 100644
--- a/src/dns/gnunet-dns-monitor.c
+++ b/src/dns/gnunet-dns-monitor.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/dns/gnunet-dns-redirector.c b/src/dns/gnunet-dns-redirector.c
index 3a652f880..608540e12 100644
--- a/src/dns/gnunet-dns-redirector.c
+++ b/src/dns/gnunet-dns-redirector.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/dns/gnunet-helper-dns.c b/src/dns/gnunet-helper-dns.c
index 3ed18bb7c..f236924bb 100644
--- a/src/dns/gnunet-helper-dns.c
+++ b/src/dns/gnunet-helper-dns.c
@@ -14,6 +14,8 @@
   
    You should have received a copy of the GNU Affero General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/dns/gnunet-service-dns.c b/src/dns/gnunet-service-dns.c
index 6b75fd0f4..a63205ebf 100644
--- a/src/dns/gnunet-service-dns.c
+++ b/src/dns/gnunet-service-dns.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/dns/gnunet-zonewalk.c b/src/dns/gnunet-zonewalk.c
index b96d40ca7..19fc5b78d 100644
--- a/src/dns/gnunet-zonewalk.c
+++ b/src/dns/gnunet-zonewalk.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/dns/plugin_block_dns.c b/src/dns/plugin_block_dns.c
index 28df35641..ed75ce2f3 100644
--- a/src/dns/plugin_block_dns.c
+++ b/src/dns/plugin_block_dns.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/dv/dv.h b/src/dv/dv.h
index f54a77a7e..b85d9c33f 100644
--- a/src/dv/dv.h
+++ b/src/dv/dv.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/dv/dv_api.c b/src/dv/dv_api.c
index 17ee2f783..dd46ce9f5 100644
--- a/src/dv/dv_api.c
+++ b/src/dv/dv_api.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/dv/gnunet-dv.c b/src/dv/gnunet-dv.c
index 6f5323c65..90d8144e5 100644
--- a/src/dv/gnunet-dv.c
+++ b/src/dv/gnunet-dv.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file dv/gnunet-dv.c
diff --git a/src/dv/gnunet-service-dv.c b/src/dv/gnunet-service-dv.c
index f183c77fd..dd2ff9c12 100644
--- a/src/dv/gnunet-service-dv.c
+++ b/src/dv/gnunet-service-dv.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/dv/plugin_transport_dv.c b/src/dv/plugin_transport_dv.c
index ca4908e95..a99c170d7 100644
--- a/src/dv/plugin_transport_dv.c
+++ b/src/dv/plugin_transport_dv.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/dv/test_transport_blacklist.c 
b/src/dv/test_transport_blacklist.c
index 88f68d55b..4fc9b4908 100644
--- a/src/dv/test_transport_blacklist.c
+++ b/src/dv/test_transport_blacklist.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file dv/test_transport_blacklist.c
diff --git a/src/dv/test_transport_dv.c b/src/dv/test_transport_dv.c
index 41ff5f302..03b6087d5 100644
--- a/src/dv/test_transport_dv.c
+++ b/src/dv/test_transport_dv.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file dv/test_transport_dv.c
diff --git a/src/exit/exit.h b/src/exit/exit.h
index f5b5741a9..6214c230a 100644
--- a/src/exit/exit.h
+++ b/src/exit/exit.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/exit/gnunet-daemon-exit.c b/src/exit/gnunet-daemon-exit.c
index 349f382bb..3dedae830 100644
--- a/src/exit/gnunet-daemon-exit.c
+++ b/src/exit/gnunet-daemon-exit.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/exit/gnunet-helper-exit-windows.c 
b/src/exit/gnunet-helper-exit-windows.c
index b8ea198af..6633fbc31 100644
--- a/src/exit/gnunet-helper-exit-windows.c
+++ b/src/exit/gnunet-helper-exit-windows.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file exit/gnunet-helper-exit-windows.c
diff --git a/src/exit/gnunet-helper-exit.c b/src/exit/gnunet-helper-exit.c
index 8c8a4f3df..de9ea39be 100644
--- a/src/exit/gnunet-helper-exit.c
+++ b/src/exit/gnunet-helper-exit.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/fragmentation/defragmentation.c 
b/src/fragmentation/defragmentation.c
index c1dbc3ad7..bbe6f3741 100644
--- a/src/fragmentation/defragmentation.c
+++ b/src/fragmentation/defragmentation.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file src/fragmentation/defragmentation.c
diff --git a/src/fragmentation/fragmentation.c 
b/src/fragmentation/fragmentation.c
index d8eb6e3ea..9fca6eef0 100644
--- a/src/fragmentation/fragmentation.c
+++ b/src/fragmentation/fragmentation.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file src/fragmentation/fragmentation.c
diff --git a/src/fragmentation/fragmentation.h 
b/src/fragmentation/fragmentation.h
index 6ca521d95..9816e2116 100644
--- a/src/fragmentation/fragmentation.h
+++ b/src/fragmentation/fragmentation.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file src/fragmentation/fragmentation.h
diff --git a/src/fragmentation/test_fragmentation.c 
b/src/fragmentation/test_fragmentation.c
index ec81ce9ec..0bf3b2ab1 100644
--- a/src/fragmentation/test_fragmentation.c
+++ b/src/fragmentation/test_fragmentation.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file fragmentation/test_fragmentation.c
diff --git a/src/fragmentation/test_fragmentation_parallel.c 
b/src/fragmentation/test_fragmentation_parallel.c
index 2aef0f97c..5cde75c0b 100644
--- a/src/fragmentation/test_fragmentation_parallel.c
+++ b/src/fragmentation/test_fragmentation_parallel.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file fragmentation/test_fragmentation.c
diff --git a/src/fs/fs.h b/src/fs/fs.h
index f176a270e..25bc95e62 100644
--- a/src/fs/fs.h
+++ b/src/fs/fs.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/fs/fs_api.c b/src/fs/fs_api.c
index 9b783ba93..aec5ff340 100644
--- a/src/fs/fs_api.c
+++ b/src/fs/fs_api.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/fs/fs_api.h b/src/fs/fs_api.h
index 35a3c6837..ad054ef06 100644
--- a/src/fs/fs_api.h
+++ b/src/fs/fs_api.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/fs/fs_directory.c b/src/fs/fs_directory.c
index 2693ecf22..2dadc4835 100644
--- a/src/fs/fs_directory.c
+++ b/src/fs/fs_directory.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/fs/fs_dirmetascan.c b/src/fs/fs_dirmetascan.c
index d002bad44..4a86a717f 100644
--- a/src/fs/fs_dirmetascan.c
+++ b/src/fs/fs_dirmetascan.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/fs/fs_download.c b/src/fs/fs_download.c
index b32e9ddde..c138ee365 100644
--- a/src/fs/fs_download.c
+++ b/src/fs/fs_download.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file fs/fs_download.c
diff --git a/src/fs/fs_file_information.c b/src/fs/fs_file_information.c
index 5d139812a..49cfc1a68 100644
--- a/src/fs/fs_file_information.c
+++ b/src/fs/fs_file_information.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/fs/fs_getopt.c b/src/fs/fs_getopt.c
index cbd9339c9..0d5907a40 100644
--- a/src/fs/fs_getopt.c
+++ b/src/fs/fs_getopt.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/fs/fs_list_indexed.c b/src/fs/fs_list_indexed.c
index 353f779cf..08a7be48e 100644
--- a/src/fs/fs_list_indexed.c
+++ b/src/fs/fs_list_indexed.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/fs/fs_misc.c b/src/fs/fs_misc.c
index 0d23f2e6f..918c637a0 100644
--- a/src/fs/fs_misc.c
+++ b/src/fs/fs_misc.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file fs/fs_misc.c
diff --git a/src/fs/fs_namespace.c b/src/fs/fs_namespace.c
index 130d5deba..675253b90 100644
--- a/src/fs/fs_namespace.c
+++ b/src/fs/fs_namespace.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/fs/fs_publish.c b/src/fs/fs_publish.c
index 2bb7c5750..c7f3c4152 100644
--- a/src/fs/fs_publish.c
+++ b/src/fs/fs_publish.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file fs/fs_publish.c
diff --git a/src/fs/fs_publish_ksk.c b/src/fs/fs_publish_ksk.c
index b80ce3cf2..e7f6408fd 100644
--- a/src/fs/fs_publish_ksk.c
+++ b/src/fs/fs_publish_ksk.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/fs/fs_publish_ublock.c b/src/fs/fs_publish_ublock.c
index abbc5cc25..368a4aff4 100644
--- a/src/fs/fs_publish_ublock.c
+++ b/src/fs/fs_publish_ublock.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/fs/fs_publish_ublock.h b/src/fs/fs_publish_ublock.h
index f38441dcc..ad07e5f6f 100644
--- a/src/fs/fs_publish_ublock.h
+++ b/src/fs/fs_publish_ublock.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/fs/fs_search.c b/src/fs/fs_search.c
index 6324fba63..0571a2b3f 100644
--- a/src/fs/fs_search.c
+++ b/src/fs/fs_search.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file fs/fs_search.c
diff --git a/src/fs/fs_sharetree.c b/src/fs/fs_sharetree.c
index ac6f1ca4a..282d7796a 100644
--- a/src/fs/fs_sharetree.c
+++ b/src/fs/fs_sharetree.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/fs/fs_test_lib.c b/src/fs/fs_test_lib.c
index f8ed3a22f..abbda1ece 100644
--- a/src/fs/fs_test_lib.c
+++ b/src/fs/fs_test_lib.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/fs/fs_test_lib.h b/src/fs/fs_test_lib.h
index 705fde74c..4bf0c7caa 100644
--- a/src/fs/fs_test_lib.h
+++ b/src/fs/fs_test_lib.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/fs/fs_tree.c b/src/fs/fs_tree.c
index 1f391da71..203de3c7e 100644
--- a/src/fs/fs_tree.c
+++ b/src/fs/fs_tree.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file fs/fs_tree.c
diff --git a/src/fs/fs_tree.h b/src/fs/fs_tree.h
index f11f66c58..13a8603c5 100644
--- a/src/fs/fs_tree.h
+++ b/src/fs/fs_tree.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/fs/fs_unindex.c b/src/fs/fs_unindex.c
index 776c868e6..b013902c9 100644
--- a/src/fs/fs_unindex.c
+++ b/src/fs/fs_unindex.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/fs/fs_uri.c b/src/fs/fs_uri.c
index 89699be41..7d5a9a70a 100644
--- a/src/fs/fs_uri.c
+++ b/src/fs/fs_uri.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/fs/gnunet-auto-share.c b/src/fs/gnunet-auto-share.c
index a540cde0e..bb14ac7e8 100644
--- a/src/fs/gnunet-auto-share.c
+++ b/src/fs/gnunet-auto-share.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file fs/gnunet-auto-share.c
diff --git a/src/fs/gnunet-daemon-fsprofiler.c 
b/src/fs/gnunet-daemon-fsprofiler.c
index 7015a26b1..0202dde9c 100644
--- a/src/fs/gnunet-daemon-fsprofiler.c
+++ b/src/fs/gnunet-daemon-fsprofiler.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/fs/gnunet-directory.c b/src/fs/gnunet-directory.c
index a7e35be5e..097dd4406 100644
--- a/src/fs/gnunet-directory.c
+++ b/src/fs/gnunet-directory.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file fs/gnunet-directory.c
diff --git a/src/fs/gnunet-download-manager.scm 
b/src/fs/gnunet-download-manager.scm
index a7cacffd9..0b4301cc8 100755
--- a/src/fs/gnunet-download-manager.scm
+++ b/src/fs/gnunet-download-manager.scm
@@ -18,6 +18,8 @@ exec guile -e main -s "$0" "$@"
 ;;;    You should have received a copy of the GNU General Public License
 ;;;    along with this program; if not, write to the Free Software
 ;;;    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  
02110-1301 USA.
+;;;
+;;;    SPDX-License-Identifier: GPL-2.0-or-later
 
 ;;; Remember ongoing GNUnet downloads so as to be able to resume them
 ;;; later.  Typical usage is to define the following alias in your
diff --git a/src/fs/gnunet-download.c b/src/fs/gnunet-download.c
index 1b5b3dcb0..31e62c603 100644
--- a/src/fs/gnunet-download.c
+++ b/src/fs/gnunet-download.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file fs/gnunet-download.c
diff --git a/src/fs/gnunet-fs-profiler.c b/src/fs/gnunet-fs-profiler.c
index a703292e5..8a71c5a59 100644
--- a/src/fs/gnunet-fs-profiler.c
+++ b/src/fs/gnunet-fs-profiler.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/fs/gnunet-fs.c b/src/fs/gnunet-fs.c
index 4dc60a915..26970c06a 100644
--- a/src/fs/gnunet-fs.c
+++ b/src/fs/gnunet-fs.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file fs/gnunet-fs.c
diff --git a/src/fs/gnunet-helper-fs-publish.c 
b/src/fs/gnunet-helper-fs-publish.c
index cf384aa05..fefb33e14 100644
--- a/src/fs/gnunet-helper-fs-publish.c
+++ b/src/fs/gnunet-helper-fs-publish.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/fs/gnunet-publish.c b/src/fs/gnunet-publish.c
index ffcf9b5d0..a825795cb 100644
--- a/src/fs/gnunet-publish.c
+++ b/src/fs/gnunet-publish.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file fs/gnunet-publish.c
diff --git a/src/fs/gnunet-search.c b/src/fs/gnunet-search.c
index 2a0a153e7..57d8eed5d 100644
--- a/src/fs/gnunet-search.c
+++ b/src/fs/gnunet-search.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file fs/gnunet-search.c
diff --git a/src/fs/gnunet-service-fs.c b/src/fs/gnunet-service-fs.c
index 04d483847..b9ccf7c55 100644
--- a/src/fs/gnunet-service-fs.c
+++ b/src/fs/gnunet-service-fs.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/fs/gnunet-service-fs.h b/src/fs/gnunet-service-fs.h
index 63cafd4d1..661126f08 100644
--- a/src/fs/gnunet-service-fs.h
+++ b/src/fs/gnunet-service-fs.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/fs/gnunet-service-fs_cadet.h b/src/fs/gnunet-service-fs_cadet.h
index d6ce3de63..728faaf27 100644
--- a/src/fs/gnunet-service-fs_cadet.h
+++ b/src/fs/gnunet-service-fs_cadet.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/fs/gnunet-service-fs_cadet_client.c 
b/src/fs/gnunet-service-fs_cadet_client.c
index 3cdac3563..61f73a50a 100644
--- a/src/fs/gnunet-service-fs_cadet_client.c
+++ b/src/fs/gnunet-service-fs_cadet_client.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/fs/gnunet-service-fs_cadet_server.c 
b/src/fs/gnunet-service-fs_cadet_server.c
index 15faaeef0..bb320806a 100644
--- a/src/fs/gnunet-service-fs_cadet_server.c
+++ b/src/fs/gnunet-service-fs_cadet_server.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/fs/gnunet-service-fs_cp.c b/src/fs/gnunet-service-fs_cp.c
index efed8680e..6486732a6 100644
--- a/src/fs/gnunet-service-fs_cp.c
+++ b/src/fs/gnunet-service-fs_cp.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file fs/gnunet-service-fs_cp.c
diff --git a/src/fs/gnunet-service-fs_cp.h b/src/fs/gnunet-service-fs_cp.h
index dc7e03f4a..486b696ba 100644
--- a/src/fs/gnunet-service-fs_cp.h
+++ b/src/fs/gnunet-service-fs_cp.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/fs/gnunet-service-fs_indexing.c 
b/src/fs/gnunet-service-fs_indexing.c
index 5389cb16a..0e8e62fc7 100644
--- a/src/fs/gnunet-service-fs_indexing.c
+++ b/src/fs/gnunet-service-fs_indexing.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/fs/gnunet-service-fs_indexing.h 
b/src/fs/gnunet-service-fs_indexing.h
index b91d020d6..d6166f0a9 100644
--- a/src/fs/gnunet-service-fs_indexing.h
+++ b/src/fs/gnunet-service-fs_indexing.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/fs/gnunet-service-fs_pe.c b/src/fs/gnunet-service-fs_pe.c
index bb428de9f..5e85bfdb7 100644
--- a/src/fs/gnunet-service-fs_pe.c
+++ b/src/fs/gnunet-service-fs_pe.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/fs/gnunet-service-fs_pe.h b/src/fs/gnunet-service-fs_pe.h
index 62a948bf7..10f7daea5 100644
--- a/src/fs/gnunet-service-fs_pe.h
+++ b/src/fs/gnunet-service-fs_pe.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/fs/gnunet-service-fs_pr.c b/src/fs/gnunet-service-fs_pr.c
index f1a115cb6..abbaf94ef 100644
--- a/src/fs/gnunet-service-fs_pr.c
+++ b/src/fs/gnunet-service-fs_pr.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/fs/gnunet-service-fs_pr.h b/src/fs/gnunet-service-fs_pr.h
index 83752f1b3..abdb0c9f6 100644
--- a/src/fs/gnunet-service-fs_pr.h
+++ b/src/fs/gnunet-service-fs_pr.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/fs/gnunet-service-fs_push.c b/src/fs/gnunet-service-fs_push.c
index 169dcbc98..a75f17f82 100644
--- a/src/fs/gnunet-service-fs_push.c
+++ b/src/fs/gnunet-service-fs_push.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/fs/gnunet-service-fs_push.h b/src/fs/gnunet-service-fs_push.h
index 0b40d23a4..ab2d2204a 100644
--- a/src/fs/gnunet-service-fs_push.h
+++ b/src/fs/gnunet-service-fs_push.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/fs/gnunet-service-fs_put.c b/src/fs/gnunet-service-fs_put.c
index ab1024c8a..78a4b98df 100644
--- a/src/fs/gnunet-service-fs_put.c
+++ b/src/fs/gnunet-service-fs_put.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/fs/gnunet-service-fs_put.h b/src/fs/gnunet-service-fs_put.h
index 2b3b797ed..de9751842 100644
--- a/src/fs/gnunet-service-fs_put.h
+++ b/src/fs/gnunet-service-fs_put.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/fs/gnunet-unindex.c b/src/fs/gnunet-unindex.c
index c5c5f1103..f9a3f8f3a 100644
--- a/src/fs/gnunet-unindex.c
+++ b/src/fs/gnunet-unindex.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file fs/gnunet-unindex.c
diff --git a/src/fs/perf_gnunet_service_fs_p2p.c 
b/src/fs/perf_gnunet_service_fs_p2p.c
index 5736c921b..61f859235 100644
--- a/src/fs/perf_gnunet_service_fs_p2p.c
+++ b/src/fs/perf_gnunet_service_fs_p2p.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/fs/perf_gnunet_service_fs_p2p_respect.c 
b/src/fs/perf_gnunet_service_fs_p2p_respect.c
index e1e55516e..afde310a0 100644
--- a/src/fs/perf_gnunet_service_fs_p2p_respect.c
+++ b/src/fs/perf_gnunet_service_fs_p2p_respect.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/fs/plugin_block_fs.c b/src/fs/plugin_block_fs.c
index 92d30c48d..f0df52c99 100644
--- a/src/fs/plugin_block_fs.c
+++ b/src/fs/plugin_block_fs.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/fs/test_fs.c b/src/fs/test_fs.c
index 47ad34f19..95368f108 100644
--- a/src/fs/test_fs.c
+++ b/src/fs/test_fs.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/fs/test_fs_directory.c b/src/fs/test_fs_directory.c
index ea1cf4490..a2d131ca1 100644
--- a/src/fs/test_fs_directory.c
+++ b/src/fs/test_fs_directory.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file fs/test_fs_directory.c
diff --git a/src/fs/test_fs_download.c b/src/fs/test_fs_download.c
index 226e5a0fd..135e2d378 100644
--- a/src/fs/test_fs_download.c
+++ b/src/fs/test_fs_download.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/fs/test_fs_download_persistence.c 
b/src/fs/test_fs_download_persistence.c
index 94405a813..183a407e0 100644
--- a/src/fs/test_fs_download_persistence.c
+++ b/src/fs/test_fs_download_persistence.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/fs/test_fs_file_information.c 
b/src/fs/test_fs_file_information.c
index 4de6b5f73..06682043a 100644
--- a/src/fs/test_fs_file_information.c
+++ b/src/fs/test_fs_file_information.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/fs/test_fs_getopt.c b/src/fs/test_fs_getopt.c
index 32f324aa7..03de383a4 100644
--- a/src/fs/test_fs_getopt.c
+++ b/src/fs/test_fs_getopt.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file fs/test_fs_getopt.c
diff --git a/src/fs/test_fs_list_indexed.c b/src/fs/test_fs_list_indexed.c
index 952480155..632cba43e 100644
--- a/src/fs/test_fs_list_indexed.c
+++ b/src/fs/test_fs_list_indexed.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/fs/test_fs_namespace.c b/src/fs/test_fs_namespace.c
index 5bdabe585..56a36825c 100644
--- a/src/fs/test_fs_namespace.c
+++ b/src/fs/test_fs_namespace.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/fs/test_fs_namespace_list_updateable.c 
b/src/fs/test_fs_namespace_list_updateable.c
index 6945476af..99c0967b8 100644
--- a/src/fs/test_fs_namespace_list_updateable.c
+++ b/src/fs/test_fs_namespace_list_updateable.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/fs/test_fs_publish.c b/src/fs/test_fs_publish.c
index 0a367f31e..bc38d316a 100644
--- a/src/fs/test_fs_publish.c
+++ b/src/fs/test_fs_publish.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file fs/test_fs_publish.c
diff --git a/src/fs/test_fs_publish_persistence.c 
b/src/fs/test_fs_publish_persistence.c
index 833d4f091..4d27b1509 100644
--- a/src/fs/test_fs_publish_persistence.c
+++ b/src/fs/test_fs_publish_persistence.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file fs/test_fs_publish_persistence.c
diff --git a/src/fs/test_fs_search.c b/src/fs/test_fs_search.c
index fa5f3988b..2377cb1a2 100644
--- a/src/fs/test_fs_search.c
+++ b/src/fs/test_fs_search.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file fs/test_fs_search.c
diff --git a/src/fs/test_fs_search_persistence.c 
b/src/fs/test_fs_search_persistence.c
index f26b27f77..a0483e723 100644
--- a/src/fs/test_fs_search_persistence.c
+++ b/src/fs/test_fs_search_persistence.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file fs/test_fs_search_persistence.c
diff --git a/src/fs/test_fs_search_probes.c b/src/fs/test_fs_search_probes.c
index 504fe2032..ca504c08e 100644
--- a/src/fs/test_fs_search_probes.c
+++ b/src/fs/test_fs_search_probes.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/fs/test_fs_search_with_and.c b/src/fs/test_fs_search_with_and.c
index 0427425af..daaf38a19 100644
--- a/src/fs/test_fs_search_with_and.c
+++ b/src/fs/test_fs_search_with_and.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file fs/test_fs_search_with_and.c
diff --git a/src/fs/test_fs_start_stop.c b/src/fs/test_fs_start_stop.c
index bbe60ee0b..e20e00996 100644
--- a/src/fs/test_fs_start_stop.c
+++ b/src/fs/test_fs_start_stop.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file fs/test_fs_start_stop.c
diff --git a/src/fs/test_fs_test_lib.c b/src/fs/test_fs_test_lib.c
index f63bf14a7..52b0bf2c0 100644
--- a/src/fs/test_fs_test_lib.c
+++ b/src/fs/test_fs_test_lib.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/fs/test_fs_unindex.c b/src/fs/test_fs_unindex.c
index f0f43edb4..9e358dade 100644
--- a/src/fs/test_fs_unindex.c
+++ b/src/fs/test_fs_unindex.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/fs/test_fs_unindex_persistence.c 
b/src/fs/test_fs_unindex_persistence.c
index 0a4d2e3c4..4d6d63c6a 100644
--- a/src/fs/test_fs_unindex_persistence.c
+++ b/src/fs/test_fs_unindex_persistence.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/fs/test_fs_uri.c b/src/fs/test_fs_uri.c
index 4f6ff0096..d4ee8c302 100644
--- a/src/fs/test_fs_uri.c
+++ b/src/fs/test_fs_uri.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file fs/test_fs_uri.c
diff --git a/src/fs/test_gnunet_fs_idx.py.in b/src/fs/test_gnunet_fs_idx.py.in
index e12462138..4798cf503 100755
--- a/src/fs/test_gnunet_fs_idx.py.in
+++ b/src/fs/test_gnunet_fs_idx.py.in
@@ -15,6 +15,8 @@
 #    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+#    SPDX-License-Identifier: AGPL3.0-or-later
+#
 # Testcase for file-sharing command-line tools (indexing and unindexing)
 import sys
 import os
diff --git a/src/fs/test_gnunet_fs_psd.py.in b/src/fs/test_gnunet_fs_psd.py.in
index 906282200..416ab5db3 100755
--- a/src/fs/test_gnunet_fs_psd.py.in
+++ b/src/fs/test_gnunet_fs_psd.py.in
@@ -15,6 +15,8 @@
 #    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+#    SPDX-License-Identifier: AGPL3.0-or-later
+#
 # Testcase for file-sharing command-line tools (publish, search, download)
 import sys
 import os
diff --git a/src/fs/test_gnunet_fs_rec.py.in b/src/fs/test_gnunet_fs_rec.py.in
index 99850232b..eba64715c 100755
--- a/src/fs/test_gnunet_fs_rec.py.in
+++ b/src/fs/test_gnunet_fs_rec.py.in
@@ -14,6 +14,8 @@
 #   
 #    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 #
 # Testcase for file-sharing command-line tools (recursive publishing & 
download)
 import sys
diff --git a/src/fs/test_gnunet_service_fs_migration.c 
b/src/fs/test_gnunet_service_fs_migration.c
index 61cd69e95..4a3bf67c7 100644
--- a/src/fs/test_gnunet_service_fs_migration.c
+++ b/src/fs/test_gnunet_service_fs_migration.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/fs/test_gnunet_service_fs_p2p.c 
b/src/fs/test_gnunet_service_fs_p2p.c
index 376b4a45e..e33df8502 100644
--- a/src/fs/test_gnunet_service_fs_p2p.c
+++ b/src/fs/test_gnunet_service_fs_p2p.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/fs/test_plugin_block_fs.c b/src/fs/test_plugin_block_fs.c
index 3eb7cb67e..30981abc5 100644
--- a/src/fs/test_plugin_block_fs.c
+++ b/src/fs/test_plugin_block_fs.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file fs/test_plugin_block_fs.c
diff --git a/src/gns/gns.h b/src/gns/gns.h
index 8a615f43e..2b35fa814 100644
--- a/src/gns/gns.h
+++ b/src/gns/gns.h
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file gns/gns.h
diff --git a/src/gns/gns_api.c b/src/gns/gns_api.c
index 3b658da92..ba83b73cd 100644
--- a/src/gns/gns_api.c
+++ b/src/gns/gns_api.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file gns/gns_api.c
diff --git a/src/gns/gns_api.h b/src/gns/gns_api.h
index 622e4339c..40fdbfacd 100644
--- a/src/gns/gns_api.h
+++ b/src/gns/gns_api.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file gns/gns_api.h
diff --git a/src/gns/gns_tld_api.c b/src/gns/gns_tld_api.c
index d9856ea90..0dabac60e 100644
--- a/src/gns/gns_tld_api.c
+++ b/src/gns/gns_tld_api.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file gns/gns_tld_api.c
diff --git a/src/gns/gnunet-bcd.c b/src/gns/gnunet-bcd.c
index 9737e1a49..db7e68c49 100644
--- a/src/gns/gnunet-bcd.c
+++ b/src/gns/gnunet-bcd.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/gns/gnunet-dns2gns.c b/src/gns/gnunet-dns2gns.c
index 8d39e8c53..68d090579 100644
--- a/src/gns/gnunet-dns2gns.c
+++ b/src/gns/gnunet-dns2gns.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file gnunet-dns2gns.c
diff --git a/src/gns/gnunet-gns-benchmark.c b/src/gns/gnunet-gns-benchmark.c
index 6ed4dfe6c..77066fd3f 100644
--- a/src/gns/gnunet-gns-benchmark.c
+++ b/src/gns/gnunet-gns-benchmark.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file src/gns/gnunet-gns-benchmark.c
diff --git a/src/gns/gnunet-gns-helper-service-w32.c 
b/src/gns/gnunet-gns-helper-service-w32.c
index 0e3b3f0e6..4eb965e24 100644
--- a/src/gns/gnunet-gns-helper-service-w32.c
+++ b/src/gns/gnunet-gns-helper-service-w32.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file gnunet-gns-helper-service-w32.c
diff --git a/src/gns/gnunet-gns-import.c b/src/gns/gnunet-gns-import.c
index 2b2c0ddee..5e3560313 100644
--- a/src/gns/gnunet-gns-import.c
+++ b/src/gns/gnunet-gns-import.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file gnunet-gns.c
diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c
index d9ce3a4b1..7e0dec722 100644
--- a/src/gns/gnunet-gns-proxy.c
+++ b/src/gns/gnunet-gns-proxy.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @author Martin Schanzenbach
diff --git a/src/gns/gnunet-gns.c b/src/gns/gnunet-gns.c
index 463348ed3..83dd7b27b 100644
--- a/src/gns/gnunet-gns.c
+++ b/src/gns/gnunet-gns.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file gnunet-gns.c
diff --git a/src/gns/gnunet-service-gns.c b/src/gns/gnunet-service-gns.c
index bd9d17895..65c232f93 100644
--- a/src/gns/gnunet-service-gns.c
+++ b/src/gns/gnunet-service-gns.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file gns/gnunet-service-gns.c
diff --git a/src/gns/gnunet-service-gns.h b/src/gns/gnunet-service-gns.h
index 952c7178f..d9309e985 100644
--- a/src/gns/gnunet-service-gns.h
+++ b/src/gns/gnunet-service-gns.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file gns/gnunet-service-gns.h
diff --git a/src/gns/gnunet-service-gns_interceptor.c 
b/src/gns/gnunet-service-gns_interceptor.c
index 42f3e1514..d5a84f6a0 100644
--- a/src/gns/gnunet-service-gns_interceptor.c
+++ b/src/gns/gnunet-service-gns_interceptor.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file gns/gnunet-service-gns_interceptor.c
diff --git a/src/gns/gnunet-service-gns_interceptor.h 
b/src/gns/gnunet-service-gns_interceptor.h
index 460665cf0..095448db2 100644
--- a/src/gns/gnunet-service-gns_interceptor.h
+++ b/src/gns/gnunet-service-gns_interceptor.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file gns/gnunet-service-gns_interceptor.h
diff --git a/src/gns/gnunet-service-gns_resolver.c 
b/src/gns/gnunet-service-gns_resolver.c
index 57dca9ae2..68c03edf1 100644
--- a/src/gns/gnunet-service-gns_resolver.c
+++ b/src/gns/gnunet-service-gns_resolver.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/gns/gnunet-service-gns_resolver.h 
b/src/gns/gnunet-service-gns_resolver.h
index d4cbd08f8..240747931 100644
--- a/src/gns/gnunet-service-gns_resolver.h
+++ b/src/gns/gnunet-service-gns_resolver.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file gns/gnunet-service-gns_resolver.h
diff --git a/src/gns/nss/nss_gns_query.c b/src/gns/nss/nss_gns_query.c
index 58c38323a..380788d35 100644
--- a/src/gns/nss/nss_gns_query.c
+++ b/src/gns/nss/nss_gns_query.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 #include <string.h>
 #include <stdio.h>
diff --git a/src/gns/nss/nss_gns_query.h b/src/gns/nss/nss_gns_query.h
index bc732b3aa..30ba76fd9 100644
--- a/src/gns/nss/nss_gns_query.h
+++ b/src/gns/nss/nss_gns_query.h
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 #ifndef NSS_GNS_QUERY_H
 #define NSS_GNS_QUERY_H
diff --git a/src/gns/plugin_block_gns.c b/src/gns/plugin_block_gns.c
index 677bb7721..1f27cb04e 100644
--- a/src/gns/plugin_block_gns.c
+++ b/src/gns/plugin_block_gns.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/gns/plugin_gnsrecord_gns.c b/src/gns/plugin_gnsrecord_gns.c
index c99f39616..ebba0db47 100644
--- a/src/gns/plugin_gnsrecord_gns.c
+++ b/src/gns/plugin_gnsrecord_gns.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/gns/test_gns_proxy.c b/src/gns/test_gns_proxy.c
index 4c915cabe..ea61a89d5 100644
--- a/src/gns/test_gns_proxy.c
+++ b/src/gns/test_gns_proxy.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/gns/w32nsp-install.c b/src/gns/w32nsp-install.c
index 7a8beb703..6c9c44409 100644
--- a/src/gns/w32nsp-install.c
+++ b/src/gns/w32nsp-install.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file gns/w32nsp-install.c
diff --git a/src/gns/w32nsp-resolve.c b/src/gns/w32nsp-resolve.c
index c1178cb23..841f5b9e6 100644
--- a/src/gns/w32nsp-resolve.c
+++ b/src/gns/w32nsp-resolve.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file gns/w32nsp-resolve.c
diff --git a/src/gns/w32nsp.c b/src/gns/w32nsp.c
index 082319ffe..56d07a50c 100644
--- a/src/gns/w32nsp.c
+++ b/src/gns/w32nsp.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file gns/w32nsp.c
diff --git a/src/gns/w32resolver.h b/src/gns/w32resolver.h
index 8649d82d4..c73559cf0 100644
--- a/src/gns/w32resolver.h
+++ b/src/gns/w32resolver.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/gnsrecord/gnsrecord.c b/src/gnsrecord/gnsrecord.c
index f0d7a839e..a4e8624e8 100644
--- a/src/gnsrecord/gnsrecord.c
+++ b/src/gnsrecord/gnsrecord.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/gnsrecord/gnsrecord_crypto.c b/src/gnsrecord/gnsrecord_crypto.c
index 295d31100..2785a4a59 100644
--- a/src/gnsrecord/gnsrecord_crypto.c
+++ b/src/gnsrecord/gnsrecord_crypto.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/gnsrecord/gnsrecord_misc.c b/src/gnsrecord/gnsrecord_misc.c
index 5032647ef..50dd2086b 100644
--- a/src/gnsrecord/gnsrecord_misc.c
+++ b/src/gnsrecord/gnsrecord_misc.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/gnsrecord/gnsrecord_serialization.c 
b/src/gnsrecord/gnsrecord_serialization.c
index 934d36102..be1dc1889 100644
--- a/src/gnsrecord/gnsrecord_serialization.c
+++ b/src/gnsrecord/gnsrecord_serialization.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/gnsrecord/perf_gnsrecord_crypto.c 
b/src/gnsrecord/perf_gnsrecord_crypto.c
index 35547ebc2..a7cff9d48 100644
--- a/src/gnsrecord/perf_gnsrecord_crypto.c
+++ b/src/gnsrecord/perf_gnsrecord_crypto.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file gnsrecord/test_gnsrecord_crypto.c
diff --git a/src/gnsrecord/plugin_gnsrecord_dns.c 
b/src/gnsrecord/plugin_gnsrecord_dns.c
index 254ae15ea..881dcec6b 100644
--- a/src/gnsrecord/plugin_gnsrecord_dns.c
+++ b/src/gnsrecord/plugin_gnsrecord_dns.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/gnsrecord/test_gnsrecord_block_expiration.c 
b/src/gnsrecord/test_gnsrecord_block_expiration.c
index 5bb14cdbc..1a9dbc105 100644
--- a/src/gnsrecord/test_gnsrecord_block_expiration.c
+++ b/src/gnsrecord/test_gnsrecord_block_expiration.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file gnsrecord/test_gnsrecord_crypto.c
diff --git a/src/gnsrecord/test_gnsrecord_crypto.c 
b/src/gnsrecord/test_gnsrecord_crypto.c
index 5a78f8b25..35cc5d34b 100644
--- a/src/gnsrecord/test_gnsrecord_crypto.c
+++ b/src/gnsrecord/test_gnsrecord_crypto.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file gnsrecord/test_gnsrecord_crypto.c
diff --git a/src/gnsrecord/test_gnsrecord_serialization.c 
b/src/gnsrecord/test_gnsrecord_serialization.c
index 03a4d8b03..f2ee1a479 100644
--- a/src/gnsrecord/test_gnsrecord_serialization.c
+++ b/src/gnsrecord/test_gnsrecord_serialization.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file gnsrecord/test_gnsrecord_serialization.c
diff --git a/src/hello/address.c b/src/hello/address.c
index 12e31f8ee..9aaafeb53 100644
--- a/src/hello/address.c
+++ b/src/hello/address.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/hello/gnunet-hello.c b/src/hello/gnunet-hello.c
index 1766813a6..0b176ac79 100644
--- a/src/hello/gnunet-hello.c
+++ b/src/hello/gnunet-hello.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file hello/gnunet-hello.c
diff --git a/src/hello/hello-ng.c b/src/hello/hello-ng.c
index 723ec0eaa..c088abf35 100644
--- a/src/hello/hello-ng.c
+++ b/src/hello/hello-ng.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/hello/hello.c b/src/hello/hello.c
index 0f7ca7e49..218d73127 100644
--- a/src/hello/hello.c
+++ b/src/hello/hello.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/hello/test_friend_hello.c b/src/hello/test_friend_hello.c
index de652e4eb..9e1a3297c 100644
--- a/src/hello/test_friend_hello.c
+++ b/src/hello/test_friend_hello.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file hello/test_friend_hello.c
diff --git a/src/hello/test_hello.c b/src/hello/test_hello.c
index 04fb1f5d8..4d8988c50 100644
--- a/src/hello/test_hello.c
+++ b/src/hello/test_hello.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file hello/test_hello.c
diff --git a/src/hostlist/gnunet-daemon-hostlist.c 
b/src/hostlist/gnunet-daemon-hostlist.c
index 31259b829..478776128 100644
--- a/src/hostlist/gnunet-daemon-hostlist.c
+++ b/src/hostlist/gnunet-daemon-hostlist.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/hostlist/gnunet-daemon-hostlist.h 
b/src/hostlist/gnunet-daemon-hostlist.h
index e94c9da26..df4c54db0 100644
--- a/src/hostlist/gnunet-daemon-hostlist.h
+++ b/src/hostlist/gnunet-daemon-hostlist.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/hostlist/gnunet-daemon-hostlist_client.c 
b/src/hostlist/gnunet-daemon-hostlist_client.c
index 43b4e4593..f15cda2f3 100644
--- a/src/hostlist/gnunet-daemon-hostlist_client.c
+++ b/src/hostlist/gnunet-daemon-hostlist_client.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file hostlist/gnunet-daemon-hostlist_client.c
diff --git a/src/hostlist/gnunet-daemon-hostlist_client.h 
b/src/hostlist/gnunet-daemon-hostlist_client.h
index c7ee072a9..8ac5bdb58 100644
--- a/src/hostlist/gnunet-daemon-hostlist_client.h
+++ b/src/hostlist/gnunet-daemon-hostlist_client.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file hostlist/gnunet-daemon-hostlist_client.h
diff --git a/src/hostlist/gnunet-daemon-hostlist_server.c 
b/src/hostlist/gnunet-daemon-hostlist_server.c
index 8687d6e95..529fe4e62 100644
--- a/src/hostlist/gnunet-daemon-hostlist_server.c
+++ b/src/hostlist/gnunet-daemon-hostlist_server.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/hostlist/gnunet-daemon-hostlist_server.h 
b/src/hostlist/gnunet-daemon-hostlist_server.h
index d30c68131..bb0efef41 100644
--- a/src/hostlist/gnunet-daemon-hostlist_server.h
+++ b/src/hostlist/gnunet-daemon-hostlist_server.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/hostlist/test_gnunet_daemon_hostlist.c 
b/src/hostlist/test_gnunet_daemon_hostlist.c
index c3292939f..1bcf4e86a 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist.c
+++ b/src/hostlist/test_gnunet_daemon_hostlist.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file hostlist/test_gnunet_daemon_hostlist.c
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_learning.c 
b/src/hostlist/test_gnunet_daemon_hostlist_learning.c
index e420a5022..f92215679 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_learning.c
+++ b/src/hostlist/test_gnunet_daemon_hostlist_learning.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file hostlist/test_gnunet_daemon_hostlist_learning.c
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c 
b/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c
index dad55f3d3..5dc116ccd 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c
+++ b/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file hostlist/test_gnunet_daemon_hostlist_reconnect.c
diff --git a/src/identity/gnunet-identity.c b/src/identity/gnunet-identity.c
index 0c3f9fead..051f08cd3 100644
--- a/src/identity/gnunet-identity.c
+++ b/src/identity/gnunet-identity.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file identity/gnunet-identity.c
diff --git a/src/identity/gnunet-service-identity.c 
b/src/identity/gnunet-service-identity.c
index 155c49cc5..3e53d1ceb 100644
--- a/src/identity/gnunet-service-identity.c
+++ b/src/identity/gnunet-service-identity.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/identity/identity.h b/src/identity/identity.h
index 45b23066d..7e7b5d4cd 100644
--- a/src/identity/identity.h
+++ b/src/identity/identity.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/identity/identity_api.c b/src/identity/identity_api.c
index 30a6fb23d..a058c5426 100644
--- a/src/identity/identity_api.c
+++ b/src/identity/identity_api.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/identity/identity_api_lookup.c 
b/src/identity/identity_api_lookup.c
index 25aec8ede..40a22c262 100644
--- a/src/identity/identity_api_lookup.c
+++ b/src/identity/identity_api_lookup.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/identity/test_identity.c b/src/identity/test_identity.c
index a1cb1dc6d..cfd759050 100644
--- a/src/identity/test_identity.c
+++ b/src/identity/test_identity.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/identity/test_identity_defaults.c 
b/src/identity/test_identity_defaults.c
index 1e91f139e..a7559cd94 100644
--- a/src/identity/test_identity_defaults.c
+++ b/src/identity/test_identity_defaults.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/block_dns.h b/src/include/block_dns.h
index 234ed502d..399b34962 100644
--- a/src/include/block_dns.h
+++ b/src/include/block_dns.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/block_fs.h b/src/include/block_fs.h
index f0034d769..b5c8d71d4 100644
--- a/src/include/block_fs.h
+++ b/src/include/block_fs.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/block_regex.h b/src/include/block_regex.h
index e0346c5c5..499655977 100644
--- a/src/include/block_regex.h
+++ b/src/include/block_regex.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_abe_lib.h b/src/include/gnunet_abe_lib.h
index 554d4488b..89129ea32 100644
--- a/src/include/gnunet_abe_lib.h
+++ b/src/include/gnunet_abe_lib.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_applications.h 
b/src/include/gnunet_applications.h
index b9c596178..493e1f53e 100644
--- a/src/include/gnunet_applications.h
+++ b/src/include/gnunet_applications.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_arm_service.h b/src/include/gnunet_arm_service.h
index c68a118b5..1f9d250d0 100644
--- a/src/include/gnunet_arm_service.h
+++ b/src/include/gnunet_arm_service.h
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/include/gnunet_ats_application_service.h 
b/src/include/gnunet_ats_application_service.h
index 60560790a..e942ca4d8 100644
--- a/src/include/gnunet_ats_application_service.h
+++ b/src/include/gnunet_ats_application_service.h
@@ -14,6 +14,8 @@
 
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file
diff --git a/src/include/gnunet_ats_plugin.h b/src/include/gnunet_ats_plugin.h
index 16711c852..da00f277c 100644
--- a/src/include/gnunet_ats_plugin.h
+++ b/src/include/gnunet_ats_plugin.h
@@ -14,6 +14,8 @@
 
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/include/gnunet_ats_plugin_new.h 
b/src/include/gnunet_ats_plugin_new.h
index 2ae37d7ea..633343272 100644
--- a/src/include/gnunet_ats_plugin_new.h
+++ b/src/include/gnunet_ats_plugin_new.h
@@ -14,6 +14,8 @@
 
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/include/gnunet_ats_service.h b/src/include/gnunet_ats_service.h
index b25cf3ec0..7ea624f5e 100644
--- a/src/include/gnunet_ats_service.h
+++ b/src/include/gnunet_ats_service.h
@@ -14,6 +14,8 @@
 
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file
diff --git a/src/include/gnunet_ats_transport_service.h 
b/src/include/gnunet_ats_transport_service.h
index 0df703712..287f0600d 100644
--- a/src/include/gnunet_ats_transport_service.h
+++ b/src/include/gnunet_ats_transport_service.h
@@ -14,6 +14,8 @@
 
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file
diff --git a/src/include/gnunet_bandwidth_lib.h 
b/src/include/gnunet_bandwidth_lib.h
index cb30b73e1..e52ab54be 100644
--- a/src/include/gnunet_bandwidth_lib.h
+++ b/src/include/gnunet_bandwidth_lib.h
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_bio_lib.h b/src/include/gnunet_bio_lib.h
index 1dd17b889..e90e85832 100644
--- a/src/include/gnunet_bio_lib.h
+++ b/src/include/gnunet_bio_lib.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_block_group_lib.h 
b/src/include/gnunet_block_group_lib.h
index efeb1fe0f..777ef7dd6 100644
--- a/src/include/gnunet_block_group_lib.h
+++ b/src/include/gnunet_block_group_lib.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_block_lib.h b/src/include/gnunet_block_lib.h
index c2b1e9e48..c85d3702b 100644
--- a/src/include/gnunet_block_lib.h
+++ b/src/include/gnunet_block_lib.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_block_plugin.h 
b/src/include/gnunet_block_plugin.h
index 4bdaec841..f0438c82f 100644
--- a/src/include/gnunet_block_plugin.h
+++ b/src/include/gnunet_block_plugin.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_cadet_service.h 
b/src/include/gnunet_cadet_service.h
index 276fe4dbc..00bef48f1 100644
--- a/src/include/gnunet_cadet_service.h
+++ b/src/include/gnunet_cadet_service.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @author Christian Grothoff
diff --git a/src/include/gnunet_client_lib.h b/src/include/gnunet_client_lib.h
index ea52736d5..c8c5c2885 100644
--- a/src/include/gnunet_client_lib.h
+++ b/src/include/gnunet_client_lib.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_common.h b/src/include/gnunet_common.h
index 1e9152bbf..e482e5ebe 100644
--- a/src/include/gnunet_common.h
+++ b/src/include/gnunet_common.h
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_configuration_lib.h 
b/src/include/gnunet_configuration_lib.h
index ec3d12738..a0e73f474 100644
--- a/src/include/gnunet_configuration_lib.h
+++ b/src/include/gnunet_configuration_lib.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_consensus_service.h 
b/src/include/gnunet_consensus_service.h
index c6aed298c..19736f241 100644
--- a/src/include/gnunet_consensus_service.h
+++ b/src/include/gnunet_consensus_service.h
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/include/gnunet_constants.h b/src/include/gnunet_constants.h
index f35b218d9..7e4653a97 100644
--- a/src/include/gnunet_constants.h
+++ b/src/include/gnunet_constants.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_container_lib.h 
b/src/include/gnunet_container_lib.h
index 1fb460ece..e7bd4113d 100644
--- a/src/include/gnunet_container_lib.h
+++ b/src/include/gnunet_container_lib.h
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_conversation_service.h 
b/src/include/gnunet_conversation_service.h
index 68b92959c..64da5380e 100644
--- a/src/include/gnunet_conversation_service.h
+++ b/src/include/gnunet_conversation_service.h
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/include/gnunet_core_service.h 
b/src/include/gnunet_core_service.h
index b8172c37d..f10ddee75 100644
--- a/src/include/gnunet_core_service.h
+++ b/src/include/gnunet_core_service.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @author Christian Grothoff
diff --git a/src/include/gnunet_credential_service.h 
b/src/include/gnunet_credential_service.h
index bac9f408a..c925b0da8 100644
--- a/src/include/gnunet_credential_service.h
+++ b/src/include/gnunet_credential_service.h
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/include/gnunet_crypto_lib.h b/src/include/gnunet_crypto_lib.h
index 1c69646f3..6342862eb 100644
--- a/src/include/gnunet_crypto_lib.h
+++ b/src/include/gnunet_crypto_lib.h
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_curl_lib.h b/src/include/gnunet_curl_lib.h
index 0bad7e6c7..0cbef9c73 100644
--- a/src/include/gnunet_curl_lib.h
+++ b/src/include/gnunet_curl_lib.h
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file src/include/gnunet_curl_lib.h
diff --git a/src/include/gnunet_datacache_lib.h 
b/src/include/gnunet_datacache_lib.h
index 3e0c97254..568e60d42 100644
--- a/src/include/gnunet_datacache_lib.h
+++ b/src/include/gnunet_datacache_lib.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_datacache_plugin.h 
b/src/include/gnunet_datacache_plugin.h
index d423c039b..5a4e6dc0d 100644
--- a/src/include/gnunet_datacache_plugin.h
+++ b/src/include/gnunet_datacache_plugin.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_datastore_plugin.h 
b/src/include/gnunet_datastore_plugin.h
index 9c35a1577..ccd604845 100644
--- a/src/include/gnunet_datastore_plugin.h
+++ b/src/include/gnunet_datastore_plugin.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_datastore_service.h 
b/src/include/gnunet_datastore_service.h
index 013842115..b5b9d4306 100644
--- a/src/include/gnunet_datastore_service.h
+++ b/src/include/gnunet_datastore_service.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_db_lib.h b/src/include/gnunet_db_lib.h
index 1f6a4ebfa..ea3b8d519 100644
--- a/src/include/gnunet_db_lib.h
+++ b/src/include/gnunet_db_lib.h
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file include/gnunet_db_lib.h
diff --git a/src/include/gnunet_dht_service.h b/src/include/gnunet_dht_service.h
index 89e436ffb..d9bbccbdf 100644
--- a/src/include/gnunet_dht_service.h
+++ b/src/include/gnunet_dht_service.h
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/include/gnunet_disk_lib.h b/src/include/gnunet_disk_lib.h
index 950df5a4e..367789722 100644
--- a/src/include/gnunet_disk_lib.h
+++ b/src/include/gnunet_disk_lib.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @author Christian Grothoff
diff --git a/src/include/gnunet_dns_service.h b/src/include/gnunet_dns_service.h
index ac50624f2..d31476d87 100644
--- a/src/include/gnunet_dns_service.h
+++ b/src/include/gnunet_dns_service.h
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/include/gnunet_dnsparser_lib.h 
b/src/include/gnunet_dnsparser_lib.h
index 0fc6ac19c..04b09fbc4 100644
--- a/src/include/gnunet_dnsparser_lib.h
+++ b/src/include/gnunet_dnsparser_lib.h
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/include/gnunet_dnsstub_lib.h b/src/include/gnunet_dnsstub_lib.h
index ad44be846..5d134e44a 100644
--- a/src/include/gnunet_dnsstub_lib.h
+++ b/src/include/gnunet_dnsstub_lib.h
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/include/gnunet_dv_service.h b/src/include/gnunet_dv_service.h
index b97a2629f..334912773 100644
--- a/src/include/gnunet_dv_service.h
+++ b/src/include/gnunet_dv_service.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_fragmentation_lib.h 
b/src/include/gnunet_fragmentation_lib.h
index 544af904b..f76bfc23f 100644
--- a/src/include/gnunet_fragmentation_lib.h
+++ b/src/include/gnunet_fragmentation_lib.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @author Christian Grothoff
diff --git a/src/include/gnunet_friends_lib.h b/src/include/gnunet_friends_lib.h
index 038c4b480..8a25be07c 100644
--- a/src/include/gnunet_friends_lib.h
+++ b/src/include/gnunet_friends_lib.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_fs_service.h b/src/include/gnunet_fs_service.h
index 2030c942c..5ee863d12 100644
--- a/src/include/gnunet_fs_service.h
+++ b/src/include/gnunet_fs_service.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @author Christian Grothoff
diff --git a/src/include/gnunet_getopt_lib.h b/src/include/gnunet_getopt_lib.h
index 5372170d9..ddeeffef4 100644
--- a/src/include/gnunet_getopt_lib.h
+++ b/src/include/gnunet_getopt_lib.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_gns_service.h b/src/include/gnunet_gns_service.h
index b6fac6111..7b4230f6b 100644
--- a/src/include/gnunet_gns_service.h
+++ b/src/include/gnunet_gns_service.h
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/include/gnunet_gnsrecord_lib.h 
b/src/include/gnunet_gnsrecord_lib.h
index 693cc6cdb..7c25bdf15 100644
--- a/src/include/gnunet_gnsrecord_lib.h
+++ b/src/include/gnunet_gnsrecord_lib.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_gnsrecord_plugin.h 
b/src/include/gnunet_gnsrecord_plugin.h
index 6b2fd8b45..cc10e3e7f 100644
--- a/src/include/gnunet_gnsrecord_plugin.h
+++ b/src/include/gnunet_gnsrecord_plugin.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_hello_lib.h b/src/include/gnunet_hello_lib.h
index a47162f99..a1b97809e 100644
--- a/src/include/gnunet_hello_lib.h
+++ b/src/include/gnunet_hello_lib.h
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_helper_lib.h b/src/include/gnunet_helper_lib.h
index 3f17706e4..5a34daf78 100644
--- a/src/include/gnunet_helper_lib.h
+++ b/src/include/gnunet_helper_lib.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_identity_service.h 
b/src/include/gnunet_identity_service.h
index ec2a7ff8e..086f924d6 100644
--- a/src/include/gnunet_identity_service.h
+++ b/src/include/gnunet_identity_service.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_json_lib.h b/src/include/gnunet_json_lib.h
index 781d5698b..640ffa35a 100644
--- a/src/include/gnunet_json_lib.h
+++ b/src/include/gnunet_json_lib.h
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file gnunet_json_lib.h
diff --git a/src/include/gnunet_load_lib.h b/src/include/gnunet_load_lib.h
index 3e7c1e487..f38b66b88 100644
--- a/src/include/gnunet_load_lib.h
+++ b/src/include/gnunet_load_lib.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_microphone_lib.h 
b/src/include/gnunet_microphone_lib.h
index dfad5f56a..46e5bfa25 100644
--- a/src/include/gnunet_microphone_lib.h
+++ b/src/include/gnunet_microphone_lib.h
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/include/gnunet_mq_lib.h b/src/include/gnunet_mq_lib.h
index 574c0932d..3f67dc365 100644
--- a/src/include/gnunet_mq_lib.h
+++ b/src/include/gnunet_mq_lib.h
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_mst_lib.h b/src/include/gnunet_mst_lib.h
index 2716f4dce..b048f94bc 100644
--- a/src/include/gnunet_mst_lib.h
+++ b/src/include/gnunet_mst_lib.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_multicast_service.h 
b/src/include/gnunet_multicast_service.h
index 541bdd90d..58fca0b2e 100644
--- a/src/include/gnunet_multicast_service.h
+++ b/src/include/gnunet_multicast_service.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_my_lib.h b/src/include/gnunet_my_lib.h
index 655885c69..744a646f0 100644
--- a/src/include/gnunet_my_lib.h
+++ b/src/include/gnunet_my_lib.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @author Christian Grothoff
diff --git a/src/include/gnunet_mysql_lib.h b/src/include/gnunet_mysql_lib.h
index baa5a3ee1..dbbcd2b19 100644
--- a/src/include/gnunet_mysql_lib.h
+++ b/src/include/gnunet_mysql_lib.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @author Christian Grothoff
diff --git a/src/include/gnunet_namecache_plugin.h 
b/src/include/gnunet_namecache_plugin.h
index 5ef41bf4d..5281fd3dc 100644
--- a/src/include/gnunet_namecache_plugin.h
+++ b/src/include/gnunet_namecache_plugin.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_namecache_service.h 
b/src/include/gnunet_namecache_service.h
index ab9461f45..da0235fc1 100644
--- a/src/include/gnunet_namecache_service.h
+++ b/src/include/gnunet_namecache_service.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_namestore_plugin.h 
b/src/include/gnunet_namestore_plugin.h
index 5ab6ec706..46a7da792 100644
--- a/src/include/gnunet_namestore_plugin.h
+++ b/src/include/gnunet_namestore_plugin.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_namestore_service.h 
b/src/include/gnunet_namestore_service.h
index 7ab619c51..9b6beef28 100644
--- a/src/include/gnunet_namestore_service.h
+++ b/src/include/gnunet_namestore_service.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_nat_auto_service.h 
b/src/include/gnunet_nat_auto_service.h
index a58834335..dd74d1eeb 100644
--- a/src/include/gnunet_nat_auto_service.h
+++ b/src/include/gnunet_nat_auto_service.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_nat_service.h b/src/include/gnunet_nat_service.h
index eb08515a2..c1e2f0a39 100644
--- a/src/include/gnunet_nat_service.h
+++ b/src/include/gnunet_nat_service.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_nc_lib.h b/src/include/gnunet_nc_lib.h
index b911d5632..2bfa7040c 100644
--- a/src/include/gnunet_nc_lib.h
+++ b/src/include/gnunet_nc_lib.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @author Christian Grothoff
diff --git a/src/include/gnunet_network_lib.h b/src/include/gnunet_network_lib.h
index 0d3599c13..6c02f3577 100644
--- a/src/include/gnunet_network_lib.h
+++ b/src/include/gnunet_network_lib.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_nse_service.h b/src/include/gnunet_nse_service.h
index 5ca173e13..08282058a 100644
--- a/src/include/gnunet_nse_service.h
+++ b/src/include/gnunet_nse_service.h
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 #ifndef GNUNET_NSE_SERVICE_H_
diff --git a/src/include/gnunet_nt_lib.h b/src/include/gnunet_nt_lib.h
index 3d89aa7b2..1da92a79a 100644
--- a/src/include/gnunet_nt_lib.h
+++ b/src/include/gnunet_nt_lib.h
@@ -14,6 +14,8 @@
 
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file network type characterization
diff --git a/src/include/gnunet_op_lib.h b/src/include/gnunet_op_lib.h
index ad3c873b9..d04577e2d 100644
--- a/src/include/gnunet_op_lib.h
+++ b/src/include/gnunet_op_lib.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_os_lib.h b/src/include/gnunet_os_lib.h
index 98469a156..285dfb68d 100644
--- a/src/include/gnunet_os_lib.h
+++ b/src/include/gnunet_os_lib.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_peer_lib.h b/src/include/gnunet_peer_lib.h
index 9c1813c47..b1c7220e2 100644
--- a/src/include/gnunet_peer_lib.h
+++ b/src/include/gnunet_peer_lib.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_peerinfo_service.h 
b/src/include/gnunet_peerinfo_service.h
index ca3028973..6fc48f806 100644
--- a/src/include/gnunet_peerinfo_service.h
+++ b/src/include/gnunet_peerinfo_service.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @author Christian Grothoff
diff --git a/src/include/gnunet_peerstore_plugin.h 
b/src/include/gnunet_peerstore_plugin.h
index aef183670..bd5d18068 100644
--- a/src/include/gnunet_peerstore_plugin.h
+++ b/src/include/gnunet_peerstore_plugin.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_peerstore_service.h 
b/src/include/gnunet_peerstore_service.h
index 10049b15e..55f371399 100644
--- a/src/include/gnunet_peerstore_service.h
+++ b/src/include/gnunet_peerstore_service.h
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/include/gnunet_plugin_lib.h b/src/include/gnunet_plugin_lib.h
index 52e0dee51..bfcf1924f 100644
--- a/src/include/gnunet_plugin_lib.h
+++ b/src/include/gnunet_plugin_lib.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_pq_lib.h b/src/include/gnunet_pq_lib.h
index ca615cffc..492491e94 100644
--- a/src/include/gnunet_pq_lib.h
+++ b/src/include/gnunet_pq_lib.h
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file include/gnunet_pq_lib.h
diff --git a/src/include/gnunet_program_lib.h b/src/include/gnunet_program_lib.h
index 088ce1fae..c434c9170 100644
--- a/src/include/gnunet_program_lib.h
+++ b/src/include/gnunet_program_lib.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h
index fd5adeef2..af4dbd52f 100644
--- a/src/include/gnunet_protocols.h
+++ b/src/include/gnunet_protocols.h
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_psyc_env.h b/src/include/gnunet_psyc_env.h
index e03171529..0d878cb96 100644
--- a/src/include/gnunet_psyc_env.h
+++ b/src/include/gnunet_psyc_env.h
@@ -14,6 +14,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/include/gnunet_psyc_message.h 
b/src/include/gnunet_psyc_message.h
index 05cfc011e..d0cf9cc6a 100644
--- a/src/include/gnunet_psyc_message.h
+++ b/src/include/gnunet_psyc_message.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_psyc_service.h 
b/src/include/gnunet_psyc_service.h
index 053fe4495..3a3131e33 100644
--- a/src/include/gnunet_psyc_service.h
+++ b/src/include/gnunet_psyc_service.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_psyc_slicer.h b/src/include/gnunet_psyc_slicer.h
index 096794559..87f66d7e8 100644
--- a/src/include/gnunet_psyc_slicer.h
+++ b/src/include/gnunet_psyc_slicer.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_psyc_util_lib.h 
b/src/include/gnunet_psyc_util_lib.h
index b70752ea2..57eec65c3 100644
--- a/src/include/gnunet_psyc_util_lib.h
+++ b/src/include/gnunet_psyc_util_lib.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_psycstore_plugin.h 
b/src/include/gnunet_psycstore_plugin.h
index 276d60638..fac549f43 100644
--- a/src/include/gnunet_psycstore_plugin.h
+++ b/src/include/gnunet_psycstore_plugin.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_psycstore_service.h 
b/src/include/gnunet_psycstore_service.h
index 7d52259f0..92516f447 100644
--- a/src/include/gnunet_psycstore_service.h
+++ b/src/include/gnunet_psycstore_service.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_reclaim_attribute_lib.h 
b/src/include/gnunet_reclaim_attribute_lib.h
index df5356d76..1f26927b2 100644
--- a/src/include/gnunet_reclaim_attribute_lib.h
+++ b/src/include/gnunet_reclaim_attribute_lib.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_reclaim_attribute_plugin.h 
b/src/include/gnunet_reclaim_attribute_plugin.h
index cf0bb141a..0dfd69b82 100644
--- a/src/include/gnunet_reclaim_attribute_plugin.h
+++ b/src/include/gnunet_reclaim_attribute_plugin.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_reclaim_plugin.h 
b/src/include/gnunet_reclaim_plugin.h
index c400af64c..72a4bc218 100644
--- a/src/include/gnunet_reclaim_plugin.h
+++ b/src/include/gnunet_reclaim_plugin.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_reclaim_service.h 
b/src/include/gnunet_reclaim_service.h
index 7e668cd62..3029e1f4d 100644
--- a/src/include/gnunet_reclaim_service.h
+++ b/src/include/gnunet_reclaim_service.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_regex_service.h 
b/src/include/gnunet_regex_service.h
index e321bd442..4976adc6a 100644
--- a/src/include/gnunet_regex_service.h
+++ b/src/include/gnunet_regex_service.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @author Maximilian Szengel
diff --git a/src/include/gnunet_resolver_service.h 
b/src/include/gnunet_resolver_service.h
index 2d2508c17..1929feec6 100644
--- a/src/include/gnunet_resolver_service.h
+++ b/src/include/gnunet_resolver_service.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_rest_lib.h b/src/include/gnunet_rest_lib.h
index 392ef6880..83741ab95 100644
--- a/src/include/gnunet_rest_lib.h
+++ b/src/include/gnunet_rest_lib.h
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/include/gnunet_rest_plugin.h b/src/include/gnunet_rest_plugin.h
index 4aad82575..54eeb902d 100644
--- a/src/include/gnunet_rest_plugin.h
+++ b/src/include/gnunet_rest_plugin.h
@@ -14,6 +14,8 @@
   
    You should have received a copy of the GNU Affero General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
    */
 /**
  * @author Martin Schanzenbach
diff --git a/src/include/gnunet_revocation_service.h 
b/src/include/gnunet_revocation_service.h
index f9c0237d3..5fb2ed7c5 100644
--- a/src/include/gnunet_revocation_service.h
+++ b/src/include/gnunet_revocation_service.h
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 #ifndef GNUNET_REVOCATION_SERVICE_H_
diff --git a/src/include/gnunet_rps_service.h b/src/include/gnunet_rps_service.h
index 274ca94a2..8ae9f1e93 100644
--- a/src/include/gnunet_rps_service.h
+++ b/src/include/gnunet_rps_service.h
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/include/gnunet_scalarproduct_service.h 
b/src/include/gnunet_scalarproduct_service.h
index 729d58648..5d61946bb 100644
--- a/src/include/gnunet_scalarproduct_service.h
+++ b/src/include/gnunet_scalarproduct_service.h
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/include/gnunet_scheduler_lib.h 
b/src/include/gnunet_scheduler_lib.h
index 314ede6a0..3f4e3c9a8 100644
--- a/src/include/gnunet_scheduler_lib.h
+++ b/src/include/gnunet_scheduler_lib.h
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/include/gnunet_secretsharing_service.h 
b/src/include/gnunet_secretsharing_service.h
index a3f44222e..69cfa4514 100644
--- a/src/include/gnunet_secretsharing_service.h
+++ b/src/include/gnunet_secretsharing_service.h
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/include/gnunet_sensor_service.h 
b/src/include/gnunet_sensor_service.h
index c141def27..391db58bf 100644
--- a/src/include/gnunet_sensor_service.h
+++ b/src/include/gnunet_sensor_service.h
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/include/gnunet_sensor_util_lib.h 
b/src/include/gnunet_sensor_util_lib.h
index df7fa474b..f4eaad9e8 100644
--- a/src/include/gnunet_sensor_util_lib.h
+++ b/src/include/gnunet_sensor_util_lib.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_sensordashboard_service.h 
b/src/include/gnunet_sensordashboard_service.h
index 3521847cb..ffa24e3b7 100644
--- a/src/include/gnunet_sensordashboard_service.h
+++ b/src/include/gnunet_sensordashboard_service.h
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/include/gnunet_service_lib.h b/src/include/gnunet_service_lib.h
index be52cce44..fce912277 100644
--- a/src/include/gnunet_service_lib.h
+++ b/src/include/gnunet_service_lib.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_set_service.h b/src/include/gnunet_set_service.h
index 278784301..ac54153e1 100644
--- a/src/include/gnunet_set_service.h
+++ b/src/include/gnunet_set_service.h
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/include/gnunet_signal_lib.h b/src/include/gnunet_signal_lib.h
index 199270b4e..167da160a 100644
--- a/src/include/gnunet_signal_lib.h
+++ b/src/include/gnunet_signal_lib.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_signatures.h b/src/include/gnunet_signatures.h
index 109fe7045..3c2413d99 100644
--- a/src/include/gnunet_signatures.h
+++ b/src/include/gnunet_signatures.h
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_social_service.h 
b/src/include/gnunet_social_service.h
index 238166f96..7faa336d6 100644
--- a/src/include/gnunet_social_service.h
+++ b/src/include/gnunet_social_service.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_socks.h b/src/include/gnunet_socks.h
index 13c0a70c7..b82fc2afb 100644
--- a/src/include/gnunet_socks.h
+++ b/src/include/gnunet_socks.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_speaker_lib.h b/src/include/gnunet_speaker_lib.h
index 0cee7de57..71f643791 100644
--- a/src/include/gnunet_speaker_lib.h
+++ b/src/include/gnunet_speaker_lib.h
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/include/gnunet_sq_lib.h b/src/include/gnunet_sq_lib.h
index d5aa839bd..ebc79d098 100644
--- a/src/include/gnunet_sq_lib.h
+++ b/src/include/gnunet_sq_lib.h
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file include/gnunet_sq_lib.h
diff --git a/src/include/gnunet_statistics_service.h 
b/src/include/gnunet_statistics_service.h
index c14d1419d..94fa49358 100644
--- a/src/include/gnunet_statistics_service.h
+++ b/src/include/gnunet_statistics_service.h
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/include/gnunet_strings_lib.h b/src/include/gnunet_strings_lib.h
index c1d76ef71..9962160f2 100644
--- a/src/include/gnunet_strings_lib.h
+++ b/src/include/gnunet_strings_lib.h
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_testbed_logger_service.h 
b/src/include/gnunet_testbed_logger_service.h
index 1c267bb0c..6dece2915 100644
--- a/src/include/gnunet_testbed_logger_service.h
+++ b/src/include/gnunet_testbed_logger_service.h
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/include/gnunet_testbed_service.h 
b/src/include/gnunet_testbed_service.h
index 302b32019..db626df0e 100644
--- a/src/include/gnunet_testbed_service.h
+++ b/src/include/gnunet_testbed_service.h
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/include/gnunet_testing_lib.h b/src/include/gnunet_testing_lib.h
index a2dc86fc4..0317b2007 100644
--- a/src/include/gnunet_testing_lib.h
+++ b/src/include/gnunet_testing_lib.h
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/include/gnunet_time_lib.h b/src/include/gnunet_time_lib.h
index 674a95534..93e6cd00f 100644
--- a/src/include/gnunet_time_lib.h
+++ b/src/include/gnunet_time_lib.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_transport_communication_service.h 
b/src/include/gnunet_transport_communication_service.h
index a5547778e..2997c1860 100644
--- a/src/include/gnunet_transport_communication_service.h
+++ b/src/include/gnunet_transport_communication_service.h
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_transport_core_service.h 
b/src/include/gnunet_transport_core_service.h
index b52dbe5f8..f442b53c0 100644
--- a/src/include/gnunet_transport_core_service.h
+++ b/src/include/gnunet_transport_core_service.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @author Christian Grothoff
diff --git a/src/include/gnunet_transport_hello_service.h 
b/src/include/gnunet_transport_hello_service.h
index 50734f957..d568c621e 100644
--- a/src/include/gnunet_transport_hello_service.h
+++ b/src/include/gnunet_transport_hello_service.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_transport_manipulation_service.h 
b/src/include/gnunet_transport_manipulation_service.h
index 068b41dc0..5b37345b0 100644
--- a/src/include/gnunet_transport_manipulation_service.h
+++ b/src/include/gnunet_transport_manipulation_service.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_transport_monitor_service.h 
b/src/include/gnunet_transport_monitor_service.h
index 8357b101f..f83fa7e9f 100644
--- a/src/include/gnunet_transport_monitor_service.h
+++ b/src/include/gnunet_transport_monitor_service.h
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_transport_plugin.h 
b/src/include/gnunet_transport_plugin.h
index d1f8db445..ed5244987 100644
--- a/src/include/gnunet_transport_plugin.h
+++ b/src/include/gnunet_transport_plugin.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_transport_service.h 
b/src/include/gnunet_transport_service.h
index f600057e0..c5cb10ad8 100644
--- a/src/include/gnunet_transport_service.h
+++ b/src/include/gnunet_transport_service.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_tun_lib.h b/src/include/gnunet_tun_lib.h
index 8de627141..8fb6f32f0 100644
--- a/src/include/gnunet_tun_lib.h
+++ b/src/include/gnunet_tun_lib.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/gnunet_util_lib.h b/src/include/gnunet_util_lib.h
index 091d3ba58..40a0ca641 100644
--- a/src/include/gnunet_util_lib.h
+++ b/src/include/gnunet_util_lib.h
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/include/gnunet_util_taler_wallet_lib.h 
b/src/include/gnunet_util_taler_wallet_lib.h
index 0ed68437d..d986c29a4 100644
--- a/src/include/gnunet_util_taler_wallet_lib.h
+++ b/src/include/gnunet_util_taler_wallet_lib.h
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/include/gnunet_vpn_service.h b/src/include/gnunet_vpn_service.h
index 29f5aeb0f..2096bf539 100644
--- a/src/include/gnunet_vpn_service.h
+++ b/src/include/gnunet_vpn_service.h
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/include/platform.h b/src/include/platform.h
index 4a165ded6..e12c49888 100644
--- a/src/include/platform.h
+++ b/src/include/platform.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/include/winproc.h b/src/include/winproc.h
index d1438c5f4..3910321d7 100644
--- a/src/include/winproc.h
+++ b/src/include/winproc.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/integration-tests/gnunet_pyexpect.py.in 
b/src/integration-tests/gnunet_pyexpect.py.in
index 69d1495aa..73be6f295 100644
--- a/src/integration-tests/gnunet_pyexpect.py.in
+++ b/src/integration-tests/gnunet_pyexpect.py.in
@@ -15,6 +15,8 @@
 #    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+#    SPDX-License-Identifier: AGPL3.0-or-later
+#
 # Testcase for gnunet-peerinfo
 from __future__ import print_function
 import os
diff --git a/src/integration-tests/gnunet_testing.py.in 
b/src/integration-tests/gnunet_testing.py.in
index fa43c6838..0d02a792f 100644
--- a/src/integration-tests/gnunet_testing.py.in
+++ b/src/integration-tests/gnunet_testing.py.in
@@ -15,6 +15,8 @@
 #    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+#    SPDX-License-Identifier: AGPL3.0-or-later
+#
 # Functions for integration testing
 import os
 import subprocess
diff --git a/src/integration-tests/test_integration_bootstrap_and_connect.py.in 
b/src/integration-tests/test_integration_bootstrap_and_connect.py.in
index bb3e9cebb..5bd938019 100755
--- a/src/integration-tests/test_integration_bootstrap_and_connect.py.in
+++ b/src/integration-tests/test_integration_bootstrap_and_connect.py.in
@@ -15,6 +15,8 @@
 #    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+#    SPDX-License-Identifier: AGPL3.0-or-later
+#
 #
 import signal
 import sys
diff --git a/src/integration-tests/test_integration_clique.py.in 
b/src/integration-tests/test_integration_clique.py.in
index c2228da41..0444cf249 100755
--- a/src/integration-tests/test_integration_clique.py.in
+++ b/src/integration-tests/test_integration_clique.py.in
@@ -15,6 +15,8 @@
 #    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+#    SPDX-License-Identifier: AGPL3.0-or-later
+#
 #
 #
 # This test starts 3 peers (nated, server, no nat)and expects bootstrap
diff --git a/src/integration-tests/test_integration_disconnect.py.in 
b/src/integration-tests/test_integration_disconnect.py.in
index 52dfd2102..f8b411778 100755
--- a/src/integration-tests/test_integration_disconnect.py.in
+++ b/src/integration-tests/test_integration_disconnect.py.in
@@ -15,6 +15,8 @@
 #    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+#    SPDX-License-Identifier: AGPL3.0-or-later
+#
 # 
 import sys
 import signal
diff --git a/src/integration-tests/test_integration_disconnect_nat.py.in 
b/src/integration-tests/test_integration_disconnect_nat.py.in
index 69d670663..885492741 100755
--- a/src/integration-tests/test_integration_disconnect_nat.py.in
+++ b/src/integration-tests/test_integration_disconnect_nat.py.in
@@ -15,6 +15,8 @@
 #    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+#    SPDX-License-Identifier: AGPL3.0-or-later
+#
 #
 import sys
 import signal
diff --git a/src/integration-tests/test_integration_reconnect.py.in 
b/src/integration-tests/test_integration_reconnect.py.in
index 4783463b5..13179eef6 100755
--- a/src/integration-tests/test_integration_reconnect.py.in
+++ b/src/integration-tests/test_integration_reconnect.py.in
@@ -15,6 +15,8 @@
 #    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+#    SPDX-License-Identifier: AGPL3.0-or-later
+#
 # 
 import sys
 import os
diff --git a/src/integration-tests/test_integration_reconnect_nat.py.in 
b/src/integration-tests/test_integration_reconnect_nat.py.in
index f175554fb..d9714f875 100755
--- a/src/integration-tests/test_integration_reconnect_nat.py.in
+++ b/src/integration-tests/test_integration_reconnect_nat.py.in
@@ -15,6 +15,8 @@
 #    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+#    SPDX-License-Identifier: AGPL3.0-or-later
+#
 #
 import sys
 import os
diff --git a/src/json/json.c b/src/json/json.c
index bb3979b36..fdce30488 100644
--- a/src/json/json.c
+++ b/src/json/json.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file json/json.c
diff --git a/src/json/json_generator.c b/src/json/json_generator.c
index 96f07bdc2..0b25013e3 100644
--- a/src/json/json_generator.c
+++ b/src/json/json_generator.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file json/json_generator.c
diff --git a/src/json/json_gnsrecord.c b/src/json/json_gnsrecord.c
index fe51119b1..83ea367d5 100644
--- a/src/json/json_gnsrecord.c
+++ b/src/json/json_gnsrecord.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/json/json_helper.c b/src/json/json_helper.c
index a553dd8e7..fdbb13267 100644
--- a/src/json/json_helper.c
+++ b/src/json/json_helper.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file json/json_helper.c
diff --git a/src/json/json_mhd.c b/src/json/json_mhd.c
index 9823eb676..f095e1011 100644
--- a/src/json/json_mhd.c
+++ b/src/json/json_mhd.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file json/json_mhd.c
diff --git a/src/json/test_json.c b/src/json/test_json.c
index 69cc26308..dd957eb8e 100644
--- a/src/json/test_json.c
+++ b/src/json/test_json.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/multicast/gnunet-multicast.c b/src/multicast/gnunet-multicast.c
index e0902f112..63e1d52aa 100644
--- a/src/multicast/gnunet-multicast.c
+++ b/src/multicast/gnunet-multicast.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/multicast/gnunet-service-multicast.c 
b/src/multicast/gnunet-service-multicast.c
index f8441cc2b..18c366118 100644
--- a/src/multicast/gnunet-service-multicast.c
+++ b/src/multicast/gnunet-service-multicast.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/multicast/multicast.h b/src/multicast/multicast.h
index e95299a5e..8a3ca14c8 100644
--- a/src/multicast/multicast.h
+++ b/src/multicast/multicast.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/multicast/multicast_api.c b/src/multicast/multicast_api.c
index 9f8d49253..e5e830225 100644
--- a/src/multicast/multicast_api.c
+++ b/src/multicast/multicast_api.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/multicast/test_multicast.c b/src/multicast/test_multicast.c
index e00f07b51..70efdcbfb 100644
--- a/src/multicast/test_multicast.c
+++ b/src/multicast/test_multicast.c
@@ -14,6 +14,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/multicast/test_multicast_2peers.c 
b/src/multicast/test_multicast_2peers.c
index 325d81498..ea996026c 100644
--- a/src/multicast/test_multicast_2peers.c
+++ b/src/multicast/test_multicast_2peers.c
@@ -14,6 +14,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/multicast/test_multicast_multipeer.c 
b/src/multicast/test_multicast_multipeer.c
index 7766ff875..9b44e05db 100644
--- a/src/multicast/test_multicast_multipeer.c
+++ b/src/multicast/test_multicast_multipeer.c
@@ -14,6 +14,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/my/my.c b/src/my/my.c
index 16df437b2..dd2140c31 100644
--- a/src/my/my.c
+++ b/src/my/my.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file my/my.c
diff --git a/src/my/my_query_helper.c b/src/my/my_query_helper.c
index b2a893a44..8d4435b01 100644
--- a/src/my/my_query_helper.c
+++ b/src/my/my_query_helper.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file my/my_query_helper.c
diff --git a/src/my/my_result_helper.c b/src/my/my_result_helper.c
index df4b15e61..75a340014 100644
--- a/src/my/my_result_helper.c
+++ b/src/my/my_result_helper.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file my/my_result_helper.c
diff --git a/src/my/test_my.c b/src/my/test_my.c
index 22a61dcb6..556d2baa2 100644
--- a/src/my/test_my.c
+++ b/src/my/test_my.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file my/test_my.c
diff --git a/src/mysql/mysql.c b/src/mysql/mysql.c
index 1d3b27690..5abc7bdf0 100644
--- a/src/mysql/mysql.c
+++ b/src/mysql/mysql.c
@@ -15,6 +15,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file mysql/mysql.c
diff --git a/src/namecache/gnunet-namecache.c b/src/namecache/gnunet-namecache.c
index 3af28cbb3..3932931e3 100644
--- a/src/namecache/gnunet-namecache.c
+++ b/src/namecache/gnunet-namecache.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file gnunet-namecache.c
diff --git a/src/namecache/gnunet-service-namecache.c 
b/src/namecache/gnunet-service-namecache.c
index 3b5119a8f..00d9d81b5 100644
--- a/src/namecache/gnunet-service-namecache.c
+++ b/src/namecache/gnunet-service-namecache.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/namecache/namecache.h b/src/namecache/namecache.h
index 3dac9f637..1c9fe6b95 100644
--- a/src/namecache/namecache.h
+++ b/src/namecache/namecache.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/namecache/namecache_api.c b/src/namecache/namecache_api.c
index 2a60a2813..b91c1ac8f 100644
--- a/src/namecache/namecache_api.c
+++ b/src/namecache/namecache_api.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/namecache/plugin_namecache_flat.c 
b/src/namecache/plugin_namecache_flat.c
index fdf6544d0..4323780d5 100644
--- a/src/namecache/plugin_namecache_flat.c
+++ b/src/namecache/plugin_namecache_flat.c
@@ -14,6 +14,8 @@
   *
   * You should have received a copy of the GNU Affero General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
   */
 
 /**
diff --git a/src/namecache/plugin_namecache_postgres.c 
b/src/namecache/plugin_namecache_postgres.c
index 99dc19f05..1d6d9f392 100644
--- a/src/namecache/plugin_namecache_postgres.c
+++ b/src/namecache/plugin_namecache_postgres.c
@@ -14,6 +14,8 @@
   *
   * You should have received a copy of the GNU Affero General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
   */
 
 /**
diff --git a/src/namecache/plugin_namecache_sqlite.c 
b/src/namecache/plugin_namecache_sqlite.c
index 84794e1ac..f493e015f 100644
--- a/src/namecache/plugin_namecache_sqlite.c
+++ b/src/namecache/plugin_namecache_sqlite.c
@@ -14,6 +14,8 @@
   *
   * You should have received a copy of the GNU Affero General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
   */
 
 /**
diff --git a/src/namecache/test_namecache_api_cache_block.c 
b/src/namecache/test_namecache_api_cache_block.c
index be5f630f5..1d522e7fb 100644
--- a/src/namecache/test_namecache_api_cache_block.c
+++ b/src/namecache/test_namecache_api_cache_block.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file namecache/test_namecache_api.c
diff --git a/src/namecache/test_plugin_namecache.c 
b/src/namecache/test_plugin_namecache.c
index 5ccb7a704..c2a630a46 100644
--- a/src/namecache/test_plugin_namecache.c
+++ b/src/namecache/test_plugin_namecache.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /*
  * @file namecache/test_plugin_namecache.c
diff --git a/src/namestore/gnunet-namestore-fcfsd.c 
b/src/namestore/gnunet-namestore-fcfsd.c
index 0853ff4d7..58e824ea6 100644
--- a/src/namestore/gnunet-namestore-fcfsd.c
+++ b/src/namestore/gnunet-namestore-fcfsd.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file gnunet-namestore-fcfsd.c
diff --git a/src/namestore/gnunet-namestore.c b/src/namestore/gnunet-namestore.c
index c409cede3..470716f43 100644
--- a/src/namestore/gnunet-namestore.c
+++ b/src/namestore/gnunet-namestore.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file gnunet-namestore.c
diff --git a/src/namestore/gnunet-service-namestore.c 
b/src/namestore/gnunet-service-namestore.c
index cc222220f..b1f8fcf4c 100644
--- a/src/namestore/gnunet-service-namestore.c
+++ b/src/namestore/gnunet-service-namestore.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/namestore/gnunet-zoneimport.c 
b/src/namestore/gnunet-zoneimport.c
index 01706b777..4f0f848a4 100644
--- a/src/namestore/gnunet-zoneimport.c
+++ b/src/namestore/gnunet-zoneimport.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file src/namestore/gnunet-zoneimport.c
diff --git a/src/namestore/namestore.h b/src/namestore/namestore.h
index e6f5ae848..67d61f9b3 100644
--- a/src/namestore/namestore.h
+++ b/src/namestore/namestore.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/namestore/namestore_api.c b/src/namestore/namestore_api.c
index 2cc293b37..89eb0afa4 100644
--- a/src/namestore/namestore_api.c
+++ b/src/namestore/namestore_api.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/namestore/namestore_api_monitor.c 
b/src/namestore/namestore_api_monitor.c
index b26389718..67715f634 100644
--- a/src/namestore/namestore_api_monitor.c
+++ b/src/namestore/namestore_api_monitor.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file namestore/namestore_api_monitor.c
diff --git a/src/namestore/perf_namestore_api_zone_iteration.c 
b/src/namestore/perf_namestore_api_zone_iteration.c
index 03f53e63b..505f624df 100644
--- a/src/namestore/perf_namestore_api_zone_iteration.c
+++ b/src/namestore/perf_namestore_api_zone_iteration.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file namestore/perf_namestore_api_zone_iteration.c
diff --git a/src/namestore/plugin_namestore_heap.c 
b/src/namestore/plugin_namestore_heap.c
index 8442294f7..78e99442c 100644
--- a/src/namestore/plugin_namestore_heap.c
+++ b/src/namestore/plugin_namestore_heap.c
@@ -14,6 +14,8 @@
   *
   * You should have received a copy of the GNU Affero General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
   */
 
 /**
diff --git a/src/namestore/plugin_namestore_postgres.c 
b/src/namestore/plugin_namestore_postgres.c
index 7c6acc91b..57a8ae2be 100644
--- a/src/namestore/plugin_namestore_postgres.c
+++ b/src/namestore/plugin_namestore_postgres.c
@@ -14,6 +14,8 @@
   *
   * You should have received a copy of the GNU Affero General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
   */
 
 /**
diff --git a/src/namestore/plugin_namestore_sqlite.c 
b/src/namestore/plugin_namestore_sqlite.c
index e68a47a7b..96b0d6457 100644
--- a/src/namestore/plugin_namestore_sqlite.c
+++ b/src/namestore/plugin_namestore_sqlite.c
@@ -14,6 +14,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/namestore/test_namestore_api_lookup_nick.c 
b/src/namestore/test_namestore_api_lookup_nick.c
index 1a5a09e47..8f2896359 100644
--- a/src/namestore/test_namestore_api_lookup_nick.c
+++ b/src/namestore/test_namestore_api_lookup_nick.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file namestore/test_namestore_api_lookup_nick.c
diff --git a/src/namestore/test_namestore_api_lookup_private.c 
b/src/namestore/test_namestore_api_lookup_private.c
index 024adaa43..0730db04c 100644
--- a/src/namestore/test_namestore_api_lookup_private.c
+++ b/src/namestore/test_namestore_api_lookup_private.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file namestore/test_namestore_api_store.c
diff --git a/src/namestore/test_namestore_api_lookup_public.c 
b/src/namestore/test_namestore_api_lookup_public.c
index 63cd7662e..2a75d42f3 100644
--- a/src/namestore/test_namestore_api_lookup_public.c
+++ b/src/namestore/test_namestore_api_lookup_public.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file namestore/test_namestore_api.c
diff --git a/src/namestore/test_namestore_api_lookup_shadow.c 
b/src/namestore/test_namestore_api_lookup_shadow.c
index 08977712b..f26593bb0 100644
--- a/src/namestore/test_namestore_api_lookup_shadow.c
+++ b/src/namestore/test_namestore_api_lookup_shadow.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file namestore/test_namestore_api_lookup_shadow.c
diff --git a/src/namestore/test_namestore_api_lookup_shadow_filter.c 
b/src/namestore/test_namestore_api_lookup_shadow_filter.c
index 7555f51e7..0347eafcc 100644
--- a/src/namestore/test_namestore_api_lookup_shadow_filter.c
+++ b/src/namestore/test_namestore_api_lookup_shadow_filter.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file namestore/test_namestore_api_lookup_shadow_filter.c
diff --git a/src/namestore/test_namestore_api_monitoring.c 
b/src/namestore/test_namestore_api_monitoring.c
index 1051e3248..4aed21d86 100644
--- a/src/namestore/test_namestore_api_monitoring.c
+++ b/src/namestore/test_namestore_api_monitoring.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file namestore/test_namestore_api_monitoring.c
diff --git a/src/namestore/test_namestore_api_monitoring_existing.c 
b/src/namestore/test_namestore_api_monitoring_existing.c
index 867f18b27..f6ec01ffc 100644
--- a/src/namestore/test_namestore_api_monitoring_existing.c
+++ b/src/namestore/test_namestore_api_monitoring_existing.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file namestore/test_namestore_api_monitoring_existing.c
diff --git a/src/namestore/test_namestore_api_remove.c 
b/src/namestore/test_namestore_api_remove.c
index 7d993d4d9..35556e330 100644
--- a/src/namestore/test_namestore_api_remove.c
+++ b/src/namestore/test_namestore_api_remove.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file namestore/test_namestore_api.c
diff --git a/src/namestore/test_namestore_api_remove_not_existing_record.c 
b/src/namestore/test_namestore_api_remove_not_existing_record.c
index a5bd6c8c2..fdbe9390f 100644
--- a/src/namestore/test_namestore_api_remove_not_existing_record.c
+++ b/src/namestore/test_namestore_api_remove_not_existing_record.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file namestore/test_namestore_api_remove_not_existing_record.c
diff --git a/src/namestore/test_namestore_api_store.c 
b/src/namestore/test_namestore_api_store.c
index 61b534781..4fe77a2c6 100644
--- a/src/namestore/test_namestore_api_store.c
+++ b/src/namestore/test_namestore_api_store.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file namestore/test_namestore_api_store.c
diff --git a/src/namestore/test_namestore_api_store_update.c 
b/src/namestore/test_namestore_api_store_update.c
index bd62fdd4c..aad5852e9 100644
--- a/src/namestore/test_namestore_api_store_update.c
+++ b/src/namestore/test_namestore_api_store_update.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file namestore/test_namestore_api_store_update.c
diff --git a/src/namestore/test_namestore_api_zone_iteration.c 
b/src/namestore/test_namestore_api_zone_iteration.c
index af263c816..d09505db1 100644
--- a/src/namestore/test_namestore_api_zone_iteration.c
+++ b/src/namestore/test_namestore_api_zone_iteration.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file namestore/test_namestore_api_zone_iteration.c
diff --git a/src/namestore/test_namestore_api_zone_iteration_nick.c 
b/src/namestore/test_namestore_api_zone_iteration_nick.c
index efaadff55..867f5acae 100644
--- a/src/namestore/test_namestore_api_zone_iteration_nick.c
+++ b/src/namestore/test_namestore_api_zone_iteration_nick.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file namestore/test_namestore_api_zone_iteration.c
diff --git a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c 
b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
index 303a7648a..0be9bab98 100644
--- a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
+++ b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file namestore/test_namestore_api_zone_iteration_specific_zone.c
diff --git a/src/namestore/test_namestore_api_zone_iteration_stop.c 
b/src/namestore/test_namestore_api_zone_iteration_stop.c
index eb7ad4305..5b54e100e 100644
--- a/src/namestore/test_namestore_api_zone_iteration_stop.c
+++ b/src/namestore/test_namestore_api_zone_iteration_stop.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file namestore/test_namestore_api_zone_iteration.c
diff --git a/src/namestore/test_namestore_api_zone_to_name.c 
b/src/namestore/test_namestore_api_zone_to_name.c
index e689455b0..70abb9bb2 100644
--- a/src/namestore/test_namestore_api_zone_to_name.c
+++ b/src/namestore/test_namestore_api_zone_to_name.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file namestore/test_namestore_api_zone_to_name.c
diff --git a/src/namestore/test_plugin_namestore.c 
b/src/namestore/test_plugin_namestore.c
index 9d21ad16a..b9c7fbef9 100644
--- a/src/namestore/test_plugin_namestore.c
+++ b/src/namestore/test_plugin_namestore.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /*
  * @file namestore/test_plugin_namestore.c
diff --git a/src/nat-auto/gnunet-nat-auto.c b/src/nat-auto/gnunet-nat-auto.c
index 7d62dfbd1..bd8f4ff45 100644
--- a/src/nat-auto/gnunet-nat-auto.c
+++ b/src/nat-auto/gnunet-nat-auto.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/nat-auto/gnunet-nat-auto_legacy.c 
b/src/nat-auto/gnunet-nat-auto_legacy.c
index 650a9c268..4a24223fd 100644
--- a/src/nat-auto/gnunet-nat-auto_legacy.c
+++ b/src/nat-auto/gnunet-nat-auto_legacy.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/nat-auto/gnunet-nat-server.c b/src/nat-auto/gnunet-nat-server.c
index 7fd3ec371..c58768982 100644
--- a/src/nat-auto/gnunet-nat-server.c
+++ b/src/nat-auto/gnunet-nat-server.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/nat-auto/gnunet-service-nat-auto.c 
b/src/nat-auto/gnunet-service-nat-auto.c
index 62577e4dd..0b2995441 100644
--- a/src/nat-auto/gnunet-service-nat-auto.c
+++ b/src/nat-auto/gnunet-service-nat-auto.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/nat-auto/gnunet-service-nat-auto_legacy.c 
b/src/nat-auto/gnunet-service-nat-auto_legacy.c
index 3334ddd41..df2975e52 100644
--- a/src/nat-auto/gnunet-service-nat-auto_legacy.c
+++ b/src/nat-auto/gnunet-service-nat-auto_legacy.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/nat-auto/nat-auto.h b/src/nat-auto/nat-auto.h
index 3822c64cd..76d877dd3 100644
--- a/src/nat-auto/nat-auto.h
+++ b/src/nat-auto/nat-auto.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/nat-auto/nat_auto_api.c b/src/nat-auto/nat_auto_api.c
index 942f126e4..d7c081e49 100644
--- a/src/nat-auto/nat_auto_api.c
+++ b/src/nat-auto/nat_auto_api.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/nat-auto/nat_auto_api_test.c b/src/nat-auto/nat_auto_api_test.c
index 1b794c799..42ce08721 100644
--- a/src/nat-auto/nat_auto_api_test.c
+++ b/src/nat-auto/nat_auto_api_test.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file nat/nat_auto_api_test.c
diff --git a/src/nat/gnunet-helper-nat-client-windows.c 
b/src/nat/gnunet-helper-nat-client-windows.c
index 9dbaa0d48..dda6552d8 100644
--- a/src/nat/gnunet-helper-nat-client-windows.c
+++ b/src/nat/gnunet-helper-nat-client-windows.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/nat/gnunet-helper-nat-client.c 
b/src/nat/gnunet-helper-nat-client.c
index d4fc54b24..54a993452 100644
--- a/src/nat/gnunet-helper-nat-client.c
+++ b/src/nat/gnunet-helper-nat-client.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/nat/gnunet-helper-nat-server-windows.c 
b/src/nat/gnunet-helper-nat-server-windows.c
index c26684369..f1b4896e8 100644
--- a/src/nat/gnunet-helper-nat-server-windows.c
+++ b/src/nat/gnunet-helper-nat-server-windows.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/nat/gnunet-helper-nat-server.c 
b/src/nat/gnunet-helper-nat-server.c
index c5c6b563e..78b926037 100644
--- a/src/nat/gnunet-helper-nat-server.c
+++ b/src/nat/gnunet-helper-nat-server.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/nat/gnunet-nat.c b/src/nat/gnunet-nat.c
index ddc678ddc..31b6a7268 100644
--- a/src/nat/gnunet-nat.c
+++ b/src/nat/gnunet-nat.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/nat/gnunet-service-nat.c b/src/nat/gnunet-service-nat.c
index dd0715785..8e7ce51e9 100644
--- a/src/nat/gnunet-service-nat.c
+++ b/src/nat/gnunet-service-nat.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/nat/gnunet-service-nat.h b/src/nat/gnunet-service-nat.h
index d1cdd0180..ec642f6e5 100644
--- a/src/nat/gnunet-service-nat.h
+++ b/src/nat/gnunet-service-nat.h
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/nat/gnunet-service-nat_externalip.c 
b/src/nat/gnunet-service-nat_externalip.c
index e55f5ac1e..282b070d3 100644
--- a/src/nat/gnunet-service-nat_externalip.c
+++ b/src/nat/gnunet-service-nat_externalip.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * Code to figure out what our external IPv4 address(es) might
diff --git a/src/nat/gnunet-service-nat_externalip.h 
b/src/nat/gnunet-service-nat_externalip.h
index 846bac7b9..f93b6793d 100644
--- a/src/nat/gnunet-service-nat_externalip.h
+++ b/src/nat/gnunet-service-nat_externalip.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * Code to figure out what our external IPv4 address(es) might
diff --git a/src/nat/gnunet-service-nat_helper.c 
b/src/nat/gnunet-service-nat_helper.c
index 35b3dd999..56090bcea 100644
--- a/src/nat/gnunet-service-nat_helper.c
+++ b/src/nat/gnunet-service-nat_helper.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/nat/gnunet-service-nat_helper.h 
b/src/nat/gnunet-service-nat_helper.h
index 52b36e057..d9294d949 100644
--- a/src/nat/gnunet-service-nat_helper.h
+++ b/src/nat/gnunet-service-nat_helper.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/nat/gnunet-service-nat_mini.c 
b/src/nat/gnunet-service-nat_mini.c
index a3617e3ce..c156d0eb0 100644
--- a/src/nat/gnunet-service-nat_mini.c
+++ b/src/nat/gnunet-service-nat_mini.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/nat/gnunet-service-nat_mini.h 
b/src/nat/gnunet-service-nat_mini.h
index 86930f39f..4b84fb425 100644
--- a/src/nat/gnunet-service-nat_mini.h
+++ b/src/nat/gnunet-service-nat_mini.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/nat/gnunet-service-nat_stun.c 
b/src/nat/gnunet-service-nat_stun.c
index 17dfcadf4..639289207 100644
--- a/src/nat/gnunet-service-nat_stun.c
+++ b/src/nat/gnunet-service-nat_stun.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * This code provides some support for doing STUN transactions.  We
diff --git a/src/nat/gnunet-service-nat_stun.h 
b/src/nat/gnunet-service-nat_stun.h
index f34c7f43b..4a61c702f 100644
--- a/src/nat/gnunet-service-nat_stun.h
+++ b/src/nat/gnunet-service-nat_stun.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * This code provides some support for doing STUN transactions.  We
diff --git a/src/nat/nat.h b/src/nat/nat.h
index d5ec7747d..86de3c2f6 100644
--- a/src/nat/nat.h
+++ b/src/nat/nat.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/nat/nat_api.c b/src/nat/nat_api.c
index 017c8739d..6ae689b63 100644
--- a/src/nat/nat_api.c
+++ b/src/nat/nat_api.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/nat/nat_api_stun.c b/src/nat/nat_api_stun.c
index 9332cfd98..a0931a06f 100644
--- a/src/nat/nat_api_stun.c
+++ b/src/nat/nat_api_stun.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * This code provides some support for doing STUN transactions.
diff --git a/src/nat/nat_stun.h b/src/nat/nat_stun.h
index 25e2e46da..fb5262dfa 100644
--- a/src/nat/nat_stun.h
+++ b/src/nat/nat_stun.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * Message types for STUN server resolution
diff --git a/src/nat/test_nat.c b/src/nat/test_nat.c
index f38fa8e81..80d7cf792 100644
--- a/src/nat/test_nat.c
+++ b/src/nat/test_nat.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/nat/test_nat_mini.c b/src/nat/test_nat_mini.c
index cc8248cfe..8a7ff16f4 100644
--- a/src/nat/test_nat_mini.c
+++ b/src/nat/test_nat_mini.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/nat/test_nat_test.c b/src/nat/test_nat_test.c
index a7cbaeab4..c9479a688 100644
--- a/src/nat/test_nat_test.c
+++ b/src/nat/test_nat_test.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file nat/test_nat_test.c
diff --git a/src/nat/test_stun.c b/src/nat/test_stun.c
index 630538162..ee2db35e5 100644
--- a/src/nat/test_stun.c
+++ b/src/nat/test_stun.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/nse/gnunet-nse-profiler.c b/src/nse/gnunet-nse-profiler.c
index 6686f8a6d..a6b847f3a 100644
--- a/src/nse/gnunet-nse-profiler.c
+++ b/src/nse/gnunet-nse-profiler.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file nse/gnunet-nse-profiler.c
diff --git a/src/nse/gnunet-nse.c b/src/nse/gnunet-nse.c
index 710411019..bf2fe11c3 100644
--- a/src/nse/gnunet-nse.c
+++ b/src/nse/gnunet-nse.c
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/nse/gnunet-service-nse.c b/src/nse/gnunet-service-nse.c
index cce62b231..b1f70214c 100644
--- a/src/nse/gnunet-service-nse.c
+++ b/src/nse/gnunet-service-nse.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/nse/nse.h b/src/nse/nse.h
index b5ad6c35f..efff57679 100644
--- a/src/nse/nse.h
+++ b/src/nse/nse.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/nse/nse_api.c b/src/nse/nse_api.c
index cecda0ebe..e9eaada93 100644
--- a/src/nse/nse_api.c
+++ b/src/nse/nse_api.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/nse/perf_kdf.c b/src/nse/perf_kdf.c
index 4fc116c7f..5178f178b 100644
--- a/src/nse/perf_kdf.c
+++ b/src/nse/perf_kdf.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/nse/test_nse_api.c b/src/nse/test_nse_api.c
index f9d244014..e427e393b 100644
--- a/src/nse/test_nse_api.c
+++ b/src/nse/test_nse_api.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file nse/test_nse_api.c
diff --git a/src/nse/test_nse_multipeer.c b/src/nse/test_nse_multipeer.c
index 3b8fc969e..6a6046173 100644
--- a/src/nse/test_nse_multipeer.c
+++ b/src/nse/test_nse_multipeer.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file nse/test_nse_multipeer.c
diff --git a/src/nt/nt.c b/src/nt/nt.c
index ae0fef119..3b95738e8 100644
--- a/src/nt/nt.c
+++ b/src/nt/nt.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file nt/nt_api_scanner.c
diff --git a/src/peerinfo-tool/gnunet-peerinfo.c 
b/src/peerinfo-tool/gnunet-peerinfo.c
index 2a7b785ee..109416600 100644
--- a/src/peerinfo-tool/gnunet-peerinfo.c
+++ b/src/peerinfo-tool/gnunet-peerinfo.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/peerinfo-tool/gnunet-peerinfo_plugins.c 
b/src/peerinfo-tool/gnunet-peerinfo_plugins.c
index b9159a5c0..a8f43a1f1 100644
--- a/src/peerinfo-tool/gnunet-peerinfo_plugins.c
+++ b/src/peerinfo-tool/gnunet-peerinfo_plugins.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/peerinfo-tool/gnunet-peerinfo_plugins.h 
b/src/peerinfo-tool/gnunet-peerinfo_plugins.h
index 825af0ecb..53196677a 100644
--- a/src/peerinfo-tool/gnunet-peerinfo_plugins.h
+++ b/src/peerinfo-tool/gnunet-peerinfo_plugins.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/peerinfo-tool/test_gnunet_peerinfo.py.in 
b/src/peerinfo-tool/test_gnunet_peerinfo.py.in
index f54da3564..d07224b14 100755
--- a/src/peerinfo-tool/test_gnunet_peerinfo.py.in
+++ b/src/peerinfo-tool/test_gnunet_peerinfo.py.in
@@ -15,6 +15,8 @@
 #    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+#    SPDX-License-Identifier: AGPL3.0-or-later
+#
 # Testcase for gnunet-peerinfo
 import sys
 import os
diff --git a/src/peerinfo/gnunet-service-peerinfo.c 
b/src/peerinfo/gnunet-service-peerinfo.c
index 57da1b03e..75e99d1f8 100644
--- a/src/peerinfo/gnunet-service-peerinfo.c
+++ b/src/peerinfo/gnunet-service-peerinfo.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/peerinfo/peerinfo.h b/src/peerinfo/peerinfo.h
index 0c43c107b..ea1c6598c 100644
--- a/src/peerinfo/peerinfo.h
+++ b/src/peerinfo/peerinfo.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/peerinfo/peerinfo_api.c b/src/peerinfo/peerinfo_api.c
index 13458b11d..f2af27c0b 100644
--- a/src/peerinfo/peerinfo_api.c
+++ b/src/peerinfo/peerinfo_api.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/peerinfo/peerinfo_api_notify.c 
b/src/peerinfo/peerinfo_api_notify.c
index 097f784b5..fc9b64858 100644
--- a/src/peerinfo/peerinfo_api_notify.c
+++ b/src/peerinfo/peerinfo_api_notify.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/peerinfo/perf_peerinfo_api.c b/src/peerinfo/perf_peerinfo_api.c
index c561fdef8..29c27c48c 100644
--- a/src/peerinfo/perf_peerinfo_api.c
+++ b/src/peerinfo/perf_peerinfo_api.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/peerinfo/test_peerinfo_api.c b/src/peerinfo/test_peerinfo_api.c
index 12abe26db..9060cf7b7 100644
--- a/src/peerinfo/test_peerinfo_api.c
+++ b/src/peerinfo/test_peerinfo_api.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/peerinfo/test_peerinfo_api_friend_only.c 
b/src/peerinfo/test_peerinfo_api_friend_only.c
index 7ea65977c..d9d9200ac 100644
--- a/src/peerinfo/test_peerinfo_api_friend_only.c
+++ b/src/peerinfo/test_peerinfo_api_friend_only.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/peerinfo/test_peerinfo_api_notify_friend_only.c 
b/src/peerinfo/test_peerinfo_api_notify_friend_only.c
index 6b5c433b7..50118f8bb 100644
--- a/src/peerinfo/test_peerinfo_api_notify_friend_only.c
+++ b/src/peerinfo/test_peerinfo_api_notify_friend_only.c
@@ -14,6 +14,8 @@
 
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/peerinfo/test_peerinfo_shipped_hellos.c 
b/src/peerinfo/test_peerinfo_shipped_hellos.c
index 0e4f05c24..4da6ef0ac 100644
--- a/src/peerinfo/test_peerinfo_shipped_hellos.c
+++ b/src/peerinfo/test_peerinfo_shipped_hellos.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/peerstore/gnunet-peerstore.c b/src/peerstore/gnunet-peerstore.c
index f142c3f16..9d95655b4 100644
--- a/src/peerstore/gnunet-peerstore.c
+++ b/src/peerstore/gnunet-peerstore.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/peerstore/gnunet-service-peerstore.c 
b/src/peerstore/gnunet-service-peerstore.c
index 3414111f6..9bce542b9 100644
--- a/src/peerstore/gnunet-service-peerstore.c
+++ b/src/peerstore/gnunet-service-peerstore.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/peerstore/peerstore.h b/src/peerstore/peerstore.h
index 31a11aacf..15881e6c8 100644
--- a/src/peerstore/peerstore.h
+++ b/src/peerstore/peerstore.h
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file peerstore/peerstore.h
diff --git a/src/peerstore/peerstore_api.c b/src/peerstore/peerstore_api.c
index 892bc1679..6abdef43a 100644
--- a/src/peerstore/peerstore_api.c
+++ b/src/peerstore/peerstore_api.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file peerstore/peerstore_api.c
diff --git a/src/peerstore/peerstore_common.c b/src/peerstore/peerstore_common.c
index 99e334c43..0e2cc0514 100644
--- a/src/peerstore/peerstore_common.c
+++ b/src/peerstore/peerstore_common.c
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file peerstore/peerstore_common.c
diff --git a/src/peerstore/peerstore_common.h b/src/peerstore/peerstore_common.h
index e6f2dbdd4..1e3f228b8 100644
--- a/src/peerstore/peerstore_common.h
+++ b/src/peerstore/peerstore_common.h
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/peerstore/perf_peerstore_store.c 
b/src/peerstore/perf_peerstore_store.c
index b304a6679..51761cc4f 100644
--- a/src/peerstore/perf_peerstore_store.c
+++ b/src/peerstore/perf_peerstore_store.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file peerstore/perf_peerstore_store.c
diff --git a/src/peerstore/plugin_peerstore_flat.c 
b/src/peerstore/plugin_peerstore_flat.c
index a742ef03c..cd1837e1a 100644
--- a/src/peerstore/plugin_peerstore_flat.c
+++ b/src/peerstore/plugin_peerstore_flat.c
@@ -14,6 +14,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/peerstore/plugin_peerstore_sqlite.c 
b/src/peerstore/plugin_peerstore_sqlite.c
index e09274989..898db2231 100644
--- a/src/peerstore/plugin_peerstore_sqlite.c
+++ b/src/peerstore/plugin_peerstore_sqlite.c
@@ -14,6 +14,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/peerstore/test_peerstore_api_iterate.c 
b/src/peerstore/test_peerstore_api_iterate.c
index 3b01f312d..a19aad121 100644
--- a/src/peerstore/test_peerstore_api_iterate.c
+++ b/src/peerstore/test_peerstore_api_iterate.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file peerstore/test_peerstore_api_iterate.c
diff --git a/src/peerstore/test_peerstore_api_store.c 
b/src/peerstore/test_peerstore_api_store.c
index c3c03efc9..cecf13e05 100644
--- a/src/peerstore/test_peerstore_api_store.c
+++ b/src/peerstore/test_peerstore_api_store.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file peerstore/test_peerstore_api_store.c
diff --git a/src/peerstore/test_peerstore_api_sync.c 
b/src/peerstore/test_peerstore_api_sync.c
index 15d8572ac..6fe12335e 100644
--- a/src/peerstore/test_peerstore_api_sync.c
+++ b/src/peerstore/test_peerstore_api_sync.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file peerstore/test_peerstore_api_sync.c
diff --git a/src/peerstore/test_peerstore_api_watch.c 
b/src/peerstore/test_peerstore_api_watch.c
index d00d9dbb1..9f933f584 100644
--- a/src/peerstore/test_peerstore_api_watch.c
+++ b/src/peerstore/test_peerstore_api_watch.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file peerstore/test_peerstore_api_watch.c
diff --git a/src/peerstore/test_plugin_peerstore.c 
b/src/peerstore/test_plugin_peerstore.c
index 8b47ac1dc..5f18d1532 100644
--- a/src/peerstore/test_plugin_peerstore.c
+++ b/src/peerstore/test_plugin_peerstore.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /*
  * @file namestore/test_plugin_namestore.c
diff --git a/src/pq/pq.c b/src/pq/pq.c
index ae12f461e..df5ef17ad 100644
--- a/src/pq/pq.c
+++ b/src/pq/pq.c
@@ -14,6 +14,8 @@
 
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file pq/pq.c
diff --git a/src/pq/pq_connect.c b/src/pq/pq_connect.c
index 25619f8c0..a295eb864 100644
--- a/src/pq/pq_connect.c
+++ b/src/pq/pq_connect.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file pq/pq_connect.c
diff --git a/src/pq/pq_eval.c b/src/pq/pq_eval.c
index 586de6fea..2beb3475b 100644
--- a/src/pq/pq_eval.c
+++ b/src/pq/pq_eval.c
@@ -14,6 +14,8 @@
 
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file pq/pq_eval.c
diff --git a/src/pq/pq_exec.c b/src/pq/pq_exec.c
index f089d7c0a..99eb2b270 100644
--- a/src/pq/pq_exec.c
+++ b/src/pq/pq_exec.c
@@ -14,6 +14,8 @@
 
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file pq/pq_exec.c
diff --git a/src/pq/pq_prepare.c b/src/pq/pq_prepare.c
index d55741073..9a8e4e76f 100644
--- a/src/pq/pq_prepare.c
+++ b/src/pq/pq_prepare.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file pq/pq_prepare.c
diff --git a/src/pq/pq_query_helper.c b/src/pq/pq_query_helper.c
index 98f697b5d..a6ce3c5d8 100644
--- a/src/pq/pq_query_helper.c
+++ b/src/pq/pq_query_helper.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file pq/pq_query_helper.c
diff --git a/src/pq/pq_result_helper.c b/src/pq/pq_result_helper.c
index dc1a1554f..b0f0a8a6b 100644
--- a/src/pq/pq_result_helper.c
+++ b/src/pq/pq_result_helper.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file pq/pq_result_helper.c
diff --git a/src/pq/test_pq.c b/src/pq/test_pq.c
index 437f3b4e1..cfcf7dcd7 100644
--- a/src/pq/test_pq.c
+++ b/src/pq/test_pq.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file pq/test_pq.c
diff --git a/src/psyc/gnunet-service-psyc.c b/src/psyc/gnunet-service-psyc.c
index 2a335ca43..6f2f7a999 100644
--- a/src/psyc/gnunet-service-psyc.c
+++ b/src/psyc/gnunet-service-psyc.c
@@ -14,6 +14,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/psyc/psyc.h b/src/psyc/psyc.h
index 1296cc67f..74bbf3edc 100644
--- a/src/psyc/psyc.h
+++ b/src/psyc/psyc.h
@@ -14,6 +14,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/psyc/psyc_api.c b/src/psyc/psyc_api.c
index c87503119..37ea112cb 100644
--- a/src/psyc/psyc_api.c
+++ b/src/psyc/psyc_api.c
@@ -14,6 +14,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/psyc/psyc_test_lib.h b/src/psyc/psyc_test_lib.h
index 22b638edc..0ad991061 100644
--- a/src/psyc/psyc_test_lib.h
+++ b/src/psyc/psyc_test_lib.h
@@ -14,6 +14,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/psyc/test_psyc.c b/src/psyc/test_psyc.c
index f3dbbea17..b6e27bbab 100644
--- a/src/psyc/test_psyc.c
+++ b/src/psyc/test_psyc.c
@@ -14,6 +14,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/psyc/test_psyc2.c b/src/psyc/test_psyc2.c
index 4cfdab82a..c6e7237ab 100644
--- a/src/psyc/test_psyc2.c
+++ b/src/psyc/test_psyc2.c
@@ -14,6 +14,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/psyc/test_psyc_api_join.c b/src/psyc/test_psyc_api_join.c
index 896f308c0..419fa11c1 100644
--- a/src/psyc/test_psyc_api_join.c
+++ b/src/psyc/test_psyc_api_join.c
@@ -14,6 +14,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/psycstore/gnunet-service-psycstore.c 
b/src/psycstore/gnunet-service-psycstore.c
index dd27696c6..9aebd3e97 100644
--- a/src/psycstore/gnunet-service-psycstore.c
+++ b/src/psycstore/gnunet-service-psycstore.c
@@ -14,6 +14,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/psycstore/plugin_psycstore_mysql.c 
b/src/psycstore/plugin_psycstore_mysql.c
index 029e3f70f..c36b6f7a3 100644
--- a/src/psycstore/plugin_psycstore_mysql.c
+++ b/src/psycstore/plugin_psycstore_mysql.c
@@ -14,6 +14,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/psycstore/plugin_psycstore_postgres.c 
b/src/psycstore/plugin_psycstore_postgres.c
index 8a33c1ce7..33c9960b2 100644
--- a/src/psycstore/plugin_psycstore_postgres.c
+++ b/src/psycstore/plugin_psycstore_postgres.c
@@ -14,6 +14,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/psycstore/plugin_psycstore_sqlite.c 
b/src/psycstore/plugin_psycstore_sqlite.c
index 0630e7d95..24de38392 100644
--- a/src/psycstore/plugin_psycstore_sqlite.c
+++ b/src/psycstore/plugin_psycstore_sqlite.c
@@ -14,6 +14,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/psycstore/psycstore.h b/src/psycstore/psycstore.h
index c3d307e65..9a1c06aa8 100644
--- a/src/psycstore/psycstore.h
+++ b/src/psycstore/psycstore.h
@@ -14,6 +14,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/psycstore/psycstore_api.c b/src/psycstore/psycstore_api.c
index f345748c6..ab4cd0fbf 100644
--- a/src/psycstore/psycstore_api.c
+++ b/src/psycstore/psycstore_api.c
@@ -14,6 +14,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/psycstore/test_plugin_psycstore.c 
b/src/psycstore/test_plugin_psycstore.c
index 65ba38e9e..ff4eac820 100644
--- a/src/psycstore/test_plugin_psycstore.c
+++ b/src/psycstore/test_plugin_psycstore.c
@@ -14,6 +14,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/psycstore/test_psycstore.c b/src/psycstore/test_psycstore.c
index 160085368..ca509041c 100644
--- a/src/psycstore/test_psycstore.c
+++ b/src/psycstore/test_psycstore.c
@@ -14,6 +14,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/psycutil/psyc_env.c b/src/psycutil/psyc_env.c
index 10cf9001e..fc4b8eb7c 100644
--- a/src/psycutil/psyc_env.c
+++ b/src/psycutil/psyc_env.c
@@ -14,6 +14,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/psycutil/psyc_message.c b/src/psycutil/psyc_message.c
index 7daa923cf..a03eff47f 100644
--- a/src/psycutil/psyc_message.c
+++ b/src/psycutil/psyc_message.c
@@ -14,6 +14,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/psycutil/psyc_slicer.c b/src/psycutil/psyc_slicer.c
index d546f7946..9b25d8a4b 100644
--- a/src/psycutil/psyc_slicer.c
+++ b/src/psycutil/psyc_slicer.c
@@ -14,6 +14,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/psycutil/test_psyc_env.c b/src/psycutil/test_psyc_env.c
index 825ff12ec..432e15503 100644
--- a/src/psycutil/test_psyc_env.c
+++ b/src/psycutil/test_psyc_env.c
@@ -14,6 +14,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/pt/gnunet-daemon-pt.c b/src/pt/gnunet-daemon-pt.c
index 6a8c2e7f4..6a07b6e42 100644
--- a/src/pt/gnunet-daemon-pt.c
+++ b/src/pt/gnunet-daemon-pt.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file pt/gnunet-daemon-pt.c
diff --git a/src/pt/test_gns_vpn.c b/src/pt/test_gns_vpn.c
index 72b4bdc23..05fab18be 100644
--- a/src/pt/test_gns_vpn.c
+++ b/src/pt/test_gns_vpn.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/pt/test_gnunet_vpn.c b/src/pt/test_gnunet_vpn.c
index 43bed0a14..0afd0f94b 100644
--- a/src/pt/test_gnunet_vpn.c
+++ b/src/pt/test_gnunet_vpn.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/reclaim-attribute/plugin_reclaim_attribute_gnuid.c 
b/src/reclaim-attribute/plugin_reclaim_attribute_gnuid.c
index 48afc0732..4d506fe67 100644
--- a/src/reclaim-attribute/plugin_reclaim_attribute_gnuid.c
+++ b/src/reclaim-attribute/plugin_reclaim_attribute_gnuid.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/reclaim-attribute/reclaim_attribute.c 
b/src/reclaim-attribute/reclaim_attribute.c
index 1ffa9618f..a5520cbcf 100644
--- a/src/reclaim-attribute/reclaim_attribute.c
+++ b/src/reclaim-attribute/reclaim_attribute.c
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/reclaim-attribute/reclaim_attribute.h 
b/src/reclaim-attribute/reclaim_attribute.h
index 746d32980..43228f5c3 100644
--- a/src/reclaim-attribute/reclaim_attribute.h
+++ b/src/reclaim-attribute/reclaim_attribute.h
@@ -14,6 +14,8 @@
   
    You should have received a copy of the GNU Affero General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
    */
 /**
  * @author Martin Schanzenbach
diff --git a/src/reclaim/gnunet-reclaim.c b/src/reclaim/gnunet-reclaim.c
index 677e9f49f..177f505c6 100644
--- a/src/reclaim/gnunet-reclaim.c
+++ b/src/reclaim/gnunet-reclaim.c
@@ -14,6 +14,8 @@
   
    You should have received a copy of the GNU Affero General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
    */
 /**
  * @author Martin Schanzenbach
diff --git a/src/reclaim/gnunet-service-reclaim.c 
b/src/reclaim/gnunet-service-reclaim.c
index 600b5aec0..937e1410f 100644
--- a/src/reclaim/gnunet-service-reclaim.c
+++ b/src/reclaim/gnunet-service-reclaim.c
@@ -14,6 +14,8 @@
   
    You should have received a copy of the GNU Affero General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
    */
 /**
  * @author Martin Schanzenbach
diff --git a/src/reclaim/plugin_gnsrecord_reclaim.c 
b/src/reclaim/plugin_gnsrecord_reclaim.c
index 781b88abc..9be0e7632 100644
--- a/src/reclaim/plugin_gnsrecord_reclaim.c
+++ b/src/reclaim/plugin_gnsrecord_reclaim.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/reclaim/plugin_reclaim_sqlite.c 
b/src/reclaim/plugin_reclaim_sqlite.c
index b545a94e8..f6e1436cc 100644
--- a/src/reclaim/plugin_reclaim_sqlite.c
+++ b/src/reclaim/plugin_reclaim_sqlite.c
@@ -14,6 +14,8 @@
   *
   * You should have received a copy of the GNU Affero General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
   */
 
 /**
diff --git a/src/reclaim/reclaim.h b/src/reclaim/reclaim.h
index d2c84686d..38f32426a 100644
--- a/src/reclaim/reclaim.h
+++ b/src/reclaim/reclaim.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/reclaim/reclaim_api.c b/src/reclaim/reclaim_api.c
index 3f1584ccd..cfa0cbbfb 100644
--- a/src/reclaim/reclaim_api.c
+++ b/src/reclaim/reclaim_api.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/regex/gnunet-daemon-regexprofiler.c 
b/src/regex/gnunet-daemon-regexprofiler.c
index 11c2f513a..f1c00a554 100644
--- a/src/regex/gnunet-daemon-regexprofiler.c
+++ b/src/regex/gnunet-daemon-regexprofiler.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/regex/gnunet-regex-profiler.c 
b/src/regex/gnunet-regex-profiler.c
index f65ba3db1..a4d4ce99b 100644
--- a/src/regex/gnunet-regex-profiler.c
+++ b/src/regex/gnunet-regex-profiler.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/regex/gnunet-regex-simulation-profiler.c 
b/src/regex/gnunet-regex-simulation-profiler.c
index b7e256f48..e8f6d867b 100644
--- a/src/regex/gnunet-regex-simulation-profiler.c
+++ b/src/regex/gnunet-regex-simulation-profiler.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 
diff --git a/src/regex/gnunet-service-regex.c b/src/regex/gnunet-service-regex.c
index 9b9cad231..a866288a3 100644
--- a/src/regex/gnunet-service-regex.c
+++ b/src/regex/gnunet-service-regex.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/regex/perf-regex.c b/src/regex/perf-regex.c
index b507e75b0..ea331eed0 100644
--- a/src/regex/perf-regex.c
+++ b/src/regex/perf-regex.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/regex/plugin_block_regex.c b/src/regex/plugin_block_regex.c
index 76045efcd..bc2d287c5 100644
--- a/src/regex/plugin_block_regex.c
+++ b/src/regex/plugin_block_regex.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/regex/regex_api_announce.c b/src/regex/regex_api_announce.c
index e3ad70c6a..e1af0b7a9 100644
--- a/src/regex/regex_api_announce.c
+++ b/src/regex/regex_api_announce.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file regex/regex_api_announce.c
diff --git a/src/regex/regex_api_search.c b/src/regex/regex_api_search.c
index 2e2536a02..ebd1a69f3 100644
--- a/src/regex/regex_api_search.c
+++ b/src/regex/regex_api_search.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file regex/regex_api_search.c
diff --git a/src/regex/regex_block_lib.c b/src/regex/regex_block_lib.c
index 33eaf466f..b535394ca 100644
--- a/src/regex/regex_block_lib.c
+++ b/src/regex/regex_block_lib.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @author Bartlomiej Polot
diff --git a/src/regex/regex_block_lib.h b/src/regex/regex_block_lib.h
index c5f5f31c0..920c9d1d0 100644
--- a/src/regex/regex_block_lib.h
+++ b/src/regex/regex_block_lib.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/regex/regex_internal.c b/src/regex/regex_internal.c
index 944ca9bb9..3f667a11f 100644
--- a/src/regex/regex_internal.c
+++ b/src/regex/regex_internal.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file src/regex/regex_internal.c
diff --git a/src/regex/regex_internal.h b/src/regex/regex_internal.h
index d52479ffe..43686b5e2 100644
--- a/src/regex/regex_internal.h
+++ b/src/regex/regex_internal.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file src/regex/regex_internal.h
diff --git a/src/regex/regex_internal_dht.c b/src/regex/regex_internal_dht.c
index 2555ef1df..7cfaea894 100644
--- a/src/regex/regex_internal_dht.c
+++ b/src/regex/regex_internal_dht.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file src/regex/regex_internal_dht.c
diff --git a/src/regex/regex_internal_lib.h b/src/regex/regex_internal_lib.h
index dc194546d..bbf89758e 100644
--- a/src/regex/regex_internal_lib.h
+++ b/src/regex/regex_internal_lib.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file regex/regex_internal_lib.h
diff --git a/src/regex/regex_ipc.h b/src/regex/regex_ipc.h
index 71ac273cd..11c570178 100644
--- a/src/regex/regex_ipc.h
+++ b/src/regex/regex_ipc.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file regex/regex_ipc.h
diff --git a/src/regex/regex_test_graph.c b/src/regex/regex_test_graph.c
index d8f16e894..54ee1d17f 100644
--- a/src/regex/regex_test_graph.c
+++ b/src/regex/regex_test_graph.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file src/regex/regex_test_graph.c
diff --git a/src/regex/regex_test_lib.c b/src/regex/regex_test_lib.c
index d25799ea4..bd1a06a53 100644
--- a/src/regex/regex_test_lib.c
+++ b/src/regex/regex_test_lib.c
@@ -14,6 +14,8 @@
  * 
  *  You should have received a copy of the GNU Affero General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file src/regex/regex_test_lib.c
diff --git a/src/regex/regex_test_lib.h b/src/regex/regex_test_lib.h
index 533ba3efb..226a0fbb6 100644
--- a/src/regex/regex_test_lib.h
+++ b/src/regex/regex_test_lib.h
@@ -14,6 +14,8 @@
  * 
  *  You should have received a copy of the GNU Affero General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file src/regex/regex_test_lib.h
diff --git a/src/regex/regex_test_random.c b/src/regex/regex_test_random.c
index 6e51885ee..7fcdd1e63 100644
--- a/src/regex/regex_test_random.c
+++ b/src/regex/regex_test_random.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file src/regex/regex_test_random.c
diff --git a/src/regex/test_regex_api.c b/src/regex/test_regex_api.c
index a08e2ed6d..099f9f68c 100644
--- a/src/regex/test_regex_api.c
+++ b/src/regex/test_regex_api.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file regex/test_regex_api.c
diff --git a/src/regex/test_regex_eval_api.c b/src/regex/test_regex_eval_api.c
index 8a0c0d024..f8565b380 100644
--- a/src/regex/test_regex_eval_api.c
+++ b/src/regex/test_regex_eval_api.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file regex/test_regex_eval_api.c
diff --git a/src/regex/test_regex_graph_api.c b/src/regex/test_regex_graph_api.c
index 46eacc1d7..92792c19f 100644
--- a/src/regex/test_regex_graph_api.c
+++ b/src/regex/test_regex_graph_api.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file regex/test_regex_graph_api.c
diff --git a/src/regex/test_regex_integration.c 
b/src/regex/test_regex_integration.c
index 99287243e..d7a58b994 100644
--- a/src/regex/test_regex_integration.c
+++ b/src/regex/test_regex_integration.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file regex/test_regex_integration.c
diff --git a/src/regex/test_regex_iterate_api.c 
b/src/regex/test_regex_iterate_api.c
index f4cc725e0..bbc60475e 100644
--- a/src/regex/test_regex_iterate_api.c
+++ b/src/regex/test_regex_iterate_api.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file regex/test_regex_iterate_api.c
diff --git a/src/regex/test_regex_proofs.c b/src/regex/test_regex_proofs.c
index 72e02fa07..4f49ef656 100644
--- a/src/regex/test_regex_proofs.c
+++ b/src/regex/test_regex_proofs.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file regex/test_regex_proofs.c
diff --git a/src/rest-plugins/json_reclaim.c b/src/rest-plugins/json_reclaim.c
index 03f58e0ba..0fe9150d9 100644
--- a/src/rest-plugins/json_reclaim.c
+++ b/src/rest-plugins/json_reclaim.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/rest-plugins/json_reclaim.h b/src/rest-plugins/json_reclaim.h
index 49674a173..ced2e10dd 100644
--- a/src/rest-plugins/json_reclaim.h
+++ b/src/rest-plugins/json_reclaim.h
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/rest-plugins/oidc_helper.c b/src/rest-plugins/oidc_helper.c
index 539d59e08..646e58551 100644
--- a/src/rest-plugins/oidc_helper.c
+++ b/src/rest-plugins/oidc_helper.c
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/rest-plugins/oidc_helper.h b/src/rest-plugins/oidc_helper.h
index ebec1a865..d718b7a78 100644
--- a/src/rest-plugins/oidc_helper.h
+++ b/src/rest-plugins/oidc_helper.h
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/rest-plugins/plugin_rest_copying.c 
b/src/rest-plugins/plugin_rest_copying.c
index 668dc5d38..92c2c6601 100644
--- a/src/rest-plugins/plugin_rest_copying.c
+++ b/src/rest-plugins/plugin_rest_copying.c
@@ -14,6 +14,8 @@
   
    You should have received a copy of the GNU Affero General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
    */
 /**
  * @author Martin Schanzenbach
diff --git a/src/rest-plugins/plugin_rest_credential.c 
b/src/rest-plugins/plugin_rest_credential.c
index 253378dfc..78267b54e 100644
--- a/src/rest-plugins/plugin_rest_credential.c
+++ b/src/rest-plugins/plugin_rest_credential.c
@@ -14,6 +14,8 @@
   
    You should have received a copy of the GNU Affero General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
    */
 /**
  * @author Martin Schanzenbach
diff --git a/src/rest-plugins/plugin_rest_gns.c 
b/src/rest-plugins/plugin_rest_gns.c
index 0bf4198fc..e41df4085 100644
--- a/src/rest-plugins/plugin_rest_gns.c
+++ b/src/rest-plugins/plugin_rest_gns.c
@@ -14,6 +14,8 @@
 
    You should have received a copy of the GNU Affero General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
    */
 /**
  * @author Philippe Buschmann
diff --git a/src/rest-plugins/plugin_rest_identity.c 
b/src/rest-plugins/plugin_rest_identity.c
index 9f1765a63..3bfca3121 100644
--- a/src/rest-plugins/plugin_rest_identity.c
+++ b/src/rest-plugins/plugin_rest_identity.c
@@ -14,6 +14,8 @@
 
    You should have received a copy of the GNU Affero General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @author Martin Schanzenbach
diff --git a/src/rest-plugins/plugin_rest_namestore.c 
b/src/rest-plugins/plugin_rest_namestore.c
index 2926f4b90..26a037eae 100644
--- a/src/rest-plugins/plugin_rest_namestore.c
+++ b/src/rest-plugins/plugin_rest_namestore.c
@@ -14,6 +14,8 @@
 
    You should have received a copy of the GNU Affero General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
    */
 /**
  * @author Martin Schanzenbach
diff --git a/src/rest-plugins/plugin_rest_openid_connect.c 
b/src/rest-plugins/plugin_rest_openid_connect.c
index 1d92410b5..9124de7ff 100644
--- a/src/rest-plugins/plugin_rest_openid_connect.c
+++ b/src/rest-plugins/plugin_rest_openid_connect.c
@@ -14,6 +14,8 @@
   
    You should have received a copy of the GNU Affero General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
    */
 /**
  * @author Martin Schanzenbach
diff --git a/src/rest-plugins/plugin_rest_peerinfo.c 
b/src/rest-plugins/plugin_rest_peerinfo.c
index 29b40088d..24af2c193 100644
--- a/src/rest-plugins/plugin_rest_peerinfo.c
+++ b/src/rest-plugins/plugin_rest_peerinfo.c
@@ -14,6 +14,8 @@
 
    You should have received a copy of the GNU Affero General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
    */
 /**
  * @author Martin Schanzenbach
diff --git a/src/rest-plugins/plugin_rest_reclaim.c 
b/src/rest-plugins/plugin_rest_reclaim.c
index 3919e8ab1..b36ed2bb6 100644
--- a/src/rest-plugins/plugin_rest_reclaim.c
+++ b/src/rest-plugins/plugin_rest_reclaim.c
@@ -14,6 +14,8 @@
   
    You should have received a copy of the GNU Affero General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
    */
 /**
  * @author Martin Schanzenbach
diff --git a/src/rest/gnunet-rest-server.c b/src/rest/gnunet-rest-server.c
index 5c5a2daa9..77f3d898d 100644
--- a/src/rest/gnunet-rest-server.c
+++ b/src/rest/gnunet-rest-server.c
@@ -14,6 +14,8 @@
   
    You should have received a copy of the GNU Affero General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
    */
 /**
  * @author Martin Schanzenbach
diff --git a/src/rest/rest.c b/src/rest/rest.c
index d6f5de895..b0c2da6c2 100644
--- a/src/rest/rest.c
+++ b/src/rest/rest.c
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/revocation/gnunet-revocation.c 
b/src/revocation/gnunet-revocation.c
index 7ec4c0d14..7596cab2d 100644
--- a/src/revocation/gnunet-revocation.c
+++ b/src/revocation/gnunet-revocation.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/revocation/gnunet-service-revocation.c 
b/src/revocation/gnunet-service-revocation.c
index ce1fefd34..fd646b4b7 100644
--- a/src/revocation/gnunet-service-revocation.c
+++ b/src/revocation/gnunet-service-revocation.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/revocation/plugin_block_revocation.c 
b/src/revocation/plugin_block_revocation.c
index 3ed743288..2d03eb8b2 100644
--- a/src/revocation/plugin_block_revocation.c
+++ b/src/revocation/plugin_block_revocation.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/revocation/revocation.h b/src/revocation/revocation.h
index 28168c8a5..f17a7fae5 100644
--- a/src/revocation/revocation.h
+++ b/src/revocation/revocation.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/revocation/revocation_api.c b/src/revocation/revocation_api.c
index bc9700817..90f15a17a 100644
--- a/src/revocation/revocation_api.c
+++ b/src/revocation/revocation_api.c
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file revocation/revocation_api.c
diff --git a/src/revocation/test_local_revocation.py.in 
b/src/revocation/test_local_revocation.py.in
index f31ed3cfe..212e8e777 100644
--- a/src/revocation/test_local_revocation.py.in
+++ b/src/revocation/test_local_revocation.py.in
@@ -15,6 +15,8 @@
 #    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+#    SPDX-License-Identifier: AGPL3.0-or-later
+#
 # Testcase for ego revocation
 from __future__ import print_function
 import sys
diff --git a/src/revocation/test_revocation.c b/src/revocation/test_revocation.c
index 145726e14..e384d309a 100644
--- a/src/revocation/test_revocation.c
+++ b/src/revocation/test_revocation.c
@@ -14,6 +14,8 @@
   
    You should have received a copy of the GNU Affero General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file revocation/test_revocation.c
diff --git a/src/rps/gnunet-rps-profiler.c b/src/rps/gnunet-rps-profiler.c
index e7759689b..36a167203 100644
--- a/src/rps/gnunet-rps-profiler.c
+++ b/src/rps/gnunet-rps-profiler.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file rps/test_rps.c
diff --git a/src/rps/gnunet-rps.c b/src/rps/gnunet-rps.c
index 49189481f..50b5b6739 100644
--- a/src/rps/gnunet-rps.c
+++ b/src/rps/gnunet-rps.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/rps/gnunet-service-rps.c b/src/rps/gnunet-service-rps.c
index 0c333c4f1..08f2450f5 100644
--- a/src/rps/gnunet-service-rps.c
+++ b/src/rps/gnunet-service-rps.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/rps/gnunet-service-rps_custommap.c 
b/src/rps/gnunet-service-rps_custommap.c
index c0cb6e650..18a433d6b 100644
--- a/src/rps/gnunet-service-rps_custommap.c
+++ b/src/rps/gnunet-service-rps_custommap.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/rps/gnunet-service-rps_custommap.h 
b/src/rps/gnunet-service-rps_custommap.h
index 376213728..53d256487 100644
--- a/src/rps/gnunet-service-rps_custommap.h
+++ b/src/rps/gnunet-service-rps_custommap.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/rps/gnunet-service-rps_sampler.c 
b/src/rps/gnunet-service-rps_sampler.c
index d3abfa67f..a95ac82d4 100644
--- a/src/rps/gnunet-service-rps_sampler.c
+++ b/src/rps/gnunet-service-rps_sampler.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/rps/gnunet-service-rps_sampler.h 
b/src/rps/gnunet-service-rps_sampler.h
index ab4a6bbbb..9f60aa7c9 100644
--- a/src/rps/gnunet-service-rps_sampler.h
+++ b/src/rps/gnunet-service-rps_sampler.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/rps/gnunet-service-rps_sampler_elem.c 
b/src/rps/gnunet-service-rps_sampler_elem.c
index f0c112ac7..737b7ee7f 100644
--- a/src/rps/gnunet-service-rps_sampler_elem.c
+++ b/src/rps/gnunet-service-rps_sampler_elem.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/rps/gnunet-service-rps_sampler_elem.h 
b/src/rps/gnunet-service-rps_sampler_elem.h
index 7598a627b..3f33a6816 100644
--- a/src/rps/gnunet-service-rps_sampler_elem.h
+++ b/src/rps/gnunet-service-rps_sampler_elem.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/rps/gnunet-service-rps_view.c 
b/src/rps/gnunet-service-rps_view.c
index 17fec559d..8a0cae21e 100644
--- a/src/rps/gnunet-service-rps_view.c
+++ b/src/rps/gnunet-service-rps_view.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/rps/gnunet-service-rps_view.h 
b/src/rps/gnunet-service-rps_view.h
index a9017bab8..4339b6d4e 100644
--- a/src/rps/gnunet-service-rps_view.h
+++ b/src/rps/gnunet-service-rps_view.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/rps/rps-sampler_client.c b/src/rps/rps-sampler_client.c
index 7b6094b0c..1ba60e1a8 100644
--- a/src/rps/rps-sampler_client.c
+++ b/src/rps/rps-sampler_client.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/rps/rps-sampler_client.h b/src/rps/rps-sampler_client.h
index fd0538efa..1b425b754 100644
--- a/src/rps/rps-sampler_client.h
+++ b/src/rps/rps-sampler_client.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/rps/rps-sampler_common.c b/src/rps/rps-sampler_common.c
index 60d2d5ed5..e34cdd67b 100644
--- a/src/rps/rps-sampler_common.c
+++ b/src/rps/rps-sampler_common.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/rps/rps-sampler_common.h b/src/rps/rps-sampler_common.h
index a9a079aff..e36f6e834 100644
--- a/src/rps/rps-sampler_common.h
+++ b/src/rps/rps-sampler_common.h
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/rps/rps-test_util.c b/src/rps/rps-test_util.c
index 6644a1c20..7f54feca1 100644
--- a/src/rps/rps-test_util.c
+++ b/src/rps/rps-test_util.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/rps/rps-test_util.h b/src/rps/rps-test_util.h
index 5dfcc5f6a..cf15a9909 100644
--- a/src/rps/rps-test_util.h
+++ b/src/rps/rps-test_util.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/rps/rps.h b/src/rps/rps.h
index 616eabdac..ef968ffbb 100644
--- a/src/rps/rps.h
+++ b/src/rps/rps.h
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file rps/rps.h
diff --git a/src/rps/rps_api.c b/src/rps/rps_api.c
index a489b4ff1..6fac4cf6f 100644
--- a/src/rps/rps_api.c
+++ b/src/rps/rps_api.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/rps/test_rps.c b/src/rps/test_rps.c
index 63a6007ae..126cc5dec 100644
--- a/src/rps/test_rps.c
+++ b/src/rps/test_rps.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file rps/test_rps.c
diff --git a/src/rps/test_rps_api.c b/src/rps/test_rps_api.c
index 85a0ccdd0..b56eaabf2 100644
--- a/src/rps/test_rps_api.c
+++ b/src/rps/test_rps_api.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file rps/test_rps_api.c
diff --git a/src/rps/test_service_rps_custommap.c 
b/src/rps/test_service_rps_custommap.c
index 003523087..d2061d4ec 100644
--- a/src/rps/test_service_rps_custommap.c
+++ b/src/rps/test_service_rps_custommap.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file rps/test_service_rps_custommap.c
diff --git a/src/rps/test_service_rps_sampler_elem.c 
b/src/rps/test_service_rps_sampler_elem.c
index c68a3e384..4e96b9bd1 100644
--- a/src/rps/test_service_rps_sampler_elem.c
+++ b/src/rps/test_service_rps_sampler_elem.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file rps/test_service_rps_sampler_elem.c
diff --git a/src/rps/test_service_rps_view.c b/src/rps/test_service_rps_view.c
index 7418a16fc..c366b407b 100644
--- a/src/rps/test_service_rps_view.c
+++ b/src/rps/test_service_rps_view.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file rps/test_service_rps_view.c
diff --git a/src/scalarproduct/gnunet-scalarproduct.c 
b/src/scalarproduct/gnunet-scalarproduct.c
index 4bb0e0d50..7a86b27d2 100644
--- a/src/scalarproduct/gnunet-scalarproduct.c
+++ b/src/scalarproduct/gnunet-scalarproduct.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/scalarproduct/gnunet-service-scalarproduct-ecc.h 
b/src/scalarproduct/gnunet-service-scalarproduct-ecc.h
index 29161a8fc..0c40eb0c3 100644
--- a/src/scalarproduct/gnunet-service-scalarproduct-ecc.h
+++ b/src/scalarproduct/gnunet-service-scalarproduct-ecc.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file scalarproduct/gnunet-service-scalarproduct-ecc.h
diff --git a/src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c 
b/src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c
index a71e0d1c8..368bbe605 100644
--- a/src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c
+++ b/src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file scalarproduct/gnunet-service-scalarproduct-ecc_alice.c
diff --git a/src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c 
b/src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c
index c6424ffcb..eb39943f8 100644
--- a/src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c
+++ b/src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file scalarproduct/gnunet-service-scalarproduct-ecc_bob.c
diff --git a/src/scalarproduct/gnunet-service-scalarproduct.h 
b/src/scalarproduct/gnunet-service-scalarproduct.h
index e0551ca3d..668f6441c 100644
--- a/src/scalarproduct/gnunet-service-scalarproduct.h
+++ b/src/scalarproduct/gnunet-service-scalarproduct.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file scalarproduct/gnunet-service-scalarproduct.h
diff --git a/src/scalarproduct/gnunet-service-scalarproduct_alice.c 
b/src/scalarproduct/gnunet-service-scalarproduct_alice.c
index c7550ca85..38aef6409 100644
--- a/src/scalarproduct/gnunet-service-scalarproduct_alice.c
+++ b/src/scalarproduct/gnunet-service-scalarproduct_alice.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file scalarproduct/gnunet-service-scalarproduct_alice.c
diff --git a/src/scalarproduct/gnunet-service-scalarproduct_bob.c 
b/src/scalarproduct/gnunet-service-scalarproduct_bob.c
index 84223cc8e..0b95f3a00 100644
--- a/src/scalarproduct/gnunet-service-scalarproduct_bob.c
+++ b/src/scalarproduct/gnunet-service-scalarproduct_bob.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file scalarproduct/gnunet-service-scalarproduct_bob.c
diff --git a/src/scalarproduct/scalarproduct.h 
b/src/scalarproduct/scalarproduct.h
index d4b0d5b88..2a6a5c76c 100644
--- a/src/scalarproduct/scalarproduct.h
+++ b/src/scalarproduct/scalarproduct.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file   scalarproduct.h
diff --git a/src/scalarproduct/scalarproduct_api.c 
b/src/scalarproduct/scalarproduct_api.c
index 529d45fbe..89aec14bc 100644
--- a/src/scalarproduct/scalarproduct_api.c
+++ b/src/scalarproduct/scalarproduct_api.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file scalarproduct/scalarproduct_api.c
diff --git a/src/scalarproduct/test_ecc_scalarproduct.c 
b/src/scalarproduct/test_ecc_scalarproduct.c
index 0fcb11139..f078ab37d 100644
--- a/src/scalarproduct/test_ecc_scalarproduct.c
+++ b/src/scalarproduct/test_ecc_scalarproduct.c
@@ -15,6 +15,8 @@
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+     SPDX-License-Identifier: AGPL3.0-or-later
+
 */
 /**
  * @file util/test_ecc_scalarproduct.c
diff --git a/src/secretsharing/gnunet-secretsharing-profiler.c 
b/src/secretsharing/gnunet-secretsharing-profiler.c
index 12c97e2ba..f4cc0f248 100644
--- a/src/secretsharing/gnunet-secretsharing-profiler.c
+++ b/src/secretsharing/gnunet-secretsharing-profiler.c
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/secretsharing/gnunet-service-secretsharing.c 
b/src/secretsharing/gnunet-service-secretsharing.c
index 1f565cfeb..d4c01fedb 100644
--- a/src/secretsharing/gnunet-service-secretsharing.c
+++ b/src/secretsharing/gnunet-service-secretsharing.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/secretsharing/secretsharing.h 
b/src/secretsharing/secretsharing.h
index cc485fd8a..d3f054919 100644
--- a/src/secretsharing/secretsharing.h
+++ b/src/secretsharing/secretsharing.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/secretsharing/secretsharing_api.c 
b/src/secretsharing/secretsharing_api.c
index 2a828f08d..065aac8d7 100644
--- a/src/secretsharing/secretsharing_api.c
+++ b/src/secretsharing/secretsharing_api.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/secretsharing/secretsharing_common.c 
b/src/secretsharing/secretsharing_common.c
index d5699d76e..7fb45793e 100644
--- a/src/secretsharing/secretsharing_common.c
+++ b/src/secretsharing/secretsharing_common.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 #include "secretsharing.h"
diff --git a/src/secretsharing/secretsharing_protocol.h 
b/src/secretsharing/secretsharing_protocol.h
index da1454ec0..f05d27e29 100644
--- a/src/secretsharing/secretsharing_protocol.h
+++ b/src/secretsharing/secretsharing_protocol.h
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 
diff --git a/src/secretsharing/test_secretsharing_api.c 
b/src/secretsharing/test_secretsharing_api.c
index f5814132f..a217bafcc 100644
--- a/src/secretsharing/test_secretsharing_api.c
+++ b/src/secretsharing/test_secretsharing_api.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/set/gnunet-service-set.c b/src/set/gnunet-service-set.c
index 75122395d..0d47504d2 100644
--- a/src/set/gnunet-service-set.c
+++ b/src/set/gnunet-service-set.c
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file set/gnunet-service-set.c
diff --git a/src/set/gnunet-service-set.h b/src/set/gnunet-service-set.h
index a58b22995..c39c68d21 100644
--- a/src/set/gnunet-service-set.h
+++ b/src/set/gnunet-service-set.h
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file set/gnunet-service-set.h
diff --git a/src/set/gnunet-service-set_intersection.c 
b/src/set/gnunet-service-set_intersection.c
index 1083384f5..d681666fe 100644
--- a/src/set/gnunet-service-set_intersection.c
+++ b/src/set/gnunet-service-set_intersection.c
@@ -14,6 +14,8 @@
 
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file set/gnunet-service-set_intersection.c
diff --git a/src/set/gnunet-service-set_intersection.h 
b/src/set/gnunet-service-set_intersection.h
index a3a3172f6..0e8e644cc 100644
--- a/src/set/gnunet-service-set_intersection.h
+++ b/src/set/gnunet-service-set_intersection.h
@@ -15,6 +15,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file set/gnunet-service-set_intersection.h
diff --git a/src/set/gnunet-service-set_protocol.h 
b/src/set/gnunet-service-set_protocol.h
index 6ec08ce22..13f90a6df 100644
--- a/src/set/gnunet-service-set_protocol.h
+++ b/src/set/gnunet-service-set_protocol.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @author Florian Dold
diff --git a/src/set/gnunet-service-set_union.c 
b/src/set/gnunet-service-set_union.c
index 73d3f5c83..7d7ab27a5 100644
--- a/src/set/gnunet-service-set_union.c
+++ b/src/set/gnunet-service-set_union.c
@@ -14,6 +14,8 @@
 
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file set/gnunet-service-set_union.c
diff --git a/src/set/gnunet-service-set_union.h 
b/src/set/gnunet-service-set_union.h
index a4dff4885..5d9b8965a 100644
--- a/src/set/gnunet-service-set_union.h
+++ b/src/set/gnunet-service-set_union.h
@@ -15,6 +15,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file set/gnunet-service-set_union.h
diff --git a/src/set/gnunet-service-set_union_strata_estimator.c 
b/src/set/gnunet-service-set_union_strata_estimator.c
index 16b7fd234..688c32306 100644
--- a/src/set/gnunet-service-set_union_strata_estimator.c
+++ b/src/set/gnunet-service-set_union_strata_estimator.c
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file set/gnunet-service-set_union_strata_estimator.c
diff --git a/src/set/gnunet-service-set_union_strata_estimator.h 
b/src/set/gnunet-service-set_union_strata_estimator.h
index 3e4dfa93b..99f16f20a 100644
--- a/src/set/gnunet-service-set_union_strata_estimator.h
+++ b/src/set/gnunet-service-set_union_strata_estimator.h
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/set/gnunet-set-ibf-profiler.c 
b/src/set/gnunet-set-ibf-profiler.c
index e1a2f4aa8..d45669dc7 100644
--- a/src/set/gnunet-set-ibf-profiler.c
+++ b/src/set/gnunet-set-ibf-profiler.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/set/gnunet-set-profiler.c b/src/set/gnunet-set-profiler.c
index 2a7d5174c..9b30d47fd 100644
--- a/src/set/gnunet-set-profiler.c
+++ b/src/set/gnunet-set-profiler.c
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/set/ibf.c b/src/set/ibf.c
index 0cfd15109..43d2e7bce 100644
--- a/src/set/ibf.c
+++ b/src/set/ibf.c
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/set/ibf.h b/src/set/ibf.h
index 07c323635..dd0edc053 100644
--- a/src/set/ibf.h
+++ b/src/set/ibf.h
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/set/ibf_sim.c b/src/set/ibf_sim.c
index 1ec90e87b..d05e06188 100644
--- a/src/set/ibf_sim.c
+++ b/src/set/ibf_sim.c
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/set/plugin_block_set_test.c b/src/set/plugin_block_set_test.c
index d8021886d..f7bdb8920 100644
--- a/src/set/plugin_block_set_test.c
+++ b/src/set/plugin_block_set_test.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/set/set.h b/src/set/set.h
index 06d8382f9..34b97736c 100644
--- a/src/set/set.h
+++ b/src/set/set.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file set/set.h
diff --git a/src/set/set_api.c b/src/set/set_api.c
index ec06af520..3b92cd26c 100644
--- a/src/set/set_api.c
+++ b/src/set/set_api.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file set/set_api.c
diff --git a/src/set/test_set_api.c b/src/set/test_set_api.c
index 736abf025..7fd69a752 100644
--- a/src/set/test_set_api.c
+++ b/src/set/test_set_api.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/set/test_set_intersection_result_full.c 
b/src/set/test_set_intersection_result_full.c
index 63f8c2360..3f209668d 100644
--- a/src/set/test_set_intersection_result_full.c
+++ b/src/set/test_set_intersection_result_full.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/set/test_set_union_copy.c b/src/set/test_set_union_copy.c
index d63bcd3d2..d129753e8 100644
--- a/src/set/test_set_union_copy.c
+++ b/src/set/test_set_union_copy.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/set/test_set_union_result_symmetric.c 
b/src/set/test_set_union_result_symmetric.c
index 10d031cc4..3fe7e4995 100644
--- a/src/set/test_set_union_result_symmetric.c
+++ b/src/set/test_set_union_result_symmetric.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/social/gnunet-service-social.c 
b/src/social/gnunet-service-social.c
index 7e2c6efef..33fabae5d 100644
--- a/src/social/gnunet-service-social.c
+++ b/src/social/gnunet-service-social.c
@@ -14,6 +14,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/social/gnunet-social.c b/src/social/gnunet-social.c
index 9cff2da12..14701bfda 100644
--- a/src/social/gnunet-social.c
+++ b/src/social/gnunet-social.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/social/social.h b/src/social/social.h
index 9464db19d..73f73f651 100644
--- a/src/social/social.h
+++ b/src/social/social.h
@@ -14,6 +14,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/social/social_api.c b/src/social/social_api.c
index 189d1256f..9b9658096 100644
--- a/src/social/social_api.c
+++ b/src/social/social_api.c
@@ -14,6 +14,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/social/test_social.c b/src/social/test_social.c
index ffc790052..feac3c591 100644
--- a/src/social/test_social.c
+++ b/src/social/test_social.c
@@ -14,6 +14,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file social/test_social.c
diff --git a/src/sq/sq.c b/src/sq/sq.c
index 1281da82e..36200aa26 100644
--- a/src/sq/sq.c
+++ b/src/sq/sq.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file sq/sq.c
diff --git a/src/sq/sq_exec.c b/src/sq/sq_exec.c
index 34a54dcca..325dfa014 100644
--- a/src/sq/sq_exec.c
+++ b/src/sq/sq_exec.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file sq/sq_exec.c
diff --git a/src/sq/sq_prepare.c b/src/sq/sq_prepare.c
index 8c46302f2..ab5ee09f5 100644
--- a/src/sq/sq_prepare.c
+++ b/src/sq/sq_prepare.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file sq/sq_prepare.c
diff --git a/src/sq/sq_query_helper.c b/src/sq/sq_query_helper.c
index 5f15fcec1..2c7a9028a 100644
--- a/src/sq/sq_query_helper.c
+++ b/src/sq/sq_query_helper.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file sq/sq_query_helper.c
diff --git a/src/sq/sq_result_helper.c b/src/sq/sq_result_helper.c
index ebbd4f814..aba1eaea5 100644
--- a/src/sq/sq_result_helper.c
+++ b/src/sq/sq_result_helper.c
@@ -15,6 +15,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file sq/sq_result_helper.c
diff --git a/src/sq/test_sq.c b/src/sq/test_sq.c
index 3d7685c6e..c6711bf0d 100644
--- a/src/sq/test_sq.c
+++ b/src/sq/test_sq.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file sq/test_sq.c
diff --git a/src/statistics/gnunet-service-statistics.c 
b/src/statistics/gnunet-service-statistics.c
index f9877301b..5ce54d768 100644
--- a/src/statistics/gnunet-service-statistics.c
+++ b/src/statistics/gnunet-service-statistics.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/statistics/gnunet-statistics.c 
b/src/statistics/gnunet-statistics.c
index 8f43df0ff..bf111ade2 100644
--- a/src/statistics/gnunet-statistics.c
+++ b/src/statistics/gnunet-statistics.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/statistics/statistics.h b/src/statistics/statistics.h
index c05b5e222..f5fa48580 100644
--- a/src/statistics/statistics.h
+++ b/src/statistics/statistics.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/statistics/statistics_api.c b/src/statistics/statistics_api.c
index 35390ffca..da307c887 100644
--- a/src/statistics/statistics_api.c
+++ b/src/statistics/statistics_api.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/statistics/test_statistics_api.c 
b/src/statistics/test_statistics_api.c
index 6831f1e5b..7a0756cda 100644
--- a/src/statistics/test_statistics_api.c
+++ b/src/statistics/test_statistics_api.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file statistics/test_statistics_api.c
diff --git a/src/statistics/test_statistics_api_loop.c 
b/src/statistics/test_statistics_api_loop.c
index 87cfaff59..2438fd95a 100644
--- a/src/statistics/test_statistics_api_loop.c
+++ b/src/statistics/test_statistics_api_loop.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file statistics/test_statistics_api_loop.c
diff --git a/src/statistics/test_statistics_api_watch.c 
b/src/statistics/test_statistics_api_watch.c
index ced14e6b5..38ba0e84e 100644
--- a/src/statistics/test_statistics_api_watch.c
+++ b/src/statistics/test_statistics_api_watch.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file statistics/test_statistics_api_watch.c
diff --git a/src/statistics/test_statistics_api_watch_zero_value.c 
b/src/statistics/test_statistics_api_watch_zero_value.c
index f36cc8392..05dc75366 100644
--- a/src/statistics/test_statistics_api_watch_zero_value.c
+++ b/src/statistics/test_statistics_api_watch_zero_value.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file statistics/test_statistics_api_watch_zero_value.c
diff --git a/src/template/gnunet-service-template.c 
b/src/template/gnunet-service-template.c
index 45209f6fe..7c6575163 100644
--- a/src/template/gnunet-service-template.c
+++ b/src/template/gnunet-service-template.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/template/gnunet-template.c b/src/template/gnunet-template.c
index 87053f403..ec2c8f624 100644
--- a/src/template/gnunet-template.c
+++ b/src/template/gnunet-template.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/template/test_template_api.c b/src/template/test_template_api.c
index 2ec309253..9a588cf8f 100644
--- a/src/template/test_template_api.c
+++ b/src/template/test_template_api.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file template/test_template_api.c
diff --git a/src/testbed-logger/gnunet-service-testbed-logger.c 
b/src/testbed-logger/gnunet-service-testbed-logger.c
index 39c339349..25217cdfb 100644
--- a/src/testbed-logger/gnunet-service-testbed-logger.c
+++ b/src/testbed-logger/gnunet-service-testbed-logger.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/testbed-logger/test_testbed_logger_api.c 
b/src/testbed-logger/test_testbed_logger_api.c
index 594711e43..11c166f25 100644
--- a/src/testbed-logger/test_testbed_logger_api.c
+++ b/src/testbed-logger/test_testbed_logger_api.c
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file testbed-logger/test_testbed_logger_api.c
diff --git a/src/testbed-logger/testbed_logger_api.c 
b/src/testbed-logger/testbed_logger_api.c
index 345199c8e..5a550e876 100644
--- a/src/testbed-logger/testbed_logger_api.c
+++ b/src/testbed-logger/testbed_logger_api.c
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/testbed/buildvars.py.in b/src/testbed/buildvars.py.in
index 01a3eb6df..e2f8ec27b 100644
--- a/src/testbed/buildvars.py.in
+++ b/src/testbed/buildvars.py.in
@@ -13,6 +13,8 @@
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# SPDX-License-Identifier: AGPL3.0-or-later
 
 
 # file:     testbed/buildvars.py
diff --git a/src/testbed/generate-underlay-topology.c 
b/src/testbed/generate-underlay-topology.c
index 9d527d27f..1bfbfda50 100644
--- a/src/testbed/generate-underlay-topology.c
+++ b/src/testbed/generate-underlay-topology.c
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/testbed/gnunet-daemon-latency-logger.c 
b/src/testbed/gnunet-daemon-latency-logger.c
index 015b9cc69..a1685d849 100644
--- a/src/testbed/gnunet-daemon-latency-logger.c
+++ b/src/testbed/gnunet-daemon-latency-logger.c
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/testbed/gnunet-daemon-testbed-blacklist.c 
b/src/testbed/gnunet-daemon-testbed-blacklist.c
index e81353918..a91c6a161 100644
--- a/src/testbed/gnunet-daemon-testbed-blacklist.c
+++ b/src/testbed/gnunet-daemon-testbed-blacklist.c
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 
diff --git a/src/testbed/gnunet-daemon-testbed-underlay.c 
b/src/testbed/gnunet-daemon-testbed-underlay.c
index f282e8e5f..f5f6899e9 100644
--- a/src/testbed/gnunet-daemon-testbed-underlay.c
+++ b/src/testbed/gnunet-daemon-testbed-underlay.c
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 
diff --git a/src/testbed/gnunet-helper-testbed.c 
b/src/testbed/gnunet-helper-testbed.c
index 1ac1b9e7e..25d9724fa 100644
--- a/src/testbed/gnunet-helper-testbed.c
+++ b/src/testbed/gnunet-helper-testbed.c
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/testbed/gnunet-service-test-barriers.c 
b/src/testbed/gnunet-service-test-barriers.c
index 3fc2695a3..948daa633 100644
--- a/src/testbed/gnunet-service-test-barriers.c
+++ b/src/testbed/gnunet-service-test-barriers.c
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/testbed/gnunet-service-testbed.c 
b/src/testbed/gnunet-service-testbed.c
index a668b3ff0..51460f65b 100644
--- a/src/testbed/gnunet-service-testbed.c
+++ b/src/testbed/gnunet-service-testbed.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/testbed/gnunet-service-testbed.h 
b/src/testbed/gnunet-service-testbed.h
index c1c5b9e87..0960e9cc5 100644
--- a/src/testbed/gnunet-service-testbed.h
+++ b/src/testbed/gnunet-service-testbed.h
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/testbed/gnunet-service-testbed_barriers.c 
b/src/testbed/gnunet-service-testbed_barriers.c
index 0e4b37586..dbcf5ed69 100644
--- a/src/testbed/gnunet-service-testbed_barriers.c
+++ b/src/testbed/gnunet-service-testbed_barriers.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/testbed/gnunet-service-testbed_barriers.h 
b/src/testbed/gnunet-service-testbed_barriers.h
index d2b8b0da3..c5547867f 100644
--- a/src/testbed/gnunet-service-testbed_barriers.h
+++ b/src/testbed/gnunet-service-testbed_barriers.h
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/testbed/gnunet-service-testbed_cache.c 
b/src/testbed/gnunet-service-testbed_cache.c
index 6b714b5e6..80b0aed0c 100644
--- a/src/testbed/gnunet-service-testbed_cache.c
+++ b/src/testbed/gnunet-service-testbed_cache.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/testbed/gnunet-service-testbed_connectionpool.c 
b/src/testbed/gnunet-service-testbed_connectionpool.c
index a907dcf03..d8461f8e2 100644
--- a/src/testbed/gnunet-service-testbed_connectionpool.c
+++ b/src/testbed/gnunet-service-testbed_connectionpool.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/testbed/gnunet-service-testbed_connectionpool.h 
b/src/testbed/gnunet-service-testbed_connectionpool.h
index 3a28d930e..ca4ea22ce 100644
--- a/src/testbed/gnunet-service-testbed_connectionpool.h
+++ b/src/testbed/gnunet-service-testbed_connectionpool.h
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/testbed/gnunet-service-testbed_cpustatus.c 
b/src/testbed/gnunet-service-testbed_cpustatus.c
index f193b98cd..d715036c7 100644
--- a/src/testbed/gnunet-service-testbed_cpustatus.c
+++ b/src/testbed/gnunet-service-testbed_cpustatus.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/testbed/gnunet-service-testbed_links.c 
b/src/testbed/gnunet-service-testbed_links.c
index 984e6c1a6..62f65387e 100644
--- a/src/testbed/gnunet-service-testbed_links.c
+++ b/src/testbed/gnunet-service-testbed_links.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/testbed/gnunet-service-testbed_links.h 
b/src/testbed/gnunet-service-testbed_links.h
index 36e640180..e4824ede9 100644
--- a/src/testbed/gnunet-service-testbed_links.h
+++ b/src/testbed/gnunet-service-testbed_links.h
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/testbed/gnunet-service-testbed_meminfo.c 
b/src/testbed/gnunet-service-testbed_meminfo.c
index 803fabc0a..7b42331b5 100644
--- a/src/testbed/gnunet-service-testbed_meminfo.c
+++ b/src/testbed/gnunet-service-testbed_meminfo.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 #include "platform.h"
diff --git a/src/testbed/gnunet-service-testbed_meminfo.h 
b/src/testbed/gnunet-service-testbed_meminfo.h
index d5e89bc61..6f51bdfb7 100644
--- a/src/testbed/gnunet-service-testbed_meminfo.h
+++ b/src/testbed/gnunet-service-testbed_meminfo.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /* obsolete */
diff --git a/src/testbed/gnunet-service-testbed_oc.c 
b/src/testbed/gnunet-service-testbed_oc.c
index a20cafac2..98a4282df 100644
--- a/src/testbed/gnunet-service-testbed_oc.c
+++ b/src/testbed/gnunet-service-testbed_oc.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/testbed/gnunet-service-testbed_peers.c 
b/src/testbed/gnunet-service-testbed_peers.c
index ff8ca02e0..b88812e7e 100644
--- a/src/testbed/gnunet-service-testbed_peers.c
+++ b/src/testbed/gnunet-service-testbed_peers.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 
diff --git a/src/testbed/gnunet-testbed-profiler.c 
b/src/testbed/gnunet-testbed-profiler.c
index ac20378b6..8b19d7431 100644
--- a/src/testbed/gnunet-testbed-profiler.c
+++ b/src/testbed/gnunet-testbed-profiler.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/testbed/test_gnunet_helper_testbed.c 
b/src/testbed/test_gnunet_helper_testbed.c
index f4804c352..851375291 100644
--- a/src/testbed/test_gnunet_helper_testbed.c
+++ b/src/testbed/test_gnunet_helper_testbed.c
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/testbed/test_testbed_api.c b/src/testbed/test_testbed_api.c
index 56ff4bf91..00d53dc25 100644
--- a/src/testbed/test_testbed_api.c
+++ b/src/testbed/test_testbed_api.c
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/testbed/test_testbed_api_2peers_1controller.c 
b/src/testbed/test_testbed_api_2peers_1controller.c
index 0bbc184d0..dcb6a174f 100644
--- a/src/testbed/test_testbed_api_2peers_1controller.c
+++ b/src/testbed/test_testbed_api_2peers_1controller.c
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/testbed/test_testbed_api_3peers_3controllers.c 
b/src/testbed/test_testbed_api_3peers_3controllers.c
index 4e67ef152..8c976e13b 100644
--- a/src/testbed/test_testbed_api_3peers_3controllers.c
+++ b/src/testbed/test_testbed_api_3peers_3controllers.c
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/testbed/test_testbed_api_barriers.c 
b/src/testbed/test_testbed_api_barriers.c
index 08e3d4089..9383ab85b 100644
--- a/src/testbed/test_testbed_api_barriers.c
+++ b/src/testbed/test_testbed_api_barriers.c
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/testbed/test_testbed_api_controllerlink.c 
b/src/testbed/test_testbed_api_controllerlink.c
index cd7eb950a..181d7d86d 100644
--- a/src/testbed/test_testbed_api_controllerlink.c
+++ b/src/testbed/test_testbed_api_controllerlink.c
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/testbed/test_testbed_api_hosts.c 
b/src/testbed/test_testbed_api_hosts.c
index 55933950a..c3f565949 100644
--- a/src/testbed/test_testbed_api_hosts.c
+++ b/src/testbed/test_testbed_api_hosts.c
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/testbed/test_testbed_api_operations.c 
b/src/testbed/test_testbed_api_operations.c
index abdfa1890..dfa8abc99 100644
--- a/src/testbed/test_testbed_api_operations.c
+++ b/src/testbed/test_testbed_api_operations.c
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/testbed/test_testbed_api_peer_reconfiguration.c 
b/src/testbed/test_testbed_api_peer_reconfiguration.c
index e9b748c82..e79876997 100644
--- a/src/testbed/test_testbed_api_peer_reconfiguration.c
+++ b/src/testbed/test_testbed_api_peer_reconfiguration.c
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/testbed/test_testbed_api_peers_manage_services.c 
b/src/testbed/test_testbed_api_peers_manage_services.c
index 0c4cf578c..c5e2b2646 100644
--- a/src/testbed/test_testbed_api_peers_manage_services.c
+++ b/src/testbed/test_testbed_api_peers_manage_services.c
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/testbed/test_testbed_api_sd.c 
b/src/testbed/test_testbed_api_sd.c
index a8f1c155e..1a7b4adbd 100644
--- a/src/testbed/test_testbed_api_sd.c
+++ b/src/testbed/test_testbed_api_sd.c
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 
diff --git a/src/testbed/test_testbed_api_statistics.c 
b/src/testbed/test_testbed_api_statistics.c
index 5b5c30e5c..6d1673cef 100644
--- a/src/testbed/test_testbed_api_statistics.c
+++ b/src/testbed/test_testbed_api_statistics.c
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/testbed/test_testbed_api_test.c 
b/src/testbed/test_testbed_api_test.c
index a639c9bd3..372ac1ebe 100644
--- a/src/testbed/test_testbed_api_test.c
+++ b/src/testbed/test_testbed_api_test.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/testbed/test_testbed_api_test_timeout.c 
b/src/testbed/test_testbed_api_test_timeout.c
index da30d7807..68233e207 100644
--- a/src/testbed/test_testbed_api_test_timeout.c
+++ b/src/testbed/test_testbed_api_test_timeout.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/testbed/test_testbed_api_testbed_run.c 
b/src/testbed/test_testbed_api_testbed_run.c
index bbf29244e..27f5b13e7 100644
--- a/src/testbed/test_testbed_api_testbed_run.c
+++ b/src/testbed/test_testbed_api_testbed_run.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/testbed/test_testbed_api_topology.c 
b/src/testbed/test_testbed_api_topology.c
index b3b16b55f..d1b8da31a 100644
--- a/src/testbed/test_testbed_api_topology.c
+++ b/src/testbed/test_testbed_api_topology.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/testbed/test_testbed_api_topology_clique.c 
b/src/testbed/test_testbed_api_topology_clique.c
index 69315f95c..4cc34dfaf 100644
--- a/src/testbed/test_testbed_api_topology_clique.c
+++ b/src/testbed/test_testbed_api_topology_clique.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/testbed/test_testbed_underlay.c 
b/src/testbed/test_testbed_underlay.c
index 3b4742b47..41aa43ce5 100644
--- a/src/testbed/test_testbed_underlay.c
+++ b/src/testbed/test_testbed_underlay.c
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/testbed/testbed.h b/src/testbed/testbed.h
index 5b01a8e7f..b659a3408 100644
--- a/src/testbed/testbed.h
+++ b/src/testbed/testbed.h
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/testbed/testbed_api.c b/src/testbed/testbed_api.c
index a643aacdd..793ed4edd 100644
--- a/src/testbed/testbed_api.c
+++ b/src/testbed/testbed_api.c
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/testbed/testbed_api.h b/src/testbed/testbed_api.h
index c8a381685..a9c2a0b71 100644
--- a/src/testbed/testbed_api.h
+++ b/src/testbed/testbed_api.h
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/testbed/testbed_api_barriers.c 
b/src/testbed/testbed_api_barriers.c
index efac01c0c..f811b6381 100644
--- a/src/testbed/testbed_api_barriers.c
+++ b/src/testbed/testbed_api_barriers.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/testbed/testbed_api_hosts.c b/src/testbed/testbed_api_hosts.c
index 84296b26a..327f84f2a 100644
--- a/src/testbed/testbed_api_hosts.c
+++ b/src/testbed/testbed_api_hosts.c
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/testbed/testbed_api_hosts.h b/src/testbed/testbed_api_hosts.h
index 1dcfc06b2..bc5e988d3 100644
--- a/src/testbed/testbed_api_hosts.h
+++ b/src/testbed/testbed_api_hosts.h
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/testbed/testbed_api_operations.c 
b/src/testbed/testbed_api_operations.c
index 4bb581c7a..167e1b833 100644
--- a/src/testbed/testbed_api_operations.c
+++ b/src/testbed/testbed_api_operations.c
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/testbed/testbed_api_operations.h 
b/src/testbed/testbed_api_operations.h
index c40141fc6..28d64e8bb 100644
--- a/src/testbed/testbed_api_operations.h
+++ b/src/testbed/testbed_api_operations.h
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/testbed/testbed_api_peers.c b/src/testbed/testbed_api_peers.c
index f5efa6a73..5b7820e39 100644
--- a/src/testbed/testbed_api_peers.c
+++ b/src/testbed/testbed_api_peers.c
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/testbed/testbed_api_peers.h b/src/testbed/testbed_api_peers.h
index 0a38c005b..cf0624eec 100644
--- a/src/testbed/testbed_api_peers.h
+++ b/src/testbed/testbed_api_peers.h
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/testbed/testbed_api_sd.c b/src/testbed/testbed_api_sd.c
index 3daad1513..c9cbb27a1 100644
--- a/src/testbed/testbed_api_sd.c
+++ b/src/testbed/testbed_api_sd.c
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/testbed/testbed_api_sd.h b/src/testbed/testbed_api_sd.h
index 4852e7f53..a924857bb 100644
--- a/src/testbed/testbed_api_sd.h
+++ b/src/testbed/testbed_api_sd.h
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/testbed/testbed_api_services.c 
b/src/testbed/testbed_api_services.c
index 6483ae514..c2b74e580 100644
--- a/src/testbed/testbed_api_services.c
+++ b/src/testbed/testbed_api_services.c
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/testbed/testbed_api_statistics.c 
b/src/testbed/testbed_api_statistics.c
index c0d72ffdc..6115f6e61 100644
--- a/src/testbed/testbed_api_statistics.c
+++ b/src/testbed/testbed_api_statistics.c
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/testbed/testbed_api_test.c b/src/testbed/testbed_api_test.c
index ccf341d60..3f9400bda 100644
--- a/src/testbed/testbed_api_test.c
+++ b/src/testbed/testbed_api_test.c
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/testbed/testbed_api_testbed.c 
b/src/testbed/testbed_api_testbed.c
index ab02487d9..c61934a40 100644
--- a/src/testbed/testbed_api_testbed.c
+++ b/src/testbed/testbed_api_testbed.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/testbed/testbed_api_topology.c 
b/src/testbed/testbed_api_topology.c
index 114055a07..59512d59f 100644
--- a/src/testbed/testbed_api_topology.c
+++ b/src/testbed/testbed_api_topology.c
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/testbed/testbed_api_topology.h 
b/src/testbed/testbed_api_topology.h
index 43ffda4fb..7feec5f75 100644
--- a/src/testbed/testbed_api_topology.h
+++ b/src/testbed/testbed_api_topology.h
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/testbed/testbed_api_underlay.c 
b/src/testbed/testbed_api_underlay.c
index 5b0aa8c89..5cc8d8597 100644
--- a/src/testbed/testbed_api_underlay.c
+++ b/src/testbed/testbed_api_underlay.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/testbed/testbed_helper.h b/src/testbed/testbed_helper.h
index 5f781478a..fb5428cbe 100644
--- a/src/testbed/testbed_helper.h
+++ b/src/testbed/testbed_helper.h
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/testing/gnunet-testing.c b/src/testing/gnunet-testing.c
index f0a9bc66a..ec611ba4c 100644
--- a/src/testing/gnunet-testing.c
+++ b/src/testing/gnunet-testing.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/testing/test_testing_peerstartup.c 
b/src/testing/test_testing_peerstartup.c
index 5ffdb950a..241bc63a7 100644
--- a/src/testing/test_testing_peerstartup.c
+++ b/src/testing/test_testing_peerstartup.c
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/testing/test_testing_peerstartup2.c 
b/src/testing/test_testing_peerstartup2.c
index 9dfa9717a..a077ddcc2 100644
--- a/src/testing/test_testing_peerstartup2.c
+++ b/src/testing/test_testing_peerstartup2.c
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/testing/test_testing_portreservation.c 
b/src/testing/test_testing_portreservation.c
index 2e2f4373e..86ecc494a 100644
--- a/src/testing/test_testing_portreservation.c
+++ b/src/testing/test_testing_portreservation.c
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/testing/test_testing_servicestartup.c 
b/src/testing/test_testing_servicestartup.c
index f36305228..e0cadfb06 100644
--- a/src/testing/test_testing_servicestartup.c
+++ b/src/testing/test_testing_servicestartup.c
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/testing/test_testing_sharedservices.c 
b/src/testing/test_testing_sharedservices.c
index 45fac1590..e7d285bb9 100644
--- a/src/testing/test_testing_sharedservices.c
+++ b/src/testing/test_testing_sharedservices.c
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/testing/testing.c b/src/testing/testing.c
index 8205da91f..b34815364 100644
--- a/src/testing/testing.c
+++ b/src/testing/testing.c
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/topology/friends.c b/src/topology/friends.c
index ba081a3a2..4278e1266 100644
--- a/src/topology/friends.c
+++ b/src/topology/friends.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/topology/gnunet-daemon-topology.c 
b/src/topology/gnunet-daemon-topology.c
index dd384d9a1..6c93e9845 100644
--- a/src/topology/gnunet-daemon-topology.c
+++ b/src/topology/gnunet-daemon-topology.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/topology/test_gnunet_daemon_topology.c 
b/src/topology/test_gnunet_daemon_topology.c
index 5359c280e..477d218ce 100644
--- a/src/topology/test_gnunet_daemon_topology.c
+++ b/src/topology/test_gnunet_daemon_topology.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file topology/test_gnunet_daemon_topology.c
diff --git a/src/transport/communicator.h b/src/transport/communicator.h
index 38b9f93b1..e238c168c 100644
--- a/src/transport/communicator.h
+++ b/src/transport/communicator.h
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/transport/gnunet-communicator-unix.c 
b/src/transport/gnunet-communicator-unix.c
index 57fa22ecf..5d4032834 100644
--- a/src/transport/gnunet-communicator-unix.c
+++ b/src/transport/gnunet-communicator-unix.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/transport/gnunet-helper-transport-bluetooth.c 
b/src/transport/gnunet-helper-transport-bluetooth.c
index 27d862f22..217022190 100644
--- a/src/transport/gnunet-helper-transport-bluetooth.c
+++ b/src/transport/gnunet-helper-transport-bluetooth.c
@@ -16,6 +16,8 @@
   
    You should have received a copy of the GNU Affero General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 #include "gnunet_config.h"
 
diff --git a/src/transport/gnunet-helper-transport-wlan-dummy.c 
b/src/transport/gnunet-helper-transport-wlan-dummy.c
index 7b24caf4e..dbd9014cb 100644
--- a/src/transport/gnunet-helper-transport-wlan-dummy.c
+++ b/src/transport/gnunet-helper-transport-wlan-dummy.c
@@ -14,6 +14,8 @@
 
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file transport/gnunet-helper-transport-wlan-dummy.c
diff --git a/src/transport/gnunet-helper-transport-wlan.c 
b/src/transport/gnunet-helper-transport-wlan.c
index 59a2d8b56..6cd45ead8 100644
--- a/src/transport/gnunet-helper-transport-wlan.c
+++ b/src/transport/gnunet-helper-transport-wlan.c
@@ -16,6 +16,8 @@
   
    You should have received a copy of the GNU Affero General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file src/transport/gnunet-helper-transport-wlan.c
diff --git a/src/transport/gnunet-service-tng.c 
b/src/transport/gnunet-service-tng.c
index 85ac3da83..5a335f447 100644
--- a/src/transport/gnunet-service-tng.c
+++ b/src/transport/gnunet-service-tng.c
@@ -14,6 +14,8 @@
 
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file transport/gnunet-service-tng.c
diff --git a/src/transport/gnunet-service-transport.c 
b/src/transport/gnunet-service-transport.c
index 2c1ee12fe..d3d2a86a3 100644
--- a/src/transport/gnunet-service-transport.c
+++ b/src/transport/gnunet-service-transport.c
@@ -14,6 +14,8 @@
 
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file transport/gnunet-service-transport.c
diff --git a/src/transport/gnunet-service-transport.h 
b/src/transport/gnunet-service-transport.h
index 253b785e3..467469064 100644
--- a/src/transport/gnunet-service-transport.h
+++ b/src/transport/gnunet-service-transport.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/transport/gnunet-service-transport_ats.c 
b/src/transport/gnunet-service-transport_ats.c
index 358ed95c3..f8756c750 100644
--- a/src/transport/gnunet-service-transport_ats.c
+++ b/src/transport/gnunet-service-transport_ats.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file transport/gnunet-service-transport_ats.c
diff --git a/src/transport/gnunet-service-transport_ats.h 
b/src/transport/gnunet-service-transport_ats.h
index 139c04c3b..c8f2c309f 100644
--- a/src/transport/gnunet-service-transport_ats.h
+++ b/src/transport/gnunet-service-transport_ats.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file transport/gnunet-service-transport_ats.h
diff --git a/src/transport/gnunet-service-transport_hello.c 
b/src/transport/gnunet-service-transport_hello.c
index cfd8c0f66..2d7440650 100644
--- a/src/transport/gnunet-service-transport_hello.c
+++ b/src/transport/gnunet-service-transport_hello.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/transport/gnunet-service-transport_hello.h 
b/src/transport/gnunet-service-transport_hello.h
index e4e35167f..f96b2a84d 100644
--- a/src/transport/gnunet-service-transport_hello.h
+++ b/src/transport/gnunet-service-transport_hello.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file transport/gnunet-service-transport_hello.h
diff --git a/src/transport/gnunet-service-transport_manipulation.c 
b/src/transport/gnunet-service-transport_manipulation.c
index 013b14cce..0b042dd6a 100644
--- a/src/transport/gnunet-service-transport_manipulation.c
+++ b/src/transport/gnunet-service-transport_manipulation.c
@@ -14,6 +14,8 @@
 
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/transport/gnunet-service-transport_manipulation.h 
b/src/transport/gnunet-service-transport_manipulation.h
index ee72478b6..87e71329a 100644
--- a/src/transport/gnunet-service-transport_manipulation.h
+++ b/src/transport/gnunet-service-transport_manipulation.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/transport/gnunet-service-transport_neighbours.c 
b/src/transport/gnunet-service-transport_neighbours.c
index 68344bcf4..72c425591 100644
--- a/src/transport/gnunet-service-transport_neighbours.c
+++ b/src/transport/gnunet-service-transport_neighbours.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/transport/gnunet-service-transport_neighbours.h 
b/src/transport/gnunet-service-transport_neighbours.h
index c8da98423..92ad62be9 100644
--- a/src/transport/gnunet-service-transport_neighbours.h
+++ b/src/transport/gnunet-service-transport_neighbours.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/transport/gnunet-service-transport_plugins.c 
b/src/transport/gnunet-service-transport_plugins.c
index 6ea59e29c..c6c5e0444 100644
--- a/src/transport/gnunet-service-transport_plugins.c
+++ b/src/transport/gnunet-service-transport_plugins.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/transport/gnunet-service-transport_plugins.h 
b/src/transport/gnunet-service-transport_plugins.h
index 3cc3bb901..cfb72dfed 100644
--- a/src/transport/gnunet-service-transport_plugins.h
+++ b/src/transport/gnunet-service-transport_plugins.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/transport/gnunet-service-transport_validation.c 
b/src/transport/gnunet-service-transport_validation.c
index fc02da5b4..8d22d0c7a 100644
--- a/src/transport/gnunet-service-transport_validation.c
+++ b/src/transport/gnunet-service-transport_validation.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/transport/gnunet-service-transport_validation.h 
b/src/transport/gnunet-service-transport_validation.h
index 8d11413db..f6ae764b7 100644
--- a/src/transport/gnunet-service-transport_validation.h
+++ b/src/transport/gnunet-service-transport_validation.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/transport/gnunet-transport-certificate-creation.c 
b/src/transport/gnunet-transport-certificate-creation.c
index 8b536ba49..288652566 100644
--- a/src/transport/gnunet-transport-certificate-creation.c
+++ b/src/transport/gnunet-transport-certificate-creation.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/transport/gnunet-transport-profiler.c 
b/src/transport/gnunet-transport-profiler.c
index 951975f03..9160a78b2 100644
--- a/src/transport/gnunet-transport-profiler.c
+++ b/src/transport/gnunet-transport-profiler.c
@@ -14,6 +14,8 @@
 
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/transport/gnunet-transport-wlan-receiver.c 
b/src/transport/gnunet-transport-wlan-receiver.c
index 930d29e9e..04f30a683 100644
--- a/src/transport/gnunet-transport-wlan-receiver.c
+++ b/src/transport/gnunet-transport-wlan-receiver.c
@@ -14,6 +14,8 @@
 
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/transport/gnunet-transport-wlan-sender.c 
b/src/transport/gnunet-transport-wlan-sender.c
index 0c0326b8f..36d26f8dc 100644
--- a/src/transport/gnunet-transport-wlan-sender.c
+++ b/src/transport/gnunet-transport-wlan-sender.c
@@ -14,6 +14,8 @@
 
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/transport/gnunet-transport.c b/src/transport/gnunet-transport.c
index 6c589307b..c3c1afc38 100644
--- a/src/transport/gnunet-transport.c
+++ b/src/transport/gnunet-transport.c
@@ -14,6 +14,8 @@
 
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/transport/plugin_transport_http.h 
b/src/transport/plugin_transport_http.h
index a21904edd..6867d3b9d 100644
--- a/src/transport/plugin_transport_http.h
+++ b/src/transport/plugin_transport_http.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/transport/plugin_transport_http_client.c 
b/src/transport/plugin_transport_http_client.c
index e88e2c69f..3c8dc21e5 100644
--- a/src/transport/plugin_transport_http_client.c
+++ b/src/transport/plugin_transport_http_client.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/transport/plugin_transport_http_common.c 
b/src/transport/plugin_transport_http_common.c
index 3f0452d0b..0a0545dd6 100644
--- a/src/transport/plugin_transport_http_common.c
+++ b/src/transport/plugin_transport_http_common.c
@@ -14,6 +14,8 @@
 
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/transport/plugin_transport_http_common.h 
b/src/transport/plugin_transport_http_common.h
index f758015e1..0410be8e9 100644
--- a/src/transport/plugin_transport_http_common.h
+++ b/src/transport/plugin_transport_http_common.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file transport/plugin_transport_http_common.c
diff --git a/src/transport/plugin_transport_http_server.c 
b/src/transport/plugin_transport_http_server.c
index 8c657503a..c522904d3 100644
--- a/src/transport/plugin_transport_http_server.c
+++ b/src/transport/plugin_transport_http_server.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/transport/plugin_transport_smtp.c 
b/src/transport/plugin_transport_smtp.c
index 8898bd827..705c91b85 100644
--- a/src/transport/plugin_transport_smtp.c
+++ b/src/transport/plugin_transport_smtp.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/transport/plugin_transport_tcp.c 
b/src/transport/plugin_transport_tcp.c
index c056946b6..5afea593f 100644
--- a/src/transport/plugin_transport_tcp.c
+++ b/src/transport/plugin_transport_tcp.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file transport/plugin_transport_tcp.c
diff --git a/src/transport/plugin_transport_template.c 
b/src/transport/plugin_transport_template.c
index be2dfb1c8..8ec2c3992 100644
--- a/src/transport/plugin_transport_template.c
+++ b/src/transport/plugin_transport_template.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/transport/plugin_transport_udp.c 
b/src/transport/plugin_transport_udp.c
index 9fed9b429..30a54cb17 100644
--- a/src/transport/plugin_transport_udp.c
+++ b/src/transport/plugin_transport_udp.c
@@ -14,6 +14,8 @@
 
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/transport/plugin_transport_udp.h 
b/src/transport/plugin_transport_udp.h
index 7a6e09329..cccb3ceb3 100644
--- a/src/transport/plugin_transport_udp.h
+++ b/src/transport/plugin_transport_udp.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/transport/plugin_transport_udp_broadcasting.c 
b/src/transport/plugin_transport_udp_broadcasting.c
index c802304aa..0c26aa624 100644
--- a/src/transport/plugin_transport_udp_broadcasting.c
+++ b/src/transport/plugin_transport_udp_broadcasting.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/transport/plugin_transport_unix.c 
b/src/transport/plugin_transport_unix.c
index 19961d792..5d095236d 100644
--- a/src/transport/plugin_transport_unix.c
+++ b/src/transport/plugin_transport_unix.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/transport/plugin_transport_wlan.c 
b/src/transport/plugin_transport_wlan.c
index e34143c59..e1a93bf88 100644
--- a/src/transport/plugin_transport_wlan.c
+++ b/src/transport/plugin_transport_wlan.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/transport/plugin_transport_wlan.h 
b/src/transport/plugin_transport_wlan.h
index ad16a267e..926e16e6f 100644
--- a/src/transport/plugin_transport_wlan.h
+++ b/src/transport/plugin_transport_wlan.h
@@ -14,6 +14,8 @@
 
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/transport/plugin_transport_xt.c 
b/src/transport/plugin_transport_xt.c
index 08f59bd70..df5e8a127 100644
--- a/src/transport/plugin_transport_xt.c
+++ b/src/transport/plugin_transport_xt.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file transport/plugin_transport_xt.c
diff --git a/src/transport/plugin_transport_xu.c 
b/src/transport/plugin_transport_xu.c
index 639b38671..b716c6878 100644
--- a/src/transport/plugin_transport_xu.c
+++ b/src/transport/plugin_transport_xu.c
@@ -14,6 +14,8 @@
 
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/transport/plugin_transport_xu.h 
b/src/transport/plugin_transport_xu.h
index cbf9706b6..dd3dcd738 100644
--- a/src/transport/plugin_transport_xu.h
+++ b/src/transport/plugin_transport_xu.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/transport/tcp_connection_legacy.c 
b/src/transport/tcp_connection_legacy.c
index 66902c6a0..6ecf50b79 100644
--- a/src/transport/tcp_connection_legacy.c
+++ b/src/transport/tcp_connection_legacy.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/transport/tcp_server_legacy.c 
b/src/transport/tcp_server_legacy.c
index 4744e20d8..d66cb8387 100644
--- a/src/transport/tcp_server_legacy.c
+++ b/src/transport/tcp_server_legacy.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/transport/tcp_server_mst_legacy.c 
b/src/transport/tcp_server_mst_legacy.c
index 5bd9ba35e..868f64d7c 100644
--- a/src/transport/tcp_server_mst_legacy.c
+++ b/src/transport/tcp_server_mst_legacy.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/transport/tcp_service_legacy.c 
b/src/transport/tcp_service_legacy.c
index b7ea9b20a..641d0195a 100644
--- a/src/transport/tcp_service_legacy.c
+++ b/src/transport/tcp_service_legacy.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/transport/test_http_common.c b/src/transport/test_http_common.c
index bad06b89d..70ad04719 100644
--- a/src/transport/test_http_common.c
+++ b/src/transport/test_http_common.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file transport/test_http_common.c
diff --git a/src/transport/test_plugin_transport.c 
b/src/transport/test_plugin_transport.c
index 47ba7aed4..fe0840041 100644
--- a/src/transport/test_plugin_transport.c
+++ b/src/transport/test_plugin_transport.c
@@ -14,6 +14,8 @@
 
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file transport/test_plugin_transport.c
diff --git a/src/transport/test_quota_compliance.c 
b/src/transport/test_quota_compliance.c
index 6309c3278..0c94fa5c9 100644
--- a/src/transport/test_quota_compliance.c
+++ b/src/transport/test_quota_compliance.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file transport/test_quota_compliance.c
diff --git a/src/transport/test_transport_address_switch.c 
b/src/transport/test_transport_address_switch.c
index 0414673f4..fa977a364 100644
--- a/src/transport/test_transport_address_switch.c
+++ b/src/transport/test_transport_address_switch.c
@@ -14,6 +14,8 @@
 
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file transport/test_transport_address_switch.c
diff --git a/src/transport/test_transport_api.c 
b/src/transport/test_transport_api.c
index 847b9f56a..0b458a317 100644
--- a/src/transport/test_transport_api.c
+++ b/src/transport/test_transport_api.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file transport/test_transport_api.c
diff --git a/src/transport/test_transport_api_blacklisting.c 
b/src/transport/test_transport_api_blacklisting.c
index 427240b29..f0cc9b6d2 100644
--- a/src/transport/test_transport_api_blacklisting.c
+++ b/src/transport/test_transport_api_blacklisting.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/transport/test_transport_api_disconnect.c 
b/src/transport/test_transport_api_disconnect.c
index 85bfb7368..8522a3a88 100644
--- a/src/transport/test_transport_api_disconnect.c
+++ b/src/transport/test_transport_api_disconnect.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file transport/test_transport_api_disconnect.c
diff --git a/src/transport/test_transport_api_limited_sockets.c 
b/src/transport/test_transport_api_limited_sockets.c
index bba695bb5..d5c6934b5 100644
--- a/src/transport/test_transport_api_limited_sockets.c
+++ b/src/transport/test_transport_api_limited_sockets.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file transport/test_transport_api_limited_sockets.c
diff --git a/src/transport/test_transport_api_manipulation_cfg.c 
b/src/transport/test_transport_api_manipulation_cfg.c
index 350dc8eab..2d17cca45 100644
--- a/src/transport/test_transport_api_manipulation_cfg.c
+++ b/src/transport/test_transport_api_manipulation_cfg.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file transport/test_transport_api_manipulation_cfg.c
diff --git a/src/transport/test_transport_api_manipulation_recv_tcp.c 
b/src/transport/test_transport_api_manipulation_recv_tcp.c
index 40e0b6a4d..bf7eb1666 100644
--- a/src/transport/test_transport_api_manipulation_recv_tcp.c
+++ b/src/transport/test_transport_api_manipulation_recv_tcp.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file transport/test_transport_api_manipulation_recv_tcp.c
diff --git a/src/transport/test_transport_api_manipulation_send_tcp.c 
b/src/transport/test_transport_api_manipulation_send_tcp.c
index 278ec45c5..408301b0f 100644
--- a/src/transport/test_transport_api_manipulation_send_tcp.c
+++ b/src/transport/test_transport_api_manipulation_send_tcp.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file transport/test_transport_api_manipulation_send_tcp.c
diff --git a/src/transport/test_transport_api_monitor_peers.c 
b/src/transport/test_transport_api_monitor_peers.c
index 8a01b15a3..9c3e535fe 100644
--- a/src/transport/test_transport_api_monitor_peers.c
+++ b/src/transport/test_transport_api_monitor_peers.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file transport/test_transport_api_monitor_peers.c
diff --git a/src/transport/test_transport_api_reliability.c 
b/src/transport/test_transport_api_reliability.c
index c6e77bae0..8442b92e8 100644
--- a/src/transport/test_transport_api_reliability.c
+++ b/src/transport/test_transport_api_reliability.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file transport/test_transport_api_reliability.c
diff --git a/src/transport/test_transport_api_restart_reconnect.c 
b/src/transport/test_transport_api_restart_reconnect.c
index fc0c20233..5a6c10f8a 100644
--- a/src/transport/test_transport_api_restart_reconnect.c
+++ b/src/transport/test_transport_api_restart_reconnect.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file transport/test_transport_api_restart_reconnect.c
diff --git a/src/transport/test_transport_api_timeout.c 
b/src/transport/test_transport_api_timeout.c
index 0185b690b..a00e0aeb6 100644
--- a/src/transport/test_transport_api_timeout.c
+++ b/src/transport/test_transport_api_timeout.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file transport/test_transport_api_timeout.c
diff --git a/src/transport/test_transport_blacklisting.c 
b/src/transport/test_transport_blacklisting.c
index 6871d01b1..1cd244115 100644
--- a/src/transport/test_transport_blacklisting.c
+++ b/src/transport/test_transport_blacklisting.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/transport/test_transport_testing_restart.c 
b/src/transport/test_transport_testing_restart.c
index 0afa08fd0..4df8b2d6d 100644
--- a/src/transport/test_transport_testing_restart.c
+++ b/src/transport/test_transport_testing_restart.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file transport/test_transport_testing_restart.c
diff --git a/src/transport/test_transport_testing_startstop.c 
b/src/transport/test_transport_testing_startstop.c
index d307f8722..57b6840a5 100644
--- a/src/transport/test_transport_testing_startstop.c
+++ b/src/transport/test_transport_testing_startstop.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file transport/test_transport_testing_startstop.c
diff --git a/src/transport/transport-testing-filenames.c 
b/src/transport/transport-testing-filenames.c
index ac42388fb..4c2fbd3f5 100644
--- a/src/transport/transport-testing-filenames.c
+++ b/src/transport/transport-testing-filenames.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file transport-testing-filenames.c
diff --git a/src/transport/transport-testing-loggers.c 
b/src/transport/transport-testing-loggers.c
index 4feba1d42..6ad181e87 100644
--- a/src/transport/transport-testing-loggers.c
+++ b/src/transport/transport-testing-loggers.c
@@ -15,6 +15,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file transport-testing-loggers.c
diff --git a/src/transport/transport-testing-main.c 
b/src/transport/transport-testing-main.c
index 1fa4b2731..6cef20ba1 100644
--- a/src/transport/transport-testing-main.c
+++ b/src/transport/transport-testing-main.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file transport-testing-main.c
diff --git a/src/transport/transport-testing-send.c 
b/src/transport/transport-testing-send.c
index 8dac9453e..cb4be57de 100644
--- a/src/transport/transport-testing-send.c
+++ b/src/transport/transport-testing-send.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file transport-testing-send.c
diff --git a/src/transport/transport-testing.c 
b/src/transport/transport-testing.c
index 4295446d2..1ff1ec9f8 100644
--- a/src/transport/transport-testing.c
+++ b/src/transport/transport-testing.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file transport-testing.c
diff --git a/src/transport/transport-testing.h 
b/src/transport/transport-testing.h
index 3a638580d..4629d6125 100644
--- a/src/transport/transport-testing.h
+++ b/src/transport/transport-testing.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/transport/transport.h b/src/transport/transport.h
index 3c5fe72de..670a8d32d 100644
--- a/src/transport/transport.h
+++ b/src/transport/transport.h
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/transport/transport_api2_communication.c 
b/src/transport/transport_api2_communication.c
index a8237f18f..1a176e68f 100644
--- a/src/transport/transport_api2_communication.c
+++ b/src/transport/transport_api2_communication.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/transport/transport_api2_core.c 
b/src/transport/transport_api2_core.c
index d81a6f730..607f26777 100644
--- a/src/transport/transport_api2_core.c
+++ b/src/transport/transport_api2_core.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/transport/transport_api2_monitor.c 
b/src/transport/transport_api2_monitor.c
index ca9832e45..315001bad 100644
--- a/src/transport/transport_api2_monitor.c
+++ b/src/transport/transport_api2_monitor.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/transport/transport_api_address_to_string.c 
b/src/transport/transport_api_address_to_string.c
index 258bf19c9..006e81f29 100644
--- a/src/transport/transport_api_address_to_string.c
+++ b/src/transport/transport_api_address_to_string.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file transport/transport_api_address_to_string.c
diff --git a/src/transport/transport_api_blacklist.c 
b/src/transport/transport_api_blacklist.c
index 87fdce724..63fee8781 100644
--- a/src/transport/transport_api_blacklist.c
+++ b/src/transport/transport_api_blacklist.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/transport/transport_api_core.c 
b/src/transport/transport_api_core.c
index 06d459f4e..b144ef6b6 100644
--- a/src/transport/transport_api_core.c
+++ b/src/transport/transport_api_core.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/transport/transport_api_hello_get.c 
b/src/transport/transport_api_hello_get.c
index 183135458..a4d55b430 100644
--- a/src/transport/transport_api_hello_get.c
+++ b/src/transport/transport_api_hello_get.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/transport/transport_api_manipulation.c 
b/src/transport/transport_api_manipulation.c
index e7ecd2e42..8e85a365c 100644
--- a/src/transport/transport_api_manipulation.c
+++ b/src/transport/transport_api_manipulation.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/transport/transport_api_monitor_peers.c 
b/src/transport/transport_api_monitor_peers.c
index c48a0e4bb..ce4d9ae9e 100644
--- a/src/transport/transport_api_monitor_peers.c
+++ b/src/transport/transport_api_monitor_peers.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/transport/transport_api_monitor_plugins.c 
b/src/transport/transport_api_monitor_plugins.c
index c349144aa..f0acc2408 100644
--- a/src/transport/transport_api_monitor_plugins.c
+++ b/src/transport/transport_api_monitor_plugins.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/transport/transport_api_offer_hello.c 
b/src/transport/transport_api_offer_hello.c
index b976a0272..c4432af93 100644
--- a/src/transport/transport_api_offer_hello.c
+++ b/src/transport/transport_api_offer_hello.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/bandwidth.c b/src/util/bandwidth.c
index 5e0bae539..5cf1297c7 100644
--- a/src/util/bandwidth.c
+++ b/src/util/bandwidth.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/benchmark.c b/src/util/benchmark.c
index b5fc2752c..bb1c3c79a 100644
--- a/src/util/benchmark.c
+++ b/src/util/benchmark.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/benchmark.h b/src/util/benchmark.h
index 145d7cee7..36f57febe 100644
--- a/src/util/benchmark.h
+++ b/src/util/benchmark.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/bio.c b/src/util/bio.c
index a31e5448f..def9b02e1 100644
--- a/src/util/bio.c
+++ b/src/util/bio.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/bio.c
diff --git a/src/util/client.c b/src/util/client.c
index 1f569255a..9bdb09e30 100644
--- a/src/util/client.c
+++ b/src/util/client.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/common_allocation.c b/src/util/common_allocation.c
index 53e1a6707..20333ce56 100644
--- a/src/util/common_allocation.c
+++ b/src/util/common_allocation.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/common_endian.c b/src/util/common_endian.c
index 502e1e3a3..d7daa2d79 100644
--- a/src/util/common_endian.c
+++ b/src/util/common_endian.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/common_logging.c b/src/util/common_logging.c
index f9f767daa..ffc9a527b 100644
--- a/src/util/common_logging.c
+++ b/src/util/common_logging.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/configuration.c b/src/util/configuration.c
index d61b9c27e..a38438ba8 100644
--- a/src/util/configuration.c
+++ b/src/util/configuration.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/configuration_loader.c b/src/util/configuration_loader.c
index 45711e0fd..095e69474 100644
--- a/src/util/configuration_loader.c
+++ b/src/util/configuration_loader.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/container_bloomfilter.c b/src/util/container_bloomfilter.c
index 5f2fdd3ad..a41c0cf8a 100644
--- a/src/util/container_bloomfilter.c
+++ b/src/util/container_bloomfilter.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/container_bloomfilter.c
diff --git a/src/util/container_heap.c b/src/util/container_heap.c
index 5a0ae0002..d5dca20ef 100644
--- a/src/util/container_heap.c
+++ b/src/util/container_heap.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/container_meta_data.c b/src/util/container_meta_data.c
index 3859d8e64..4989b876a 100644
--- a/src/util/container_meta_data.c
+++ b/src/util/container_meta_data.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/container_multihashmap.c 
b/src/util/container_multihashmap.c
index e344c2aec..cf5c2a334 100644
--- a/src/util/container_multihashmap.c
+++ b/src/util/container_multihashmap.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/container_multihashmap.c
diff --git a/src/util/container_multihashmap32.c 
b/src/util/container_multihashmap32.c
index 72940489e..4b19c7c10 100644
--- a/src/util/container_multihashmap32.c
+++ b/src/util/container_multihashmap32.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/container_multihashmap32.c
diff --git a/src/util/container_multipeermap.c 
b/src/util/container_multipeermap.c
index 67d6e1684..8fa23df72 100644
--- a/src/util/container_multipeermap.c
+++ b/src/util/container_multipeermap.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/container_multipeermap.c
diff --git a/src/util/container_multishortmap.c 
b/src/util/container_multishortmap.c
index 050fd21f9..a48581b6a 100644
--- a/src/util/container_multishortmap.c
+++ b/src/util/container_multishortmap.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/container_multishortmap.c
diff --git a/src/util/crypto_abe.c b/src/util/crypto_abe.c
index 581e63764..1d69a01ae 100644
--- a/src/util/crypto_abe.c
+++ b/src/util/crypto_abe.c
@@ -15,6 +15,8 @@
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+     SPDX-License-Identifier: AGPL3.0-or-later
+
 */
 
 /**
diff --git a/src/util/crypto_crc.c b/src/util/crypto_crc.c
index b8fd8059d..3d8e23e24 100644
--- a/src/util/crypto_crc.c
+++ b/src/util/crypto_crc.c
@@ -15,6 +15,8 @@
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+     SPDX-License-Identifier: AGPL3.0-or-later
+
      For the actual CRC-32 code:
      Copyright abandoned; this code is in the public domain.
      Provided to GNUnet by address@hidden
diff --git a/src/util/crypto_ecc.c b/src/util/crypto_ecc.c
index 9902f276d..ac7662a10 100644
--- a/src/util/crypto_ecc.c
+++ b/src/util/crypto_ecc.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/crypto_ecc_dlog.c b/src/util/crypto_ecc_dlog.c
index 9d3674319..07777e377 100644
--- a/src/util/crypto_ecc_dlog.c
+++ b/src/util/crypto_ecc_dlog.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/crypto_ecc_setup.c b/src/util/crypto_ecc_setup.c
index 507cbba11..1031b302e 100644
--- a/src/util/crypto_ecc_setup.c
+++ b/src/util/crypto_ecc_setup.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/crypto_hash.c b/src/util/crypto_hash.c
index cd36fbbd7..925d6b94d 100644
--- a/src/util/crypto_hash.c
+++ b/src/util/crypto_hash.c
@@ -15,6 +15,8 @@
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+     SPDX-License-Identifier: AGPL3.0-or-later
+
 */
 /**
  * @file util/crypto_hash.c
diff --git a/src/util/crypto_hash_file.c b/src/util/crypto_hash_file.c
index 4d9824d22..83afe5e91 100644
--- a/src/util/crypto_hash_file.c
+++ b/src/util/crypto_hash_file.c
@@ -15,6 +15,8 @@
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+     SPDX-License-Identifier: AGPL3.0-or-later
+
 */
 /**
  * @file util/crypto_hash_file.c
diff --git a/src/util/crypto_kdf.c b/src/util/crypto_kdf.c
index 0fc6996eb..ac68ed7f1 100644
--- a/src/util/crypto_kdf.c
+++ b/src/util/crypto_kdf.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/crypto_mpi.c b/src/util/crypto_mpi.c
index 0cb49d62f..14c672383 100644
--- a/src/util/crypto_mpi.c
+++ b/src/util/crypto_mpi.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/crypto_paillier.c b/src/util/crypto_paillier.c
index 416240ea4..622ce81fa 100644
--- a/src/util/crypto_paillier.c
+++ b/src/util/crypto_paillier.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/util/crypto_random.c b/src/util/crypto_random.c
index df6d3fb9b..54bea58e1 100644
--- a/src/util/crypto_random.c
+++ b/src/util/crypto_random.c
@@ -15,6 +15,8 @@
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+     SPDX-License-Identifier: AGPL3.0-or-later
+
 */
 
 /**
diff --git a/src/util/crypto_rsa.c b/src/util/crypto_rsa.c
index c981ea63b..8cb0fe6c6 100644
--- a/src/util/crypto_rsa.c
+++ b/src/util/crypto_rsa.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/crypto_symmetric.c b/src/util/crypto_symmetric.c
index f7d7b4a7a..18784d127 100644
--- a/src/util/crypto_symmetric.c
+++ b/src/util/crypto_symmetric.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/disk.c b/src/util/disk.c
index d723303d8..de37cba0a 100644
--- a/src/util/disk.c
+++ b/src/util/disk.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/disk.c
diff --git a/src/util/disk.h b/src/util/disk.h
index 629971d81..aee028ade 100644
--- a/src/util/disk.h
+++ b/src/util/disk.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/dnsparser.c b/src/util/dnsparser.c
index 2d2354222..2baa76ef2 100644
--- a/src/util/dnsparser.c
+++ b/src/util/dnsparser.c
@@ -14,6 +14,8 @@
 
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/util/dnsstub.c b/src/util/dnsstub.c
index 5b84e6e63..a16a9a7dd 100644
--- a/src/util/dnsstub.c
+++ b/src/util/dnsstub.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file dns/dnsstub.c
diff --git a/src/util/getopt_helpers.c b/src/util/getopt_helpers.c
index 661521c45..77032e501 100644
--- a/src/util/getopt_helpers.c
+++ b/src/util/getopt_helpers.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/gnunet-config.c b/src/util/gnunet-config.c
index 3c7eaa6dc..361fa55d6 100644
--- a/src/util/gnunet-config.c
+++ b/src/util/gnunet-config.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/gnunet-ecc.c b/src/util/gnunet-ecc.c
index 438999402..27ef59c9f 100644
--- a/src/util/gnunet-ecc.c
+++ b/src/util/gnunet-ecc.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/gnunet-helper-w32-console.c 
b/src/util/gnunet-helper-w32-console.c
index 3540cae8a..fdebd9a49 100644
--- a/src/util/gnunet-helper-w32-console.c
+++ b/src/util/gnunet-helper-w32-console.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/gnunet-helper-w32-console.h 
b/src/util/gnunet-helper-w32-console.h
index d70b0e32a..eaa9019a5 100644
--- a/src/util/gnunet-helper-w32-console.h
+++ b/src/util/gnunet-helper-w32-console.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/gnunet-resolver.c b/src/util/gnunet-resolver.c
index e841afca9..e5d58b4b6 100644
--- a/src/util/gnunet-resolver.c
+++ b/src/util/gnunet-resolver.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/gnunet-scrypt.c b/src/util/gnunet-scrypt.c
index fb66a757d..5e15eb16a 100644
--- a/src/util/gnunet-scrypt.c
+++ b/src/util/gnunet-scrypt.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/gnunet-scrypt.c
diff --git a/src/util/gnunet-service-resolver.c 
b/src/util/gnunet-service-resolver.c
index 5f8957d8c..d85885d64 100644
--- a/src/util/gnunet-service-resolver.c
+++ b/src/util/gnunet-service-resolver.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/gnunet-timeout-w32.c b/src/util/gnunet-timeout-w32.c
index 78b268fe2..6f92b172f 100644
--- a/src/util/gnunet-timeout-w32.c
+++ b/src/util/gnunet-timeout-w32.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/gnunet-timeout.c b/src/util/gnunet-timeout.c
index 8dfb6ad17..18721ba03 100644
--- a/src/util/gnunet-timeout.c
+++ b/src/util/gnunet-timeout.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/gnunet-uri.c b/src/util/gnunet-uri.c
index 33cd3543d..58f9e331c 100644
--- a/src/util/gnunet-uri.c
+++ b/src/util/gnunet-uri.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/helper.c b/src/util/helper.c
index 5cdfb904a..7eb2ce6d9 100644
--- a/src/util/helper.c
+++ b/src/util/helper.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/load.c b/src/util/load.c
index 41ee7a91a..f5ea875bb 100644
--- a/src/util/load.c
+++ b/src/util/load.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/mq.c b/src/util/mq.c
index 8bf1f9752..4dfcb72be 100644
--- a/src/util/mq.c
+++ b/src/util/mq.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/mst.c b/src/util/mst.c
index a5c6f3c3e..bc52f2356 100644
--- a/src/util/mst.c
+++ b/src/util/mst.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/nc.c b/src/util/nc.c
index 42a0114a7..7a3c5877e 100644
--- a/src/util/nc.c
+++ b/src/util/nc.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/network.c b/src/util/network.c
index fe9827083..3e39374e8 100644
--- a/src/util/network.c
+++ b/src/util/network.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/op.c b/src/util/op.c
index 19f6ce4f0..8fca7553e 100644
--- a/src/util/op.c
+++ b/src/util/op.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/os_installation.c b/src/util/os_installation.c
index 2977a833b..f2d24f85e 100644
--- a/src/util/os_installation.c
+++ b/src/util/os_installation.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/os_network.c b/src/util/os_network.c
index 3e9ea47b4..dba61f1e4 100644
--- a/src/util/os_network.c
+++ b/src/util/os_network.c
@@ -15,6 +15,8 @@
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+     SPDX-License-Identifier: AGPL3.0-or-later
+
 */
 /**
  * @file util/os_network.c
diff --git a/src/util/os_priority.c b/src/util/os_priority.c
index a758f24f1..03d4bde9e 100644
--- a/src/util/os_priority.c
+++ b/src/util/os_priority.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/peer.c b/src/util/peer.c
index f9e1b4cbe..00a259a3b 100644
--- a/src/util/peer.c
+++ b/src/util/peer.c
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/util/perf_crypto_asymmetric.c 
b/src/util/perf_crypto_asymmetric.c
index acfdba541..b2b9f5692 100644
--- a/src/util/perf_crypto_asymmetric.c
+++ b/src/util/perf_crypto_asymmetric.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/perf_crypto_ecc_dlog.c b/src/util/perf_crypto_ecc_dlog.c
index 4be928d42..59fa08d3a 100644
--- a/src/util/perf_crypto_ecc_dlog.c
+++ b/src/util/perf_crypto_ecc_dlog.c
@@ -15,6 +15,8 @@
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+     SPDX-License-Identifier: AGPL3.0-or-later
+
 */
 /**
  * @file util/perf_crypto_ecc_dlog.c
diff --git a/src/util/perf_crypto_hash.c b/src/util/perf_crypto_hash.c
index f1c69e96a..c74f425ce 100644
--- a/src/util/perf_crypto_hash.c
+++ b/src/util/perf_crypto_hash.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/perf_crypto_paillier.c b/src/util/perf_crypto_paillier.c
index b1430d713..a62b72c96 100644
--- a/src/util/perf_crypto_paillier.c
+++ b/src/util/perf_crypto_paillier.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/perf_crypto_rsa.c b/src/util/perf_crypto_rsa.c
index 4ad348d5b..685389206 100644
--- a/src/util/perf_crypto_rsa.c
+++ b/src/util/perf_crypto_rsa.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/perf_crypto_symmetric.c b/src/util/perf_crypto_symmetric.c
index 2382010e1..0bef04b7a 100644
--- a/src/util/perf_crypto_symmetric.c
+++ b/src/util/perf_crypto_symmetric.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/perf_malloc.c b/src/util/perf_malloc.c
index 01694d766..4447934af 100644
--- a/src/util/perf_malloc.c
+++ b/src/util/perf_malloc.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/plugin.c b/src/util/plugin.c
index 4a6e8577e..4b922340d 100644
--- a/src/util/plugin.c
+++ b/src/util/plugin.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/program.c b/src/util/program.c
index 2fa8676a2..f22dcddbf 100644
--- a/src/util/program.c
+++ b/src/util/program.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/regex.c b/src/util/regex.c
index 7565a9eac..70bf5c485 100644
--- a/src/util/regex.c
+++ b/src/util/regex.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file src/tun/regex.c
diff --git a/src/util/resolver.h b/src/util/resolver.h
index 54a1cf5fd..0991ad39f 100644
--- a/src/util/resolver.h
+++ b/src/util/resolver.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/resolver_api.c b/src/util/resolver_api.c
index 871eeb4bf..78ce222e6 100644
--- a/src/util/resolver_api.c
+++ b/src/util/resolver_api.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/scheduler.c b/src/util/scheduler.c
index 5d3836639..dd0d5d5cf 100644
--- a/src/util/scheduler.c
+++ b/src/util/scheduler.c
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file util/scheduler.c
diff --git a/src/util/service.c b/src/util/service.c
index 098030ddf..b481a4786 100644
--- a/src/util/service.c
+++ b/src/util/service.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/signal.c b/src/util/signal.c
index ecb792106..3e23f4a59 100644
--- a/src/util/signal.c
+++ b/src/util/signal.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/socks.c b/src/util/socks.c
index 1459fd2f0..7eca04878 100644
--- a/src/util/socks.c
+++ b/src/util/socks.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/speedup.c b/src/util/speedup.c
index d32364480..c5c1f6a53 100644
--- a/src/util/speedup.c
+++ b/src/util/speedup.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/speedup.h b/src/util/speedup.h
index a9ea1cbae..5b665133e 100644
--- a/src/util/speedup.h
+++ b/src/util/speedup.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/strings.c b/src/util/strings.c
index 3f85384e1..535c998cd 100644
--- a/src/util/strings.c
+++ b/src/util/strings.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/strings.c
diff --git a/src/util/test_bio.c b/src/util/test_bio.c
index acdd0bc06..719f622ba 100644
--- a/src/util/test_bio.c
+++ b/src/util/test_bio.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/test_client.c b/src/util/test_client.c
index a425f7ec4..365b8663f 100644
--- a/src/util/test_client.c
+++ b/src/util/test_client.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/test_client.c
diff --git a/src/util/test_common_allocation.c 
b/src/util/test_common_allocation.c
index dd2bb23c3..476934b3f 100644
--- a/src/util/test_common_allocation.c
+++ b/src/util/test_common_allocation.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/test_common_endian.c b/src/util/test_common_endian.c
index f7bf00b40..6e08b4f07 100644
--- a/src/util/test_common_endian.c
+++ b/src/util/test_common_endian.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/test_common_endian.c
diff --git a/src/util/test_common_logging.c b/src/util/test_common_logging.c
index 5832e75f4..396bf3966 100644
--- a/src/util/test_common_logging.c
+++ b/src/util/test_common_logging.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/test_common_logging_dummy.c 
b/src/util/test_common_logging_dummy.c
index afa78aad0..b8f2bef91 100644
--- a/src/util/test_common_logging_dummy.c
+++ b/src/util/test_common_logging_dummy.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/test_common_logging_runtime_loglevels.c 
b/src/util/test_common_logging_runtime_loglevels.c
index 863cb2a55..7c72acf7d 100644
--- a/src/util/test_common_logging_runtime_loglevels.c
+++ b/src/util/test_common_logging_runtime_loglevels.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/test_configuration.c b/src/util/test_configuration.c
index 067c15bf2..96f13eefe 100644
--- a/src/util/test_configuration.c
+++ b/src/util/test_configuration.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/test_configuration.c
diff --git a/src/util/test_container_bloomfilter.c 
b/src/util/test_container_bloomfilter.c
index c144f48a1..42849af97 100644
--- a/src/util/test_container_bloomfilter.c
+++ b/src/util/test_container_bloomfilter.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/test_container_bloomfilter.c
diff --git a/src/util/test_container_dll.c b/src/util/test_container_dll.c
index 47d4c3d61..f1c0e9446 100644
--- a/src/util/test_container_dll.c
+++ b/src/util/test_container_dll.c
@@ -14,6 +14,8 @@
 
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/util/test_container_heap.c b/src/util/test_container_heap.c
index 4be235573..f95032ca0 100644
--- a/src/util/test_container_heap.c
+++ b/src/util/test_container_heap.c
@@ -14,6 +14,8 @@
 
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/util/test_container_meta_data.c 
b/src/util/test_container_meta_data.c
index 5a658cc75..416ea7db9 100644
--- a/src/util/test_container_meta_data.c
+++ b/src/util/test_container_meta_data.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/test_container_multihashmap.c 
b/src/util/test_container_multihashmap.c
index 188eb2968..b83e90646 100644
--- a/src/util/test_container_multihashmap.c
+++ b/src/util/test_container_multihashmap.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/test_container_multihashmap32.c 
b/src/util/test_container_multihashmap32.c
index 15a74d4ac..e0e813716 100644
--- a/src/util/test_container_multihashmap32.c
+++ b/src/util/test_container_multihashmap32.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/test_container_multipeermap.c 
b/src/util/test_container_multipeermap.c
index 3f7b44da5..a8ec8b8f2 100644
--- a/src/util/test_container_multipeermap.c
+++ b/src/util/test_container_multipeermap.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/test_crypto_crc.c b/src/util/test_crypto_crc.c
index 3695603cd..838da5dbc 100644
--- a/src/util/test_crypto_crc.c
+++ b/src/util/test_crypto_crc.c
@@ -15,6 +15,8 @@
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+     SPDX-License-Identifier: AGPL3.0-or-later
+
      For the actual CRC code:
      Copyright abandoned; this code is in the public domain.
      Provided to GNUnet by address@hidden
diff --git a/src/util/test_crypto_ecc_dlog.c b/src/util/test_crypto_ecc_dlog.c
index eabe3ed08..0b0b8d57c 100644
--- a/src/util/test_crypto_ecc_dlog.c
+++ b/src/util/test_crypto_ecc_dlog.c
@@ -15,6 +15,8 @@
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+     SPDX-License-Identifier: AGPL3.0-or-later
+
 */
 /**
  * @file util/test_crypto_ecc_dlog.c
diff --git a/src/util/test_crypto_ecdh_eddsa.c 
b/src/util/test_crypto_ecdh_eddsa.c
index b7b1634e4..721f831d0 100644
--- a/src/util/test_crypto_ecdh_eddsa.c
+++ b/src/util/test_crypto_ecdh_eddsa.c
@@ -15,6 +15,8 @@
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+     SPDX-License-Identifier: AGPL3.0-or-later
+
 */
 /**
  * @file util/test_crypto_ecdh_eddsa.c
diff --git a/src/util/test_crypto_ecdhe.c b/src/util/test_crypto_ecdhe.c
index 6f887e9f3..c4392ca5a 100644
--- a/src/util/test_crypto_ecdhe.c
+++ b/src/util/test_crypto_ecdhe.c
@@ -15,6 +15,8 @@
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+     SPDX-License-Identifier: AGPL3.0-or-later
+
 */
 /**
  * @file util/test_crypto_ecdhe.c
diff --git a/src/util/test_crypto_ecdsa.c b/src/util/test_crypto_ecdsa.c
index b3df27513..8fa5eb486 100644
--- a/src/util/test_crypto_ecdsa.c
+++ b/src/util/test_crypto_ecdsa.c
@@ -15,6 +15,8 @@
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+     SPDX-License-Identifier: AGPL3.0-or-later
+
 */
 /**
  * @file util/test_crypto_ecdsa.c
diff --git a/src/util/test_crypto_eddsa.c b/src/util/test_crypto_eddsa.c
index 8539be277..e738f7e6c 100644
--- a/src/util/test_crypto_eddsa.c
+++ b/src/util/test_crypto_eddsa.c
@@ -15,6 +15,8 @@
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+     SPDX-License-Identifier: AGPL3.0-or-later
+
 */
 /**
  * @file util/test_crypto_eddsa.c
diff --git a/src/util/test_crypto_hash.c b/src/util/test_crypto_hash.c
index 609be8a72..52e24718d 100644
--- a/src/util/test_crypto_hash.c
+++ b/src/util/test_crypto_hash.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/test_crypto_hash_context.c 
b/src/util/test_crypto_hash_context.c
index 26487fd39..847fe56ba 100644
--- a/src/util/test_crypto_hash_context.c
+++ b/src/util/test_crypto_hash_context.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/test_crypto_hash_context.c
diff --git a/src/util/test_crypto_paillier.c b/src/util/test_crypto_paillier.c
index d600a2806..d19696372 100644
--- a/src/util/test_crypto_paillier.c
+++ b/src/util/test_crypto_paillier.c
@@ -15,6 +15,8 @@
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+     SPDX-License-Identifier: AGPL3.0-or-later
+
 */
 /**
  * @file util/test_crypto_paillier.c
diff --git a/src/util/test_crypto_random.c b/src/util/test_crypto_random.c
index f5e0a2731..dec58086a 100644
--- a/src/util/test_crypto_random.c
+++ b/src/util/test_crypto_random.c
@@ -15,6 +15,8 @@
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+     SPDX-License-Identifier: AGPL3.0-or-later
+
 */
 
 /**
diff --git a/src/util/test_crypto_rsa.c b/src/util/test_crypto_rsa.c
index 320dfce54..36c47005e 100644
--- a/src/util/test_crypto_rsa.c
+++ b/src/util/test_crypto_rsa.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/test_crypto_symmetric.c b/src/util/test_crypto_symmetric.c
index d6d177ed0..d731c45b7 100644
--- a/src/util/test_crypto_symmetric.c
+++ b/src/util/test_crypto_symmetric.c
@@ -15,6 +15,8 @@
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+     SPDX-License-Identifier: AGPL3.0-or-later
+
 */
 /**
  * @author Christian Grothoff
diff --git a/src/util/test_disk.c b/src/util/test_disk.c
index 352e3ee3e..267d4d4f9 100644
--- a/src/util/test_disk.c
+++ b/src/util/test_disk.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/test_getopt.c b/src/util/test_getopt.c
index e5b854658..4294117a6 100644
--- a/src/util/test_getopt.c
+++ b/src/util/test_getopt.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/test_getopt.c
diff --git a/src/util/test_hexcoder.c b/src/util/test_hexcoder.c
index 441d7e200..f73989a0e 100644
--- a/src/util/test_hexcoder.c
+++ b/src/util/test_hexcoder.c
@@ -15,6 +15,8 @@
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+     SPDX-License-Identifier: AGPL3.0-or-later
+
 */
 /**
  * @author Christian Grothoff
diff --git a/src/util/test_mq.c b/src/util/test_mq.c
index c02ee677e..9a396bcae 100644
--- a/src/util/test_mq.c
+++ b/src/util/test_mq.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/test_os_network.c b/src/util/test_os_network.c
index 1809a8eb6..b6e981bc3 100644
--- a/src/util/test_os_network.c
+++ b/src/util/test_os_network.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/test_os_network.c
diff --git a/src/util/test_os_start_process.c b/src/util/test_os_start_process.c
index 1d87f2ab3..826e5744c 100644
--- a/src/util/test_os_start_process.c
+++ b/src/util/test_os_start_process.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/test_os_start_process.c
diff --git a/src/util/test_peer.c b/src/util/test_peer.c
index ddb242738..9fbedb15c 100644
--- a/src/util/test_peer.c
+++ b/src/util/test_peer.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/test_peer.c
diff --git a/src/util/test_plugin.c b/src/util/test_plugin.c
index a736a077a..04dcdf213 100644
--- a/src/util/test_plugin.c
+++ b/src/util/test_plugin.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/test_plugin.c
diff --git a/src/util/test_plugin_plug.c b/src/util/test_plugin_plug.c
index 683b45d3c..deb36b0a0 100644
--- a/src/util/test_plugin_plug.c
+++ b/src/util/test_plugin_plug.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/test_plugin_plug.c
diff --git a/src/util/test_program.c b/src/util/test_program.c
index 001f3aea1..a9b3b064a 100644
--- a/src/util/test_program.c
+++ b/src/util/test_program.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/test_program.c
diff --git a/src/util/test_regex.c b/src/util/test_regex.c
index 4eb7cf87d..b47314084 100644
--- a/src/util/test_regex.c
+++ b/src/util/test_regex.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file tun/test_regex.c
diff --git a/src/util/test_resolver_api.c b/src/util/test_resolver_api.c
index 5a8f95093..686301694 100644
--- a/src/util/test_resolver_api.c
+++ b/src/util/test_resolver_api.c
@@ -14,6 +14,8 @@
 
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file resolver/test_resolver_api.c
diff --git a/src/util/test_scheduler.c b/src/util/test_scheduler.c
index 904461465..c38af8a0a 100644
--- a/src/util/test_scheduler.c
+++ b/src/util/test_scheduler.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/test_scheduler.c
diff --git a/src/util/test_scheduler_delay.c b/src/util/test_scheduler_delay.c
index f8c4ef8da..6c25531f2 100644
--- a/src/util/test_scheduler_delay.c
+++ b/src/util/test_scheduler_delay.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/test_scheduler_delay.c
diff --git a/src/util/test_service.c b/src/util/test_service.c
index 6858f956e..72bd1f371 100644
--- a/src/util/test_service.c
+++ b/src/util/test_service.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/test_service.c
diff --git a/src/util/test_socks.c b/src/util/test_socks.c
index 9df7b66bc..89a350feb 100644
--- a/src/util/test_socks.c
+++ b/src/util/test_socks.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/test_socks.c
diff --git a/src/util/test_speedup.c b/src/util/test_speedup.c
index 8a385ae47..a46d83dc3 100644
--- a/src/util/test_speedup.c
+++ b/src/util/test_speedup.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/test_speedup.c
diff --git a/src/util/test_strings.c b/src/util/test_strings.c
index 3750986e6..652c3be23 100644
--- a/src/util/test_strings.c
+++ b/src/util/test_strings.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/test_strings.c
diff --git a/src/util/test_strings_to_data.c b/src/util/test_strings_to_data.c
index 1c58d91ec..f7d20441f 100644
--- a/src/util/test_strings_to_data.c
+++ b/src/util/test_strings_to_data.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/test_strings_to_data.c
diff --git a/src/util/test_time.c b/src/util/test_time.c
index 80c4e5337..6f4a6332b 100644
--- a/src/util/test_time.c
+++ b/src/util/test_time.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/test_time.c
diff --git a/src/util/test_tun.c b/src/util/test_tun.c
index 429678fd5..391791c4b 100644
--- a/src/util/test_tun.c
+++ b/src/util/test_tun.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/time.c b/src/util/time.c
index 382265aa1..799c6cc63 100644
--- a/src/util/time.c
+++ b/src/util/time.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/tun.c b/src/util/tun.c
index 25e729e58..97fbaa83b 100644
--- a/src/util/tun.c
+++ b/src/util/tun.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/w32cat.c b/src/util/w32cat.c
index f2a0feac5..8a48638aa 100644
--- a/src/util/w32cat.c
+++ b/src/util/w32cat.c
@@ -16,6 +16,8 @@
      along with cat; see the file COPYING.  If not, write to the
      Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
      Boston, MA 02110-1301, USA.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 #include <stdio.h>
diff --git a/src/util/win.c b/src/util/win.c
index 511e5d515..ad6275cc4 100644
--- a/src/util/win.c
+++ b/src/util/win.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/winproc.c b/src/util/winproc.c
index 887df2412..2781b901f 100644
--- a/src/util/winproc.c
+++ b/src/util/winproc.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/vpn/gnunet-helper-vpn-windows.c 
b/src/vpn/gnunet-helper-vpn-windows.c
index 71a54466e..14c0c3fec 100644
--- a/src/vpn/gnunet-helper-vpn-windows.c
+++ b/src/vpn/gnunet-helper-vpn-windows.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file vpn/gnunet-helper-vpn-windows.c
diff --git a/src/vpn/gnunet-helper-vpn.c b/src/vpn/gnunet-helper-vpn.c
index a9fd7f021..e621b8716 100644
--- a/src/vpn/gnunet-helper-vpn.c
+++ b/src/vpn/gnunet-helper-vpn.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/vpn/gnunet-service-vpn.c b/src/vpn/gnunet-service-vpn.c
index 706a1294d..40a890070 100644
--- a/src/vpn/gnunet-service-vpn.c
+++ b/src/vpn/gnunet-service-vpn.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/vpn/gnunet-vpn.c b/src/vpn/gnunet-vpn.c
index dc47421d7..38ead2023 100644
--- a/src/vpn/gnunet-vpn.c
+++ b/src/vpn/gnunet-vpn.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/vpn/vpn.h b/src/vpn/vpn.h
index 1945e8559..4c106361e 100644
--- a/src/vpn/vpn.h
+++ b/src/vpn/vpn.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/vpn/vpn_api.c b/src/vpn/vpn_api.c
index 190ed0f99..b53c32e64 100644
--- a/src/vpn/vpn_api.c
+++ b/src/vpn/vpn_api.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/zonemaster/gnunet-service-zonemaster-monitor.c 
b/src/zonemaster/gnunet-service-zonemaster-monitor.c
index 9a6fa678e..dfbd9cf03 100644
--- a/src/zonemaster/gnunet-service-zonemaster-monitor.c
+++ b/src/zonemaster/gnunet-service-zonemaster-monitor.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/zonemaster/gnunet-service-zonemaster.c 
b/src/zonemaster/gnunet-service-zonemaster.c
index fcc6b4226..079013b6c 100644
--- a/src/zonemaster/gnunet-service-zonemaster.c
+++ b/src/zonemaster/gnunet-service-zonemaster.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**

-- 
To stop receiving notification emails like this one, please contact
address@hidden



reply via email to

[Prev in Thread] Current Thread [Next in Thread]