remove duplicate headers

alandekok · alandekok · commit 94998a2dba52 · 2026-03-12T07:43:08.000-04:00
perl -ni -e 'print unless (/&lt;(stdbool|stdint|stddef|string).h&gt;/)' $(git grep -l stdbool.h src | grep '\.[ch]' | egrep -v 'build|autoconf' )
diff --git a/src/bin/radict.c b/src/bin/radict.c
@@ -31,7 +31,6 @@ RCSID("$Id$")
 #include <freeradius-devel/util/dict_priv.h>
 #include <dirent.h>
 #include <sys/stat.h>
-#include <stdbool.h>
 
 #ifdef HAVE_GETOPT_H
 #  include <getopt.h>
diff --git a/src/bin/radlock.c b/src/bin/radlock.c
@@ -33,7 +33,6 @@ RCSID("$Id$")
 
 #include <ctype.h>
 #include <stdarg.h>
-#include <stdbool.h>
 #include <sys/ipc.h>
 #include <sys/sem.h>
 
diff --git a/src/lib/eap/compose.h b/src/lib/eap/compose.h
@@ -23,7 +23,6 @@
  * @copyright 2019 The FreeRADIUS server project
  */
 
-#include <stdbool.h>
 
 #include "types.h"
 
diff --git a/src/lib/eap_aka_sim/crypto.c b/src/lib/eap_aka_sim/crypto.c
@@ -1339,8 +1339,6 @@ void fr_aka_sim_crypto_keys_log(request_t *request, fr_aka_sim_keys_t *keys)
 /*
  *  cc crypto.c fips186prf.c -g3 -Wall -DHAVE_DLFCN_H -DTESTING_SIM_CRYPTO -DWITH_TLS -I../../../../ -I../../../ -I ../base/ -I /usr/local/opt/openssl/include/ -include ../include/build.h -L /usr/local/opt/openssl/lib/ -l ssl -l crypto -l talloc -L ../../../../../build/lib/local/.libs/ -lfreeradius-server -lfreeradius-tls -lfreeradius-util -o test_sim_crypto && ./test_sim_crypto
  */
-#include <stddef.h>
-#include <stdbool.h>
 #include <freeradius-devel/util/test/acutest.h>
 
 /*
diff --git a/src/lib/eap_aka_sim/id.c b/src/lib/eap_aka_sim/id.c
@@ -670,8 +670,6 @@ int fr_aka_sim_id_3gpp_pseudonym_decrypt(char out[AKA_SIM_IMSI_MAX_LEN + 1],
 /*
  *  cc id.c -g3 -Wall -DHAVE_DLFCN_H -DTESTING_SIM_ID -DWITH_TLS -I../../../../ -I../../../ -I ../base/ -I /usr/local/opt/openssl/include/ -include ../include/build.h -L /usr/local/opt/openssl/lib/ -l ssl -l crypto -l talloc -L ../../../../../build/lib/local/.libs/ -lfreeradius-server -lfreeradius-tls -lfreeradius-util -o test_sim_id && ./test_sim_id
  */
-#include <stddef.h>
-#include <stdbool.h>
 #include <freeradius-devel/util/test/acutest.h>
 
 void test_encrypt_decypt_key0(void)
diff --git a/src/lib/io/atomic_queue.h b/src/lib/io/atomic_queue.h
@@ -25,7 +25,6 @@
  */
 RCSIDH(atomic_queue_h, "$Id$")
 
-#include <stdbool.h>
 
 #ifdef HAVE_STDATOMIC_H
 #  include <stdatomic.h>
diff --git a/src/lib/io/queue.h b/src/lib/io/queue.h
@@ -25,7 +25,6 @@
  */
 RCSIDH(queue_h, "$Id$")
 
-#include <stdbool.h>
 #include <freeradius-devel/io/atomic_queue.h>
 #include <freeradius-devel/util/talloc.h>
 
diff --git a/src/lib/io/ring_buffer.h b/src/lib/io/ring_buffer.h
@@ -27,8 +27,6 @@
 RCSIDH(ring_buffer_h, "$Id$")
 
 #include <freeradius-devel/util/talloc.h>
-#include <stdbool.h>
-#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/lib/server/cf_parse.h b/src/lib/server/cf_parse.h
@@ -27,9 +27,6 @@ RCSIDH(cf_parse_h, "$Id$")
 
 typedef struct conf_parser_s conf_parser_t;
 
-#include <stddef.h>
-#include <stdint.h>
-#include <stdbool.h>
 #include <unistd.h>
 #include <sys/time.h>
 #include <freeradius-devel/util/rb.h>
