aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xconfigure.py6
-rw-r--r--src/build-data/buildh.in4
-rw-r--r--src/cli/cli.h4
-rw-r--r--src/cli/credentials.h4
-rw-r--r--src/fuzzer/ecc_helper.h4
-rw-r--r--src/fuzzer/fuzzers.h4
-rw-r--r--src/fuzzer/redc_helper.h4
-rw-r--r--src/lib/asn1/alg_id.h4
-rw-r--r--src/lib/asn1/asn1_alt_name.h4
-rw-r--r--src/lib/asn1/asn1_attribute.h4
-rw-r--r--src/lib/asn1/asn1_obj.h4
-rw-r--r--src/lib/asn1/asn1_oid.h4
-rw-r--r--src/lib/asn1/asn1_str.h4
-rw-r--r--src/lib/asn1/asn1_time.h4
-rw-r--r--src/lib/asn1/ber_dec.h4
-rw-r--r--src/lib/asn1/der_enc.h4
-rw-r--r--src/lib/asn1/oids.h4
-rw-r--r--src/lib/asn1/x509_dn.h4
-rw-r--r--src/lib/base/botan.h4
-rw-r--r--src/lib/base/buf_comp.h4
-rw-r--r--src/lib/base/init.h4
-rw-r--r--src/lib/base/key_spec.h4
-rw-r--r--src/lib/base/lookup.h4
-rw-r--r--src/lib/base/scan_name.h4
-rw-r--r--src/lib/base/secmem.h4
-rw-r--r--src/lib/base/sym_algo.h4
-rw-r--r--src/lib/base/symkey.h4
-rw-r--r--src/lib/block/aes/aes.h4
-rw-r--r--src/lib/block/aria/aria.h4
-rw-r--r--src/lib/block/block_cipher.h4
-rw-r--r--src/lib/block/blowfish/blowfish.h4
-rw-r--r--src/lib/block/camellia/camellia.h4
-rw-r--r--src/lib/block/cascade/cascade.h4
-rw-r--r--src/lib/block/cast/cast128.h4
-rw-r--r--src/lib/block/cast/cast256.h4
-rw-r--r--src/lib/block/cast/cast_sboxes.h4
-rw-r--r--src/lib/block/des/des.h4
-rw-r--r--src/lib/block/des/desx.h4
-rw-r--r--src/lib/block/gost_28147/gost_28147.h4
-rw-r--r--src/lib/block/idea/idea.h4
-rw-r--r--src/lib/block/kasumi/kasumi.h4
-rw-r--r--src/lib/block/lion/lion.h4
-rw-r--r--src/lib/block/misty1/misty1.h4
-rw-r--r--src/lib/block/noekeon/noekeon.h4
-rw-r--r--src/lib/block/seed/seed.h4
-rw-r--r--src/lib/block/serpent/serpent.h4
-rw-r--r--src/lib/block/serpent/serpent_sbox.h4
-rw-r--r--src/lib/block/shacal2/shacal2.h4
-rw-r--r--src/lib/block/sm4/sm4.h4
-rw-r--r--src/lib/block/threefish/threefish.h4
-rw-r--r--src/lib/block/twofish/twofish.h4
-rw-r--r--src/lib/block/xtea/xtea.h4
-rw-r--r--src/lib/codec/base64/base64.h4
-rw-r--r--src/lib/codec/hex/hex.h4
-rw-r--r--src/lib/compression/bzip2/bzip2.h4
-rw-r--r--src/lib/compression/compress_utils.h4
-rw-r--r--src/lib/compression/compression.h4
-rw-r--r--src/lib/compression/lzma/lzma.h4
-rw-r--r--src/lib/compression/zlib/zlib.h4
-rw-r--r--src/lib/entropy/darwin_secrandom/darwin_secrandom.h4
-rw-r--r--src/lib/entropy/dev_random/dev_random.h4
-rw-r--r--src/lib/entropy/entropy_src.h4
-rw-r--r--src/lib/entropy/getentropy/getentropy.h4
-rw-r--r--src/lib/entropy/proc_walk/proc_walk.h4
-rw-r--r--src/lib/entropy/rdrand/rdrand.h4
-rw-r--r--src/lib/entropy/rdseed/rdseed.h4
-rw-r--r--src/lib/entropy/win32_stats/es_win32.h4
-rw-r--r--src/lib/ffi/ffi.h4
-rw-r--r--src/lib/ffi/ffi_mp.h4
-rw-r--r--src/lib/ffi/ffi_pkey.h4
-rw-r--r--src/lib/ffi/ffi_rng.h4
-rw-r--r--src/lib/ffi/ffi_util.h4
-rw-r--r--src/lib/filters/aead_filt.h4
-rw-r--r--src/lib/filters/basefilt.h4
-rw-r--r--src/lib/filters/buf_filt.h4
-rw-r--r--src/lib/filters/cipher_filter.h4
-rw-r--r--src/lib/filters/codec_filt/b64_filt.h4
-rw-r--r--src/lib/filters/codec_filt/hex_filt.h4
-rw-r--r--src/lib/filters/comp_filter.h4
-rw-r--r--src/lib/filters/data_snk.h4
-rw-r--r--src/lib/filters/fd_unix/fd_unix.h4
-rw-r--r--src/lib/filters/filter.h4
-rw-r--r--src/lib/filters/filters.h4
-rw-r--r--src/lib/filters/key_filt.h4
-rw-r--r--src/lib/filters/out_buf.h4
-rw-r--r--src/lib/filters/pipe.h4
-rw-r--r--src/lib/filters/secqueue.h4
-rw-r--r--src/lib/hash/blake2/blake2b.h4
-rw-r--r--src/lib/hash/checksum/adler32/adler32.h4
-rw-r--r--src/lib/hash/checksum/crc24/crc24.h4
-rw-r--r--src/lib/hash/checksum/crc32/crc32.h4
-rw-r--r--src/lib/hash/comb4p/comb4p.h4
-rw-r--r--src/lib/hash/gost_3411/gost_3411.h4
-rw-r--r--src/lib/hash/hash.h4
-rw-r--r--src/lib/hash/keccak/keccak.h4
-rw-r--r--src/lib/hash/md4/md4.h4
-rw-r--r--src/lib/hash/md5/md5.h4
-rw-r--r--src/lib/hash/mdx_hash/mdx_hash.h4
-rw-r--r--src/lib/hash/par_hash/par_hash.h4
-rw-r--r--src/lib/hash/rmd160/rmd160.h4
-rw-r--r--src/lib/hash/sha1/sha160.h4
-rw-r--r--src/lib/hash/sha2_32/sha2_32.h4
-rw-r--r--src/lib/hash/sha2_64/sha2_64.h4
-rw-r--r--src/lib/hash/sha3/sha3.h4
-rw-r--r--src/lib/hash/shake/shake.h4
-rw-r--r--src/lib/hash/skein/skein_512.h4
-rw-r--r--src/lib/hash/sm3/sm3.h4
-rw-r--r--src/lib/hash/streebog/streebog.h4
-rw-r--r--src/lib/hash/tiger/tiger.h4
-rw-r--r--src/lib/hash/whirlpool/whrlpool.h4
-rw-r--r--src/lib/kdf/hkdf/hkdf.h4
-rw-r--r--src/lib/kdf/kdf.h4
-rw-r--r--src/lib/kdf/kdf1/kdf1.h4
-rw-r--r--src/lib/kdf/kdf1_iso18033/kdf1_iso18033.h4
-rw-r--r--src/lib/kdf/kdf2/kdf2.h4
-rw-r--r--src/lib/kdf/prf_tls/prf_tls.h4
-rw-r--r--src/lib/kdf/prf_x942/prf_x942.h4
-rw-r--r--src/lib/kdf/sp800_108/sp800_108.h4
-rw-r--r--src/lib/kdf/sp800_56a/sp800_56a.h4
-rw-r--r--src/lib/kdf/sp800_56c/sp800_56c.h4
-rw-r--r--src/lib/mac/cbc_mac/cbc_mac.h4
-rw-r--r--src/lib/mac/cmac/cmac.h4
-rw-r--r--src/lib/mac/gmac/gmac.h4
-rw-r--r--src/lib/mac/hmac/hmac.h4
-rw-r--r--src/lib/mac/mac.h4
-rw-r--r--src/lib/mac/poly1305/poly1305.h4
-rw-r--r--src/lib/mac/siphash/siphash.h4
-rw-r--r--src/lib/mac/x919_mac/x919_mac.h4
-rw-r--r--src/lib/math/bigint/bigint.h4
-rw-r--r--src/lib/math/bigint/divide.h4
-rw-r--r--src/lib/math/ec_gfp/curve_gfp.h4
-rw-r--r--src/lib/math/ec_gfp/curve_nistp.h4
-rw-r--r--src/lib/math/ec_gfp/point_gfp.h4
-rw-r--r--src/lib/math/mp/mp_asmi.h4
-rw-r--r--src/lib/math/mp/mp_core.h4
-rw-r--r--src/lib/math/mp/mp_madd.h4
-rw-r--r--src/lib/math/mp/mp_types.h4
-rw-r--r--src/lib/math/numbertheory/def_powm.h4
-rw-r--r--src/lib/math/numbertheory/numthry.h4
-rw-r--r--src/lib/math/numbertheory/pow_mod.h4
-rw-r--r--src/lib/math/numbertheory/reducer.h4
-rw-r--r--src/lib/misc/aont/package.h4
-rw-r--r--src/lib/misc/cryptobox/cryptobox.h4
-rw-r--r--src/lib/misc/fpe_fe1/fpe_fe1.h4
-rw-r--r--src/lib/misc/hotp/hotp.h4
-rw-r--r--src/lib/misc/hotp/totp.h4
-rw-r--r--src/lib/misc/rfc3394/rfc3394.h4
-rw-r--r--src/lib/misc/srp6/srp6.h4
-rw-r--r--src/lib/misc/tss/tss.h4
-rw-r--r--src/lib/modes/aead/aead.h4
-rw-r--r--src/lib/modes/aead/ccm/ccm.h4
-rw-r--r--src/lib/modes/aead/chacha20poly1305/chacha20poly1305.h4
-rw-r--r--src/lib/modes/aead/eax/eax.h4
-rw-r--r--src/lib/modes/aead/gcm/clmul/clmul.h4
-rw-r--r--src/lib/modes/aead/gcm/gcm.h4
-rw-r--r--src/lib/modes/aead/gcm/pmull/pmull.h4
-rw-r--r--src/lib/modes/aead/ocb/ocb.h4
-rw-r--r--src/lib/modes/aead/siv/siv.h4
-rw-r--r--src/lib/modes/cbc/cbc.h4
-rw-r--r--src/lib/modes/cfb/cfb.h4
-rw-r--r--src/lib/modes/cipher_mode.h4
-rw-r--r--src/lib/modes/mode_pad/mode_pad.h4
-rw-r--r--src/lib/modes/stream_mode.h4
-rw-r--r--src/lib/modes/xts/xts.h4
-rw-r--r--src/lib/passhash/bcrypt/bcrypt.h4
-rw-r--r--src/lib/passhash/passhash9/passhash9.h4
-rw-r--r--src/lib/pbkdf/pbkdf.h4
-rw-r--r--src/lib/pbkdf/pbkdf1/pbkdf1.h4
-rw-r--r--src/lib/pbkdf/pbkdf2/pbkdf2.h4
-rw-r--r--src/lib/pbkdf/pgp_s2k/pgp_s2k.h4
-rw-r--r--src/lib/pk_pad/eme.h4
-rw-r--r--src/lib/pk_pad/eme_oaep/oaep.h4
-rw-r--r--src/lib/pk_pad/eme_pkcs1/eme_pkcs.h4
-rw-r--r--src/lib/pk_pad/eme_raw/eme_raw.h4
-rw-r--r--src/lib/pk_pad/emsa.h4
-rw-r--r--src/lib/pk_pad/emsa1/emsa1.h4
-rw-r--r--src/lib/pk_pad/emsa_pkcs1/emsa_pkcs1.h4
-rw-r--r--src/lib/pk_pad/emsa_pssr/pssr.h4
-rw-r--r--src/lib/pk_pad/emsa_raw/emsa_raw.h4
-rw-r--r--src/lib/pk_pad/emsa_x931/emsa_x931.h4
-rw-r--r--src/lib/pk_pad/hash_id/hash_id.h4
-rw-r--r--src/lib/pk_pad/iso9796/iso9796.h4
-rw-r--r--src/lib/pk_pad/mgf1/mgf1.h4
-rw-r--r--src/lib/prov/bearssl/bearssl.h4
-rw-r--r--src/lib/prov/openssl/openssl.h4
-rw-r--r--src/lib/prov/pkcs11/p11.h4
-rw-r--r--src/lib/prov/pkcs11/p11_ecc_key.h4
-rw-r--r--src/lib/prov/pkcs11/p11_ecdh.h4
-rw-r--r--src/lib/prov/pkcs11/p11_ecdsa.h4
-rw-r--r--src/lib/prov/pkcs11/p11_mechanism.h4
-rw-r--r--src/lib/prov/pkcs11/p11_module.h4
-rw-r--r--src/lib/prov/pkcs11/p11_object.h4
-rw-r--r--src/lib/prov/pkcs11/p11_randomgenerator.h4
-rw-r--r--src/lib/prov/pkcs11/p11_rsa.h4
-rw-r--r--src/lib/prov/pkcs11/p11_session.h4
-rw-r--r--src/lib/prov/pkcs11/p11_slot.h4
-rw-r--r--src/lib/prov/pkcs11/p11_x509.h4
-rw-r--r--src/lib/prov/tpm/tpm.h4
-rw-r--r--src/lib/prov/tpm/uuid.h4
-rw-r--r--src/lib/pubkey/blinding.h4
-rw-r--r--src/lib/pubkey/cecpq1/cecpq1.h4
-rw-r--r--src/lib/pubkey/curve25519/curve25519.h4
-rw-r--r--src/lib/pubkey/dh/dh.h4
-rw-r--r--src/lib/pubkey/dl_algo/dl_algo.h4
-rw-r--r--src/lib/pubkey/dl_group/dl_group.h4
-rw-r--r--src/lib/pubkey/dlies/dlies.h4
-rw-r--r--src/lib/pubkey/dsa/dsa.h4
-rw-r--r--src/lib/pubkey/ec_group/ec_group.h4
-rw-r--r--src/lib/pubkey/ecc_key/ecc_key.h4
-rw-r--r--src/lib/pubkey/ecdh/ecdh.h4
-rw-r--r--src/lib/pubkey/ecdsa/ecdsa.h4
-rw-r--r--src/lib/pubkey/ecgdsa/ecgdsa.h4
-rw-r--r--src/lib/pubkey/ecies/ecies.h4
-rw-r--r--src/lib/pubkey/eckcdsa/eckcdsa.h4
-rw-r--r--src/lib/pubkey/ed25519/ed25519.h4
-rw-r--r--src/lib/pubkey/ed25519/ed25519_fe.h4
-rw-r--r--src/lib/pubkey/ed25519/ed25519_internal.h4
-rw-r--r--src/lib/pubkey/elgamal/elgamal.h4
-rw-r--r--src/lib/pubkey/gost_3410/gost_3410.h4
-rw-r--r--src/lib/pubkey/keypair/keypair.h4
-rw-r--r--src/lib/pubkey/mce/code_based_util.h4
-rw-r--r--src/lib/pubkey/mce/gf2m_small_m.h4
-rw-r--r--src/lib/pubkey/mce/mce_internal.h4
-rw-r--r--src/lib/pubkey/mce/mceliece.h4
-rw-r--r--src/lib/pubkey/mce/polyn_gf2m.h4
-rw-r--r--src/lib/pubkey/mceies/mceies.h4
-rw-r--r--src/lib/pubkey/newhope/newhope.h4
-rw-r--r--src/lib/pubkey/pbes2/pbes2.h4
-rw-r--r--src/lib/pubkey/pem/pem.h4
-rw-r--r--src/lib/pubkey/pk_algs.h4
-rw-r--r--src/lib/pubkey/pk_keys.h4
-rw-r--r--src/lib/pubkey/pk_ops.h4
-rw-r--r--src/lib/pubkey/pk_ops_fwd.h4
-rw-r--r--src/lib/pubkey/pk_ops_impl.h4
-rw-r--r--src/lib/pubkey/pkcs8.h4
-rw-r--r--src/lib/pubkey/pubkey.h4
-rw-r--r--src/lib/pubkey/rfc6979/rfc6979.h4
-rw-r--r--src/lib/pubkey/rsa/rsa.h4
-rw-r--r--src/lib/pubkey/sm2/sm2.h4
-rw-r--r--src/lib/pubkey/sm2/sm2_enc.h4
-rw-r--r--src/lib/pubkey/workfactor.h4
-rw-r--r--src/lib/pubkey/x509_key.h4
-rw-r--r--src/lib/pubkey/xmss/atomic.h4
-rw-r--r--src/lib/pubkey/xmss/xmss.h4
-rw-r--r--src/lib/pubkey/xmss/xmss_address.h4
-rw-r--r--src/lib/pubkey/xmss/xmss_common_ops.h4
-rw-r--r--src/lib/pubkey/xmss/xmss_hash.h4
-rw-r--r--src/lib/pubkey/xmss/xmss_index_registry.h4
-rw-r--r--src/lib/pubkey/xmss/xmss_key_pair.h4
-rw-r--r--src/lib/pubkey/xmss/xmss_parameters.h4
-rw-r--r--src/lib/pubkey/xmss/xmss_privatekey.h4
-rw-r--r--src/lib/pubkey/xmss/xmss_publickey.h4
-rw-r--r--src/lib/pubkey/xmss/xmss_signature.h4
-rw-r--r--src/lib/pubkey/xmss/xmss_signature_operation.h4
-rw-r--r--src/lib/pubkey/xmss/xmss_tools.h4
-rw-r--r--src/lib/pubkey/xmss/xmss_verification_operation.h4
-rw-r--r--src/lib/pubkey/xmss/xmss_wots_addressed_privatekey.h4
-rw-r--r--src/lib/pubkey/xmss/xmss_wots_addressed_publickey.h4
-rw-r--r--src/lib/pubkey/xmss/xmss_wots_common_ops.h4
-rw-r--r--src/lib/pubkey/xmss/xmss_wots_parameters.h4
-rw-r--r--src/lib/pubkey/xmss/xmss_wots_privatekey.h4
-rw-r--r--src/lib/pubkey/xmss/xmss_wots_publickey.h4
-rw-r--r--src/lib/pubkey/xmss/xmss_wots_signature_operation.h4
-rw-r--r--src/lib/pubkey/xmss/xmss_wots_verification_operation.h4
-rw-r--r--src/lib/rng/auto_rng/auto_rng.h4
-rw-r--r--src/lib/rng/chacha_rng/chacha_rng.h4
-rw-r--r--src/lib/rng/hmac_drbg/hmac_drbg.h4
-rw-r--r--src/lib/rng/rdrand_rng/rdrand_rng.h4
-rw-r--r--src/lib/rng/rng.h4
-rw-r--r--src/lib/rng/stateful_rng/stateful_rng.h4
-rw-r--r--src/lib/rng/system_rng/system_rng.h4
-rw-r--r--src/lib/stream/chacha/chacha.h4
-rw-r--r--src/lib/stream/ctr/ctr.h4
-rw-r--r--src/lib/stream/ofb/ofb.h4
-rw-r--r--src/lib/stream/rc4/rc4.h4
-rw-r--r--src/lib/stream/salsa20/salsa20.h4
-rw-r--r--src/lib/stream/shake_cipher/shake_cipher.h4
-rw-r--r--src/lib/stream/stream_cipher.h4
-rw-r--r--src/lib/tls/credentials_manager.h4
-rw-r--r--src/lib/tls/sessions_sql/tls_session_manager_sql.h4
-rw-r--r--src/lib/tls/sessions_sqlite3/tls_session_manager_sqlite.h4
-rw-r--r--src/lib/tls/tls_alert.h4
-rw-r--r--src/lib/tls/tls_blocking.h4
-rw-r--r--src/lib/tls/tls_callbacks.h4
-rw-r--r--src/lib/tls/tls_cbc/tls_cbc.h4
-rw-r--r--src/lib/tls/tls_channel.h4
-rw-r--r--src/lib/tls/tls_ciphersuite.h4
-rw-r--r--src/lib/tls/tls_client.h4
-rw-r--r--src/lib/tls/tls_exceptn.h4
-rw-r--r--src/lib/tls/tls_extensions.h4
-rw-r--r--src/lib/tls/tls_handshake_hash.h4
-rw-r--r--src/lib/tls/tls_handshake_io.h4
-rw-r--r--src/lib/tls/tls_handshake_msg.h4
-rw-r--r--src/lib/tls/tls_handshake_state.h4
-rw-r--r--src/lib/tls/tls_magic.h4
-rw-r--r--src/lib/tls/tls_messages.h4
-rw-r--r--src/lib/tls/tls_policy.h4
-rw-r--r--src/lib/tls/tls_reader.h4
-rw-r--r--src/lib/tls/tls_record.h4
-rw-r--r--src/lib/tls/tls_seq_numbers.h4
-rw-r--r--src/lib/tls/tls_server.h4
-rw-r--r--src/lib/tls/tls_server_info.h4
-rw-r--r--src/lib/tls/tls_session.h4
-rw-r--r--src/lib/tls/tls_session_key.h4
-rw-r--r--src/lib/tls/tls_session_manager.h4
-rw-r--r--src/lib/tls/tls_version.h4
-rw-r--r--src/lib/utils/assert.h4
-rw-r--r--src/lib/utils/barrier.h4
-rw-r--r--src/lib/utils/bit_ops.h4
-rw-r--r--src/lib/utils/bswap.h4
-rw-r--r--src/lib/utils/calendar.h4
-rw-r--r--src/lib/utils/charset.h4
-rw-r--r--src/lib/utils/compiler.h4
-rw-r--r--src/lib/utils/cpuid/cpuid.h4
-rw-r--r--src/lib/utils/ct_utils.h4
-rw-r--r--src/lib/utils/data_src.h4
-rw-r--r--src/lib/utils/database.h4
-rw-r--r--src/lib/utils/donna128.h4
-rw-r--r--src/lib/utils/dyn_load/dyn_load.h4
-rw-r--r--src/lib/utils/exceptn.h4
-rw-r--r--src/lib/utils/filesystem.h4
-rw-r--r--src/lib/utils/http_util/http_util.h4
-rw-r--r--src/lib/utils/loadstor.h4
-rw-r--r--src/lib/utils/locking_allocator/locking_allocator.h4
-rw-r--r--src/lib/utils/mem_ops.h4
-rw-r--r--src/lib/utils/mul128.h4
-rw-r--r--src/lib/utils/mutex.h4
-rw-r--r--src/lib/utils/os_utils.h4
-rw-r--r--src/lib/utils/parsing.h4
-rw-r--r--src/lib/utils/poly_dbl.h4
-rw-r--r--src/lib/utils/prefetch.h4
-rw-r--r--src/lib/utils/rotate.h4
-rw-r--r--src/lib/utils/rounding.h4
-rw-r--r--src/lib/utils/safeint.h4
-rw-r--r--src/lib/utils/semaphore.h4
-rw-r--r--src/lib/utils/simd/simd_32.h4
-rw-r--r--src/lib/utils/sqlite3/sqlite3.h4
-rw-r--r--src/lib/utils/stl_compatibility.h4
-rw-r--r--src/lib/utils/stl_util.h4
-rw-r--r--src/lib/utils/types.h4
-rw-r--r--src/lib/utils/version.h4
-rw-r--r--src/lib/x509/cert_status.h4
-rw-r--r--src/lib/x509/certstor.h4
-rw-r--r--src/lib/x509/certstor_sql/certstor_sql.h4
-rw-r--r--src/lib/x509/certstor_sqlite3/certstor_sqlite.h4
-rw-r--r--src/lib/x509/crl_ent.h4
-rw-r--r--src/lib/x509/datastor.h4
-rw-r--r--src/lib/x509/key_constraint.h4
-rw-r--r--src/lib/x509/name_constraint.h4
-rw-r--r--src/lib/x509/ocsp.h4
-rw-r--r--src/lib/x509/ocsp_types.h4
-rw-r--r--src/lib/x509/pkcs10.h4
-rw-r--r--src/lib/x509/x509_ca.h4
-rw-r--r--src/lib/x509/x509_crl.h4
-rw-r--r--src/lib/x509/x509_ext.h4
-rw-r--r--src/lib/x509/x509_obj.h4
-rw-r--r--src/lib/x509/x509cert.h4
-rw-r--r--src/lib/x509/x509path.h4
-rw-r--r--src/lib/x509/x509self.h4
-rw-r--r--src/tests/test_pkcs11.h4
-rw-r--r--src/tests/test_pubkey.h4
-rw-r--r--src/tests/test_rng.h4
-rw-r--r--src/tests/tests.h4
363 files changed, 727 insertions, 727 deletions
diff --git a/configure.py b/configure.py
index 0f803c601..8a6eb2ddd 100755
--- a/configure.py
+++ b/configure.py
@@ -2554,7 +2554,7 @@ class AmalgamationHeader(object):
class AmalgamationGenerator(object):
filename_prefix = 'botan_all'
- _header_guard_pattern = re.compile('^#define BOTAN_.*_H__$')
+ _header_guard_pattern = re.compile('^#define BOTAN_.*_H_$')
@staticmethod
def strip_header_goop(header_name, header_lines):
@@ -2621,12 +2621,12 @@ class AmalgamationGenerator(object):
pub_header_amalag = AmalgamationHeader(self._build_paths.public_headers)
header_name = '%s.h' % (AmalgamationGenerator.filename_prefix)
logging.info('Writing amalgamation header to %s' % (header_name))
- pub_header_amalag.write_to_file(header_name, "BOTAN_AMALGAMATION_H__")
+ pub_header_amalag.write_to_file(header_name, "BOTAN_AMALGAMATION_H_")
internal_headers = AmalgamationHeader(self._build_paths.internal_headers)
header_int_name = '%s_internal.h' % (AmalgamationGenerator.filename_prefix)
logging.info('Writing amalgamation header to %s' % (header_int_name))
- internal_headers.write_to_file(header_int_name, "BOTAN_AMALGAMATION_INTERNAL_H__")
+ internal_headers.write_to_file(header_int_name, "BOTAN_AMALGAMATION_INTERNAL_H_")
header_files = [header_name, header_int_name]
included_in_headers = pub_header_amalag.all_std_includes | internal_headers.all_std_includes
diff --git a/src/build-data/buildh.in b/src/build-data/buildh.in
index d5d3bc276..3df1a1fc9 100644
--- a/src/build-data/buildh.in
+++ b/src/build-data/buildh.in
@@ -1,5 +1,5 @@
-#ifndef BOTAN_BUILD_CONFIG_H__
-#define BOTAN_BUILD_CONFIG_H__
+#ifndef BOTAN_BUILD_CONFIG_H_
+#define BOTAN_BUILD_CONFIG_H_
/*
* This file was automatically generated running
diff --git a/src/cli/cli.h b/src/cli/cli.h
index 249c87722..37985339e 100644
--- a/src/cli/cli.h
+++ b/src/cli/cli.h
@@ -4,8 +4,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_CLI_H__
-#define BOTAN_CLI_H__
+#ifndef BOTAN_CLI_H_
+#define BOTAN_CLI_H_
#include <botan/build.h>
#include <botan/parsing.h>
diff --git a/src/cli/credentials.h b/src/cli/credentials.h
index da83e73e9..23d651240 100644
--- a/src/cli/credentials.h
+++ b/src/cli/credentials.h
@@ -4,8 +4,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef EXAMPLE_CREDENTIALS_MANAGER_H__
-#define EXAMPLE_CREDENTIALS_MANAGER_H__
+#ifndef EXAMPLE_CREDENTIALS_MANAGER_H_
+#define EXAMPLE_CREDENTIALS_MANAGER_H_
#include <botan/pkcs8.h>
#include <botan/credentials_manager.h>
diff --git a/src/fuzzer/ecc_helper.h b/src/fuzzer/ecc_helper.h
index c9b3a6604..b427bc976 100644
--- a/src/fuzzer/ecc_helper.h
+++ b/src/fuzzer/ecc_helper.h
@@ -4,8 +4,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef ECC_HELPERS_H__
-#define ECC_HELPERS_H__
+#ifndef ECC_HELPERS_H_
+#define ECC_HELPERS_H_
#include "fuzzers.h"
#include <botan/curve_gfp.h>
diff --git a/src/fuzzer/fuzzers.h b/src/fuzzer/fuzzers.h
index caade8a13..91a8b8cdc 100644
--- a/src/fuzzer/fuzzers.h
+++ b/src/fuzzer/fuzzers.h
@@ -4,8 +4,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_FUZZER_DRIVER_H__
-#define BOTAN_FUZZER_DRIVER_H__
+#ifndef BOTAN_FUZZER_DRIVER_H_
+#define BOTAN_FUZZER_DRIVER_H_
#include <stdint.h>
#include <stdlib.h> // for setenv
diff --git a/src/fuzzer/redc_helper.h b/src/fuzzer/redc_helper.h
index 4fc33894a..0e23686ed 100644
--- a/src/fuzzer/redc_helper.h
+++ b/src/fuzzer/redc_helper.h
@@ -4,8 +4,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_FUZZ_REDC_HELPERS_H__
-#define BOTAN_FUZZ_REDC_HELPERS_H__
+#ifndef BOTAN_FUZZ_REDC_HELPERS_H_
+#define BOTAN_FUZZ_REDC_HELPERS_H_
#include "fuzzers.h"
#include <botan/reducer.h>
diff --git a/src/lib/asn1/alg_id.h b/src/lib/asn1/alg_id.h
index 60cf036f4..f07280994 100644
--- a/src/lib/asn1/alg_id.h
+++ b/src/lib/asn1/alg_id.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_ALGORITHM_IDENTIFIER_H__
-#define BOTAN_ALGORITHM_IDENTIFIER_H__
+#ifndef BOTAN_ALGORITHM_IDENTIFIER_H_
+#define BOTAN_ALGORITHM_IDENTIFIER_H_
#include <botan/asn1_obj.h>
#include <botan/asn1_oid.h>
diff --git a/src/lib/asn1/asn1_alt_name.h b/src/lib/asn1/asn1_alt_name.h
index 65baba0e2..9a9b759d7 100644
--- a/src/lib/asn1/asn1_alt_name.h
+++ b/src/lib/asn1/asn1_alt_name.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_ASN1_ALT_NAME_H__
-#define BOTAN_ASN1_ALT_NAME_H__
+#ifndef BOTAN_ASN1_ALT_NAME_H_
+#define BOTAN_ASN1_ALT_NAME_H_
#include <botan/asn1_obj.h>
#include <botan/asn1_str.h>
diff --git a/src/lib/asn1/asn1_attribute.h b/src/lib/asn1/asn1_attribute.h
index c545c4c0c..da0ee48d1 100644
--- a/src/lib/asn1/asn1_attribute.h
+++ b/src/lib/asn1/asn1_attribute.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_ASN1_ATTRIBUTE_H__
-#define BOTAN_ASN1_ATTRIBUTE_H__
+#ifndef BOTAN_ASN1_ATTRIBUTE_H_
+#define BOTAN_ASN1_ATTRIBUTE_H_
#include <botan/asn1_obj.h>
#include <botan/asn1_oid.h>
diff --git a/src/lib/asn1/asn1_obj.h b/src/lib/asn1/asn1_obj.h
index 2d349c984..133166d28 100644
--- a/src/lib/asn1/asn1_obj.h
+++ b/src/lib/asn1/asn1_obj.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_ASN1_H__
-#define BOTAN_ASN1_H__
+#ifndef BOTAN_ASN1_H_
+#define BOTAN_ASN1_H_
#include <botan/secmem.h>
#include <botan/exceptn.h>
diff --git a/src/lib/asn1/asn1_oid.h b/src/lib/asn1/asn1_oid.h
index 4cf6e8a93..8f3f20f2f 100644
--- a/src/lib/asn1/asn1_oid.h
+++ b/src/lib/asn1/asn1_oid.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_ASN1_OID_H__
-#define BOTAN_ASN1_OID_H__
+#ifndef BOTAN_ASN1_OID_H_
+#define BOTAN_ASN1_OID_H_
#include <botan/asn1_obj.h>
#include <string>
diff --git a/src/lib/asn1/asn1_str.h b/src/lib/asn1/asn1_str.h
index 42db68f4a..9e0237550 100644
--- a/src/lib/asn1/asn1_str.h
+++ b/src/lib/asn1/asn1_str.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_ASN1_STRING_H__
-#define BOTAN_ASN1_STRING_H__
+#ifndef BOTAN_ASN1_STRING_H_
+#define BOTAN_ASN1_STRING_H_
#include <botan/asn1_obj.h>
diff --git a/src/lib/asn1/asn1_time.h b/src/lib/asn1/asn1_time.h
index 4e47e5079..73bf2747f 100644
--- a/src/lib/asn1/asn1_time.h
+++ b/src/lib/asn1/asn1_time.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_ASN1_TIME_H__
-#define BOTAN_ASN1_TIME_H__
+#ifndef BOTAN_ASN1_TIME_H_
+#define BOTAN_ASN1_TIME_H_
#include <botan/asn1_obj.h>
#include <chrono>
diff --git a/src/lib/asn1/ber_dec.h b/src/lib/asn1/ber_dec.h
index 77eb6a1a8..e725ef583 100644
--- a/src/lib/asn1/ber_dec.h
+++ b/src/lib/asn1/ber_dec.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_BER_DECODER_H__
-#define BOTAN_BER_DECODER_H__
+#ifndef BOTAN_BER_DECODER_H_
+#define BOTAN_BER_DECODER_H_
#include <botan/asn1_oid.h>
#include <botan/data_src.h>
diff --git a/src/lib/asn1/der_enc.h b/src/lib/asn1/der_enc.h
index fcfe63154..becdd747e 100644
--- a/src/lib/asn1/der_enc.h
+++ b/src/lib/asn1/der_enc.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_DER_ENCODER_H__
-#define BOTAN_DER_ENCODER_H__
+#ifndef BOTAN_DER_ENCODER_H_
+#define BOTAN_DER_ENCODER_H_
#include <botan/asn1_obj.h>
#include <vector>
diff --git a/src/lib/asn1/oids.h b/src/lib/asn1/oids.h
index 7e1dc7c8f..7feeee6ec 100644
--- a/src/lib/asn1/oids.h
+++ b/src/lib/asn1/oids.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_OIDS_H__
-#define BOTAN_OIDS_H__
+#ifndef BOTAN_OIDS_H_
+#define BOTAN_OIDS_H_
#include <botan/asn1_oid.h>
diff --git a/src/lib/asn1/x509_dn.h b/src/lib/asn1/x509_dn.h
index 164c2b64c..eb2682b10 100644
--- a/src/lib/asn1/x509_dn.h
+++ b/src/lib/asn1/x509_dn.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_X509_DN_H__
-#define BOTAN_X509_DN_H__
+#ifndef BOTAN_X509_DN_H_
+#define BOTAN_X509_DN_H_
#include <botan/asn1_obj.h>
#include <botan/asn1_oid.h>
diff --git a/src/lib/base/botan.h b/src/lib/base/botan.h
index 5054b34b1..189ad5bcf 100644
--- a/src/lib/base/botan.h
+++ b/src/lib/base/botan.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_BOTAN_H__
-#define BOTAN_BOTAN_H__
+#ifndef BOTAN_BOTAN_H_
+#define BOTAN_BOTAN_H_
namespace Botan {
diff --git a/src/lib/base/buf_comp.h b/src/lib/base/buf_comp.h
index a5f12d836..4c2b3a635 100644
--- a/src/lib/base/buf_comp.h
+++ b/src/lib/base/buf_comp.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_BUFFERED_COMPUTATION_H__
-#define BOTAN_BUFFERED_COMPUTATION_H__
+#ifndef BOTAN_BUFFERED_COMPUTATION_H_
+#define BOTAN_BUFFERED_COMPUTATION_H_
#include <botan/secmem.h>
#include <botan/loadstor.h>
diff --git a/src/lib/base/init.h b/src/lib/base/init.h
index e0ac8af89..37c053b4c 100644
--- a/src/lib/base/init.h
+++ b/src/lib/base/init.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_LIBRARY_INITIALIZER_H__
-#define BOTAN_LIBRARY_INITIALIZER_H__
+#ifndef BOTAN_LIBRARY_INITIALIZER_H_
+#define BOTAN_LIBRARY_INITIALIZER_H_
#include <botan/types.h>
#include <string>
diff --git a/src/lib/base/key_spec.h b/src/lib/base/key_spec.h
index ad66e81fe..0a08cf27a 100644
--- a/src/lib/base/key_spec.h
+++ b/src/lib/base/key_spec.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_KEY_LEN_SPECIFICATION_H__
-#define BOTAN_KEY_LEN_SPECIFICATION_H__
+#ifndef BOTAN_KEY_LEN_SPECIFICATION_H_
+#define BOTAN_KEY_LEN_SPECIFICATION_H_
#include <botan/types.h>
diff --git a/src/lib/base/lookup.h b/src/lib/base/lookup.h
index c699e5980..808848d37 100644
--- a/src/lib/base/lookup.h
+++ b/src/lib/base/lookup.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_LOOKUP_H__
-#define BOTAN_LOOKUP_H__
+#ifndef BOTAN_LOOKUP_H_
+#define BOTAN_LOOKUP_H_
#include <botan/block_cipher.h>
#include <botan/stream_cipher.h>
diff --git a/src/lib/base/scan_name.h b/src/lib/base/scan_name.h
index 394d59760..38f432f3a 100644
--- a/src/lib/base/scan_name.h
+++ b/src/lib/base/scan_name.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_SCAN_NAME_H__
-#define BOTAN_SCAN_NAME_H__
+#ifndef BOTAN_SCAN_NAME_H_
+#define BOTAN_SCAN_NAME_H_
#include <botan/exceptn.h>
#include <string>
diff --git a/src/lib/base/secmem.h b/src/lib/base/secmem.h
index c39429367..cdcbb3236 100644
--- a/src/lib/base/secmem.h
+++ b/src/lib/base/secmem.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_SECURE_MEMORY_BUFFERS_H__
-#define BOTAN_SECURE_MEMORY_BUFFERS_H__
+#ifndef BOTAN_SECURE_MEMORY_BUFFERS_H_
+#define BOTAN_SECURE_MEMORY_BUFFERS_H_
#include <botan/mem_ops.h>
#include <algorithm>
diff --git a/src/lib/base/sym_algo.h b/src/lib/base/sym_algo.h
index 45cb5a55e..7dbf600f8 100644
--- a/src/lib/base/sym_algo.h
+++ b/src/lib/base/sym_algo.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_SYMMETRIC_ALGORITHM_H__
-#define BOTAN_SYMMETRIC_ALGORITHM_H__
+#ifndef BOTAN_SYMMETRIC_ALGORITHM_H_
+#define BOTAN_SYMMETRIC_ALGORITHM_H_
#include <botan/key_spec.h>
#include <botan/exceptn.h>
diff --git a/src/lib/base/symkey.h b/src/lib/base/symkey.h
index 3bbd35306..6f933896d 100644
--- a/src/lib/base/symkey.h
+++ b/src/lib/base/symkey.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_SYMKEY_H__
-#define BOTAN_SYMKEY_H__
+#ifndef BOTAN_SYMKEY_H_
+#define BOTAN_SYMKEY_H_
#include <botan/secmem.h>
#include <string>
diff --git a/src/lib/block/aes/aes.h b/src/lib/block/aes/aes.h
index c3f7dbdd9..8af2423d0 100644
--- a/src/lib/block/aes/aes.h
+++ b/src/lib/block/aes/aes.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_AES_H__
-#define BOTAN_AES_H__
+#ifndef BOTAN_AES_H_
+#define BOTAN_AES_H_
#include <botan/block_cipher.h>
diff --git a/src/lib/block/aria/aria.h b/src/lib/block/aria/aria.h
index 17d665e9e..f412197cf 100644
--- a/src/lib/block/aria/aria.h
+++ b/src/lib/block/aria/aria.h
@@ -13,8 +13,8 @@
* Internet & Security Agency homepage</A>
*/
-#ifndef BOTAN_ARIA_H__
-#define BOTAN_ARIA_H__
+#ifndef BOTAN_ARIA_H_
+#define BOTAN_ARIA_H_
#include <botan/block_cipher.h>
diff --git a/src/lib/block/block_cipher.h b/src/lib/block/block_cipher.h
index 627691f01..03e8a5512 100644
--- a/src/lib/block/block_cipher.h
+++ b/src/lib/block/block_cipher.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_BLOCK_CIPHER_H__
-#define BOTAN_BLOCK_CIPHER_H__
+#ifndef BOTAN_BLOCK_CIPHER_H_
+#define BOTAN_BLOCK_CIPHER_H_
#include <botan/sym_algo.h>
#include <string>
diff --git a/src/lib/block/blowfish/blowfish.h b/src/lib/block/blowfish/blowfish.h
index 24b57ed36..fa84e2a3d 100644
--- a/src/lib/block/blowfish/blowfish.h
+++ b/src/lib/block/blowfish/blowfish.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_BLOWFISH_H__
-#define BOTAN_BLOWFISH_H__
+#ifndef BOTAN_BLOWFISH_H_
+#define BOTAN_BLOWFISH_H_
#include <botan/block_cipher.h>
diff --git a/src/lib/block/camellia/camellia.h b/src/lib/block/camellia/camellia.h
index 822f8aa1f..3d639bf77 100644
--- a/src/lib/block/camellia/camellia.h
+++ b/src/lib/block/camellia/camellia.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_CAMELLIA_H__
-#define BOTAN_CAMELLIA_H__
+#ifndef BOTAN_CAMELLIA_H_
+#define BOTAN_CAMELLIA_H_
#include <botan/block_cipher.h>
diff --git a/src/lib/block/cascade/cascade.h b/src/lib/block/cascade/cascade.h
index c96b61a6e..8a641fc2f 100644
--- a/src/lib/block/cascade/cascade.h
+++ b/src/lib/block/cascade/cascade.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_CASCADE_H__
-#define BOTAN_CASCADE_H__
+#ifndef BOTAN_CASCADE_H_
+#define BOTAN_CASCADE_H_
#include <botan/block_cipher.h>
diff --git a/src/lib/block/cast/cast128.h b/src/lib/block/cast/cast128.h
index 7840c30cf..3a1740777 100644
--- a/src/lib/block/cast/cast128.h
+++ b/src/lib/block/cast/cast128.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_CAST128_H__
-#define BOTAN_CAST128_H__
+#ifndef BOTAN_CAST128_H_
+#define BOTAN_CAST128_H_
#include <botan/block_cipher.h>
diff --git a/src/lib/block/cast/cast256.h b/src/lib/block/cast/cast256.h
index 183dfe845..798649ef7 100644
--- a/src/lib/block/cast/cast256.h
+++ b/src/lib/block/cast/cast256.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_CAST256_H__
-#define BOTAN_CAST256_H__
+#ifndef BOTAN_CAST256_H_
+#define BOTAN_CAST256_H_
#include <botan/block_cipher.h>
diff --git a/src/lib/block/cast/cast_sboxes.h b/src/lib/block/cast/cast_sboxes.h
index c8d6a3a90..9d52f6f6c 100644
--- a/src/lib/block/cast/cast_sboxes.h
+++ b/src/lib/block/cast/cast_sboxes.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_CAST_SBOX_TABLES_H__
-#define BOTAN_CAST_SBOX_TABLES_H__
+#ifndef BOTAN_CAST_SBOX_TABLES_H_
+#define BOTAN_CAST_SBOX_TABLES_H_
#include <botan/types.h>
diff --git a/src/lib/block/des/des.h b/src/lib/block/des/des.h
index 4d17f0bed..bdedeff64 100644
--- a/src/lib/block/des/des.h
+++ b/src/lib/block/des/des.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_DES_H__
-#define BOTAN_DES_H__
+#ifndef BOTAN_DES_H_
+#define BOTAN_DES_H_
#include <botan/block_cipher.h>
diff --git a/src/lib/block/des/desx.h b/src/lib/block/des/desx.h
index 6f525b6ef..fa9a99663 100644
--- a/src/lib/block/des/desx.h
+++ b/src/lib/block/des/desx.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_DESX_H__
-#define BOTAN_DESX_H__
+#ifndef BOTAN_DESX_H_
+#define BOTAN_DESX_H_
#include <botan/des.h>
diff --git a/src/lib/block/gost_28147/gost_28147.h b/src/lib/block/gost_28147/gost_28147.h
index 543723c95..735cc6161 100644
--- a/src/lib/block/gost_28147/gost_28147.h
+++ b/src/lib/block/gost_28147/gost_28147.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_GOST_28147_89_H__
-#define BOTAN_GOST_28147_89_H__
+#ifndef BOTAN_GOST_28147_89_H_
+#define BOTAN_GOST_28147_89_H_
#include <botan/block_cipher.h>
diff --git a/src/lib/block/idea/idea.h b/src/lib/block/idea/idea.h
index b76d18a13..4c45a3aaa 100644
--- a/src/lib/block/idea/idea.h
+++ b/src/lib/block/idea/idea.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_IDEA_H__
-#define BOTAN_IDEA_H__
+#ifndef BOTAN_IDEA_H_
+#define BOTAN_IDEA_H_
#include <botan/block_cipher.h>
diff --git a/src/lib/block/kasumi/kasumi.h b/src/lib/block/kasumi/kasumi.h
index 7d51285ea..4a3712cd2 100644
--- a/src/lib/block/kasumi/kasumi.h
+++ b/src/lib/block/kasumi/kasumi.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_KASUMI_H__
-#define BOTAN_KASUMI_H__
+#ifndef BOTAN_KASUMI_H_
+#define BOTAN_KASUMI_H_
#include <botan/block_cipher.h>
diff --git a/src/lib/block/lion/lion.h b/src/lib/block/lion/lion.h
index 87abfab60..54e13175e 100644
--- a/src/lib/block/lion/lion.h
+++ b/src/lib/block/lion/lion.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_LION_H__
-#define BOTAN_LION_H__
+#ifndef BOTAN_LION_H_
+#define BOTAN_LION_H_
#include <botan/block_cipher.h>
#include <botan/stream_cipher.h>
diff --git a/src/lib/block/misty1/misty1.h b/src/lib/block/misty1/misty1.h
index c3ab3db5f..c63e3713e 100644
--- a/src/lib/block/misty1/misty1.h
+++ b/src/lib/block/misty1/misty1.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_MISTY1_H__
-#define BOTAN_MISTY1_H__
+#ifndef BOTAN_MISTY1_H_
+#define BOTAN_MISTY1_H_
#include <botan/block_cipher.h>
diff --git a/src/lib/block/noekeon/noekeon.h b/src/lib/block/noekeon/noekeon.h
index 2b823cd39..a93266309 100644
--- a/src/lib/block/noekeon/noekeon.h
+++ b/src/lib/block/noekeon/noekeon.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_NOEKEON_H__
-#define BOTAN_NOEKEON_H__
+#ifndef BOTAN_NOEKEON_H_
+#define BOTAN_NOEKEON_H_
#include <botan/block_cipher.h>
diff --git a/src/lib/block/seed/seed.h b/src/lib/block/seed/seed.h
index fa5136de6..e30293645 100644
--- a/src/lib/block/seed/seed.h
+++ b/src/lib/block/seed/seed.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_SEED_H__
-#define BOTAN_SEED_H__
+#ifndef BOTAN_SEED_H_
+#define BOTAN_SEED_H_
#include <botan/block_cipher.h>
diff --git a/src/lib/block/serpent/serpent.h b/src/lib/block/serpent/serpent.h
index edae9b338..a6463546e 100644
--- a/src/lib/block/serpent/serpent.h
+++ b/src/lib/block/serpent/serpent.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_SERPENT_H__
-#define BOTAN_SERPENT_H__
+#ifndef BOTAN_SERPENT_H_
+#define BOTAN_SERPENT_H_
#include <botan/block_cipher.h>
diff --git a/src/lib/block/serpent/serpent_sbox.h b/src/lib/block/serpent/serpent_sbox.h
index afde289b1..2301893a5 100644
--- a/src/lib/block/serpent/serpent_sbox.h
+++ b/src/lib/block/serpent/serpent_sbox.h
@@ -8,8 +8,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_SERPENT_SBOX_H__
-#define BOTAN_SERPENT_SBOX_H__
+#ifndef BOTAN_SERPENT_SBOX_H_
+#define BOTAN_SERPENT_SBOX_H_
#define SBoxE1(B0, B1, B2, B3) \
do { \
diff --git a/src/lib/block/shacal2/shacal2.h b/src/lib/block/shacal2/shacal2.h
index 6d1613558..c4a8f2073 100644
--- a/src/lib/block/shacal2/shacal2.h
+++ b/src/lib/block/shacal2/shacal2.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_SHACAL2_H__
-#define BOTAN_SHACAL2_H__
+#ifndef BOTAN_SHACAL2_H_
+#define BOTAN_SHACAL2_H_
#include <botan/block_cipher.h>
diff --git a/src/lib/block/sm4/sm4.h b/src/lib/block/sm4/sm4.h
index f740ba6f5..bf3fa59dc 100644
--- a/src/lib/block/sm4/sm4.h
+++ b/src/lib/block/sm4/sm4.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_SM4_H__
-#define BOTAN_SM4_H__
+#ifndef BOTAN_SM4_H_
+#define BOTAN_SM4_H_
#include <botan/block_cipher.h>
diff --git a/src/lib/block/threefish/threefish.h b/src/lib/block/threefish/threefish.h
index 1a0cc1bf4..de46913c5 100644
--- a/src/lib/block/threefish/threefish.h
+++ b/src/lib/block/threefish/threefish.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_THREEFISH_H__
-#define BOTAN_THREEFISH_H__
+#ifndef BOTAN_THREEFISH_H_
+#define BOTAN_THREEFISH_H_
#include <botan/block_cipher.h>
diff --git a/src/lib/block/twofish/twofish.h b/src/lib/block/twofish/twofish.h
index bdfb81ef5..8201ede76 100644
--- a/src/lib/block/twofish/twofish.h
+++ b/src/lib/block/twofish/twofish.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_TWOFISH_H__
-#define BOTAN_TWOFISH_H__
+#ifndef BOTAN_TWOFISH_H_
+#define BOTAN_TWOFISH_H_
#include <botan/block_cipher.h>
diff --git a/src/lib/block/xtea/xtea.h b/src/lib/block/xtea/xtea.h
index 2392f07e8..1a073418b 100644
--- a/src/lib/block/xtea/xtea.h
+++ b/src/lib/block/xtea/xtea.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_XTEA_H__
-#define BOTAN_XTEA_H__
+#ifndef BOTAN_XTEA_H_
+#define BOTAN_XTEA_H_
#include <botan/block_cipher.h>
diff --git a/src/lib/codec/base64/base64.h b/src/lib/codec/base64/base64.h
index 70e05828d..a20d03b0f 100644
--- a/src/lib/codec/base64/base64.h
+++ b/src/lib/codec/base64/base64.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_BASE64_CODEC_H__
-#define BOTAN_BASE64_CODEC_H__
+#ifndef BOTAN_BASE64_CODEC_H_
+#define BOTAN_BASE64_CODEC_H_
#include <botan/secmem.h>
#include <string>
diff --git a/src/lib/codec/hex/hex.h b/src/lib/codec/hex/hex.h
index d22f1e084..330d8a69a 100644
--- a/src/lib/codec/hex/hex.h
+++ b/src/lib/codec/hex/hex.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_HEX_CODEC_H__
-#define BOTAN_HEX_CODEC_H__
+#ifndef BOTAN_HEX_CODEC_H_
+#define BOTAN_HEX_CODEC_H_
#include <botan/secmem.h>
#include <string>
diff --git a/src/lib/compression/bzip2/bzip2.h b/src/lib/compression/bzip2/bzip2.h
index 5ab06a98d..e056d5502 100644
--- a/src/lib/compression/bzip2/bzip2.h
+++ b/src/lib/compression/bzip2/bzip2.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_BZIP2_H__
-#define BOTAN_BZIP2_H__
+#ifndef BOTAN_BZIP2_H_
+#define BOTAN_BZIP2_H_
#include <botan/compression.h>
diff --git a/src/lib/compression/compress_utils.h b/src/lib/compression/compress_utils.h
index a34faef69..90244a8c0 100644
--- a/src/lib/compression/compress_utils.h
+++ b/src/lib/compression/compress_utils.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_COMPRESSION_UTILS_H__
-#define BOTAN_COMPRESSION_UTILS_H__
+#ifndef BOTAN_COMPRESSION_UTILS_H_
+#define BOTAN_COMPRESSION_UTILS_H_
#include <botan/compression.h>
#include <memory>
diff --git a/src/lib/compression/compression.h b/src/lib/compression/compression.h
index 8757d9118..ac1de5774 100644
--- a/src/lib/compression/compression.h
+++ b/src/lib/compression/compression.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_COMPRESSION_TRANSFORM_H__
-#define BOTAN_COMPRESSION_TRANSFORM_H__
+#ifndef BOTAN_COMPRESSION_TRANSFORM_H_
+#define BOTAN_COMPRESSION_TRANSFORM_H_
#include <botan/secmem.h>
#include <string>
diff --git a/src/lib/compression/lzma/lzma.h b/src/lib/compression/lzma/lzma.h
index 8def571dd..02a1f8c8d 100644
--- a/src/lib/compression/lzma/lzma.h
+++ b/src/lib/compression/lzma/lzma.h
@@ -7,8 +7,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_LZMA_H__
-#define BOTAN_LZMA_H__
+#ifndef BOTAN_LZMA_H_
+#define BOTAN_LZMA_H_
#include <botan/compression.h>
diff --git a/src/lib/compression/zlib/zlib.h b/src/lib/compression/zlib/zlib.h
index 65614d6a9..9b88a3305 100644
--- a/src/lib/compression/zlib/zlib.h
+++ b/src/lib/compression/zlib/zlib.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_ZLIB_H__
-#define BOTAN_ZLIB_H__
+#ifndef BOTAN_ZLIB_H_
+#define BOTAN_ZLIB_H_
#include <botan/compression.h>
diff --git a/src/lib/entropy/darwin_secrandom/darwin_secrandom.h b/src/lib/entropy/darwin_secrandom/darwin_secrandom.h
index e1c012459..83b4da4f5 100644
--- a/src/lib/entropy/darwin_secrandom/darwin_secrandom.h
+++ b/src/lib/entropy/darwin_secrandom/darwin_secrandom.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_ENTROPY_SRC_DARWIN_SECRANDOM_H__
-#define BOTAN_ENTROPY_SRC_DARWIN_SECRANDOM_H__
+#ifndef BOTAN_ENTROPY_SRC_DARWIN_SECRANDOM_H_
+#define BOTAN_ENTROPY_SRC_DARWIN_SECRANDOM_H_
#include <botan/entropy_src.h>
diff --git a/src/lib/entropy/dev_random/dev_random.h b/src/lib/entropy/dev_random/dev_random.h
index 7c8df0553..1c358e509 100644
--- a/src/lib/entropy/dev_random/dev_random.h
+++ b/src/lib/entropy/dev_random/dev_random.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_ENTROPY_SRC_DEVICE_H__
-#define BOTAN_ENTROPY_SRC_DEVICE_H__
+#ifndef BOTAN_ENTROPY_SRC_DEVICE_H_
+#define BOTAN_ENTROPY_SRC_DEVICE_H_
#include <botan/entropy_src.h>
#include <vector>
diff --git a/src/lib/entropy/entropy_src.h b/src/lib/entropy/entropy_src.h
index 6f8a468b1..3b91847d8 100644
--- a/src/lib/entropy/entropy_src.h
+++ b/src/lib/entropy/entropy_src.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_ENTROPY_H__
-#define BOTAN_ENTROPY_H__
+#ifndef BOTAN_ENTROPY_H_
+#define BOTAN_ENTROPY_H_
#include <botan/secmem.h>
#include <botan/rng.h>
diff --git a/src/lib/entropy/getentropy/getentropy.h b/src/lib/entropy/getentropy/getentropy.h
index ebc49320b..997f4c55e 100644
--- a/src/lib/entropy/getentropy/getentropy.h
+++ b/src/lib/entropy/getentropy/getentropy.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_ENTROPY_SRC_GETENTROPY_H__
-#define BOTAN_ENTROPY_SRC_GETENTROPY_H__
+#ifndef BOTAN_ENTROPY_SRC_GETENTROPY_H_
+#define BOTAN_ENTROPY_SRC_GETENTROPY_H_
#include <botan/entropy_src.h>
diff --git a/src/lib/entropy/proc_walk/proc_walk.h b/src/lib/entropy/proc_walk/proc_walk.h
index e1a844c7d..c261c4d92 100644
--- a/src/lib/entropy/proc_walk/proc_walk.h
+++ b/src/lib/entropy/proc_walk/proc_walk.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_ENTROPY_SRC_PROC_WALK_H__
-#define BOTAN_ENTROPY_SRC_PROC_WALK_H__
+#ifndef BOTAN_ENTROPY_SRC_PROC_WALK_H_
+#define BOTAN_ENTROPY_SRC_PROC_WALK_H_
#include <botan/entropy_src.h>
#include <botan/mutex.h>
diff --git a/src/lib/entropy/rdrand/rdrand.h b/src/lib/entropy/rdrand/rdrand.h
index db9de39b6..6544fe57f 100644
--- a/src/lib/entropy/rdrand/rdrand.h
+++ b/src/lib/entropy/rdrand/rdrand.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_ENTROPY_SRC_RDRAND_H__
-#define BOTAN_ENTROPY_SRC_RDRAND_H__
+#ifndef BOTAN_ENTROPY_SRC_RDRAND_H_
+#define BOTAN_ENTROPY_SRC_RDRAND_H_
#include <botan/entropy_src.h>
diff --git a/src/lib/entropy/rdseed/rdseed.h b/src/lib/entropy/rdseed/rdseed.h
index 4ea584354..da94bc0a1 100644
--- a/src/lib/entropy/rdseed/rdseed.h
+++ b/src/lib/entropy/rdseed/rdseed.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_ENTROPY_SRC_RDSEED_H__
-#define BOTAN_ENTROPY_SRC_RDSEED_H__
+#ifndef BOTAN_ENTROPY_SRC_RDSEED_H_
+#define BOTAN_ENTROPY_SRC_RDSEED_H_
#include <botan/entropy_src.h>
diff --git a/src/lib/entropy/win32_stats/es_win32.h b/src/lib/entropy/win32_stats/es_win32.h
index 26b904bbb..2b11ee080 100644
--- a/src/lib/entropy/win32_stats/es_win32.h
+++ b/src/lib/entropy/win32_stats/es_win32.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_ENTROPY_SRC_WIN32_H__
-#define BOTAN_ENTROPY_SRC_WIN32_H__
+#ifndef BOTAN_ENTROPY_SRC_WIN32_H_
+#define BOTAN_ENTROPY_SRC_WIN32_H_
#include <botan/entropy_src.h>
diff --git a/src/lib/ffi/ffi.h b/src/lib/ffi/ffi.h
index 3c9c0627c..43bb9b61a 100644
--- a/src/lib/ffi/ffi.h
+++ b/src/lib/ffi/ffi.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_FFI_H__
-#define BOTAN_FFI_H__
+#ifndef BOTAN_FFI_H_
+#define BOTAN_FFI_H_
#ifdef __cplusplus
extern "C" {
diff --git a/src/lib/ffi/ffi_mp.h b/src/lib/ffi/ffi_mp.h
index fb2e2dee5..448d20e56 100644
--- a/src/lib/ffi/ffi_mp.h
+++ b/src/lib/ffi/ffi_mp.h
@@ -4,8 +4,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_FFI_MP_H__
-#define BOTAN_FFI_MP_H__
+#ifndef BOTAN_FFI_MP_H_
+#define BOTAN_FFI_MP_H_
#include <botan/bigint.h>
#include <botan/internal/ffi_util.h>
diff --git a/src/lib/ffi/ffi_pkey.h b/src/lib/ffi/ffi_pkey.h
index 536e5fc29..a61087ef0 100644
--- a/src/lib/ffi/ffi_pkey.h
+++ b/src/lib/ffi/ffi_pkey.h
@@ -4,8 +4,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_FFI_PKEY_H__
-#define BOTAN_FFI_PKEY_H__
+#ifndef BOTAN_FFI_PKEY_H_
+#define BOTAN_FFI_PKEY_H_
#include <botan/pk_keys.h>
#include <botan/internal/ffi_util.h>
diff --git a/src/lib/ffi/ffi_rng.h b/src/lib/ffi/ffi_rng.h
index 73060eab7..395e7d9d9 100644
--- a/src/lib/ffi/ffi_rng.h
+++ b/src/lib/ffi/ffi_rng.h
@@ -4,8 +4,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_FFI_RNG_H__
-#define BOTAN_FFI_RNG_H__
+#ifndef BOTAN_FFI_RNG_H_
+#define BOTAN_FFI_RNG_H_
#include <botan/rng.h>
#include <botan/internal/ffi_util.h>
diff --git a/src/lib/ffi/ffi_util.h b/src/lib/ffi/ffi_util.h
index 883c1146c..59d9a032d 100644
--- a/src/lib/ffi/ffi_util.h
+++ b/src/lib/ffi/ffi_util.h
@@ -4,8 +4,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_FFI_UTILS_H__
-#define BOTAN_FFI_UTILS_H__
+#ifndef BOTAN_FFI_UTILS_H_
+#define BOTAN_FFI_UTILS_H_
#include <cstdint>
#include <memory>
diff --git a/src/lib/filters/aead_filt.h b/src/lib/filters/aead_filt.h
index f05d3abdb..7927e7001 100644
--- a/src/lib/filters/aead_filt.h
+++ b/src/lib/filters/aead_filt.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_AEAD_FILTER_H__
-#define BOTAN_AEAD_FILTER_H__
+#ifndef BOTAN_AEAD_FILTER_H_
+#define BOTAN_AEAD_FILTER_H_
#include <botan/cipher_filter.h>
#include <botan/aead.h>
diff --git a/src/lib/filters/basefilt.h b/src/lib/filters/basefilt.h
index d81022c07..1716c6aaf 100644
--- a/src/lib/filters/basefilt.h
+++ b/src/lib/filters/basefilt.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_BASEFILT_H__
-#define BOTAN_BASEFILT_H__
+#ifndef BOTAN_BASEFILT_H_
+#define BOTAN_BASEFILT_H_
#include <botan/filter.h>
diff --git a/src/lib/filters/buf_filt.h b/src/lib/filters/buf_filt.h
index 2c68c6f69..b4cd8e680 100644
--- a/src/lib/filters/buf_filt.h
+++ b/src/lib/filters/buf_filt.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_BUFFERED_FILTER_H__
-#define BOTAN_BUFFERED_FILTER_H__
+#ifndef BOTAN_BUFFERED_FILTER_H_
+#define BOTAN_BUFFERED_FILTER_H_
#include <botan/secmem.h>
diff --git a/src/lib/filters/cipher_filter.h b/src/lib/filters/cipher_filter.h
index 3ec56d5cc..d26585723 100644
--- a/src/lib/filters/cipher_filter.h
+++ b/src/lib/filters/cipher_filter.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_TRANSFORM_FILTER_H__
-#define BOTAN_TRANSFORM_FILTER_H__
+#ifndef BOTAN_TRANSFORM_FILTER_H_
+#define BOTAN_TRANSFORM_FILTER_H_
#include <botan/cipher_mode.h>
#include <botan/key_filt.h>
diff --git a/src/lib/filters/codec_filt/b64_filt.h b/src/lib/filters/codec_filt/b64_filt.h
index 0d9584ea1..9c9602b98 100644
--- a/src/lib/filters/codec_filt/b64_filt.h
+++ b/src/lib/filters/codec_filt/b64_filt.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_BASE64_FILTER_H__
-#define BOTAN_BASE64_FILTER_H__
+#ifndef BOTAN_BASE64_FILTER_H_
+#define BOTAN_BASE64_FILTER_H_
#include <botan/filter.h>
diff --git a/src/lib/filters/codec_filt/hex_filt.h b/src/lib/filters/codec_filt/hex_filt.h
index 69b0a255d..4128d627a 100644
--- a/src/lib/filters/codec_filt/hex_filt.h
+++ b/src/lib/filters/codec_filt/hex_filt.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_HEX_FILTER_H__
-#define BOTAN_HEX_FILTER_H__
+#ifndef BOTAN_HEX_FILTER_H_
+#define BOTAN_HEX_FILTER_H_
#include <botan/filter.h>
diff --git a/src/lib/filters/comp_filter.h b/src/lib/filters/comp_filter.h
index 6a487b094..f9d2a7d1d 100644
--- a/src/lib/filters/comp_filter.h
+++ b/src/lib/filters/comp_filter.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_COMPRESSION_FILTER_H__
-#define BOTAN_COMPRESSION_FILTER_H__
+#ifndef BOTAN_COMPRESSION_FILTER_H_
+#define BOTAN_COMPRESSION_FILTER_H_
#include <botan/filter.h>
diff --git a/src/lib/filters/data_snk.h b/src/lib/filters/data_snk.h
index 1223dbd27..4134ccbe5 100644
--- a/src/lib/filters/data_snk.h
+++ b/src/lib/filters/data_snk.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_DATA_SINK_H__
-#define BOTAN_DATA_SINK_H__
+#ifndef BOTAN_DATA_SINK_H_
+#define BOTAN_DATA_SINK_H_
#include <botan/filter.h>
#include <memory>
diff --git a/src/lib/filters/fd_unix/fd_unix.h b/src/lib/filters/fd_unix/fd_unix.h
index 380a209f6..b2f91ccdb 100644
--- a/src/lib/filters/fd_unix/fd_unix.h
+++ b/src/lib/filters/fd_unix/fd_unix.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_PIPE_UNIXFD_H__
-#define BOTAN_PIPE_UNIXFD_H__
+#ifndef BOTAN_PIPE_UNIXFD_H_
+#define BOTAN_PIPE_UNIXFD_H_
#include <botan/pipe.h>
diff --git a/src/lib/filters/filter.h b/src/lib/filters/filter.h
index be77b0df1..8cd045f6e 100644
--- a/src/lib/filters/filter.h
+++ b/src/lib/filters/filter.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_FILTER_H__
-#define BOTAN_FILTER_H__
+#ifndef BOTAN_FILTER_H_
+#define BOTAN_FILTER_H_
#include <botan/secmem.h>
#include <vector>
diff --git a/src/lib/filters/filters.h b/src/lib/filters/filters.h
index 9574e59f5..4f0e836ba 100644
--- a/src/lib/filters/filters.h
+++ b/src/lib/filters/filters.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_FILTERS_H__
-#define BOTAN_FILTERS_H__
+#ifndef BOTAN_FILTERS_H_
+#define BOTAN_FILTERS_H_
#include <botan/block_cipher.h>
#include <botan/stream_cipher.h>
diff --git a/src/lib/filters/key_filt.h b/src/lib/filters/key_filt.h
index 932bf43eb..9ce4fd1fd 100644
--- a/src/lib/filters/key_filt.h
+++ b/src/lib/filters/key_filt.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_KEYED_FILTER_H__
-#define BOTAN_KEYED_FILTER_H__
+#ifndef BOTAN_KEYED_FILTER_H_
+#define BOTAN_KEYED_FILTER_H_
#include <botan/filter.h>
#include <botan/cipher_mode.h>
diff --git a/src/lib/filters/out_buf.h b/src/lib/filters/out_buf.h
index 9f20e2858..d933df223 100644
--- a/src/lib/filters/out_buf.h
+++ b/src/lib/filters/out_buf.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_OUTPUT_BUFFER_H__
-#define BOTAN_OUTPUT_BUFFER_H__
+#ifndef BOTAN_OUTPUT_BUFFER_H_
+#define BOTAN_OUTPUT_BUFFER_H_
#include <botan/types.h>
#include <botan/pipe.h>
diff --git a/src/lib/filters/pipe.h b/src/lib/filters/pipe.h
index 9dc7152b0..677bd460b 100644
--- a/src/lib/filters/pipe.h
+++ b/src/lib/filters/pipe.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_PIPE_H__
-#define BOTAN_PIPE_H__
+#ifndef BOTAN_PIPE_H_
+#define BOTAN_PIPE_H_
#include <botan/data_src.h>
#include <botan/filter.h>
diff --git a/src/lib/filters/secqueue.h b/src/lib/filters/secqueue.h
index bb18f1f8d..2a999a04b 100644
--- a/src/lib/filters/secqueue.h
+++ b/src/lib/filters/secqueue.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_SECURE_QUEUE_H__
-#define BOTAN_SECURE_QUEUE_H__
+#ifndef BOTAN_SECURE_QUEUE_H_
+#define BOTAN_SECURE_QUEUE_H_
#include <botan/data_src.h>
#include <botan/filter.h>
diff --git a/src/lib/hash/blake2/blake2b.h b/src/lib/hash/blake2/blake2b.h
index c177cc620..fa67ab2cf 100644
--- a/src/lib/hash/blake2/blake2b.h
+++ b/src/lib/hash/blake2/blake2b.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_BLAKE2B_H__
-#define BOTAN_BLAKE2B_H__
+#ifndef BOTAN_BLAKE2B_H_
+#define BOTAN_BLAKE2B_H_
#include <botan/hash.h>
#include <string>
diff --git a/src/lib/hash/checksum/adler32/adler32.h b/src/lib/hash/checksum/adler32/adler32.h
index 93a68267a..f0aac72b5 100644
--- a/src/lib/hash/checksum/adler32/adler32.h
+++ b/src/lib/hash/checksum/adler32/adler32.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_ADLER32_H__
-#define BOTAN_ADLER32_H__
+#ifndef BOTAN_ADLER32_H_
+#define BOTAN_ADLER32_H_
#include <botan/hash.h>
diff --git a/src/lib/hash/checksum/crc24/crc24.h b/src/lib/hash/checksum/crc24/crc24.h
index 91b947e00..9465b0724 100644
--- a/src/lib/hash/checksum/crc24/crc24.h
+++ b/src/lib/hash/checksum/crc24/crc24.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_CRC24_H__
-#define BOTAN_CRC24_H__
+#ifndef BOTAN_CRC24_H_
+#define BOTAN_CRC24_H_
#include <botan/hash.h>
diff --git a/src/lib/hash/checksum/crc32/crc32.h b/src/lib/hash/checksum/crc32/crc32.h
index 6da2a06d4..2c24acf04 100644
--- a/src/lib/hash/checksum/crc32/crc32.h
+++ b/src/lib/hash/checksum/crc32/crc32.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_CRC32_H__
-#define BOTAN_CRC32_H__
+#ifndef BOTAN_CRC32_H_
+#define BOTAN_CRC32_H_
#include <botan/hash.h>
diff --git a/src/lib/hash/comb4p/comb4p.h b/src/lib/hash/comb4p/comb4p.h
index 1cc9ff566..5d25ff3ad 100644
--- a/src/lib/hash/comb4p/comb4p.h
+++ b/src/lib/hash/comb4p/comb4p.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_COMB4P_H__
-#define BOTAN_COMB4P_H__
+#ifndef BOTAN_COMB4P_H_
+#define BOTAN_COMB4P_H_
#include <botan/hash.h>
diff --git a/src/lib/hash/gost_3411/gost_3411.h b/src/lib/hash/gost_3411/gost_3411.h
index cc38f1a87..9bafa6828 100644
--- a/src/lib/hash/gost_3411/gost_3411.h
+++ b/src/lib/hash/gost_3411/gost_3411.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_GOST_3411_H__
-#define BOTAN_GOST_3411_H__
+#ifndef BOTAN_GOST_3411_H_
+#define BOTAN_GOST_3411_H_
#include <botan/hash.h>
#include <botan/gost_28147.h>
diff --git a/src/lib/hash/hash.h b/src/lib/hash/hash.h
index 557e60476..3041774b8 100644
--- a/src/lib/hash/hash.h
+++ b/src/lib/hash/hash.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_HASH_FUNCTION_BASE_CLASS_H__
-#define BOTAN_HASH_FUNCTION_BASE_CLASS_H__
+#ifndef BOTAN_HASH_FUNCTION_BASE_CLASS_H_
+#define BOTAN_HASH_FUNCTION_BASE_CLASS_H_
#include <botan/buf_comp.h>
#include <string>
diff --git a/src/lib/hash/keccak/keccak.h b/src/lib/hash/keccak/keccak.h
index 72143c8e5..b6a50fb6d 100644
--- a/src/lib/hash/keccak/keccak.h
+++ b/src/lib/hash/keccak/keccak.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_KECCAK_H__
-#define BOTAN_KECCAK_H__
+#ifndef BOTAN_KECCAK_H_
+#define BOTAN_KECCAK_H_
#include <botan/hash.h>
#include <botan/secmem.h>
diff --git a/src/lib/hash/md4/md4.h b/src/lib/hash/md4/md4.h
index 278bd16f7..15f796df8 100644
--- a/src/lib/hash/md4/md4.h
+++ b/src/lib/hash/md4/md4.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_MD4_H__
-#define BOTAN_MD4_H__
+#ifndef BOTAN_MD4_H_
+#define BOTAN_MD4_H_
#include <botan/mdx_hash.h>
diff --git a/src/lib/hash/md5/md5.h b/src/lib/hash/md5/md5.h
index 3f4d52536..54231e785 100644
--- a/src/lib/hash/md5/md5.h
+++ b/src/lib/hash/md5/md5.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_MD5_H__
-#define BOTAN_MD5_H__
+#ifndef BOTAN_MD5_H_
+#define BOTAN_MD5_H_
#include <botan/mdx_hash.h>
diff --git a/src/lib/hash/mdx_hash/mdx_hash.h b/src/lib/hash/mdx_hash/mdx_hash.h
index dd3faadd0..5b5aef7b0 100644
--- a/src/lib/hash/mdx_hash/mdx_hash.h
+++ b/src/lib/hash/mdx_hash/mdx_hash.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_MDX_BASE_H__
-#define BOTAN_MDX_BASE_H__
+#ifndef BOTAN_MDX_BASE_H_
+#define BOTAN_MDX_BASE_H_
#include <botan/hash.h>
diff --git a/src/lib/hash/par_hash/par_hash.h b/src/lib/hash/par_hash/par_hash.h
index c3cbdae49..78077cc61 100644
--- a/src/lib/hash/par_hash/par_hash.h
+++ b/src/lib/hash/par_hash/par_hash.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_PARALLEL_HASH_H__
-#define BOTAN_PARALLEL_HASH_H__
+#ifndef BOTAN_PARALLEL_HASH_H_
+#define BOTAN_PARALLEL_HASH_H_
#include <botan/hash.h>
#include <vector>
diff --git a/src/lib/hash/rmd160/rmd160.h b/src/lib/hash/rmd160/rmd160.h
index 3e0dbb9d7..daba812d9 100644
--- a/src/lib/hash/rmd160/rmd160.h
+++ b/src/lib/hash/rmd160/rmd160.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_RIPEMD_160_H__
-#define BOTAN_RIPEMD_160_H__
+#ifndef BOTAN_RIPEMD_160_H_
+#define BOTAN_RIPEMD_160_H_
#include <botan/mdx_hash.h>
diff --git a/src/lib/hash/sha1/sha160.h b/src/lib/hash/sha1/sha160.h
index 326ea6329..9f7035ee6 100644
--- a/src/lib/hash/sha1/sha160.h
+++ b/src/lib/hash/sha1/sha160.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_SHA_160_H__
-#define BOTAN_SHA_160_H__
+#ifndef BOTAN_SHA_160_H_
+#define BOTAN_SHA_160_H_
#include <botan/mdx_hash.h>
diff --git a/src/lib/hash/sha2_32/sha2_32.h b/src/lib/hash/sha2_32/sha2_32.h
index 89e21f0a4..6a0d87ac7 100644
--- a/src/lib/hash/sha2_32/sha2_32.h
+++ b/src/lib/hash/sha2_32/sha2_32.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_SHA_224_256_H__
-#define BOTAN_SHA_224_256_H__
+#ifndef BOTAN_SHA_224_256_H_
+#define BOTAN_SHA_224_256_H_
#include <botan/mdx_hash.h>
diff --git a/src/lib/hash/sha2_64/sha2_64.h b/src/lib/hash/sha2_64/sha2_64.h
index 5d9496871..cbe1ad70b 100644
--- a/src/lib/hash/sha2_64/sha2_64.h
+++ b/src/lib/hash/sha2_64/sha2_64.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_SHA_64BIT_H__
-#define BOTAN_SHA_64BIT_H__
+#ifndef BOTAN_SHA_64BIT_H_
+#define BOTAN_SHA_64BIT_H_
#include <botan/mdx_hash.h>
diff --git a/src/lib/hash/sha3/sha3.h b/src/lib/hash/sha3/sha3.h
index 5c2c280be..c198515df 100644
--- a/src/lib/hash/sha3/sha3.h
+++ b/src/lib/hash/sha3/sha3.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_SHA3_H__
-#define BOTAN_SHA3_H__
+#ifndef BOTAN_SHA3_H_
+#define BOTAN_SHA3_H_
#include <botan/hash.h>
#include <botan/secmem.h>
diff --git a/src/lib/hash/shake/shake.h b/src/lib/hash/shake/shake.h
index b76d00546..b41baa492 100644
--- a/src/lib/hash/shake/shake.h
+++ b/src/lib/hash/shake/shake.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_SHAKE_HASH_H__
-#define BOTAN_SHAKE_HASH_H__
+#ifndef BOTAN_SHAKE_HASH_H_
+#define BOTAN_SHAKE_HASH_H_
#include <botan/hash.h>
#include <botan/secmem.h>
diff --git a/src/lib/hash/skein/skein_512.h b/src/lib/hash/skein/skein_512.h
index f34c4c283..a602b4b5e 100644
--- a/src/lib/hash/skein/skein_512.h
+++ b/src/lib/hash/skein/skein_512.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_SKEIN_512_H__
-#define BOTAN_SKEIN_512_H__
+#ifndef BOTAN_SKEIN_512_H_
+#define BOTAN_SKEIN_512_H_
#include <botan/hash.h>
#include <botan/threefish.h>
diff --git a/src/lib/hash/sm3/sm3.h b/src/lib/hash/sm3/sm3.h
index f065637a3..5aa0f289c 100644
--- a/src/lib/hash/sm3/sm3.h
+++ b/src/lib/hash/sm3/sm3.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_SM3_H__
-#define BOTAN_SM3_H__
+#ifndef BOTAN_SM3_H_
+#define BOTAN_SM3_H_
#include <botan/mdx_hash.h>
diff --git a/src/lib/hash/streebog/streebog.h b/src/lib/hash/streebog/streebog.h
index 1bc2cd9db..d18ac02fc 100644
--- a/src/lib/hash/streebog/streebog.h
+++ b/src/lib/hash/streebog/streebog.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_STREEBOG_H__
-#define BOTAN_STREEBOG_H__
+#ifndef BOTAN_STREEBOG_H_
+#define BOTAN_STREEBOG_H_
#include <botan/hash.h>
diff --git a/src/lib/hash/tiger/tiger.h b/src/lib/hash/tiger/tiger.h
index fc74b821b..ef15fb16e 100644
--- a/src/lib/hash/tiger/tiger.h
+++ b/src/lib/hash/tiger/tiger.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_TIGER_H__
-#define BOTAN_TIGER_H__
+#ifndef BOTAN_TIGER_H_
+#define BOTAN_TIGER_H_
#include <botan/mdx_hash.h>
diff --git a/src/lib/hash/whirlpool/whrlpool.h b/src/lib/hash/whirlpool/whrlpool.h
index 2e96f3013..3a07ea5c5 100644
--- a/src/lib/hash/whirlpool/whrlpool.h
+++ b/src/lib/hash/whirlpool/whrlpool.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_WHIRLPOOL_H__
-#define BOTAN_WHIRLPOOL_H__
+#ifndef BOTAN_WHIRLPOOL_H_
+#define BOTAN_WHIRLPOOL_H_
#include <botan/mdx_hash.h>
diff --git a/src/lib/kdf/hkdf/hkdf.h b/src/lib/kdf/hkdf/hkdf.h
index 3e0f1d77c..1d8d3c159 100644
--- a/src/lib/kdf/hkdf/hkdf.h
+++ b/src/lib/kdf/hkdf/hkdf.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_HKDF_H__
-#define BOTAN_HKDF_H__
+#ifndef BOTAN_HKDF_H_
+#define BOTAN_HKDF_H_
#include <botan/mac.h>
#include <botan/hash.h>
diff --git a/src/lib/kdf/kdf.h b/src/lib/kdf/kdf.h
index cc8ebf252..b99a3a83c 100644
--- a/src/lib/kdf/kdf.h
+++ b/src/lib/kdf/kdf.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_KDF_BASE_H__
-#define BOTAN_KDF_BASE_H__
+#ifndef BOTAN_KDF_BASE_H_
+#define BOTAN_KDF_BASE_H_
#include <botan/secmem.h>
#include <botan/types.h>
diff --git a/src/lib/kdf/kdf1/kdf1.h b/src/lib/kdf/kdf1/kdf1.h
index 7f895fed2..803aae300 100644
--- a/src/lib/kdf/kdf1/kdf1.h
+++ b/src/lib/kdf/kdf1/kdf1.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_KDF1_H__
-#define BOTAN_KDF1_H__
+#ifndef BOTAN_KDF1_H_
+#define BOTAN_KDF1_H_
#include <botan/kdf.h>
#include <botan/hash.h>
diff --git a/src/lib/kdf/kdf1_iso18033/kdf1_iso18033.h b/src/lib/kdf/kdf1_iso18033/kdf1_iso18033.h
index ce9f487ee..e49f41d22 100644
--- a/src/lib/kdf/kdf1_iso18033/kdf1_iso18033.h
+++ b/src/lib/kdf/kdf1_iso18033/kdf1_iso18033.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_KDF1_18033_H__
-#define BOTAN_KDF1_18033_H__
+#ifndef BOTAN_KDF1_18033_H_
+#define BOTAN_KDF1_18033_H_
#include <botan/kdf.h>
#include <botan/hash.h>
diff --git a/src/lib/kdf/kdf2/kdf2.h b/src/lib/kdf/kdf2/kdf2.h
index 3f1f74ea6..2fd40e736 100644
--- a/src/lib/kdf/kdf2/kdf2.h
+++ b/src/lib/kdf/kdf2/kdf2.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_KDF2_H__
-#define BOTAN_KDF2_H__
+#ifndef BOTAN_KDF2_H_
+#define BOTAN_KDF2_H_
#include <botan/kdf.h>
#include <botan/hash.h>
diff --git a/src/lib/kdf/prf_tls/prf_tls.h b/src/lib/kdf/prf_tls/prf_tls.h
index 2414c305f..3ed8db247 100644
--- a/src/lib/kdf/prf_tls/prf_tls.h
+++ b/src/lib/kdf/prf_tls/prf_tls.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_TLS_PRF_H__
-#define BOTAN_TLS_PRF_H__
+#ifndef BOTAN_TLS_PRF_H_
+#define BOTAN_TLS_PRF_H_
#include <botan/kdf.h>
#include <botan/mac.h>
diff --git a/src/lib/kdf/prf_x942/prf_x942.h b/src/lib/kdf/prf_x942/prf_x942.h
index 01b90060b..ebf9839f5 100644
--- a/src/lib/kdf/prf_x942/prf_x942.h
+++ b/src/lib/kdf/prf_x942/prf_x942.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_ANSI_X942_PRF_H__
-#define BOTAN_ANSI_X942_PRF_H__
+#ifndef BOTAN_ANSI_X942_PRF_H_
+#define BOTAN_ANSI_X942_PRF_H_
#include <botan/kdf.h>
diff --git a/src/lib/kdf/sp800_108/sp800_108.h b/src/lib/kdf/sp800_108/sp800_108.h
index 1cf13721f..6bf488ac0 100644
--- a/src/lib/kdf/sp800_108/sp800_108.h
+++ b/src/lib/kdf/sp800_108/sp800_108.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_SP800_108_H__
-#define BOTAN_SP800_108_H__
+#ifndef BOTAN_SP800_108_H_
+#define BOTAN_SP800_108_H_
#include <botan/kdf.h>
#include <botan/mac.h>
diff --git a/src/lib/kdf/sp800_56a/sp800_56a.h b/src/lib/kdf/sp800_56a/sp800_56a.h
index 7e517679c..17fd3a84b 100644
--- a/src/lib/kdf/sp800_56a/sp800_56a.h
+++ b/src/lib/kdf/sp800_56a/sp800_56a.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_SP800_56A_H__
-#define BOTAN_SP800_56A_H__
+#ifndef BOTAN_SP800_56A_H_
+#define BOTAN_SP800_56A_H_
#include <botan/kdf.h>
#include <botan/hash.h>
diff --git a/src/lib/kdf/sp800_56c/sp800_56c.h b/src/lib/kdf/sp800_56c/sp800_56c.h
index a04593f8f..891933296 100644
--- a/src/lib/kdf/sp800_56c/sp800_56c.h
+++ b/src/lib/kdf/sp800_56c/sp800_56c.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_SP800_56C_H__
-#define BOTAN_SP800_56C_H__
+#ifndef BOTAN_SP800_56C_H_
+#define BOTAN_SP800_56C_H_
#include <botan/kdf.h>
#include <botan/mac.h>
diff --git a/src/lib/mac/cbc_mac/cbc_mac.h b/src/lib/mac/cbc_mac/cbc_mac.h
index efecc0472..aed3a8caf 100644
--- a/src/lib/mac/cbc_mac/cbc_mac.h
+++ b/src/lib/mac/cbc_mac/cbc_mac.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_CBC_MAC_H__
-#define BOTAN_CBC_MAC_H__
+#ifndef BOTAN_CBC_MAC_H_
+#define BOTAN_CBC_MAC_H_
#include <botan/mac.h>
#include <botan/block_cipher.h>
diff --git a/src/lib/mac/cmac/cmac.h b/src/lib/mac/cmac/cmac.h
index f3265d7ae..7c81272e8 100644
--- a/src/lib/mac/cmac/cmac.h
+++ b/src/lib/mac/cmac/cmac.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_CMAC_H__
-#define BOTAN_CMAC_H__
+#ifndef BOTAN_CMAC_H_
+#define BOTAN_CMAC_H_
#include <botan/mac.h>
#include <botan/block_cipher.h>
diff --git a/src/lib/mac/gmac/gmac.h b/src/lib/mac/gmac/gmac.h
index fef347cbf..64550d2b1 100644
--- a/src/lib/mac/gmac/gmac.h
+++ b/src/lib/mac/gmac/gmac.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_GMAC_H__
-#define BOTAN_GMAC_H__
+#ifndef BOTAN_GMAC_H_
+#define BOTAN_GMAC_H_
#include <botan/gcm.h>
#include <botan/mac.h>
diff --git a/src/lib/mac/hmac/hmac.h b/src/lib/mac/hmac/hmac.h
index dac56a8d2..253184895 100644
--- a/src/lib/mac/hmac/hmac.h
+++ b/src/lib/mac/hmac/hmac.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_HMAC_H__
-#define BOTAN_HMAC_H__
+#ifndef BOTAN_HMAC_H_
+#define BOTAN_HMAC_H_
#include <botan/mac.h>
#include <botan/hash.h>
diff --git a/src/lib/mac/mac.h b/src/lib/mac/mac.h
index 4c6ab602d..b072fbaa2 100644
--- a/src/lib/mac/mac.h
+++ b/src/lib/mac/mac.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_MESSAGE_AUTH_CODE_BASE_H__
-#define BOTAN_MESSAGE_AUTH_CODE_BASE_H__
+#ifndef BOTAN_MESSAGE_AUTH_CODE_BASE_H_
+#define BOTAN_MESSAGE_AUTH_CODE_BASE_H_
#include <botan/buf_comp.h>
#include <botan/sym_algo.h>
diff --git a/src/lib/mac/poly1305/poly1305.h b/src/lib/mac/poly1305/poly1305.h
index 55ec77241..aa94b5807 100644
--- a/src/lib/mac/poly1305/poly1305.h
+++ b/src/lib/mac/poly1305/poly1305.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_MAC_POLY1305_H__
-#define BOTAN_MAC_POLY1305_H__
+#ifndef BOTAN_MAC_POLY1305_H_
+#define BOTAN_MAC_POLY1305_H_
#include <botan/mac.h>
#include <memory>
diff --git a/src/lib/mac/siphash/siphash.h b/src/lib/mac/siphash/siphash.h
index 3405ef4e8..0e05c8407 100644
--- a/src/lib/mac/siphash/siphash.h
+++ b/src/lib/mac/siphash/siphash.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_SIPHASH_H__
-#define BOTAN_SIPHASH_H__
+#ifndef BOTAN_SIPHASH_H_
+#define BOTAN_SIPHASH_H_
#include <botan/mac.h>
diff --git a/src/lib/mac/x919_mac/x919_mac.h b/src/lib/mac/x919_mac/x919_mac.h
index e922590ac..3da8048e4 100644
--- a/src/lib/mac/x919_mac/x919_mac.h
+++ b/src/lib/mac/x919_mac/x919_mac.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_ANSI_X919_MAC_H__
-#define BOTAN_ANSI_X919_MAC_H__
+#ifndef BOTAN_ANSI_X919_MAC_H_
+#define BOTAN_ANSI_X919_MAC_H_
#include <botan/mac.h>
#include <botan/block_cipher.h>
diff --git a/src/lib/math/bigint/bigint.h b/src/lib/math/bigint/bigint.h
index f1d2d277a..683a1f596 100644
--- a/src/lib/math/bigint/bigint.h
+++ b/src/lib/math/bigint/bigint.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_BIGINT_H__
-#define BOTAN_BIGINT_H__
+#ifndef BOTAN_BIGINT_H_
+#define BOTAN_BIGINT_H_
#include <botan/rng.h>
#include <botan/secmem.h>
diff --git a/src/lib/math/bigint/divide.h b/src/lib/math/bigint/divide.h
index 9616d4859..03e5ff7c1 100644
--- a/src/lib/math/bigint/divide.h
+++ b/src/lib/math/bigint/divide.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_DIVISON_ALGORITHM_H__
-#define BOTAN_DIVISON_ALGORITHM_H__
+#ifndef BOTAN_DIVISON_ALGORITHM_H_
+#define BOTAN_DIVISON_ALGORITHM_H_
#include <botan/bigint.h>
diff --git a/src/lib/math/ec_gfp/curve_gfp.h b/src/lib/math/ec_gfp/curve_gfp.h
index 25585a482..330d0ba0d 100644
--- a/src/lib/math/ec_gfp/curve_gfp.h
+++ b/src/lib/math/ec_gfp/curve_gfp.h
@@ -7,8 +7,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_GFP_CURVE_H__
-#define BOTAN_GFP_CURVE_H__
+#ifndef BOTAN_GFP_CURVE_H_
+#define BOTAN_GFP_CURVE_H_
#include <botan/numthry.h>
#include <memory>
diff --git a/src/lib/math/ec_gfp/curve_nistp.h b/src/lib/math/ec_gfp/curve_nistp.h
index 795ca00aa..c9936a338 100644
--- a/src/lib/math/ec_gfp/curve_nistp.h
+++ b/src/lib/math/ec_gfp/curve_nistp.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_NIST_PRIMES_H__
-#define BOTAN_NIST_PRIMES_H__
+#ifndef BOTAN_NIST_PRIMES_H_
+#define BOTAN_NIST_PRIMES_H_
#include <botan/bigint.h>
diff --git a/src/lib/math/ec_gfp/point_gfp.h b/src/lib/math/ec_gfp/point_gfp.h
index bd66ca682..125fd6ccf 100644
--- a/src/lib/math/ec_gfp/point_gfp.h
+++ b/src/lib/math/ec_gfp/point_gfp.h
@@ -7,8 +7,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_POINT_GFP_H__
-#define BOTAN_POINT_GFP_H__
+#ifndef BOTAN_POINT_GFP_H_
+#define BOTAN_POINT_GFP_H_
#include <botan/curve_gfp.h>
#include <vector>
diff --git a/src/lib/math/mp/mp_asmi.h b/src/lib/math/mp/mp_asmi.h
index afb4d1407..4a0a2ec03 100644
--- a/src/lib/math/mp/mp_asmi.h
+++ b/src/lib/math/mp/mp_asmi.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_MP_ASM_INTERNAL_H__
-#define BOTAN_MP_ASM_INTERNAL_H__
+#ifndef BOTAN_MP_ASM_INTERNAL_H_
+#define BOTAN_MP_ASM_INTERNAL_H_
#include <botan/internal/mp_madd.h>
diff --git a/src/lib/math/mp/mp_core.h b/src/lib/math/mp/mp_core.h
index f76096d23..06b0c6f7f 100644
--- a/src/lib/math/mp/mp_core.h
+++ b/src/lib/math/mp/mp_core.h
@@ -7,8 +7,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_MP_CORE_OPS_H__
-#define BOTAN_MP_CORE_OPS_H__
+#ifndef BOTAN_MP_CORE_OPS_H_
+#define BOTAN_MP_CORE_OPS_H_
#include <botan/bigint.h>
#include <botan/mp_types.h>
diff --git a/src/lib/math/mp/mp_madd.h b/src/lib/math/mp/mp_madd.h
index e72c16ecb..68b9ed644 100644
--- a/src/lib/math/mp/mp_madd.h
+++ b/src/lib/math/mp/mp_madd.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_MP_WORD_MULADD_H__
-#define BOTAN_MP_WORD_MULADD_H__
+#ifndef BOTAN_MP_WORD_MULADD_H_
+#define BOTAN_MP_WORD_MULADD_H_
#include <botan/mp_types.h>
#include <botan/mul128.h>
diff --git a/src/lib/math/mp/mp_types.h b/src/lib/math/mp/mp_types.h
index 0b5c5055e..fb52c2e9a 100644
--- a/src/lib/math/mp/mp_types.h
+++ b/src/lib/math/mp/mp_types.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_MPI_TYPES_H__
-#define BOTAN_MPI_TYPES_H__
+#ifndef BOTAN_MPI_TYPES_H_
+#define BOTAN_MPI_TYPES_H_
#include <botan/types.h>
diff --git a/src/lib/math/numbertheory/def_powm.h b/src/lib/math/numbertheory/def_powm.h
index 10ae8aa5b..f284739e4 100644
--- a/src/lib/math/numbertheory/def_powm.h
+++ b/src/lib/math/numbertheory/def_powm.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_DEFAULT_MODEXP_H__
-#define BOTAN_DEFAULT_MODEXP_H__
+#ifndef BOTAN_DEFAULT_MODEXP_H_
+#define BOTAN_DEFAULT_MODEXP_H_
#include <botan/pow_mod.h>
#include <botan/reducer.h>
diff --git a/src/lib/math/numbertheory/numthry.h b/src/lib/math/numbertheory/numthry.h
index 25110e309..91dcda68d 100644
--- a/src/lib/math/numbertheory/numthry.h
+++ b/src/lib/math/numbertheory/numthry.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_NUMBER_THEORY_H__
-#define BOTAN_NUMBER_THEORY_H__
+#ifndef BOTAN_NUMBER_THEORY_H_
+#define BOTAN_NUMBER_THEORY_H_
#include <botan/bigint.h>
#include <botan/pow_mod.h>
diff --git a/src/lib/math/numbertheory/pow_mod.h b/src/lib/math/numbertheory/pow_mod.h
index 64439acbd..0739b0736 100644
--- a/src/lib/math/numbertheory/pow_mod.h
+++ b/src/lib/math/numbertheory/pow_mod.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_POWER_MOD_H__
-#define BOTAN_POWER_MOD_H__
+#ifndef BOTAN_POWER_MOD_H_
+#define BOTAN_POWER_MOD_H_
#include <botan/bigint.h>
diff --git a/src/lib/math/numbertheory/reducer.h b/src/lib/math/numbertheory/reducer.h
index e2782a3f7..c66c22034 100644
--- a/src/lib/math/numbertheory/reducer.h
+++ b/src/lib/math/numbertheory/reducer.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_MODULAR_REDUCER_H__
-#define BOTAN_MODULAR_REDUCER_H__
+#ifndef BOTAN_MODULAR_REDUCER_H_
+#define BOTAN_MODULAR_REDUCER_H_
#include <botan/numthry.h>
diff --git a/src/lib/misc/aont/package.h b/src/lib/misc/aont/package.h
index f48a757bf..c2f8c159d 100644
--- a/src/lib/misc/aont/package.h
+++ b/src/lib/misc/aont/package.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_AONT_PACKAGE_TRANSFORM_H__
-#define BOTAN_AONT_PACKAGE_TRANSFORM_H__
+#ifndef BOTAN_AONT_PACKAGE_TRANSFORM_H_
+#define BOTAN_AONT_PACKAGE_TRANSFORM_H_
#include <botan/block_cipher.h>
#include <botan/rng.h>
diff --git a/src/lib/misc/cryptobox/cryptobox.h b/src/lib/misc/cryptobox/cryptobox.h
index da58cbf21..6f2f89621 100644
--- a/src/lib/misc/cryptobox/cryptobox.h
+++ b/src/lib/misc/cryptobox/cryptobox.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_CRYPTOBOX_H__
-#define BOTAN_CRYPTOBOX_H__
+#ifndef BOTAN_CRYPTOBOX_H_
+#define BOTAN_CRYPTOBOX_H_
#include <string>
#include <botan/rng.h>
diff --git a/src/lib/misc/fpe_fe1/fpe_fe1.h b/src/lib/misc/fpe_fe1/fpe_fe1.h
index 8d8ff6ae5..862c12846 100644
--- a/src/lib/misc/fpe_fe1/fpe_fe1.h
+++ b/src/lib/misc/fpe_fe1/fpe_fe1.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_FPE_FE1_H__
-#define BOTAN_FPE_FE1_H__
+#ifndef BOTAN_FPE_FE1_H_
+#define BOTAN_FPE_FE1_H_
#include <botan/bigint.h>
#include <botan/symkey.h>
diff --git a/src/lib/misc/hotp/hotp.h b/src/lib/misc/hotp/hotp.h
index 1b6d91c94..8d10357b9 100644
--- a/src/lib/misc/hotp/hotp.h
+++ b/src/lib/misc/hotp/hotp.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_HOTP_H__
-#define BOTAN_HOTP_H__
+#ifndef BOTAN_HOTP_H_
+#define BOTAN_HOTP_H_
#include <botan/mac.h>
diff --git a/src/lib/misc/hotp/totp.h b/src/lib/misc/hotp/totp.h
index ff65c07e9..55ff93a5e 100644
--- a/src/lib/misc/hotp/totp.h
+++ b/src/lib/misc/hotp/totp.h
@@ -4,8 +4,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_TOTP_H__
-#define BOTAN_TOTP_H__
+#ifndef BOTAN_TOTP_H_
+#define BOTAN_TOTP_H_
#include <botan/hotp.h>
#include <chrono>
diff --git a/src/lib/misc/rfc3394/rfc3394.h b/src/lib/misc/rfc3394/rfc3394.h
index 4b212810e..77e602fda 100644
--- a/src/lib/misc/rfc3394/rfc3394.h
+++ b/src/lib/misc/rfc3394/rfc3394.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_AES_KEY_WRAP_H__
-#define BOTAN_AES_KEY_WRAP_H__
+#ifndef BOTAN_AES_KEY_WRAP_H_
+#define BOTAN_AES_KEY_WRAP_H_
#include <botan/symkey.h>
diff --git a/src/lib/misc/srp6/srp6.h b/src/lib/misc/srp6/srp6.h
index 24c2693aa..a35098839 100644
--- a/src/lib/misc/srp6/srp6.h
+++ b/src/lib/misc/srp6/srp6.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_RFC5054_SRP6_H__
-#define BOTAN_RFC5054_SRP6_H__
+#ifndef BOTAN_RFC5054_SRP6_H_
+#define BOTAN_RFC5054_SRP6_H_
#include <botan/bigint.h>
#include <botan/hash.h>
diff --git a/src/lib/misc/tss/tss.h b/src/lib/misc/tss/tss.h
index 354b43514..f1f503201 100644
--- a/src/lib/misc/tss/tss.h
+++ b/src/lib/misc/tss/tss.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_RTSS_H__
-#define BOTAN_RTSS_H__
+#ifndef BOTAN_RTSS_H_
+#define BOTAN_RTSS_H_
#include <botan/secmem.h>
#include <botan/hash.h>
diff --git a/src/lib/modes/aead/aead.h b/src/lib/modes/aead/aead.h
index 95a595542..18bc339f1 100644
--- a/src/lib/modes/aead/aead.h
+++ b/src/lib/modes/aead/aead.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_AEAD_MODE_H__
-#define BOTAN_AEAD_MODE_H__
+#ifndef BOTAN_AEAD_MODE_H_
+#define BOTAN_AEAD_MODE_H_
#include <botan/cipher_mode.h>
diff --git a/src/lib/modes/aead/ccm/ccm.h b/src/lib/modes/aead/ccm/ccm.h
index 636df6fa7..38c0affe7 100644
--- a/src/lib/modes/aead/ccm/ccm.h
+++ b/src/lib/modes/aead/ccm/ccm.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_AEAD_CCM_H__
-#define BOTAN_AEAD_CCM_H__
+#ifndef BOTAN_AEAD_CCM_H_
+#define BOTAN_AEAD_CCM_H_
#include <botan/aead.h>
#include <botan/block_cipher.h>
diff --git a/src/lib/modes/aead/chacha20poly1305/chacha20poly1305.h b/src/lib/modes/aead/chacha20poly1305/chacha20poly1305.h
index bbe21fdba..e12cfb115 100644
--- a/src/lib/modes/aead/chacha20poly1305/chacha20poly1305.h
+++ b/src/lib/modes/aead/chacha20poly1305/chacha20poly1305.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_AEAD_CHACHA20_POLY1305_H__
-#define BOTAN_AEAD_CHACHA20_POLY1305_H__
+#ifndef BOTAN_AEAD_CHACHA20_POLY1305_H_
+#define BOTAN_AEAD_CHACHA20_POLY1305_H_
#include <botan/aead.h>
#include <botan/stream_cipher.h>
diff --git a/src/lib/modes/aead/eax/eax.h b/src/lib/modes/aead/eax/eax.h
index 67679dcc2..84a4f3f92 100644
--- a/src/lib/modes/aead/eax/eax.h
+++ b/src/lib/modes/aead/eax/eax.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_AEAD_EAX_H__
-#define BOTAN_AEAD_EAX_H__
+#ifndef BOTAN_AEAD_EAX_H_
+#define BOTAN_AEAD_EAX_H_
#include <botan/aead.h>
#include <botan/block_cipher.h>
diff --git a/src/lib/modes/aead/gcm/clmul/clmul.h b/src/lib/modes/aead/gcm/clmul/clmul.h
index 5e4a0de35..b47c73f27 100644
--- a/src/lib/modes/aead/gcm/clmul/clmul.h
+++ b/src/lib/modes/aead/gcm/clmul/clmul.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_GCM_CLMUL_H__
-#define BOTAN_GCM_CLMUL_H__
+#ifndef BOTAN_GCM_CLMUL_H_
+#define BOTAN_GCM_CLMUL_H_
#include <botan/types.h>
diff --git a/src/lib/modes/aead/gcm/gcm.h b/src/lib/modes/aead/gcm/gcm.h
index 0326533ff..0c5edba45 100644
--- a/src/lib/modes/aead/gcm/gcm.h
+++ b/src/lib/modes/aead/gcm/gcm.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_AEAD_GCM_H__
-#define BOTAN_AEAD_GCM_H__
+#ifndef BOTAN_AEAD_GCM_H_
+#define BOTAN_AEAD_GCM_H_
#include <botan/aead.h>
#include <botan/block_cipher.h>
diff --git a/src/lib/modes/aead/gcm/pmull/pmull.h b/src/lib/modes/aead/gcm/pmull/pmull.h
index 04afddfbf..4ddcc8f27 100644
--- a/src/lib/modes/aead/gcm/pmull/pmull.h
+++ b/src/lib/modes/aead/gcm/pmull/pmull.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_GCM_PMULL_H__
-#define BOTAN_GCM_PMULL_H__
+#ifndef BOTAN_GCM_PMULL_H_
+#define BOTAN_GCM_PMULL_H_
#include <botan/types.h>
diff --git a/src/lib/modes/aead/ocb/ocb.h b/src/lib/modes/aead/ocb/ocb.h
index 4c06527ba..e53ee0867 100644
--- a/src/lib/modes/aead/ocb/ocb.h
+++ b/src/lib/modes/aead/ocb/ocb.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_AEAD_OCB_H__
-#define BOTAN_AEAD_OCB_H__
+#ifndef BOTAN_AEAD_OCB_H_
+#define BOTAN_AEAD_OCB_H_
#include <botan/aead.h>
#include <botan/block_cipher.h>
diff --git a/src/lib/modes/aead/siv/siv.h b/src/lib/modes/aead/siv/siv.h
index 3266c6644..2f76847a8 100644
--- a/src/lib/modes/aead/siv/siv.h
+++ b/src/lib/modes/aead/siv/siv.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_AEAD_SIV_H__
-#define BOTAN_AEAD_SIV_H__
+#ifndef BOTAN_AEAD_SIV_H_
+#define BOTAN_AEAD_SIV_H_
#include <botan/aead.h>
#include <botan/block_cipher.h>
diff --git a/src/lib/modes/cbc/cbc.h b/src/lib/modes/cbc/cbc.h
index f088b817b..65b639511 100644
--- a/src/lib/modes/cbc/cbc.h
+++ b/src/lib/modes/cbc/cbc.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_MODE_CBC_H__
-#define BOTAN_MODE_CBC_H__
+#ifndef BOTAN_MODE_CBC_H_
+#define BOTAN_MODE_CBC_H_
#include <botan/cipher_mode.h>
#include <botan/block_cipher.h>
diff --git a/src/lib/modes/cfb/cfb.h b/src/lib/modes/cfb/cfb.h
index 14e4e3d0e..bb6d350b8 100644
--- a/src/lib/modes/cfb/cfb.h
+++ b/src/lib/modes/cfb/cfb.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_MODE_CFB_H__
-#define BOTAN_MODE_CFB_H__
+#ifndef BOTAN_MODE_CFB_H_
+#define BOTAN_MODE_CFB_H_
#include <botan/cipher_mode.h>
#include <botan/block_cipher.h>
diff --git a/src/lib/modes/cipher_mode.h b/src/lib/modes/cipher_mode.h
index 80b77d5f8..7abfdac97 100644
--- a/src/lib/modes/cipher_mode.h
+++ b/src/lib/modes/cipher_mode.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_CIPHER_MODE_H__
-#define BOTAN_CIPHER_MODE_H__
+#ifndef BOTAN_CIPHER_MODE_H_
+#define BOTAN_CIPHER_MODE_H_
#include <botan/secmem.h>
#include <botan/key_spec.h>
diff --git a/src/lib/modes/mode_pad/mode_pad.h b/src/lib/modes/mode_pad/mode_pad.h
index 7b54db985..4c539b181 100644
--- a/src/lib/modes/mode_pad/mode_pad.h
+++ b/src/lib/modes/mode_pad/mode_pad.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_MODE_PADDING_H__
-#define BOTAN_MODE_PADDING_H__
+#ifndef BOTAN_MODE_PADDING_H_
+#define BOTAN_MODE_PADDING_H_
#include <botan/secmem.h>
#include <string>
diff --git a/src/lib/modes/stream_mode.h b/src/lib/modes/stream_mode.h
index bee740b3a..003a396fd 100644
--- a/src/lib/modes/stream_mode.h
+++ b/src/lib/modes/stream_mode.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_STREAM_MODE_H__
-#define BOTAN_STREAM_MODE_H__
+#ifndef BOTAN_STREAM_MODE_H_
+#define BOTAN_STREAM_MODE_H_
#include <botan/cipher_mode.h>
#include <botan/stream_cipher.h>
diff --git a/src/lib/modes/xts/xts.h b/src/lib/modes/xts/xts.h
index 2c19d7172..4b25a8294 100644
--- a/src/lib/modes/xts/xts.h
+++ b/src/lib/modes/xts/xts.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_MODE_XTS_H__
-#define BOTAN_MODE_XTS_H__
+#ifndef BOTAN_MODE_XTS_H_
+#define BOTAN_MODE_XTS_H_
#include <botan/cipher_mode.h>
#include <botan/block_cipher.h>
diff --git a/src/lib/passhash/bcrypt/bcrypt.h b/src/lib/passhash/bcrypt/bcrypt.h
index 3698b0848..c88df2745 100644
--- a/src/lib/passhash/bcrypt/bcrypt.h
+++ b/src/lib/passhash/bcrypt/bcrypt.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_BCRYPT_H__
-#define BOTAN_BCRYPT_H__
+#ifndef BOTAN_BCRYPT_H_
+#define BOTAN_BCRYPT_H_
#include <botan/rng.h>
diff --git a/src/lib/passhash/passhash9/passhash9.h b/src/lib/passhash/passhash9/passhash9.h
index e6d5335de..75847bfa5 100644
--- a/src/lib/passhash/passhash9/passhash9.h
+++ b/src/lib/passhash/passhash9/passhash9.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_PASSHASH9_H__
-#define BOTAN_PASSHASH9_H__
+#ifndef BOTAN_PASSHASH9_H_
+#define BOTAN_PASSHASH9_H_
#include <botan/rng.h>
diff --git a/src/lib/pbkdf/pbkdf.h b/src/lib/pbkdf/pbkdf.h
index 43b74bb33..a86f4d5c1 100644
--- a/src/lib/pbkdf/pbkdf.h
+++ b/src/lib/pbkdf/pbkdf.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_PBKDF_H__
-#define BOTAN_PBKDF_H__
+#ifndef BOTAN_PBKDF_H_
+#define BOTAN_PBKDF_H_
#include <botan/symkey.h>
#include <botan/exceptn.h>
diff --git a/src/lib/pbkdf/pbkdf1/pbkdf1.h b/src/lib/pbkdf/pbkdf1/pbkdf1.h
index 7d2a79007..74b2644f6 100644
--- a/src/lib/pbkdf/pbkdf1/pbkdf1.h
+++ b/src/lib/pbkdf/pbkdf1/pbkdf1.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_PBKDF1_H__
-#define BOTAN_PBKDF1_H__
+#ifndef BOTAN_PBKDF1_H_
+#define BOTAN_PBKDF1_H_
#include <botan/pbkdf.h>
#include <botan/hash.h>
diff --git a/src/lib/pbkdf/pbkdf2/pbkdf2.h b/src/lib/pbkdf/pbkdf2/pbkdf2.h
index c6c8cb27d..6d1ddc94b 100644
--- a/src/lib/pbkdf/pbkdf2/pbkdf2.h
+++ b/src/lib/pbkdf/pbkdf2/pbkdf2.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_PBKDF2_H__
-#define BOTAN_PBKDF2_H__
+#ifndef BOTAN_PBKDF2_H_
+#define BOTAN_PBKDF2_H_
#include <botan/pbkdf.h>
#include <botan/mac.h>
diff --git a/src/lib/pbkdf/pgp_s2k/pgp_s2k.h b/src/lib/pbkdf/pgp_s2k/pgp_s2k.h
index 93b0e74b9..02b228258 100644
--- a/src/lib/pbkdf/pgp_s2k/pgp_s2k.h
+++ b/src/lib/pbkdf/pgp_s2k/pgp_s2k.h
@@ -5,8 +5,8 @@
* Distributed under the terms of the Botan license
*/
-#ifndef BOTAN_OPENPGP_S2K_H__
-#define BOTAN_OPENPGP_S2K_H__
+#ifndef BOTAN_OPENPGP_S2K_H_
+#define BOTAN_OPENPGP_S2K_H_
#include <botan/pbkdf.h>
#include <botan/hash.h>
diff --git a/src/lib/pk_pad/eme.h b/src/lib/pk_pad/eme.h
index d4722e793..8842358fe 100644
--- a/src/lib/pk_pad/eme.h
+++ b/src/lib/pk_pad/eme.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_PUBKEY_EME_ENCRYPTION_PAD_H__
-#define BOTAN_PUBKEY_EME_ENCRYPTION_PAD_H__
+#ifndef BOTAN_PUBKEY_EME_ENCRYPTION_PAD_H_
+#define BOTAN_PUBKEY_EME_ENCRYPTION_PAD_H_
#include <botan/secmem.h>
#include <botan/rng.h>
diff --git a/src/lib/pk_pad/eme_oaep/oaep.h b/src/lib/pk_pad/eme_oaep/oaep.h
index f675d5286..f33eceb51 100644
--- a/src/lib/pk_pad/eme_oaep/oaep.h
+++ b/src/lib/pk_pad/eme_oaep/oaep.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_OAEP_H__
-#define BOTAN_OAEP_H__
+#ifndef BOTAN_OAEP_H_
+#define BOTAN_OAEP_H_
#include <botan/eme.h>
#include <botan/hash.h>
diff --git a/src/lib/pk_pad/eme_pkcs1/eme_pkcs.h b/src/lib/pk_pad/eme_pkcs1/eme_pkcs.h
index a08160ab7..a77e0141b 100644
--- a/src/lib/pk_pad/eme_pkcs1/eme_pkcs.h
+++ b/src/lib/pk_pad/eme_pkcs1/eme_pkcs.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_EME_PKCS1_H__
-#define BOTAN_EME_PKCS1_H__
+#ifndef BOTAN_EME_PKCS1_H_
+#define BOTAN_EME_PKCS1_H_
#include <botan/eme.h>
diff --git a/src/lib/pk_pad/eme_raw/eme_raw.h b/src/lib/pk_pad/eme_raw/eme_raw.h
index b3b3be425..d736a80bb 100644
--- a/src/lib/pk_pad/eme_raw/eme_raw.h
+++ b/src/lib/pk_pad/eme_raw/eme_raw.h
@@ -4,8 +4,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_EME_RAW_H__
-#define BOTAN_EME_RAW_H__
+#ifndef BOTAN_EME_RAW_H_
+#define BOTAN_EME_RAW_H_
#include <botan/eme.h>
diff --git a/src/lib/pk_pad/emsa.h b/src/lib/pk_pad/emsa.h
index 6ee509480..270aa9298 100644
--- a/src/lib/pk_pad/emsa.h
+++ b/src/lib/pk_pad/emsa.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_PUBKEY_EMSA_H__
-#define BOTAN_PUBKEY_EMSA_H__
+#ifndef BOTAN_PUBKEY_EMSA_H_
+#define BOTAN_PUBKEY_EMSA_H_
#include <botan/secmem.h>
#include <botan/rng.h>
diff --git a/src/lib/pk_pad/emsa1/emsa1.h b/src/lib/pk_pad/emsa1/emsa1.h
index ec9394a1d..1d682f7f1 100644
--- a/src/lib/pk_pad/emsa1/emsa1.h
+++ b/src/lib/pk_pad/emsa1/emsa1.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_EMSA1_H__
-#define BOTAN_EMSA1_H__
+#ifndef BOTAN_EMSA1_H_
+#define BOTAN_EMSA1_H_
#include <botan/emsa.h>
#include <botan/hash.h>
diff --git a/src/lib/pk_pad/emsa_pkcs1/emsa_pkcs1.h b/src/lib/pk_pad/emsa_pkcs1/emsa_pkcs1.h
index 304e27815..b58ccb385 100644
--- a/src/lib/pk_pad/emsa_pkcs1/emsa_pkcs1.h
+++ b/src/lib/pk_pad/emsa_pkcs1/emsa_pkcs1.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_EMSA_PKCS1_H__
-#define BOTAN_EMSA_PKCS1_H__
+#ifndef BOTAN_EMSA_PKCS1_H_
+#define BOTAN_EMSA_PKCS1_H_
#include <botan/emsa.h>
#include <botan/hash.h>
diff --git a/src/lib/pk_pad/emsa_pssr/pssr.h b/src/lib/pk_pad/emsa_pssr/pssr.h
index 4769ca929..63a09b9c4 100644
--- a/src/lib/pk_pad/emsa_pssr/pssr.h
+++ b/src/lib/pk_pad/emsa_pssr/pssr.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_PSSR_H__
-#define BOTAN_PSSR_H__
+#ifndef BOTAN_PSSR_H_
+#define BOTAN_PSSR_H_
#include <botan/emsa.h>
#include <botan/hash.h>
diff --git a/src/lib/pk_pad/emsa_raw/emsa_raw.h b/src/lib/pk_pad/emsa_raw/emsa_raw.h
index dd7456fd7..f85595cdf 100644
--- a/src/lib/pk_pad/emsa_raw/emsa_raw.h
+++ b/src/lib/pk_pad/emsa_raw/emsa_raw.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_EMSA_RAW_H__
-#define BOTAN_EMSA_RAW_H__
+#ifndef BOTAN_EMSA_RAW_H_
+#define BOTAN_EMSA_RAW_H_
#include <botan/emsa.h>
diff --git a/src/lib/pk_pad/emsa_x931/emsa_x931.h b/src/lib/pk_pad/emsa_x931/emsa_x931.h
index 9ea63bc6b..0f186deb2 100644
--- a/src/lib/pk_pad/emsa_x931/emsa_x931.h
+++ b/src/lib/pk_pad/emsa_x931/emsa_x931.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_EMSA_X931_H__
-#define BOTAN_EMSA_X931_H__
+#ifndef BOTAN_EMSA_X931_H_
+#define BOTAN_EMSA_X931_H_
#include <botan/emsa.h>
#include <botan/hash.h>
diff --git a/src/lib/pk_pad/hash_id/hash_id.h b/src/lib/pk_pad/hash_id/hash_id.h
index 8cd442ed1..75c86c0c6 100644
--- a/src/lib/pk_pad/hash_id/hash_id.h
+++ b/src/lib/pk_pad/hash_id/hash_id.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_HASHID_H__
-#define BOTAN_HASHID_H__
+#ifndef BOTAN_HASHID_H_
+#define BOTAN_HASHID_H_
#include <botan/secmem.h>
#include <string>
diff --git a/src/lib/pk_pad/iso9796/iso9796.h b/src/lib/pk_pad/iso9796/iso9796.h
index 358685c80..692ca1300 100644
--- a/src/lib/pk_pad/iso9796/iso9796.h
+++ b/src/lib/pk_pad/iso9796/iso9796.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_ISO9796_H__
-#define BOTAN_ISO9796_H__
+#ifndef BOTAN_ISO9796_H_
+#define BOTAN_ISO9796_H_
#include <botan/emsa.h>
#include <botan/hash.h>
diff --git a/src/lib/pk_pad/mgf1/mgf1.h b/src/lib/pk_pad/mgf1/mgf1.h
index 54401cbb8..65227afef 100644
--- a/src/lib/pk_pad/mgf1/mgf1.h
+++ b/src/lib/pk_pad/mgf1/mgf1.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_MGF1_H__
-#define BOTAN_MGF1_H__
+#ifndef BOTAN_MGF1_H_
+#define BOTAN_MGF1_H_
#include <botan/hash.h>
diff --git a/src/lib/prov/bearssl/bearssl.h b/src/lib/prov/bearssl/bearssl.h
index 1ba7d2dc6..f4def013b 100644
--- a/src/lib/prov/bearssl/bearssl.h
+++ b/src/lib/prov/bearssl/bearssl.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_INTERNAL_BEARSSL_H__
-#define BOTAN_INTERNAL_BEARSSL_H__
+#ifndef BOTAN_INTERNAL_BEARSSL_H_
+#define BOTAN_INTERNAL_BEARSSL_H_
#include <botan/pk_ops_fwd.h>
#include <botan/secmem.h>
diff --git a/src/lib/prov/openssl/openssl.h b/src/lib/prov/openssl/openssl.h
index 37e8f9d4b..5a81f878d 100644
--- a/src/lib/prov/openssl/openssl.h
+++ b/src/lib/prov/openssl/openssl.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_INTERNAL_OPENSSL_H__
-#define BOTAN_INTERNAL_OPENSSL_H__
+#ifndef BOTAN_INTERNAL_OPENSSL_H_
+#define BOTAN_INTERNAL_OPENSSL_H_
#include <botan/pk_ops_fwd.h>
#include <botan/secmem.h>
diff --git a/src/lib/prov/pkcs11/p11.h b/src/lib/prov/pkcs11/p11.h
index 84bc1139e..520602b6d 100644
--- a/src/lib/prov/pkcs11/p11.h
+++ b/src/lib/prov/pkcs11/p11.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_P11_H__
-#define BOTAN_P11_H__
+#ifndef BOTAN_P11_H_
+#define BOTAN_P11_H_
#include <botan/secmem.h>
#include <botan/exceptn.h>
diff --git a/src/lib/prov/pkcs11/p11_ecc_key.h b/src/lib/prov/pkcs11/p11_ecc_key.h
index fe45cec8a..0b4d86243 100644
--- a/src/lib/prov/pkcs11/p11_ecc_key.h
+++ b/src/lib/prov/pkcs11/p11_ecc_key.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_P11_ECC_H__
-#define BOTAN_P11_ECC_H__
+#ifndef BOTAN_P11_ECC_H_
+#define BOTAN_P11_ECC_H_
#include <botan/build.h>
#include <botan/p11_object.h>
diff --git a/src/lib/prov/pkcs11/p11_ecdh.h b/src/lib/prov/pkcs11/p11_ecdh.h
index 5dee6d27e..6ad9d8889 100644
--- a/src/lib/prov/pkcs11/p11_ecdh.h
+++ b/src/lib/prov/pkcs11/p11_ecdh.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_P11_ECDH_H__
-#define BOTAN_P11_ECDH_H__
+#ifndef BOTAN_P11_ECDH_H_
+#define BOTAN_P11_ECDH_H_
#include <botan/build.h>
#if defined(BOTAN_HAS_ECDH)
diff --git a/src/lib/prov/pkcs11/p11_ecdsa.h b/src/lib/prov/pkcs11/p11_ecdsa.h
index 49dc1e8dd..829eaebe7 100644
--- a/src/lib/prov/pkcs11/p11_ecdsa.h
+++ b/src/lib/prov/pkcs11/p11_ecdsa.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_P11_ECDSA_H__
-#define BOTAN_P11_ECDSA_H__
+#ifndef BOTAN_P11_ECDSA_H_
+#define BOTAN_P11_ECDSA_H_
#include <botan/build.h>
#if defined(BOTAN_HAS_ECDSA)
diff --git a/src/lib/prov/pkcs11/p11_mechanism.h b/src/lib/prov/pkcs11/p11_mechanism.h
index be48c9a14..80f2f8ec9 100644
--- a/src/lib/prov/pkcs11/p11_mechanism.h
+++ b/src/lib/prov/pkcs11/p11_mechanism.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_P11_MECHANISM_H__
-#define BOTAN_P11_MECHANISM_H__
+#ifndef BOTAN_P11_MECHANISM_H_
+#define BOTAN_P11_MECHANISM_H_
#include <botan/p11.h>
diff --git a/src/lib/prov/pkcs11/p11_module.h b/src/lib/prov/pkcs11/p11_module.h
index f111c06c8..fd6384fa6 100644
--- a/src/lib/prov/pkcs11/p11_module.h
+++ b/src/lib/prov/pkcs11/p11_module.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_P11_MODULE_H__
-#define BOTAN_P11_MODULE_H__
+#ifndef BOTAN_P11_MODULE_H_
+#define BOTAN_P11_MODULE_H_
#include <string>
#include <memory>
diff --git a/src/lib/prov/pkcs11/p11_object.h b/src/lib/prov/pkcs11/p11_object.h
index 52361d18f..9f9674949 100644
--- a/src/lib/prov/pkcs11/p11_object.h
+++ b/src/lib/prov/pkcs11/p11_object.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_P11_OBJECT_H__
-#define BOTAN_P11_OBJECT_H__
+#ifndef BOTAN_P11_OBJECT_H_
+#define BOTAN_P11_OBJECT_H_
#include <botan/p11.h>
#include <botan/p11_session.h>
diff --git a/src/lib/prov/pkcs11/p11_randomgenerator.h b/src/lib/prov/pkcs11/p11_randomgenerator.h
index 4c9e6de2e..8a74abf52 100644
--- a/src/lib/prov/pkcs11/p11_randomgenerator.h
+++ b/src/lib/prov/pkcs11/p11_randomgenerator.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_P11_RNG_H__
-#define BOTAN_P11_RNG_H__
+#ifndef BOTAN_P11_RNG_H_
+#define BOTAN_P11_RNG_H_
#include <botan/rng.h>
#include <botan/p11_session.h>
diff --git a/src/lib/prov/pkcs11/p11_rsa.h b/src/lib/prov/pkcs11/p11_rsa.h
index 6f29a6156..b5d601365 100644
--- a/src/lib/prov/pkcs11/p11_rsa.h
+++ b/src/lib/prov/pkcs11/p11_rsa.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_P11_RSA_H__
-#define BOTAN_P11_RSA_H__
+#ifndef BOTAN_P11_RSA_H_
+#define BOTAN_P11_RSA_H_
#include <botan/build.h>
#include <botan/p11.h>
diff --git a/src/lib/prov/pkcs11/p11_session.h b/src/lib/prov/pkcs11/p11_session.h
index a11008f94..eab686ed8 100644
--- a/src/lib/prov/pkcs11/p11_session.h
+++ b/src/lib/prov/pkcs11/p11_session.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_P11_SESSION_H__
-#define BOTAN_P11_SESSION_H__
+#ifndef BOTAN_P11_SESSION_H_
+#define BOTAN_P11_SESSION_H_
#include <botan/p11.h>
#include <botan/p11_slot.h>
diff --git a/src/lib/prov/pkcs11/p11_slot.h b/src/lib/prov/pkcs11/p11_slot.h
index f64122e17..1787aab0d 100644
--- a/src/lib/prov/pkcs11/p11_slot.h
+++ b/src/lib/prov/pkcs11/p11_slot.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_P11_SLOT_H__
-#define BOTAN_P11_SLOT_H__
+#ifndef BOTAN_P11_SLOT_H_
+#define BOTAN_P11_SLOT_H_
#include <string>
#include <vector>
diff --git a/src/lib/prov/pkcs11/p11_x509.h b/src/lib/prov/pkcs11/p11_x509.h
index 61808c21d..9066e16c8 100644
--- a/src/lib/prov/pkcs11/p11_x509.h
+++ b/src/lib/prov/pkcs11/p11_x509.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_P11_X509_H__
-#define BOTAN_P11_X509_H__
+#ifndef BOTAN_P11_X509_H_
+#define BOTAN_P11_X509_H_
#include <botan/build.h>
#if defined(BOTAN_HAS_X509_CERTIFICATES)
diff --git a/src/lib/prov/tpm/tpm.h b/src/lib/prov/tpm/tpm.h
index e46dc9280..2e67a4a5b 100644
--- a/src/lib/prov/tpm/tpm.h
+++ b/src/lib/prov/tpm/tpm.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_TPM_H__
-#define BOTAN_TPM_H__
+#ifndef BOTAN_TPM_H_
+#define BOTAN_TPM_H_
#include <botan/exceptn.h>
#include <botan/pk_keys.h>
diff --git a/src/lib/prov/tpm/uuid.h b/src/lib/prov/tpm/uuid.h
index 0cfe6a46f..08eb454bb 100644
--- a/src/lib/prov/tpm/uuid.h
+++ b/src/lib/prov/tpm/uuid.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_UUID_H__
-#define BOTAN_UUID_H__
+#ifndef BOTAN_UUID_H_
+#define BOTAN_UUID_H_
#include <botan/secmem.h>
#include <botan/hex.h>
diff --git a/src/lib/pubkey/blinding.h b/src/lib/pubkey/blinding.h
index 805b1a070..fc7cabe7a 100644
--- a/src/lib/pubkey/blinding.h
+++ b/src/lib/pubkey/blinding.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_BLINDER_H__
-#define BOTAN_BLINDER_H__
+#ifndef BOTAN_BLINDER_H_
+#define BOTAN_BLINDER_H_
#include <botan/bigint.h>
#include <botan/reducer.h>
diff --git a/src/lib/pubkey/cecpq1/cecpq1.h b/src/lib/pubkey/cecpq1/cecpq1.h
index cad3acade..535cb49b7 100644
--- a/src/lib/pubkey/cecpq1/cecpq1.h
+++ b/src/lib/pubkey/cecpq1/cecpq1.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_CECPQ1_H__
-#define BOTAN_CECPQ1_H__
+#ifndef BOTAN_CECPQ1_H_
+#define BOTAN_CECPQ1_H_
#include <botan/secmem.h>
#include <botan/newhope.h>
diff --git a/src/lib/pubkey/curve25519/curve25519.h b/src/lib/pubkey/curve25519/curve25519.h
index b148facf1..9f2136a69 100644
--- a/src/lib/pubkey/curve25519/curve25519.h
+++ b/src/lib/pubkey/curve25519/curve25519.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_CURVE_25519_H__
-#define BOTAN_CURVE_25519_H__
+#ifndef BOTAN_CURVE_25519_H_
+#define BOTAN_CURVE_25519_H_
#include <botan/pk_keys.h>
diff --git a/src/lib/pubkey/dh/dh.h b/src/lib/pubkey/dh/dh.h
index 359d68f10..a252f7a80 100644
--- a/src/lib/pubkey/dh/dh.h
+++ b/src/lib/pubkey/dh/dh.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_DIFFIE_HELLMAN_H__
-#define BOTAN_DIFFIE_HELLMAN_H__
+#ifndef BOTAN_DIFFIE_HELLMAN_H_
+#define BOTAN_DIFFIE_HELLMAN_H_
#include <botan/dl_algo.h>
diff --git a/src/lib/pubkey/dl_algo/dl_algo.h b/src/lib/pubkey/dl_algo/dl_algo.h
index c2ea6e0b9..a0a898bca 100644
--- a/src/lib/pubkey/dl_algo/dl_algo.h
+++ b/src/lib/pubkey/dl_algo/dl_algo.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_DL_ALGO_H__
-#define BOTAN_DL_ALGO_H__
+#ifndef BOTAN_DL_ALGO_H_
+#define BOTAN_DL_ALGO_H_
#include <botan/dl_group.h>
#include <botan/x509_key.h>
diff --git a/src/lib/pubkey/dl_group/dl_group.h b/src/lib/pubkey/dl_group/dl_group.h
index a5ec71fd7..5bd28bc27 100644
--- a/src/lib/pubkey/dl_group/dl_group.h
+++ b/src/lib/pubkey/dl_group/dl_group.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_DL_PARAM_H__
-#define BOTAN_DL_PARAM_H__
+#ifndef BOTAN_DL_PARAM_H_
+#define BOTAN_DL_PARAM_H_
#include <botan/bigint.h>
#include <botan/data_src.h>
diff --git a/src/lib/pubkey/dlies/dlies.h b/src/lib/pubkey/dlies/dlies.h
index 8220356c1..471d29999 100644
--- a/src/lib/pubkey/dlies/dlies.h
+++ b/src/lib/pubkey/dlies/dlies.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_DLIES_H__
-#define BOTAN_DLIES_H__
+#ifndef BOTAN_DLIES_H_
+#define BOTAN_DLIES_H_
#include <botan/pubkey.h>
#include <botan/mac.h>
diff --git a/src/lib/pubkey/dsa/dsa.h b/src/lib/pubkey/dsa/dsa.h
index 085439c99..dc53d4801 100644
--- a/src/lib/pubkey/dsa/dsa.h
+++ b/src/lib/pubkey/dsa/dsa.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_DSA_H__
-#define BOTAN_DSA_H__
+#ifndef BOTAN_DSA_H_
+#define BOTAN_DSA_H_
#include <botan/dl_algo.h>
diff --git a/src/lib/pubkey/ec_group/ec_group.h b/src/lib/pubkey/ec_group/ec_group.h
index 0bedd4f52..028ec1b32 100644
--- a/src/lib/pubkey/ec_group/ec_group.h
+++ b/src/lib/pubkey/ec_group/ec_group.h
@@ -7,8 +7,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_ECC_DOMAIN_PARAMETERS_H__
-#define BOTAN_ECC_DOMAIN_PARAMETERS_H__
+#ifndef BOTAN_ECC_DOMAIN_PARAMETERS_H_
+#define BOTAN_ECC_DOMAIN_PARAMETERS_H_
#include <botan/point_gfp.h>
#include <botan/curve_gfp.h>
diff --git a/src/lib/pubkey/ecc_key/ecc_key.h b/src/lib/pubkey/ecc_key/ecc_key.h
index 11363b613..c189b38b6 100644
--- a/src/lib/pubkey/ecc_key/ecc_key.h
+++ b/src/lib/pubkey/ecc_key/ecc_key.h
@@ -7,8 +7,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_ECC_PUBLIC_KEY_BASE_H__
-#define BOTAN_ECC_PUBLIC_KEY_BASE_H__
+#ifndef BOTAN_ECC_PUBLIC_KEY_BASE_H_
+#define BOTAN_ECC_PUBLIC_KEY_BASE_H_
#include <botan/ec_group.h>
#include <botan/pk_keys.h>
diff --git a/src/lib/pubkey/ecdh/ecdh.h b/src/lib/pubkey/ecdh/ecdh.h
index 630917969..6ae155bc4 100644
--- a/src/lib/pubkey/ecdh/ecdh.h
+++ b/src/lib/pubkey/ecdh/ecdh.h
@@ -7,8 +7,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_ECDH_KEY_H__
-#define BOTAN_ECDH_KEY_H__
+#ifndef BOTAN_ECDH_KEY_H_
+#define BOTAN_ECDH_KEY_H_
#include <botan/ecc_key.h>
diff --git a/src/lib/pubkey/ecdsa/ecdsa.h b/src/lib/pubkey/ecdsa/ecdsa.h
index 2af571c9b..09968d687 100644
--- a/src/lib/pubkey/ecdsa/ecdsa.h
+++ b/src/lib/pubkey/ecdsa/ecdsa.h
@@ -7,8 +7,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_ECDSA_KEY_H__
-#define BOTAN_ECDSA_KEY_H__
+#ifndef BOTAN_ECDSA_KEY_H_
+#define BOTAN_ECDSA_KEY_H_
#include <botan/ecc_key.h>
diff --git a/src/lib/pubkey/ecgdsa/ecgdsa.h b/src/lib/pubkey/ecgdsa/ecgdsa.h
index 4a9f62240..c34b2ce56 100644
--- a/src/lib/pubkey/ecgdsa/ecgdsa.h
+++ b/src/lib/pubkey/ecgdsa/ecgdsa.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_ECGDSA_KEY_H__
-#define BOTAN_ECGDSA_KEY_H__
+#ifndef BOTAN_ECGDSA_KEY_H_
+#define BOTAN_ECGDSA_KEY_H_
#include <botan/ecc_key.h>
diff --git a/src/lib/pubkey/ecies/ecies.h b/src/lib/pubkey/ecies/ecies.h
index a5d2538cb..0e3229cdc 100644
--- a/src/lib/pubkey/ecies/ecies.h
+++ b/src/lib/pubkey/ecies/ecies.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_ECIES_H__
-#define BOTAN_ECIES_H__
+#ifndef BOTAN_ECIES_H_
+#define BOTAN_ECIES_H_
#include <botan/ecdh.h>
#include <botan/ec_group.h>
diff --git a/src/lib/pubkey/eckcdsa/eckcdsa.h b/src/lib/pubkey/eckcdsa/eckcdsa.h
index 0ee8abd21..3d2189b79 100644
--- a/src/lib/pubkey/eckcdsa/eckcdsa.h
+++ b/src/lib/pubkey/eckcdsa/eckcdsa.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_ECKCDSA_KEY_H__
-#define BOTAN_ECKCDSA_KEY_H__
+#ifndef BOTAN_ECKCDSA_KEY_H_
+#define BOTAN_ECKCDSA_KEY_H_
#include <botan/ecc_key.h>
diff --git a/src/lib/pubkey/ed25519/ed25519.h b/src/lib/pubkey/ed25519/ed25519.h
index d372936c9..f295c1c41 100644
--- a/src/lib/pubkey/ed25519/ed25519.h
+++ b/src/lib/pubkey/ed25519/ed25519.h
@@ -8,8 +8,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_ED25519_H__
-#define BOTAN_ED25519_H__
+#ifndef BOTAN_ED25519_H_
+#define BOTAN_ED25519_H_
#include <botan/pk_keys.h>
diff --git a/src/lib/pubkey/ed25519/ed25519_fe.h b/src/lib/pubkey/ed25519/ed25519_fe.h
index b82e2ebe2..9a9967554 100644
--- a/src/lib/pubkey/ed25519/ed25519_fe.h
+++ b/src/lib/pubkey/ed25519/ed25519_fe.h
@@ -8,8 +8,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_ED25519_FE_H__
-#define BOTAN_ED25519_FE_H__
+#ifndef BOTAN_ED25519_FE_H_
+#define BOTAN_ED25519_FE_H_
#include <botan/mem_ops.h>
diff --git a/src/lib/pubkey/ed25519/ed25519_internal.h b/src/lib/pubkey/ed25519/ed25519_internal.h
index 8a0ccf44c..cb75e8540 100644
--- a/src/lib/pubkey/ed25519/ed25519_internal.h
+++ b/src/lib/pubkey/ed25519/ed25519_internal.h
@@ -8,8 +8,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_ED25519_INT_H__
-#define BOTAN_ED25519_INT_H__
+#ifndef BOTAN_ED25519_INT_H_
+#define BOTAN_ED25519_INT_H_
#include <botan/internal/ed25519_fe.h>
#include <botan/loadstor.h>
diff --git a/src/lib/pubkey/elgamal/elgamal.h b/src/lib/pubkey/elgamal/elgamal.h
index 1afe89414..41fac4aae 100644
--- a/src/lib/pubkey/elgamal/elgamal.h
+++ b/src/lib/pubkey/elgamal/elgamal.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_ELGAMAL_H__
-#define BOTAN_ELGAMAL_H__
+#ifndef BOTAN_ELGAMAL_H_
+#define BOTAN_ELGAMAL_H_
#include <botan/dl_algo.h>
diff --git a/src/lib/pubkey/gost_3410/gost_3410.h b/src/lib/pubkey/gost_3410/gost_3410.h
index 85ac55ed3..cd9f03dac 100644
--- a/src/lib/pubkey/gost_3410/gost_3410.h
+++ b/src/lib/pubkey/gost_3410/gost_3410.h
@@ -7,8 +7,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_GOST_3410_KEY_H__
-#define BOTAN_GOST_3410_KEY_H__
+#ifndef BOTAN_GOST_3410_KEY_H_
+#define BOTAN_GOST_3410_KEY_H_
#include <botan/ecc_key.h>
diff --git a/src/lib/pubkey/keypair/keypair.h b/src/lib/pubkey/keypair/keypair.h
index ed7672340..4f28f325f 100644
--- a/src/lib/pubkey/keypair/keypair.h
+++ b/src/lib/pubkey/keypair/keypair.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_KEYPAIR_CHECKS_H__
-#define BOTAN_KEYPAIR_CHECKS_H__
+#ifndef BOTAN_KEYPAIR_CHECKS_H_
+#define BOTAN_KEYPAIR_CHECKS_H_
#include <botan/pk_keys.h>
diff --git a/src/lib/pubkey/mce/code_based_util.h b/src/lib/pubkey/mce/code_based_util.h
index ccc94c91b..3812f4a40 100644
--- a/src/lib/pubkey/mce/code_based_util.h
+++ b/src/lib/pubkey/mce/code_based_util.h
@@ -9,8 +9,8 @@
*
*/
-#ifndef BOTAN_CODE_BASED_UTIL_H__
-#define BOTAN_CODE_BASED_UTIL_H__
+#ifndef BOTAN_CODE_BASED_UTIL_H_
+#define BOTAN_CODE_BASED_UTIL_H_
#include <botan/gf2m_small_m.h>
diff --git a/src/lib/pubkey/mce/gf2m_small_m.h b/src/lib/pubkey/mce/gf2m_small_m.h
index b15061267..e35f14be5 100644
--- a/src/lib/pubkey/mce/gf2m_small_m.h
+++ b/src/lib/pubkey/mce/gf2m_small_m.h
@@ -9,8 +9,8 @@
*
*/
-#ifndef BOTAN_GF2M_SMALL_M_H__
-#define BOTAN_GF2M_SMALL_M_H__
+#ifndef BOTAN_GF2M_SMALL_M_H_
+#define BOTAN_GF2M_SMALL_M_H_
#include <vector>
#include <botan/types.h>
diff --git a/src/lib/pubkey/mce/mce_internal.h b/src/lib/pubkey/mce/mce_internal.h
index 81fa970bb..f20442588 100644
--- a/src/lib/pubkey/mce/mce_internal.h
+++ b/src/lib/pubkey/mce/mce_internal.h
@@ -9,8 +9,8 @@
*
*/
-#ifndef BOTAN_MCELIECE_INTERNAL_H__
-#define BOTAN_MCELIECE_INTERNAL_H__
+#ifndef BOTAN_MCELIECE_INTERNAL_H_
+#define BOTAN_MCELIECE_INTERNAL_H_
#include <botan/secmem.h>
#include <botan/types.h>
diff --git a/src/lib/pubkey/mce/mceliece.h b/src/lib/pubkey/mce/mceliece.h
index d18888784..c9b2e0afc 100644
--- a/src/lib/pubkey/mce/mceliece.h
+++ b/src/lib/pubkey/mce/mceliece.h
@@ -9,8 +9,8 @@
*
*/
-#ifndef BOTAN_MCELIECE_KEY_H__
-#define BOTAN_MCELIECE_KEY_H__
+#ifndef BOTAN_MCELIECE_KEY_H_
+#define BOTAN_MCELIECE_KEY_H_
#include <botan/pk_keys.h>
#include <botan/polyn_gf2m.h>
diff --git a/src/lib/pubkey/mce/polyn_gf2m.h b/src/lib/pubkey/mce/polyn_gf2m.h
index 075cd1c88..08d1fc98a 100644
--- a/src/lib/pubkey/mce/polyn_gf2m.h
+++ b/src/lib/pubkey/mce/polyn_gf2m.h
@@ -9,8 +9,8 @@
*
*/
-#ifndef BOTAN_POLYN_GF2M_H__
-#define BOTAN_POLYN_GF2M_H__
+#ifndef BOTAN_POLYN_GF2M_H_
+#define BOTAN_POLYN_GF2M_H_
#include <botan/secmem.h>
#include <botan/gf2m_small_m.h>
diff --git a/src/lib/pubkey/mceies/mceies.h b/src/lib/pubkey/mceies/mceies.h
index a60f56e9b..ca920a7ab 100644
--- a/src/lib/pubkey/mceies/mceies.h
+++ b/src/lib/pubkey/mceies/mceies.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_MCEIES_H__
-#define BOTAN_MCEIES_H__
+#ifndef BOTAN_MCEIES_H_
+#define BOTAN_MCEIES_H_
#include <botan/secmem.h>
#include <botan/rng.h>
diff --git a/src/lib/pubkey/newhope/newhope.h b/src/lib/pubkey/newhope/newhope.h
index 141f8e263..12b7f2e48 100644
--- a/src/lib/pubkey/newhope/newhope.h
+++ b/src/lib/pubkey/newhope/newhope.h
@@ -9,8 +9,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_NEWHOPE_H__
-#define BOTAN_NEWHOPE_H__
+#ifndef BOTAN_NEWHOPE_H_
+#define BOTAN_NEWHOPE_H_
#include <botan/rng.h>
diff --git a/src/lib/pubkey/pbes2/pbes2.h b/src/lib/pubkey/pbes2/pbes2.h
index edd46f7eb..0138d1bf3 100644
--- a/src/lib/pubkey/pbes2/pbes2.h
+++ b/src/lib/pubkey/pbes2/pbes2.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_PBE_PKCS_v20_H__
-#define BOTAN_PBE_PKCS_v20_H__
+#ifndef BOTAN_PBE_PKCS_v20_H_
+#define BOTAN_PBE_PKCS_v20_H_
#include <botan/rng.h>
#include <botan/alg_id.h>
diff --git a/src/lib/pubkey/pem/pem.h b/src/lib/pubkey/pem/pem.h
index c5f66aaf2..8be93c0f9 100644
--- a/src/lib/pubkey/pem/pem.h
+++ b/src/lib/pubkey/pem/pem.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_PEM_H__
-#define BOTAN_PEM_H__
+#ifndef BOTAN_PEM_H_
+#define BOTAN_PEM_H_
#include <botan/data_src.h>
diff --git a/src/lib/pubkey/pk_algs.h b/src/lib/pubkey/pk_algs.h
index d5ef9d6ec..e3c717428 100644
--- a/src/lib/pubkey/pk_algs.h
+++ b/src/lib/pubkey/pk_algs.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_PK_KEY_FACTORY_H__
-#define BOTAN_PK_KEY_FACTORY_H__
+#ifndef BOTAN_PK_KEY_FACTORY_H_
+#define BOTAN_PK_KEY_FACTORY_H_
#include <botan/pk_keys.h>
#include <botan/alg_id.h>
diff --git a/src/lib/pubkey/pk_keys.h b/src/lib/pubkey/pk_keys.h
index dacd68412..1d7d1f2b5 100644
--- a/src/lib/pubkey/pk_keys.h
+++ b/src/lib/pubkey/pk_keys.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_PK_KEYS_H__
-#define BOTAN_PK_KEYS_H__
+#ifndef BOTAN_PK_KEYS_H_
+#define BOTAN_PK_KEYS_H_
#include <botan/secmem.h>
#include <botan/asn1_oid.h>
diff --git a/src/lib/pubkey/pk_ops.h b/src/lib/pubkey/pk_ops.h
index 40e541ddb..4345c18c6 100644
--- a/src/lib/pubkey/pk_ops.h
+++ b/src/lib/pubkey/pk_ops.h
@@ -4,8 +4,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_PK_OPERATIONS_H__
-#define BOTAN_PK_OPERATIONS_H__
+#ifndef BOTAN_PK_OPERATIONS_H_
+#define BOTAN_PK_OPERATIONS_H_
/**
* Ordinary applications should never need to include or use this
diff --git a/src/lib/pubkey/pk_ops_fwd.h b/src/lib/pubkey/pk_ops_fwd.h
index 16c2124fb..92a3c2a96 100644
--- a/src/lib/pubkey/pk_ops_fwd.h
+++ b/src/lib/pubkey/pk_ops_fwd.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_PK_OPERATIONS_FWD_H__
-#define BOTAN_PK_OPERATIONS_FWD_H__
+#ifndef BOTAN_PK_OPERATIONS_FWD_H_
+#define BOTAN_PK_OPERATIONS_FWD_H_
namespace Botan {
diff --git a/src/lib/pubkey/pk_ops_impl.h b/src/lib/pubkey/pk_ops_impl.h
index a9f8b9c11..22586ae01 100644
--- a/src/lib/pubkey/pk_ops_impl.h
+++ b/src/lib/pubkey/pk_ops_impl.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_PK_OPERATION_IMPL_H__
-#define BOTAN_PK_OPERATION_IMPL_H__
+#ifndef BOTAN_PK_OPERATION_IMPL_H_
+#define BOTAN_PK_OPERATION_IMPL_H_
#include <botan/pk_ops.h>
#include <botan/eme.h>
diff --git a/src/lib/pubkey/pkcs8.h b/src/lib/pubkey/pkcs8.h
index 7d9b7ea49..4982f4a89 100644
--- a/src/lib/pubkey/pkcs8.h
+++ b/src/lib/pubkey/pkcs8.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_PKCS8_H__
-#define BOTAN_PKCS8_H__
+#ifndef BOTAN_PKCS8_H_
+#define BOTAN_PKCS8_H_
#include <botan/x509_key.h>
#include <functional>
diff --git a/src/lib/pubkey/pubkey.h b/src/lib/pubkey/pubkey.h
index e1bf4a421..366acea65 100644
--- a/src/lib/pubkey/pubkey.h
+++ b/src/lib/pubkey/pubkey.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_PUBKEY_H__
-#define BOTAN_PUBKEY_H__
+#ifndef BOTAN_PUBKEY_H_
+#define BOTAN_PUBKEY_H_
#include <botan/pk_keys.h>
#include <botan/pk_ops_fwd.h>
diff --git a/src/lib/pubkey/rfc6979/rfc6979.h b/src/lib/pubkey/rfc6979/rfc6979.h
index 752386f43..2afe9ca9a 100644
--- a/src/lib/pubkey/rfc6979/rfc6979.h
+++ b/src/lib/pubkey/rfc6979/rfc6979.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_RFC6979_GENERATOR_H__
-#define BOTAN_RFC6979_GENERATOR_H__
+#ifndef BOTAN_RFC6979_GENERATOR_H_
+#define BOTAN_RFC6979_GENERATOR_H_
#include <botan/bigint.h>
#include <string>
diff --git a/src/lib/pubkey/rsa/rsa.h b/src/lib/pubkey/rsa/rsa.h
index 419219c3f..0525e21ac 100644
--- a/src/lib/pubkey/rsa/rsa.h
+++ b/src/lib/pubkey/rsa/rsa.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_RSA_H__
-#define BOTAN_RSA_H__
+#ifndef BOTAN_RSA_H_
+#define BOTAN_RSA_H_
#include <botan/bigint.h>
#include <botan/x509_key.h>
diff --git a/src/lib/pubkey/sm2/sm2.h b/src/lib/pubkey/sm2/sm2.h
index 20310f041..bb88065f5 100644
--- a/src/lib/pubkey/sm2/sm2.h
+++ b/src/lib/pubkey/sm2/sm2.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_SM2_KEY_H__
-#define BOTAN_SM2_KEY_H__
+#ifndef BOTAN_SM2_KEY_H_
+#define BOTAN_SM2_KEY_H_
#include <botan/ecc_key.h>
diff --git a/src/lib/pubkey/sm2/sm2_enc.h b/src/lib/pubkey/sm2/sm2_enc.h
index 2f4945804..69a9cd953 100644
--- a/src/lib/pubkey/sm2/sm2_enc.h
+++ b/src/lib/pubkey/sm2/sm2_enc.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_SM2_ENC_KEY_H__
-#define BOTAN_SM2_ENC_KEY_H__
+#ifndef BOTAN_SM2_ENC_KEY_H_
+#define BOTAN_SM2_ENC_KEY_H_
#include <botan/ecc_key.h>
diff --git a/src/lib/pubkey/workfactor.h b/src/lib/pubkey/workfactor.h
index d0cdf6730..0eea246d7 100644
--- a/src/lib/pubkey/workfactor.h
+++ b/src/lib/pubkey/workfactor.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_WORKFACTOR_H__
-#define BOTAN_WORKFACTOR_H__
+#ifndef BOTAN_WORKFACTOR_H_
+#define BOTAN_WORKFACTOR_H_
#include <botan/types.h>
diff --git a/src/lib/pubkey/x509_key.h b/src/lib/pubkey/x509_key.h
index b3c1cd969..323ff5a01 100644
--- a/src/lib/pubkey/x509_key.h
+++ b/src/lib/pubkey/x509_key.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_X509_PUBLIC_KEY_H__
-#define BOTAN_X509_PUBLIC_KEY_H__
+#ifndef BOTAN_X509_PUBLIC_KEY_H_
+#define BOTAN_X509_PUBLIC_KEY_H_
#include <botan/pk_keys.h>
#include <botan/alg_id.h>
diff --git a/src/lib/pubkey/xmss/atomic.h b/src/lib/pubkey/xmss/atomic.h
index e2fdaa78d..760ffddc3 100644
--- a/src/lib/pubkey/xmss/atomic.h
+++ b/src/lib/pubkey/xmss/atomic.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
**/
-#ifndef BOTAN_ATOMIC_H__
-#define BOTAN_ATOMIC_H__
+#ifndef BOTAN_ATOMIC_H_
+#define BOTAN_ATOMIC_H_
#include <atomic>
#include <memory>
diff --git a/src/lib/pubkey/xmss/xmss.h b/src/lib/pubkey/xmss/xmss.h
index bad7f2aad..dd43f8284 100644
--- a/src/lib/pubkey/xmss/xmss.h
+++ b/src/lib/pubkey/xmss/xmss.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
**/
-#ifndef BOTAN_XMSS_H__
-#define BOTAN_XMSS_H__
+#ifndef BOTAN_XMSS_H_
+#define BOTAN_XMSS_H_
#include <botan/xmss_publickey.h>
#include <botan/xmss_privatekey.h>
diff --git a/src/lib/pubkey/xmss/xmss_address.h b/src/lib/pubkey/xmss/xmss_address.h
index 2268084ea..3838ed48f 100644
--- a/src/lib/pubkey/xmss/xmss_address.h
+++ b/src/lib/pubkey/xmss/xmss_address.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
**/
-#ifndef BOTAN_XMSS_ADDRESS_H__
-#define BOTAN_XMSS_ADDRESS_H__
+#ifndef BOTAN_XMSS_ADDRESS_H_
+#define BOTAN_XMSS_ADDRESS_H_
#include <botan/xmss_tools.h>
diff --git a/src/lib/pubkey/xmss/xmss_common_ops.h b/src/lib/pubkey/xmss/xmss_common_ops.h
index 2aff9b5f8..66fc76ef0 100644
--- a/src/lib/pubkey/xmss/xmss_common_ops.h
+++ b/src/lib/pubkey/xmss/xmss_common_ops.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
**/
-#ifndef BOTAN_XMSS_COMMON_OPS_H__
-#define BOTAN_XMSS_COMMON_OPS_H__
+#ifndef BOTAN_XMSS_COMMON_OPS_H_
+#define BOTAN_XMSS_COMMON_OPS_H_
#include <vector>
#include <botan/secmem.h>
diff --git a/src/lib/pubkey/xmss/xmss_hash.h b/src/lib/pubkey/xmss/xmss_hash.h
index 55b5fe930..d507c96f6 100644
--- a/src/lib/pubkey/xmss/xmss_hash.h
+++ b/src/lib/pubkey/xmss/xmss_hash.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
**/
-#ifndef BOTAN_XMSS_HASH_H__
-#define BOTAN_XMSS_HASH_H__
+#ifndef BOTAN_XMSS_HASH_H_
+#define BOTAN_XMSS_HASH_H_
#include <cstddef>
#include <string>
diff --git a/src/lib/pubkey/xmss/xmss_index_registry.h b/src/lib/pubkey/xmss/xmss_index_registry.h
index 4a00b4a90..88dfb7517 100644
--- a/src/lib/pubkey/xmss/xmss_index_registry.h
+++ b/src/lib/pubkey/xmss/xmss_index_registry.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
**/
-#ifndef BOTAN_XMSS_INDEX_REGISTRY_H__
-#define BOTAN_XMSS_INDEX_REGISTRY_H__
+#ifndef BOTAN_XMSS_INDEX_REGISTRY_H_
+#define BOTAN_XMSS_INDEX_REGISTRY_H_
#include <botan/hash.h>
#include <botan/atomic.h>
diff --git a/src/lib/pubkey/xmss/xmss_key_pair.h b/src/lib/pubkey/xmss/xmss_key_pair.h
index 3245ea2d2..1d32431bd 100644
--- a/src/lib/pubkey/xmss/xmss_key_pair.h
+++ b/src/lib/pubkey/xmss/xmss_key_pair.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
**/
-#ifndef BOTAN_XMSS_KEY_PAIR_H__
-#define BOTAN_XMSS_KEY_PAIR_H__
+#ifndef BOTAN_XMSS_KEY_PAIR_H_
+#define BOTAN_XMSS_KEY_PAIR_H_
#include <botan/botan.h>
#include <botan/rng.h>
diff --git a/src/lib/pubkey/xmss/xmss_parameters.h b/src/lib/pubkey/xmss/xmss_parameters.h
index 8db49dd02..413941b4c 100644
--- a/src/lib/pubkey/xmss/xmss_parameters.h
+++ b/src/lib/pubkey/xmss/xmss_parameters.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
**/
-#ifndef BOTAN_XMSS_PARAMETERS_H__
-#define BOTAN_XMSS_PARAMETERS_H__
+#ifndef BOTAN_XMSS_PARAMETERS_H_
+#define BOTAN_XMSS_PARAMETERS_H_
#include <cstddef>
#include <map>
diff --git a/src/lib/pubkey/xmss/xmss_privatekey.h b/src/lib/pubkey/xmss/xmss_privatekey.h
index 01b64abf7..335f3120d 100644
--- a/src/lib/pubkey/xmss/xmss_privatekey.h
+++ b/src/lib/pubkey/xmss/xmss_privatekey.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
**/
-#ifndef BOTAN_XMSS_PRIVATEKEY_H__
-#define BOTAN_XMSS_PRIVATEKEY_H__
+#ifndef BOTAN_XMSS_PRIVATEKEY_H_
+#define BOTAN_XMSS_PRIVATEKEY_H_
#include <cstddef>
#include <iterator>
diff --git a/src/lib/pubkey/xmss/xmss_publickey.h b/src/lib/pubkey/xmss/xmss_publickey.h
index 53a470e06..fbf474793 100644
--- a/src/lib/pubkey/xmss/xmss_publickey.h
+++ b/src/lib/pubkey/xmss/xmss_publickey.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
**/
-#ifndef BOTAN_XMSS_PUBLICKEY_H__
-#define BOTAN_XMSS_PUBLICKEY_H__
+#ifndef BOTAN_XMSS_PUBLICKEY_H_
+#define BOTAN_XMSS_PUBLICKEY_H_
#include <cstddef>
#include <iterator>
diff --git a/src/lib/pubkey/xmss/xmss_signature.h b/src/lib/pubkey/xmss/xmss_signature.h
index 0e6dccc9e..ce8ed6d9b 100644
--- a/src/lib/pubkey/xmss/xmss_signature.h
+++ b/src/lib/pubkey/xmss/xmss_signature.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
**/
-#ifndef BOTAN_XMSS_SIGNATURE_H__
-#define BOTAN_XMSS_SIGNATURE_H__
+#ifndef BOTAN_XMSS_SIGNATURE_H_
+#define BOTAN_XMSS_SIGNATURE_H_
#include <cstddef>
#include <iterator>
diff --git a/src/lib/pubkey/xmss/xmss_signature_operation.h b/src/lib/pubkey/xmss/xmss_signature_operation.h
index e2393750a..10197a093 100644
--- a/src/lib/pubkey/xmss/xmss_signature_operation.h
+++ b/src/lib/pubkey/xmss/xmss_signature_operation.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
**/
-#ifndef BOTAN_XMSS_SIGNATURE_OPERATION_H__
-#define BOTAN_XMSS_SIGNATURE_OPERATION_H__
+#ifndef BOTAN_XMSS_SIGNATURE_OPERATION_H_
+#define BOTAN_XMSS_SIGNATURE_OPERATION_H_
#include <cstddef>
#include <string>
diff --git a/src/lib/pubkey/xmss/xmss_tools.h b/src/lib/pubkey/xmss/xmss_tools.h
index 2fcb2f86d..564a40c52 100644
--- a/src/lib/pubkey/xmss/xmss_tools.h
+++ b/src/lib/pubkey/xmss/xmss_tools.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
**/
-#ifndef BOTAN_XMSS_TOOLS_H__
-#define BOTAN_XMSS_TOOLS_H__
+#ifndef BOTAN_XMSS_TOOLS_H_
+#define BOTAN_XMSS_TOOLS_H_
#include <botan/cpuid.h>
#include <botan/secmem.h>
diff --git a/src/lib/pubkey/xmss/xmss_verification_operation.h b/src/lib/pubkey/xmss/xmss_verification_operation.h
index e5b11d809..948550193 100644
--- a/src/lib/pubkey/xmss/xmss_verification_operation.h
+++ b/src/lib/pubkey/xmss/xmss_verification_operation.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
**/
-#ifndef BOTAN_XMSS_VERIFICATION_OPERATION_H__
-#define BOTAN_XMSS_VERIFICATION_OPERATION_H__
+#ifndef BOTAN_XMSS_VERIFICATION_OPERATION_H_
+#define BOTAN_XMSS_VERIFICATION_OPERATION_H_
#include <array>
#include <cstddef>
diff --git a/src/lib/pubkey/xmss/xmss_wots_addressed_privatekey.h b/src/lib/pubkey/xmss/xmss_wots_addressed_privatekey.h
index 66941fbfd..f3031818c 100644
--- a/src/lib/pubkey/xmss/xmss_wots_addressed_privatekey.h
+++ b/src/lib/pubkey/xmss/xmss_wots_addressed_privatekey.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
**/
-#ifndef BOTAN_XMSS_WOTS_ADDRESSED_PRIVATEKEY_H__
-#define BOTAN_XMSS_WOTS_ADDRESSED_PRIVATEKEY_H__
+#ifndef BOTAN_XMSS_WOTS_ADDRESSED_PRIVATEKEY_H_
+#define BOTAN_XMSS_WOTS_ADDRESSED_PRIVATEKEY_H_
#include <botan/xmss_address.h>
#include <botan/internal/xmss_wots_addressed_publickey.h>
diff --git a/src/lib/pubkey/xmss/xmss_wots_addressed_publickey.h b/src/lib/pubkey/xmss/xmss_wots_addressed_publickey.h
index 144be4efd..3570a5908 100644
--- a/src/lib/pubkey/xmss/xmss_wots_addressed_publickey.h
+++ b/src/lib/pubkey/xmss/xmss_wots_addressed_publickey.h
@@ -6,8 +6,8 @@
**/
-#ifndef BOTAN_XMSS_WOTS_ADDRESSED_PUBLICKEY_H__
-#define BOTAN_XMSS_WOTS_ADDRESSED_PUBLICKEY_H__
+#ifndef BOTAN_XMSS_WOTS_ADDRESSED_PUBLICKEY_H_
+#define BOTAN_XMSS_WOTS_ADDRESSED_PUBLICKEY_H_
#include <botan/xmss_address.h>
#include <botan/xmss_wots_publickey.h>
diff --git a/src/lib/pubkey/xmss/xmss_wots_common_ops.h b/src/lib/pubkey/xmss/xmss_wots_common_ops.h
index 471b67c77..a880b669f 100644
--- a/src/lib/pubkey/xmss/xmss_wots_common_ops.h
+++ b/src/lib/pubkey/xmss/xmss_wots_common_ops.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
**/
-#ifndef BOTAN_XMSS_WOTS_COMMON_OPS_H__
-#define BOTAN_XMSS_WOTS_COMMON_OPS_H__
+#ifndef BOTAN_XMSS_WOTS_COMMON_OPS_H_
+#define BOTAN_XMSS_WOTS_COMMON_OPS_H_
#include <cstddef>
#include <botan/types.h>
diff --git a/src/lib/pubkey/xmss/xmss_wots_parameters.h b/src/lib/pubkey/xmss/xmss_wots_parameters.h
index d48348316..a1cd8e971 100644
--- a/src/lib/pubkey/xmss/xmss_wots_parameters.h
+++ b/src/lib/pubkey/xmss/xmss_wots_parameters.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
**/
-#ifndef BOTAN_XMSS_WOTS_PARAMETERS_H__
-#define BOTAN_XMSS_WOTS_PARAMETERS_H__
+#ifndef BOTAN_XMSS_WOTS_PARAMETERS_H_
+#define BOTAN_XMSS_WOTS_PARAMETERS_H_
#include <cstddef>
#include <cstdint>
diff --git a/src/lib/pubkey/xmss/xmss_wots_privatekey.h b/src/lib/pubkey/xmss/xmss_wots_privatekey.h
index 8c8dd2df8..69d4234c4 100644
--- a/src/lib/pubkey/xmss/xmss_wots_privatekey.h
+++ b/src/lib/pubkey/xmss/xmss_wots_privatekey.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
**/
-#ifndef BOTAN_XMSS_WOTS_PRIVATEKEY_H__
-#define BOTAN_XMSS_WOTS_PRIVATEKEY_H__
+#ifndef BOTAN_XMSS_WOTS_PRIVATEKEY_H_
+#define BOTAN_XMSS_WOTS_PRIVATEKEY_H_
#include <cstddef>
#include <memory>
diff --git a/src/lib/pubkey/xmss/xmss_wots_publickey.h b/src/lib/pubkey/xmss/xmss_wots_publickey.h
index 3e29fe88d..e111702be 100644
--- a/src/lib/pubkey/xmss/xmss_wots_publickey.h
+++ b/src/lib/pubkey/xmss/xmss_wots_publickey.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
**/
-#ifndef BOTAN_XMSS_WOTS_PUBLICKEY_H__
-#define BOTAN_XMSS_WOTS_PUBLICKEY_H__
+#ifndef BOTAN_XMSS_WOTS_PUBLICKEY_H_
+#define BOTAN_XMSS_WOTS_PUBLICKEY_H_
#include <cstddef>
#include <string>
diff --git a/src/lib/pubkey/xmss/xmss_wots_signature_operation.h b/src/lib/pubkey/xmss/xmss_wots_signature_operation.h
index 4656c3dd1..d9d559cb2 100644
--- a/src/lib/pubkey/xmss/xmss_wots_signature_operation.h
+++ b/src/lib/pubkey/xmss/xmss_wots_signature_operation.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
**/
-#ifndef BOTAN_XMSS_WOTS_SIGNATURE_OPERATION_H__
-#define BOTAN_XMSS_WOTS_SIGNATURE_OPERATION_H__
+#ifndef BOTAN_XMSS_WOTS_SIGNATURE_OPERATION_H_
+#define BOTAN_XMSS_WOTS_SIGNATURE_OPERATION_H_
#include <cstddef>
#include <iterator>
diff --git a/src/lib/pubkey/xmss/xmss_wots_verification_operation.h b/src/lib/pubkey/xmss/xmss_wots_verification_operation.h
index 5899e4f46..3575e320a 100644
--- a/src/lib/pubkey/xmss/xmss_wots_verification_operation.h
+++ b/src/lib/pubkey/xmss/xmss_wots_verification_operation.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
**/
-#ifndef BOTAN_XMSS_WOTS_VERIFICATION_OPERATION_H__
-#define BOTAN_XMSS_WOTS_VERIFICATION_OPERATION_H__
+#ifndef BOTAN_XMSS_WOTS_VERIFICATION_OPERATION_H_
+#define BOTAN_XMSS_WOTS_VERIFICATION_OPERATION_H_
#include <cstddef>
#include <iterator>
diff --git a/src/lib/rng/auto_rng/auto_rng.h b/src/lib/rng/auto_rng/auto_rng.h
index e458f23d9..866c56e12 100644
--- a/src/lib/rng/auto_rng/auto_rng.h
+++ b/src/lib/rng/auto_rng/auto_rng.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_AUTO_SEEDING_RNG_H__
-#define BOTAN_AUTO_SEEDING_RNG_H__
+#ifndef BOTAN_AUTO_SEEDING_RNG_H_
+#define BOTAN_AUTO_SEEDING_RNG_H_
#include <botan/rng.h>
diff --git a/src/lib/rng/chacha_rng/chacha_rng.h b/src/lib/rng/chacha_rng/chacha_rng.h
index f61be1e8b..a0d7d38f2 100644
--- a/src/lib/rng/chacha_rng/chacha_rng.h
+++ b/src/lib/rng/chacha_rng/chacha_rng.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_CHACHA_RNG_H__
-#define BOTAN_CHACHA_RNG_H__
+#ifndef BOTAN_CHACHA_RNG_H_
+#define BOTAN_CHACHA_RNG_H_
#include <botan/stateful_rng.h>
#include <botan/stream_cipher.h>
diff --git a/src/lib/rng/hmac_drbg/hmac_drbg.h b/src/lib/rng/hmac_drbg/hmac_drbg.h
index 8b6799fee..bcde0db13 100644
--- a/src/lib/rng/hmac_drbg/hmac_drbg.h
+++ b/src/lib/rng/hmac_drbg/hmac_drbg.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_HMAC_DRBG_H__
-#define BOTAN_HMAC_DRBG_H__
+#ifndef BOTAN_HMAC_DRBG_H_
+#define BOTAN_HMAC_DRBG_H_
#include <botan/stateful_rng.h>
#include <botan/mac.h>
diff --git a/src/lib/rng/rdrand_rng/rdrand_rng.h b/src/lib/rng/rdrand_rng/rdrand_rng.h
index 40331671d..de9798e70 100644
--- a/src/lib/rng/rdrand_rng/rdrand_rng.h
+++ b/src/lib/rng/rdrand_rng/rdrand_rng.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_RNG_RDRAND_H__
-#define BOTAN_RNG_RDRAND_H__
+#ifndef BOTAN_RNG_RDRAND_H_
+#define BOTAN_RNG_RDRAND_H_
#include <botan/rng.h>
diff --git a/src/lib/rng/rng.h b/src/lib/rng/rng.h
index 4a58992be..f86f80d61 100644
--- a/src/lib/rng/rng.h
+++ b/src/lib/rng/rng.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_RANDOM_NUMBER_GENERATOR_H__
-#define BOTAN_RANDOM_NUMBER_GENERATOR_H__
+#ifndef BOTAN_RANDOM_NUMBER_GENERATOR_H_
+#define BOTAN_RANDOM_NUMBER_GENERATOR_H_
#include <botan/entropy_src.h>
#include <botan/secmem.h>
diff --git a/src/lib/rng/stateful_rng/stateful_rng.h b/src/lib/rng/stateful_rng/stateful_rng.h
index 521ad082e..18697ae23 100644
--- a/src/lib/rng/stateful_rng/stateful_rng.h
+++ b/src/lib/rng/stateful_rng/stateful_rng.h
@@ -4,8 +4,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_STATEFUL_RNG_H__
-#define BOTAN_STATEFUL_RNG_H__
+#ifndef BOTAN_STATEFUL_RNG_H_
+#define BOTAN_STATEFUL_RNG_H_
#include <botan/rng.h>
diff --git a/src/lib/rng/system_rng/system_rng.h b/src/lib/rng/system_rng/system_rng.h
index d3566c53e..491c4d1b3 100644
--- a/src/lib/rng/system_rng/system_rng.h
+++ b/src/lib/rng/system_rng/system_rng.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_SYSTEM_RNG_H__
-#define BOTAN_SYSTEM_RNG_H__
+#ifndef BOTAN_SYSTEM_RNG_H_
+#define BOTAN_SYSTEM_RNG_H_
#include <botan/rng.h>
diff --git a/src/lib/stream/chacha/chacha.h b/src/lib/stream/chacha/chacha.h
index cbe8a7d25..e53ae9e8c 100644
--- a/src/lib/stream/chacha/chacha.h
+++ b/src/lib/stream/chacha/chacha.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_CHACHA_H__
-#define BOTAN_CHACHA_H__
+#ifndef BOTAN_CHACHA_H_
+#define BOTAN_CHACHA_H_
#include <botan/stream_cipher.h>
diff --git a/src/lib/stream/ctr/ctr.h b/src/lib/stream/ctr/ctr.h
index a91ce65c7..e7b88bf5e 100644
--- a/src/lib/stream/ctr/ctr.h
+++ b/src/lib/stream/ctr/ctr.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_CTR_BE_H__
-#define BOTAN_CTR_BE_H__
+#ifndef BOTAN_CTR_BE_H_
+#define BOTAN_CTR_BE_H_
#include <botan/block_cipher.h>
#include <botan/stream_cipher.h>
diff --git a/src/lib/stream/ofb/ofb.h b/src/lib/stream/ofb/ofb.h
index 5be3da44c..e1f538984 100644
--- a/src/lib/stream/ofb/ofb.h
+++ b/src/lib/stream/ofb/ofb.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_OUTPUT_FEEDBACK_MODE_H__
-#define BOTAN_OUTPUT_FEEDBACK_MODE_H__
+#ifndef BOTAN_OUTPUT_FEEDBACK_MODE_H_
+#define BOTAN_OUTPUT_FEEDBACK_MODE_H_
#include <botan/stream_cipher.h>
#include <botan/block_cipher.h>
diff --git a/src/lib/stream/rc4/rc4.h b/src/lib/stream/rc4/rc4.h
index 5d6ce520e..796e8d9f9 100644
--- a/src/lib/stream/rc4/rc4.h
+++ b/src/lib/stream/rc4/rc4.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_RC4_H__
-#define BOTAN_RC4_H__
+#ifndef BOTAN_RC4_H_
+#define BOTAN_RC4_H_
#include <botan/stream_cipher.h>
#include <botan/types.h>
diff --git a/src/lib/stream/salsa20/salsa20.h b/src/lib/stream/salsa20/salsa20.h
index 55f6f4250..a9a68c537 100644
--- a/src/lib/stream/salsa20/salsa20.h
+++ b/src/lib/stream/salsa20/salsa20.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_SALSA20_H__
-#define BOTAN_SALSA20_H__
+#ifndef BOTAN_SALSA20_H_
+#define BOTAN_SALSA20_H_
#include <botan/stream_cipher.h>
diff --git a/src/lib/stream/shake_cipher/shake_cipher.h b/src/lib/stream/shake_cipher/shake_cipher.h
index ce7cc14ee..12f2e780b 100644
--- a/src/lib/stream/shake_cipher/shake_cipher.h
+++ b/src/lib/stream/shake_cipher/shake_cipher.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_SHAKE128_CIPHER_H__
-#define BOTAN_SHAKE128_CIPHER_H__
+#ifndef BOTAN_SHAKE128_CIPHER_H_
+#define BOTAN_SHAKE128_CIPHER_H_
#include <botan/stream_cipher.h>
#include <botan/secmem.h>
diff --git a/src/lib/stream/stream_cipher.h b/src/lib/stream/stream_cipher.h
index 1f46a453c..31fa5b3b0 100644
--- a/src/lib/stream/stream_cipher.h
+++ b/src/lib/stream/stream_cipher.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_STREAM_CIPHER_H__
-#define BOTAN_STREAM_CIPHER_H__
+#ifndef BOTAN_STREAM_CIPHER_H_
+#define BOTAN_STREAM_CIPHER_H_
#include <botan/sym_algo.h>
#include <string>
diff --git a/src/lib/tls/credentials_manager.h b/src/lib/tls/credentials_manager.h
index 1671665d7..5c12460aa 100644
--- a/src/lib/tls/credentials_manager.h
+++ b/src/lib/tls/credentials_manager.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_CREDENTIALS_MANAGER_H__
-#define BOTAN_CREDENTIALS_MANAGER_H__
+#ifndef BOTAN_CREDENTIALS_MANAGER_H_
+#define BOTAN_CREDENTIALS_MANAGER_H_
#include <botan/x509cert.h>
#include <botan/certstor.h>
diff --git a/src/lib/tls/sessions_sql/tls_session_manager_sql.h b/src/lib/tls/sessions_sql/tls_session_manager_sql.h
index 5ad9e6e40..a334cb687 100644
--- a/src/lib/tls/sessions_sql/tls_session_manager_sql.h
+++ b/src/lib/tls/sessions_sql/tls_session_manager_sql.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_TLS_SQL_SESSION_MANAGER_H__
-#define BOTAN_TLS_SQL_SESSION_MANAGER_H__
+#ifndef BOTAN_TLS_SQL_SESSION_MANAGER_H_
+#define BOTAN_TLS_SQL_SESSION_MANAGER_H_
#include <botan/tls_session_manager.h>
#include <botan/database.h>
diff --git a/src/lib/tls/sessions_sqlite3/tls_session_manager_sqlite.h b/src/lib/tls/sessions_sqlite3/tls_session_manager_sqlite.h
index 411898051..797180687 100644
--- a/src/lib/tls/sessions_sqlite3/tls_session_manager_sqlite.h
+++ b/src/lib/tls/sessions_sqlite3/tls_session_manager_sqlite.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_TLS_SQLITE3_SESSION_MANAGER_H__
-#define BOTAN_TLS_SQLITE3_SESSION_MANAGER_H__
+#ifndef BOTAN_TLS_SQLITE3_SESSION_MANAGER_H_
+#define BOTAN_TLS_SQLITE3_SESSION_MANAGER_H_
#include <botan/tls_session_manager_sql.h>
#include <botan/rng.h>
diff --git a/src/lib/tls/tls_alert.h b/src/lib/tls/tls_alert.h
index 1592a9e50..f76fc4af1 100644
--- a/src/lib/tls/tls_alert.h
+++ b/src/lib/tls/tls_alert.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_TLS_ALERT_H__
-#define BOTAN_TLS_ALERT_H__
+#ifndef BOTAN_TLS_ALERT_H_
+#define BOTAN_TLS_ALERT_H_
#include <botan/secmem.h>
#include <string>
diff --git a/src/lib/tls/tls_blocking.h b/src/lib/tls/tls_blocking.h
index 37279be81..851bf846c 100644
--- a/src/lib/tls/tls_blocking.h
+++ b/src/lib/tls/tls_blocking.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_TLS_BLOCKING_CHANNELS_H__
-#define BOTAN_TLS_BLOCKING_CHANNELS_H__
+#ifndef BOTAN_TLS_BLOCKING_CHANNELS_H_
+#define BOTAN_TLS_BLOCKING_CHANNELS_H_
#include <botan/tls_client.h>
#include <botan/tls_server.h>
diff --git a/src/lib/tls/tls_callbacks.h b/src/lib/tls/tls_callbacks.h
index 207899275..d89fbf22d 100644
--- a/src/lib/tls/tls_callbacks.h
+++ b/src/lib/tls/tls_callbacks.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_TLS_CALLBACKS_H__
-#define BOTAN_TLS_CALLBACKS_H__
+#ifndef BOTAN_TLS_CALLBACKS_H_
+#define BOTAN_TLS_CALLBACKS_H_
#include <botan/tls_session.h>
#include <botan/tls_alert.h>
diff --git a/src/lib/tls/tls_cbc/tls_cbc.h b/src/lib/tls/tls_cbc/tls_cbc.h
index 36c6e27f0..d0fc1fb61 100644
--- a/src/lib/tls/tls_cbc/tls_cbc.h
+++ b/src/lib/tls/tls_cbc/tls_cbc.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_TLS_CBC_HMAC_AEAD_H__
-#define BOTAN_TLS_CBC_HMAC_AEAD_H__
+#ifndef BOTAN_TLS_CBC_HMAC_AEAD_H_
+#define BOTAN_TLS_CBC_HMAC_AEAD_H_
#include <botan/aead.h>
#include <botan/block_cipher.h>
diff --git a/src/lib/tls/tls_channel.h b/src/lib/tls/tls_channel.h
index a821f4ef4..61d85756b 100644
--- a/src/lib/tls/tls_channel.h
+++ b/src/lib/tls/tls_channel.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_TLS_CHANNEL_H__
-#define BOTAN_TLS_CHANNEL_H__
+#ifndef BOTAN_TLS_CHANNEL_H_
+#define BOTAN_TLS_CHANNEL_H_
#include <botan/tls_policy.h>
#include <botan/tls_session.h>
diff --git a/src/lib/tls/tls_ciphersuite.h b/src/lib/tls/tls_ciphersuite.h
index 470352bdf..4543d81d2 100644
--- a/src/lib/tls/tls_ciphersuite.h
+++ b/src/lib/tls/tls_ciphersuite.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_TLS_CIPHER_SUITES_H__
-#define BOTAN_TLS_CIPHER_SUITES_H__
+#ifndef BOTAN_TLS_CIPHER_SUITES_H_
+#define BOTAN_TLS_CIPHER_SUITES_H_
#include <botan/types.h>
#include <string>
diff --git a/src/lib/tls/tls_client.h b/src/lib/tls/tls_client.h
index bcf878ee1..b5cb30527 100644
--- a/src/lib/tls/tls_client.h
+++ b/src/lib/tls/tls_client.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_TLS_CLIENT_H__
-#define BOTAN_TLS_CLIENT_H__
+#ifndef BOTAN_TLS_CLIENT_H_
+#define BOTAN_TLS_CLIENT_H_
#include <botan/tls_channel.h>
#include <botan/credentials_manager.h>
diff --git a/src/lib/tls/tls_exceptn.h b/src/lib/tls/tls_exceptn.h
index 3b639a4fa..79b1042d3 100644
--- a/src/lib/tls/tls_exceptn.h
+++ b/src/lib/tls/tls_exceptn.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_TLS_EXCEPTION_H__
-#define BOTAN_TLS_EXCEPTION_H__
+#ifndef BOTAN_TLS_EXCEPTION_H_
+#define BOTAN_TLS_EXCEPTION_H_
#include <botan/exceptn.h>
#include <botan/tls_alert.h>
diff --git a/src/lib/tls/tls_extensions.h b/src/lib/tls/tls_extensions.h
index 56df4ccfb..645d1a4e3 100644
--- a/src/lib/tls/tls_extensions.h
+++ b/src/lib/tls/tls_extensions.h
@@ -7,8 +7,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_TLS_EXTENSIONS_H__
-#define BOTAN_TLS_EXTENSIONS_H__
+#ifndef BOTAN_TLS_EXTENSIONS_H_
+#define BOTAN_TLS_EXTENSIONS_H_
#include <botan/secmem.h>
#include <botan/tls_magic.h>
diff --git a/src/lib/tls/tls_handshake_hash.h b/src/lib/tls/tls_handshake_hash.h
index c0c266f9e..ab03f883d 100644
--- a/src/lib/tls/tls_handshake_hash.h
+++ b/src/lib/tls/tls_handshake_hash.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_TLS_HANDSHAKE_HASH_H__
-#define BOTAN_TLS_HANDSHAKE_HASH_H__
+#ifndef BOTAN_TLS_HANDSHAKE_HASH_H_
+#define BOTAN_TLS_HANDSHAKE_HASH_H_
#include <botan/secmem.h>
#include <botan/tls_version.h>
diff --git a/src/lib/tls/tls_handshake_io.h b/src/lib/tls/tls_handshake_io.h
index c71de532b..52cb7d90f 100644
--- a/src/lib/tls/tls_handshake_io.h
+++ b/src/lib/tls/tls_handshake_io.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_TLS_HANDSHAKE_IO_H__
-#define BOTAN_TLS_HANDSHAKE_IO_H__
+#ifndef BOTAN_TLS_HANDSHAKE_IO_H_
+#define BOTAN_TLS_HANDSHAKE_IO_H_
#include <botan/tls_magic.h>
#include <botan/tls_version.h>
diff --git a/src/lib/tls/tls_handshake_msg.h b/src/lib/tls/tls_handshake_msg.h
index 9b81db4f6..394f0fa70 100644
--- a/src/lib/tls/tls_handshake_msg.h
+++ b/src/lib/tls/tls_handshake_msg.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_TLS_HANDSHAKE_MSG_H__
-#define BOTAN_TLS_HANDSHAKE_MSG_H__
+#ifndef BOTAN_TLS_HANDSHAKE_MSG_H_
+#define BOTAN_TLS_HANDSHAKE_MSG_H_
#include <botan/tls_magic.h>
#include <vector>
diff --git a/src/lib/tls/tls_handshake_state.h b/src/lib/tls/tls_handshake_state.h
index 5851a8fe8..e15e3a92f 100644
--- a/src/lib/tls/tls_handshake_state.h
+++ b/src/lib/tls/tls_handshake_state.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_TLS_HANDSHAKE_STATE_H__
-#define BOTAN_TLS_HANDSHAKE_STATE_H__
+#ifndef BOTAN_TLS_HANDSHAKE_STATE_H_
+#define BOTAN_TLS_HANDSHAKE_STATE_H_
#include <botan/internal/tls_handshake_hash.h>
#include <botan/internal/tls_handshake_io.h>
diff --git a/src/lib/tls/tls_magic.h b/src/lib/tls/tls_magic.h
index 798e428ff..70b94f90d 100644
--- a/src/lib/tls/tls_magic.h
+++ b/src/lib/tls/tls_magic.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_TLS_PROTOCOL_MAGIC_H__
-#define BOTAN_TLS_PROTOCOL_MAGIC_H__
+#ifndef BOTAN_TLS_PROTOCOL_MAGIC_H_
+#define BOTAN_TLS_PROTOCOL_MAGIC_H_
namespace Botan {
diff --git a/src/lib/tls/tls_messages.h b/src/lib/tls/tls_messages.h
index aa31fce8d..e8e3a2080 100644
--- a/src/lib/tls/tls_messages.h
+++ b/src/lib/tls/tls_messages.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_TLS_MESSAGES_H__
-#define BOTAN_TLS_MESSAGES_H__
+#ifndef BOTAN_TLS_MESSAGES_H_
+#define BOTAN_TLS_MESSAGES_H_
#include <botan/tls_extensions.h>
#include <botan/tls_handshake_msg.h>
diff --git a/src/lib/tls/tls_policy.h b/src/lib/tls/tls_policy.h
index 65112c771..84e65609d 100644
--- a/src/lib/tls/tls_policy.h
+++ b/src/lib/tls/tls_policy.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_TLS_POLICY_H__
-#define BOTAN_TLS_POLICY_H__
+#ifndef BOTAN_TLS_POLICY_H_
+#define BOTAN_TLS_POLICY_H_
#include <botan/tls_version.h>
#include <botan/tls_ciphersuite.h>
diff --git a/src/lib/tls/tls_reader.h b/src/lib/tls/tls_reader.h
index e461d8ffc..e88335227 100644
--- a/src/lib/tls/tls_reader.h
+++ b/src/lib/tls/tls_reader.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_TLS_READER_H__
-#define BOTAN_TLS_READER_H__
+#ifndef BOTAN_TLS_READER_H_
+#define BOTAN_TLS_READER_H_
#include <botan/exceptn.h>
#include <botan/secmem.h>
diff --git a/src/lib/tls/tls_record.h b/src/lib/tls/tls_record.h
index 782257b41..b2078c651 100644
--- a/src/lib/tls/tls_record.h
+++ b/src/lib/tls/tls_record.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_TLS_RECORDS_H__
-#define BOTAN_TLS_RECORDS_H__
+#ifndef BOTAN_TLS_RECORDS_H_
+#define BOTAN_TLS_RECORDS_H_
#include <botan/tls_magic.h>
#include <botan/tls_version.h>
diff --git a/src/lib/tls/tls_seq_numbers.h b/src/lib/tls/tls_seq_numbers.h
index c5741b998..dfebeae91 100644
--- a/src/lib/tls/tls_seq_numbers.h
+++ b/src/lib/tls/tls_seq_numbers.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_TLS_SEQ_NUMBERS_H__
-#define BOTAN_TLS_SEQ_NUMBERS_H__
+#ifndef BOTAN_TLS_SEQ_NUMBERS_H_
+#define BOTAN_TLS_SEQ_NUMBERS_H_
#include <botan/types.h>
diff --git a/src/lib/tls/tls_server.h b/src/lib/tls/tls_server.h
index 6931b820b..a7db74f27 100644
--- a/src/lib/tls/tls_server.h
+++ b/src/lib/tls/tls_server.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_TLS_SERVER_H__
-#define BOTAN_TLS_SERVER_H__
+#ifndef BOTAN_TLS_SERVER_H_
+#define BOTAN_TLS_SERVER_H_
#include <botan/tls_channel.h>
#include <botan/credentials_manager.h>
diff --git a/src/lib/tls/tls_server_info.h b/src/lib/tls/tls_server_info.h
index 329191aad..d1d66bdb6 100644
--- a/src/lib/tls/tls_server_info.h
+++ b/src/lib/tls/tls_server_info.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_TLS_SERVER_INFO_H__
-#define BOTAN_TLS_SERVER_INFO_H__
+#ifndef BOTAN_TLS_SERVER_INFO_H_
+#define BOTAN_TLS_SERVER_INFO_H_
#include <botan/types.h>
#include <string>
diff --git a/src/lib/tls/tls_session.h b/src/lib/tls/tls_session.h
index 4b7a6a538..5b31e8622 100644
--- a/src/lib/tls/tls_session.h
+++ b/src/lib/tls/tls_session.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_TLS_SESSION_STATE_H__
-#define BOTAN_TLS_SESSION_STATE_H__
+#ifndef BOTAN_TLS_SESSION_STATE_H_
+#define BOTAN_TLS_SESSION_STATE_H_
#include <botan/x509cert.h>
#include <botan/tls_version.h>
diff --git a/src/lib/tls/tls_session_key.h b/src/lib/tls/tls_session_key.h
index 97ad3106d..ae0db88ca 100644
--- a/src/lib/tls/tls_session_key.h
+++ b/src/lib/tls/tls_session_key.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_TLS_SESSION_KEYS_H__
-#define BOTAN_TLS_SESSION_KEYS_H__
+#ifndef BOTAN_TLS_SESSION_KEYS_H_
+#define BOTAN_TLS_SESSION_KEYS_H_
#include <botan/symkey.h>
diff --git a/src/lib/tls/tls_session_manager.h b/src/lib/tls/tls_session_manager.h
index 15e16f238..215ad1303 100644
--- a/src/lib/tls/tls_session_manager.h
+++ b/src/lib/tls/tls_session_manager.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_TLS_SESSION_MANAGER_H__
-#define BOTAN_TLS_SESSION_MANAGER_H__
+#ifndef BOTAN_TLS_SESSION_MANAGER_H_
+#define BOTAN_TLS_SESSION_MANAGER_H_
#include <botan/tls_session.h>
#include <botan/mutex.h>
diff --git a/src/lib/tls/tls_version.h b/src/lib/tls/tls_version.h
index a8f3afba4..a311db909 100644
--- a/src/lib/tls/tls_version.h
+++ b/src/lib/tls/tls_version.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_TLS_PROTOCOL_VERSION_H__
-#define BOTAN_TLS_PROTOCOL_VERSION_H__
+#ifndef BOTAN_TLS_PROTOCOL_VERSION_H_
+#define BOTAN_TLS_PROTOCOL_VERSION_H_
#include <botan/loadstor.h>
#include <string>
diff --git a/src/lib/utils/assert.h b/src/lib/utils/assert.h
index 044e27637..ab0616ff9 100644
--- a/src/lib/utils/assert.h
+++ b/src/lib/utils/assert.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_ASSERTION_CHECKING_H__
-#define BOTAN_ASSERTION_CHECKING_H__
+#ifndef BOTAN_ASSERTION_CHECKING_H_
+#define BOTAN_ASSERTION_CHECKING_H_
#include <botan/build.h>
diff --git a/src/lib/utils/barrier.h b/src/lib/utils/barrier.h
index 6d5cf9e58..303ac5a98 100644
--- a/src/lib/utils/barrier.h
+++ b/src/lib/utils/barrier.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_UTIL_BARRIER_H__
-#define BOTAN_UTIL_BARRIER_H__
+#ifndef BOTAN_UTIL_BARRIER_H_
+#define BOTAN_UTIL_BARRIER_H_
#include <botan/mutex.h>
diff --git a/src/lib/utils/bit_ops.h b/src/lib/utils/bit_ops.h
index b7ee94125..a59404c75 100644
--- a/src/lib/utils/bit_ops.h
+++ b/src/lib/utils/bit_ops.h
@@ -9,8 +9,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_BIT_OPS_H__
-#define BOTAN_BIT_OPS_H__
+#ifndef BOTAN_BIT_OPS_H_
+#define BOTAN_BIT_OPS_H_
#include <botan/types.h>
diff --git a/src/lib/utils/bswap.h b/src/lib/utils/bswap.h
index b55445f59..c97666b3f 100644
--- a/src/lib/utils/bswap.h
+++ b/src/lib/utils/bswap.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_BYTE_SWAP_H__
-#define BOTAN_BYTE_SWAP_H__
+#ifndef BOTAN_BYTE_SWAP_H_
+#define BOTAN_BYTE_SWAP_H_
#include <botan/types.h>
#include <botan/rotate.h>
diff --git a/src/lib/utils/calendar.h b/src/lib/utils/calendar.h
index 8c9d1f084..5cf59eccc 100644
--- a/src/lib/utils/calendar.h
+++ b/src/lib/utils/calendar.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_CALENDAR_H__
-#define BOTAN_CALENDAR_H__
+#ifndef BOTAN_CALENDAR_H_
+#define BOTAN_CALENDAR_H_
#include <botan/types.h>
#include <chrono>
diff --git a/src/lib/utils/charset.h b/src/lib/utils/charset.h
index cffa8ebc5..528ab908b 100644
--- a/src/lib/utils/charset.h
+++ b/src/lib/utils/charset.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_CHARSET_H__
-#define BOTAN_CHARSET_H__
+#ifndef BOTAN_CHARSET_H_
+#define BOTAN_CHARSET_H_
#include <botan/types.h>
#include <string>
diff --git a/src/lib/utils/compiler.h b/src/lib/utils/compiler.h
index 793220b00..459cb737d 100644
--- a/src/lib/utils/compiler.h
+++ b/src/lib/utils/compiler.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_UTIL_COMPILER_FLAGS_H__
-#define BOTAN_UTIL_COMPILER_FLAGS_H__
+#ifndef BOTAN_UTIL_COMPILER_FLAGS_H_
+#define BOTAN_UTIL_COMPILER_FLAGS_H_
/* Should we use GCC-style inline assembler? */
#if !defined(BOTAN_USE_GCC_INLINE_ASM) && defined(__GNUC__)
diff --git a/src/lib/utils/cpuid/cpuid.h b/src/lib/utils/cpuid/cpuid.h
index 061e2d124..839b72167 100644
--- a/src/lib/utils/cpuid/cpuid.h
+++ b/src/lib/utils/cpuid/cpuid.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_CPUID_H__
-#define BOTAN_CPUID_H__
+#ifndef BOTAN_CPUID_H_
+#define BOTAN_CPUID_H_
#include <botan/types.h>
#include <vector>
diff --git a/src/lib/utils/ct_utils.h b/src/lib/utils/ct_utils.h
index 1a88cee20..93691fc0a 100644
--- a/src/lib/utils/ct_utils.h
+++ b/src/lib/utils/ct_utils.h
@@ -11,8 +11,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_TIMING_ATTACK_CM_H__
-#define BOTAN_TIMING_ATTACK_CM_H__
+#ifndef BOTAN_TIMING_ATTACK_CM_H_
+#define BOTAN_TIMING_ATTACK_CM_H_
#include <botan/secmem.h>
#include <vector>
diff --git a/src/lib/utils/data_src.h b/src/lib/utils/data_src.h
index 8a170fdff..616556e46 100644
--- a/src/lib/utils/data_src.h
+++ b/src/lib/utils/data_src.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_DATA_SRC_H__
-#define BOTAN_DATA_SRC_H__
+#ifndef BOTAN_DATA_SRC_H_
+#define BOTAN_DATA_SRC_H_
#include <botan/secmem.h>
#include <string>
diff --git a/src/lib/utils/database.h b/src/lib/utils/database.h
index 0aa72eaa1..cd30c64ae 100644
--- a/src/lib/utils/database.h
+++ b/src/lib/utils/database.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_SQL_DATABASE_H__
-#define BOTAN_SQL_DATABASE_H__
+#ifndef BOTAN_SQL_DATABASE_H_
+#define BOTAN_SQL_DATABASE_H_
#include <botan/types.h>
#include <botan/exceptn.h>
diff --git a/src/lib/utils/donna128.h b/src/lib/utils/donna128.h
index 3e11f71c2..9efc4e332 100644
--- a/src/lib/utils/donna128.h
+++ b/src/lib/utils/donna128.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_CURVE25519_DONNA128_H__
-#define BOTAN_CURVE25519_DONNA128_H__
+#ifndef BOTAN_CURVE25519_DONNA128_H_
+#define BOTAN_CURVE25519_DONNA128_H_
#include <botan/mul128.h>
diff --git a/src/lib/utils/dyn_load/dyn_load.h b/src/lib/utils/dyn_load/dyn_load.h
index f5c0e1b24..31da6b7a2 100644
--- a/src/lib/utils/dyn_load/dyn_load.h
+++ b/src/lib/utils/dyn_load/dyn_load.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_DYNAMIC_LOADER_H__
-#define BOTAN_DYNAMIC_LOADER_H__
+#ifndef BOTAN_DYNAMIC_LOADER_H_
+#define BOTAN_DYNAMIC_LOADER_H_
#include <string>
#include <botan/build.h>
diff --git a/src/lib/utils/exceptn.h b/src/lib/utils/exceptn.h
index 47f16e0b9..e5f2e51f7 100644
--- a/src/lib/utils/exceptn.h
+++ b/src/lib/utils/exceptn.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_EXCEPTION_H__
-#define BOTAN_EXCEPTION_H__
+#ifndef BOTAN_EXCEPTION_H_
+#define BOTAN_EXCEPTION_H_
#include <botan/types.h>
#include <botan/parsing.h>
diff --git a/src/lib/utils/filesystem.h b/src/lib/utils/filesystem.h
index a3e1b8191..4d6e2fe40 100644
--- a/src/lib/utils/filesystem.h
+++ b/src/lib/utils/filesystem.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_UTIL_FILESYSTEM_H__
-#define BOTAN_UTIL_FILESYSTEM_H__
+#ifndef BOTAN_UTIL_FILESYSTEM_H_
+#define BOTAN_UTIL_FILESYSTEM_H_
#include <botan/types.h>
#include <vector>
diff --git a/src/lib/utils/http_util/http_util.h b/src/lib/utils/http_util/http_util.h
index 2a3863951..a81dd85df 100644
--- a/src/lib/utils/http_util/http_util.h
+++ b/src/lib/utils/http_util/http_util.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_UTILS_URLGET_H__
-#define BOTAN_UTILS_URLGET_H__
+#ifndef BOTAN_UTILS_URLGET_H_
+#define BOTAN_UTILS_URLGET_H_
#include <botan/types.h>
#include <botan/exceptn.h>
diff --git a/src/lib/utils/loadstor.h b/src/lib/utils/loadstor.h
index c8368fbea..affbb9ab6 100644
--- a/src/lib/utils/loadstor.h
+++ b/src/lib/utils/loadstor.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_LOAD_STORE_H__
-#define BOTAN_LOAD_STORE_H__
+#ifndef BOTAN_LOAD_STORE_H_
+#define BOTAN_LOAD_STORE_H_
#include <botan/types.h>
#include <botan/bswap.h>
diff --git a/src/lib/utils/locking_allocator/locking_allocator.h b/src/lib/utils/locking_allocator/locking_allocator.h
index 81e9234dc..b761221d2 100644
--- a/src/lib/utils/locking_allocator/locking_allocator.h
+++ b/src/lib/utils/locking_allocator/locking_allocator.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_MLOCK_ALLOCATOR_H__
-#define BOTAN_MLOCK_ALLOCATOR_H__
+#ifndef BOTAN_MLOCK_ALLOCATOR_H_
+#define BOTAN_MLOCK_ALLOCATOR_H_
#include <botan/types.h>
#include <vector>
diff --git a/src/lib/utils/mem_ops.h b/src/lib/utils/mem_ops.h
index 4bc57316b..328196000 100644
--- a/src/lib/utils/mem_ops.h
+++ b/src/lib/utils/mem_ops.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_MEMORY_OPS_H__
-#define BOTAN_MEMORY_OPS_H__
+#ifndef BOTAN_MEMORY_OPS_H_
+#define BOTAN_MEMORY_OPS_H_
#include <botan/types.h>
#include <cstring>
diff --git a/src/lib/utils/mul128.h b/src/lib/utils/mul128.h
index d5c89e0dd..ce1ef693b 100644
--- a/src/lib/utils/mul128.h
+++ b/src/lib/utils/mul128.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_UTIL_MUL128_H__
-#define BOTAN_UTIL_MUL128_H__
+#ifndef BOTAN_UTIL_MUL128_H_
+#define BOTAN_UTIL_MUL128_H_
#include <botan/types.h>
diff --git a/src/lib/utils/mutex.h b/src/lib/utils/mutex.h
index 2aabd2973..e8718d5eb 100644
--- a/src/lib/utils/mutex.h
+++ b/src/lib/utils/mutex.h
@@ -4,8 +4,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_UTIL_MUTEX_H__
-#define BOTAN_UTIL_MUTEX_H__
+#ifndef BOTAN_UTIL_MUTEX_H_
+#define BOTAN_UTIL_MUTEX_H_
#include <botan/build.h>
#include <botan/types.h>
diff --git a/src/lib/utils/os_utils.h b/src/lib/utils/os_utils.h
index 107a6904f..405afb29c 100644
--- a/src/lib/utils/os_utils.h
+++ b/src/lib/utils/os_utils.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_OS_UTILS_H__
-#define BOTAN_OS_UTILS_H__
+#ifndef BOTAN_OS_UTILS_H_
+#define BOTAN_OS_UTILS_H_
#include <botan/types.h>
#include <functional>
diff --git a/src/lib/utils/parsing.h b/src/lib/utils/parsing.h
index fa340f410..dbf5d426a 100644
--- a/src/lib/utils/parsing.h
+++ b/src/lib/utils/parsing.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_PARSER_H__
-#define BOTAN_PARSER_H__
+#ifndef BOTAN_PARSER_H_
+#define BOTAN_PARSER_H_
#include <botan/types.h>
#include <string>
diff --git a/src/lib/utils/poly_dbl.h b/src/lib/utils/poly_dbl.h
index ce62731c2..10c85c567 100644
--- a/src/lib/utils/poly_dbl.h
+++ b/src/lib/utils/poly_dbl.h
@@ -4,8 +4,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_POLY_DBL_H__
-#define BOTAN_POLY_DBL_H__
+#ifndef BOTAN_POLY_DBL_H_
+#define BOTAN_POLY_DBL_H_
#include <botan/types.h>
diff --git a/src/lib/utils/prefetch.h b/src/lib/utils/prefetch.h
index 22514b797..92c41e573 100644
--- a/src/lib/utils/prefetch.h
+++ b/src/lib/utils/prefetch.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_PREFETCH_H__
-#define BOTAN_PREFETCH_H__
+#ifndef BOTAN_PREFETCH_H_
+#define BOTAN_PREFETCH_H_
#include <botan/cpuid.h>
diff --git a/src/lib/utils/rotate.h b/src/lib/utils/rotate.h
index 8361e4705..cb92daf96 100644
--- a/src/lib/utils/rotate.h
+++ b/src/lib/utils/rotate.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_WORD_ROTATE_H__
-#define BOTAN_WORD_ROTATE_H__
+#ifndef BOTAN_WORD_ROTATE_H_
+#define BOTAN_WORD_ROTATE_H_
#include <botan/types.h>
diff --git a/src/lib/utils/rounding.h b/src/lib/utils/rounding.h
index 8ad324225..e74a80798 100644
--- a/src/lib/utils/rounding.h
+++ b/src/lib/utils/rounding.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_ROUNDING_H__
-#define BOTAN_ROUNDING_H__
+#ifndef BOTAN_ROUNDING_H_
+#define BOTAN_ROUNDING_H_
#include <botan/types.h>
#include <botan/assert.h>
diff --git a/src/lib/utils/safeint.h b/src/lib/utils/safeint.h
index e0bd66232..66632c932 100644
--- a/src/lib/utils/safeint.h
+++ b/src/lib/utils/safeint.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_UTILS_SAFE_INT_H__
-#define BOTAN_UTILS_SAFE_INT_H__
+#ifndef BOTAN_UTILS_SAFE_INT_H_
+#define BOTAN_UTILS_SAFE_INT_H_
#include <botan/exceptn.h>
#include <string>
diff --git a/src/lib/utils/semaphore.h b/src/lib/utils/semaphore.h
index 87e6b84fe..61db8d48f 100644
--- a/src/lib/utils/semaphore.h
+++ b/src/lib/utils/semaphore.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_SEMAPHORE_H__
-#define BOTAN_SEMAPHORE_H__
+#ifndef BOTAN_SEMAPHORE_H_
+#define BOTAN_SEMAPHORE_H_
#include <botan/mutex.h>
diff --git a/src/lib/utils/simd/simd_32.h b/src/lib/utils/simd/simd_32.h
index f2b6351c6..2a177b388 100644
--- a/src/lib/utils/simd/simd_32.h
+++ b/src/lib/utils/simd/simd_32.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_SIMD_32_H__
-#define BOTAN_SIMD_32_H__
+#ifndef BOTAN_SIMD_32_H_
+#define BOTAN_SIMD_32_H_
#include <botan/types.h>
#include <botan/loadstor.h>
diff --git a/src/lib/utils/sqlite3/sqlite3.h b/src/lib/utils/sqlite3/sqlite3.h
index 5715f07c8..dff189791 100644
--- a/src/lib/utils/sqlite3/sqlite3.h
+++ b/src/lib/utils/sqlite3/sqlite3.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_UTILS_SQLITE3_H__
-#define BOTAN_UTILS_SQLITE3_H__
+#ifndef BOTAN_UTILS_SQLITE3_H_
+#define BOTAN_UTILS_SQLITE3_H_
#include <botan/database.h>
diff --git a/src/lib/utils/stl_compatibility.h b/src/lib/utils/stl_compatibility.h
index 178afed52..099af83b3 100644
--- a/src/lib/utils/stl_compatibility.h
+++ b/src/lib/utils/stl_compatibility.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_STL_COMPATIBILITY_H__
-#define BOTAN_STL_COMPATIBILITY_H__
+#ifndef BOTAN_STL_COMPATIBILITY_H_
+#define BOTAN_STL_COMPATIBILITY_H_
#include <memory>
diff --git a/src/lib/utils/stl_util.h b/src/lib/utils/stl_util.h
index 3c8cacaa8..d9167bb7d 100644
--- a/src/lib/utils/stl_util.h
+++ b/src/lib/utils/stl_util.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_STL_UTIL_H__
-#define BOTAN_STL_UTIL_H__
+#ifndef BOTAN_STL_UTIL_H_
+#define BOTAN_STL_UTIL_H_
#include <vector>
#include <string>
diff --git a/src/lib/utils/types.h b/src/lib/utils/types.h
index 459d8447f..deccc2b93 100644
--- a/src/lib/utils/types.h
+++ b/src/lib/utils/types.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_TYPES_H__
-#define BOTAN_TYPES_H__
+#ifndef BOTAN_TYPES_H_
+#define BOTAN_TYPES_H_
#include <botan/build.h>
#include <botan/assert.h>
diff --git a/src/lib/utils/version.h b/src/lib/utils/version.h
index 1f364f952..f82916607 100644
--- a/src/lib/utils/version.h
+++ b/src/lib/utils/version.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_VERSION_H__
-#define BOTAN_VERSION_H__
+#ifndef BOTAN_VERSION_H_
+#define BOTAN_VERSION_H_
#include <botan/types.h>
#include <string>
diff --git a/src/lib/x509/cert_status.h b/src/lib/x509/cert_status.h
index e4052eee5..3bc610571 100644
--- a/src/lib/x509/cert_status.h
+++ b/src/lib/x509/cert_status.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_X509_PATH_RESULT_H__
-#define BOTAN_X509_PATH_RESULT_H__
+#ifndef BOTAN_X509_PATH_RESULT_H_
+#define BOTAN_X509_PATH_RESULT_H_
#include <botan/build.h>
diff --git a/src/lib/x509/certstor.h b/src/lib/x509/certstor.h
index 1e2690b4f..c2ce8b15b 100644
--- a/src/lib/x509/certstor.h
+++ b/src/lib/x509/certstor.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_CERT_STORE_H__
-#define BOTAN_CERT_STORE_H__
+#ifndef BOTAN_CERT_STORE_H_
+#define BOTAN_CERT_STORE_H_
#include <botan/x509cert.h>
#include <botan/x509_crl.h>
diff --git a/src/lib/x509/certstor_sql/certstor_sql.h b/src/lib/x509/certstor_sql/certstor_sql.h
index 343fc6a0a..98324193e 100644
--- a/src/lib/x509/certstor_sql/certstor_sql.h
+++ b/src/lib/x509/certstor_sql/certstor_sql.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_CERT_STORE_SQL_H__
-#define BOTAN_CERT_STORE_SQL_H__
+#ifndef BOTAN_CERT_STORE_SQL_H_
+#define BOTAN_CERT_STORE_SQL_H_
#include <botan/certstor.h>
#include <botan/x509cert.h>
diff --git a/src/lib/x509/certstor_sqlite3/certstor_sqlite.h b/src/lib/x509/certstor_sqlite3/certstor_sqlite.h
index 02910871a..684ece8d7 100644
--- a/src/lib/x509/certstor_sqlite3/certstor_sqlite.h
+++ b/src/lib/x509/certstor_sqlite3/certstor_sqlite.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_CERT_STORE_SQLITE_H__
-#define BOTAN_CERT_STORE_SQLITE_H__
+#ifndef BOTAN_CERT_STORE_SQLITE_H_
+#define BOTAN_CERT_STORE_SQLITE_H_
#include <botan/certstor_sql.h>
diff --git a/src/lib/x509/crl_ent.h b/src/lib/x509/crl_ent.h
index 5c265bf52..cf509d3c1 100644
--- a/src/lib/x509/crl_ent.h
+++ b/src/lib/x509/crl_ent.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_CRL_ENTRY_H__
-#define BOTAN_CRL_ENTRY_H__
+#ifndef BOTAN_CRL_ENTRY_H_
+#define BOTAN_CRL_ENTRY_H_
#include <botan/asn1_time.h>
diff --git a/src/lib/x509/datastor.h b/src/lib/x509/datastor.h
index 1b3fc244e..5cb9fad9d 100644
--- a/src/lib/x509/datastor.h
+++ b/src/lib/x509/datastor.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_DATA_STORE_H__
-#define BOTAN_DATA_STORE_H__
+#ifndef BOTAN_DATA_STORE_H_
+#define BOTAN_DATA_STORE_H_
#include <botan/secmem.h>
#include <functional>
diff --git a/src/lib/x509/key_constraint.h b/src/lib/x509/key_constraint.h
index 5a47b0046..268bd87f1 100644
--- a/src/lib/x509/key_constraint.h
+++ b/src/lib/x509/key_constraint.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_ENUMS_H__
-#define BOTAN_ENUMS_H__
+#ifndef BOTAN_ENUMS_H_
+#define BOTAN_ENUMS_H_
#include <botan/build.h>
#include <string>
diff --git a/src/lib/x509/name_constraint.h b/src/lib/x509/name_constraint.h
index b88f37cce..28c3a2f4f 100644
--- a/src/lib/x509/name_constraint.h
+++ b/src/lib/x509/name_constraint.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_NAME_CONSTRAINT_H__
-#define BOTAN_NAME_CONSTRAINT_H__
+#ifndef BOTAN_NAME_CONSTRAINT_H_
+#define BOTAN_NAME_CONSTRAINT_H_
#include <botan/asn1_obj.h>
#include <ostream>
diff --git a/src/lib/x509/ocsp.h b/src/lib/x509/ocsp.h
index dc3532247..3ff847370 100644
--- a/src/lib/x509/ocsp.h
+++ b/src/lib/x509/ocsp.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_OCSP_H__
-#define BOTAN_OCSP_H__
+#ifndef BOTAN_OCSP_H_
+#define BOTAN_OCSP_H_
#include <botan/cert_status.h>
#include <botan/ocsp_types.h>
diff --git a/src/lib/x509/ocsp_types.h b/src/lib/x509/ocsp_types.h
index 4f1ce87d6..8131addb1 100644
--- a/src/lib/x509/ocsp_types.h
+++ b/src/lib/x509/ocsp_types.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_OCSP_TYPES_H__
-#define BOTAN_OCSP_TYPES_H__
+#ifndef BOTAN_OCSP_TYPES_H_
+#define BOTAN_OCSP_TYPES_H_
#include <botan/x509cert.h>
#include <botan/asn1_time.h>
diff --git a/src/lib/x509/pkcs10.h b/src/lib/x509/pkcs10.h
index 16d41ab01..973b91b8a 100644
--- a/src/lib/x509/pkcs10.h
+++ b/src/lib/x509/pkcs10.h
@@ -6,8 +6,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_PKCS10_H__
-#define BOTAN_PKCS10_H__
+#ifndef BOTAN_PKCS10_H_
+#define BOTAN_PKCS10_H_
#include <botan/x509_obj.h>
#include <botan/x509_dn.h>
diff --git a/src/lib/x509/x509_ca.h b/src/lib/x509/x509_ca.h
index f9fd34d09..d10bdb338 100644
--- a/src/lib/x509/x509_ca.h
+++ b/src/lib/x509/x509_ca.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_X509_CA_H__
-#define BOTAN_X509_CA_H__
+#ifndef BOTAN_X509_CA_H_
+#define BOTAN_X509_CA_H_
#include <botan/x509cert.h>
#include <botan/x509_crl.h>
diff --git a/src/lib/x509/x509_crl.h b/src/lib/x509/x509_crl.h
index 9e1193f80..35eded502 100644
--- a/src/lib/x509/x509_crl.h
+++ b/src/lib/x509/x509_crl.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_X509_CRL_H__
-#define BOTAN_X509_CRL_H__
+#ifndef BOTAN_X509_CRL_H_
+#define BOTAN_X509_CRL_H_
#include <botan/x509_obj.h>
#include <botan/x509_dn.h>
diff --git a/src/lib/x509/x509_ext.h b/src/lib/x509/x509_ext.h
index a77edc194..bd2ec86c3 100644
--- a/src/lib/x509/x509_ext.h
+++ b/src/lib/x509/x509_ext.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_X509_EXTENSIONS_H__
-#define BOTAN_X509_EXTENSIONS_H__
+#ifndef BOTAN_X509_EXTENSIONS_H_
+#define BOTAN_X509_EXTENSIONS_H_
#include <botan/asn1_obj.h>
#include <botan/asn1_oid.h>
diff --git a/src/lib/x509/x509_obj.h b/src/lib/x509/x509_obj.h
index 947568c51..fdce9cb1f 100644
--- a/src/lib/x509/x509_obj.h
+++ b/src/lib/x509/x509_obj.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_X509_OBJECT_H__
-#define BOTAN_X509_OBJECT_H__
+#ifndef BOTAN_X509_OBJECT_H_
+#define BOTAN_X509_OBJECT_H_
#include <botan/asn1_obj.h>
#include <botan/x509_key.h>
diff --git a/src/lib/x509/x509cert.h b/src/lib/x509/x509cert.h
index ebd3d44aa..f2100c8b9 100644
--- a/src/lib/x509/x509cert.h
+++ b/src/lib/x509/x509cert.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_X509_CERTS_H__
-#define BOTAN_X509_CERTS_H__
+#ifndef BOTAN_X509_CERTS_H_
+#define BOTAN_X509_CERTS_H_
#include <botan/x509_obj.h>
#include <botan/x509_dn.h>
diff --git a/src/lib/x509/x509path.h b/src/lib/x509/x509path.h
index 0c1326e73..9a7f9542f 100644
--- a/src/lib/x509/x509path.h
+++ b/src/lib/x509/x509path.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_X509_CERT_PATH_VALIDATION_H__
-#define BOTAN_X509_CERT_PATH_VALIDATION_H__
+#ifndef BOTAN_X509_CERT_PATH_VALIDATION_H_
+#define BOTAN_X509_CERT_PATH_VALIDATION_H_
#include <botan/cert_status.h>
#include <botan/x509cert.h>
diff --git a/src/lib/x509/x509self.h b/src/lib/x509/x509self.h
index a6ce48cfa..b39f8bdd1 100644
--- a/src/lib/x509/x509self.h
+++ b/src/lib/x509/x509self.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_X509_SELF_H__
-#define BOTAN_X509_SELF_H__
+#ifndef BOTAN_X509_SELF_H_
+#define BOTAN_X509_SELF_H_
#include <botan/x509cert.h>
#include <botan/x509_ext.h>
diff --git a/src/tests/test_pkcs11.h b/src/tests/test_pkcs11.h
index 8606612d3..a070c5f39 100644
--- a/src/tests/test_pkcs11.h
+++ b/src/tests/test_pkcs11.h
@@ -4,8 +4,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_TESTS_PKCS11_H__
-#define BOTAN_TESTS_PKCS11_H__
+#ifndef BOTAN_TESTS_PKCS11_H_
+#define BOTAN_TESTS_PKCS11_H_
#include "tests.h"
diff --git a/src/tests/test_pubkey.h b/src/tests/test_pubkey.h
index 5d8536496..998654c19 100644
--- a/src/tests/test_pubkey.h
+++ b/src/tests/test_pubkey.h
@@ -4,8 +4,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_TEST_PUBKEY_H__
-#define BOTAN_TEST_PUBKEY_H__
+#ifndef BOTAN_TEST_PUBKEY_H_
+#define BOTAN_TEST_PUBKEY_H_
#include "tests.h"
diff --git a/src/tests/test_rng.h b/src/tests/test_rng.h
index 6e5486440..e3ae4af9b 100644
--- a/src/tests/test_rng.h
+++ b/src/tests/test_rng.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_TESTS_FIXED_RNG_H__
-#define BOTAN_TESTS_FIXED_RNG_H__
+#ifndef BOTAN_TESTS_FIXED_RNG_H_
+#define BOTAN_TESTS_FIXED_RNG_H_
#include "tests.h"
#include <deque>
diff --git a/src/tests/tests.h b/src/tests/tests.h
index 16b968bd4..32b654bbd 100644
--- a/src/tests/tests.h
+++ b/src/tests/tests.h
@@ -5,8 +5,8 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#ifndef BOTAN_TESTS_H__
-#define BOTAN_TESTS_H__
+#ifndef BOTAN_TESTS_H_
+#define BOTAN_TESTS_H_
#include <botan/build.h>
#include <botan/rng.h>