diff --git a/src/lib/server/cf_util.h b/src/lib/server/cf_util.h
@@ -39,9 +39,6 @@ typedef struct cf_pair CONF_PAIR;	//!< #CONF_ITEM with an attribute, an operator
 typedef struct cf_data CONF_DATA;	//!< #CONF_ITEM used to associate arbitrary data
 					///< with a #CONF_PAIR or #CONF_SECTION.
 
-#include <stddef.h>
-#include <stdint.h>
-#include <stdbool.h>
 #include <unistd.h>
 #include <sys/time.h>
 
diff --git a/src/lib/server/rad_assert.h b/src/lib/server/rad_assert.h
@@ -25,7 +25,6 @@
  */
 RCSIDH(fr_assert_h, "$Id$")
 
-#include <stdbool.h>
 #include <freeradius-devel/util/debug.h>
 
 #ifdef __cplusplus
diff --git a/src/lib/server/section.h b/src/lib/server/section.h
@@ -25,7 +25,6 @@
  */
 RCSIDH(section_h, "$Id$")
 
-#include <stdbool.h>
 #include <freeradius-devel/server/cf_util.h>
 
 #ifdef __cplusplus
diff --git a/src/lib/sim/comp128.h b/src/lib/sim/comp128.h
@@ -26,9 +26,6 @@
  * @copyright 2013 Hacking projects [http://www.hackingprojects.net/]
  * @copyright 2009 Sylvain Munaut (tnt@246tNt.com)
  */
-#include <string.h>
-#include <stdint.h>
-#include <stdbool.h>
 
 void comp128v1(uint8_t sres[static 4], uint8_t kc[static 8], uint8_t const ki[static 16], uint8_t const rand[static 16]);
 void comp128v23(uint8_t sres[static 4], uint8_t kc[static 8], uint8_t const ki[static 16], uint8_t const rand[static 16], bool v2);
diff --git a/src/lib/tls/log.h b/src/lib/tls/log.h
@@ -28,8 +28,6 @@ RCSIDH(tls_log_h, "$Id$")
 
 #include "openssl_user_macros.h"
 
-#include <stdbool.h>
-#include <stdint.h>
 
 #include <freeradius-devel/server/request.h>
 #include <openssl/bio.h>
diff --git a/src/lib/unlang/subrequest.h b/src/lib/unlang/subrequest.h
@@ -31,7 +31,6 @@ extern "C" {
 #include <freeradius-devel/server/request.h>
 #include <freeradius-devel/server/rcode.h>
 #include <freeradius-devel/unlang/interpret.h>
-#include <stdbool.h>
 
 typedef struct {
 	bool		enable;				//!< Whether we should store/restore sessions.
diff --git a/src/lib/util/atexit.h b/src/lib/util/atexit.h
@@ -26,7 +26,6 @@
  */
 RCSIDH(atexit_h, "$Id$")
 
-#include <stdbool.h>
 #include <stdatomic.h>
 #include <pthread.h>
 #include <freeradius-devel/util/talloc.h>
diff --git a/src/lib/util/base16.h b/src/lib/util/base16.h
@@ -31,9 +31,6 @@ extern "C" {
 #include <freeradius-devel/util/sbuff.h>
 #include <freeradius-devel/util/dbuff.h>
 
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
 #include <sys/types.h>
 
 extern char const fr_base16_alphabet_encode_lc[SBUFF_CHAR_CLASS];
diff --git a/src/lib/util/base32.h b/src/lib/util/base32.h
@@ -31,9 +31,6 @@ extern "C" {
 #include <freeradius-devel/util/sbuff.h>
 #include <freeradius-devel/util/dbuff.h>
 
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
 #include <sys/types.h>
 
 extern char const fr_base32_alphabet_encode[SBUFF_CHAR_CLASS];
diff --git a/src/lib/util/base64.h b/src/lib/util/base64.h
@@ -31,9 +31,6 @@ extern "C" {
 #include <freeradius-devel/util/sbuff.h>
 #include <freeradius-devel/util/dbuff.h>
 
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
 #include <sys/types.h>
 
 /*
diff --git a/src/lib/util/cap.h b/src/lib/util/cap.h
@@ -31,7 +31,6 @@ extern "C" {
 
 #ifdef HAVE_CAPABILITY_H
 #  include <sys/capability.h>
-#  include <stdbool.h>
 #  include <freeradius-devel/util/talloc.h>
 
 bool	fr_cap_is_enabled(cap_value_t cap, cap_flag_t set);
diff --git a/src/lib/util/dbuff.h b/src/lib/util/dbuff.h
@@ -34,8 +34,6 @@ extern "C" {
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/util/nbo.h>
 #include <limits.h>
-#include <stdbool.h>
-#include <stdint.h>
 #include <sys/types.h>
 
 DIAG_OFF(cast-align)
diff --git a/src/lib/util/dcursor.h b/src/lib/util/dcursor.h
@@ -31,8 +31,6 @@ extern "C" {
 #include <freeradius-devel/util/dlist.h>
 #include <freeradius-devel/util/talloc.h>
 
-#include <stddef.h>
-#include <stdbool.h>
 
 DIAG_OFF(unused-function)
 typedef struct fr_dcursor_s fr_dcursor_t;
diff --git a/src/lib/util/dict.h b/src/lib/util/dict.h
@@ -39,8 +39,6 @@ extern "C" {
 #include <freeradius-devel/util/talloc.h>
 #include <freeradius-devel/util/types.h>
 
-#include <stdbool.h>
-#include <stdint.h>
 
 /*
  *	Avoid circular type references.
diff --git a/src/lib/util/dl.h b/src/lib/util/dl.h
@@ -35,7 +35,6 @@ RCSIDH(dl_h, "$Id$")
 #include <freeradius-devel/util/talloc.h>
 #include <freeradius-devel/util/version.h>
 
-#include <stdbool.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/lib/util/event.h b/src/lib/util/event.h
@@ -53,7 +53,6 @@ struct fr_event_list_pub_s {
 
 #include <freeradius-devel/util/talloc.h>
 
-#include <stdbool.h>
 #include <sys/event.h>
 
 
diff --git a/src/lib/util/file.h b/src/lib/util/file.h
@@ -29,7 +29,6 @@ extern "C" {
 #endif
 
 #include <freeradius-devel/util/sbuff.h>
-#include <stdbool.h>
 
 #ifdef HAVE_DIRENT_H
 #  include <dirent.h>
diff --git a/src/lib/util/fring.h b/src/lib/util/fring.h
@@ -31,8 +31,6 @@ extern "C" {
 #include <freeradius-devel/missing.h>
 #include <freeradius-devel/util/talloc.h>
 
-#include <stdbool.h>
-#include <stdint.h>
 
 typedef struct fr_fring_buffer fr_fring_t;
 
diff --git a/src/lib/util/inet.h b/src/lib/util/inet.h
@@ -31,7 +31,6 @@ RCSIDH(inet_h, "$Id$")
 #include <arpa/inet.h>
 #include <net/if.h>		/* SIOCGIFADDR et al */
 #include <netinet/in.h>		/* in6?_addr */
-#include <stdbool.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/lib/util/log.h b/src/lib/util/log.h
@@ -33,10 +33,7 @@ extern "C" {
 #include <freeradius-devel/util/table.h>
 #include <freeradius-devel/util/talloc.h>
 
-#include <stdbool.h>
-#include <stdint.h>
 #include <stdio.h>
-#include <string.h>
 
 extern FILE	*fr_log_fp;
 
diff --git a/src/lib/util/md4.h b/src/lib/util/md4.h
@@ -17,9 +17,6 @@ extern "C" {
 
 #include <inttypes.h>
 #include <sys/types.h>
-#include <stdint.h>
-#include <stdbool.h>
-#include <string.h>
 
 #ifndef MD4_DIGEST_LENGTH
 #  define MD4_DIGEST_LENGTH 16
diff --git a/src/lib/util/md5.h b/src/lib/util/md5.h
@@ -17,9 +17,6 @@ extern "C" {
 
 #include <inttypes.h>
 #include <sys/types.h>
-#include <stdint.h>
-#include <stdbool.h>
-#include <string.h>
 
 #ifndef MD5_DIGEST_LENGTH
 #  define MD5_DIGEST_LENGTH 16
diff --git a/src/lib/util/missing.c b/src/lib/util/missing.c
@@ -26,7 +26,6 @@ RCSID("$Id$")
 
 #include <ctype.h>
 #include <pthread.h>
-#include <stdbool.h>
 
 #if !defined(HAVE_CLOCK_GETTIME) && defined(__MACH__)
 #  include <mach/mach_time.h>
diff --git a/src/lib/util/pcap.h b/src/lib/util/pcap.h
@@ -35,7 +35,6 @@ extern "C" {
 #include <freeradius-devel/util/net.h>
 
 #include <pcap.h>
-#include <stdbool.h>
 #include <sys/types.h>
 
 #define SNAPLEN ETHER_HDR_LEN + IP_HDR_LEN + sizeof(udp_header_t) + MAX_RADIUS_LEN
diff --git a/src/lib/util/rand.c b/src/lib/util/rand.c
@@ -26,7 +26,6 @@ RCSID("$Id$")
 #include <freeradius-devel/util/hash.h>
 
 #include <fcntl.h>
-#include <stdbool.h>
 
 static _Thread_local fr_randctx fr_rand_pool;		//!< A pool of pre-generated random integers
 static _Thread_local bool fr_rand_initialized = false;
diff --git a/src/lib/util/rb.h b/src/lib/util/rb.h
@@ -29,8 +29,6 @@ extern "C" {
 
 #include <freeradius-devel/util/misc.h>
 
-#include <stdbool.h>
-#include <stdint.h>
 
 /* Red-Black tree description */
 typedef enum {
diff --git a/src/lib/util/regex.h b/src/lib/util/regex.h
@@ -33,8 +33,6 @@ extern "C" {
 #include <freeradius-devel/util/talloc.h>
 #include <freeradius-devel/util/value.h>
 
-#include <stdbool.h>
-#include <stdint.h>
 #include <unistd.h>
 
 /*
diff --git a/src/lib/util/sbuff.h b/src/lib/util/sbuff.h
@@ -32,10 +32,7 @@ extern "C" {
 #include <ctype.h>
 #include <errno.h>
 #include <limits.h>
-#include <stdbool.h>
-#include <stdint.h>
 #include <stdio.h>
-#include <string.h>
 #include <sys/types.h>
 
 /** Represents number of bytes parsed or location of parse error
diff --git a/src/lib/util/sem.c b/src/lib/util/sem.c
@@ -32,7 +32,6 @@ RCSID("$Id$")
 #include <sys/sem.h>
 #include <sys/stat.h>
 
-#include <stdbool.h>
 #include <signal.h>
 
 #include <freeradius-devel/util/perm.h>
diff --git a/src/lib/util/socket.h b/src/lib/util/socket.h
@@ -36,9 +36,6 @@ extern "C" {
 #include <freeradius-devel/util/inet.h>
 #include <freeradius-devel/util/time.h>
 
-#include <stdbool.h>
-#include <stdint.h>
-#include <string.h>
 #include <sys/time.h>
 
 #ifdef HAVE_SYS_UN_H
diff --git a/src/lib/util/talloc.h b/src/lib/util/talloc.h
@@ -29,8 +29,6 @@ extern "C" {
 #endif
 
 #include <ctype.h>
-#include <stdbool.h>
-#include <stdint.h>
 
 #ifdef HAVE_WDOCUMENTATION
 DIAG_OFF(documentation)
diff --git a/src/lib/util/test/acutest.h b/src/lib/util/test/acutest.h
@@ -294,9 +294,7 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <setjmp.h>
-#include <stdbool.h>
 
 #if defined(unix) || defined(__unix__) || defined(__unix) || defined(__APPLE__)
     #define ACUTEST_UNIX_       1
diff --git a/src/lib/util/token.h b/src/lib/util/token.h
@@ -32,8 +32,6 @@ extern "C" {
 #include <freeradius-devel/build.h>
 #include <freeradius-devel/missing.h>
 #include <freeradius-devel/util/table.h>
-#include <stdbool.h>
-#include <stdint.h>
 
 typedef enum fr_token {
 	T_INVALID = 0,			/* invalid token */
diff --git a/src/lib/util/trie.h b/src/lib/util/trie.h
@@ -32,8 +32,6 @@ extern "C" {
 #include <freeradius-devel/util/misc.h>
 #include <freeradius-devel/util/talloc.h>
 
-#include <stdbool.h>
-#include <stdint.h>
 #include <stdio.h>
 
 typedef struct fr_trie_s fr_trie_t;
diff --git a/src/lib/util/types.h b/src/lib/util/types.h
@@ -30,7 +30,6 @@ extern "C" {
 
 #include <freeradius-devel/util/table.h>
 #include <freeradius-devel/util/talloc.h>
-#include <stdbool.h>
 
 /** Internal data types
  */
diff --git a/src/listen/control/conduit.c b/src/listen/control/conduit.c
@@ -27,7 +27,6 @@ RCSID("$Id$")
 
 #include <freeradius-devel/util/strerror.h>
 #include <stdlib.h>
-#include <stdbool.h>
 #include <unistd.h>
 #include <errno.h>
 #include "conduit.h"
diff --git a/src/listen/radius/proto_radius.c b/src/listen/radius/proto_radius.c
diff --git a/src/protocols/radius/list.h b/src/protocols/radius/list.h
