diff --git a/CMakeLists.txt b/CMakeLists.txt
index c321fcff..79efc7e6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -441,4 +441,4 @@ add_library(
 add_subdirectory(boringssl)
 add_subdirectory(protobuf)
 
-#target_link_libraries(test_quic_server quic ssl crypto -pthread ${BASE_ARCH_LIBRARIES})
+#target_link_libraries(test_quic_server quic bssl bsslcrypto -pthread ${BASE_ARCH_LIBRARIES})
diff --git a/boringssl/bssl-badsyms.txt b/boringssl/bssl-badsyms.txt
new file mode 100644
index 00000000..fbef9ca8
--- /dev/null
+++ b/boringssl/bssl-badsyms.txt
@@ -0,0 +1,3043 @@
+a2d_ASN1_OBJECT
+a2i_ASN1_ENUMERATED
+a2i_ASN1_INTEGER
+a2i_ASN1_STRING
+a2i_GENERAL_NAME
+a2i_ipadd
+a2i_IPADDRESS
+a2i_IPADDRESS_NC
+ACCESS_DESCRIPTION_free
+ACCESS_DESCRIPTION_it
+ACCESS_DESCRIPTION_new
+AES_cbc_encrypt
+AES_cfb128_encrypt
+AES_CMAC
+AES_ctr128_encrypt
+AES_decrypt
+AES_ecb_encrypt
+AES_encrypt
+aesni_cbc_encrypt
+aesni_ccm64_decrypt_blocks
+aesni_ccm64_encrypt_blocks
+aesni_ctr32_encrypt_blocks
+aesni_decrypt
+aesni_ecb_encrypt
+aesni_encrypt
+aesni_gcm_decrypt
+aesni_gcm_encrypt
+aesni_set_decrypt_key
+aesni_set_encrypt_key
+aesni_xts_decrypt
+aesni_xts_encrypt
+AES_ofb128_encrypt
+AES_set_decrypt_key
+AES_set_encrypt_key
+asm_AES_cbc_encrypt
+asm_AES_decrypt
+asm_AES_encrypt
+asm_AES_set_decrypt_key
+asm_AES_set_encrypt_key
+asm_RC4
+asm_RC4_set_key
+ASN1_ANY_it
+ASN1_BIT_STRING_check
+ASN1_BIT_STRING_free
+ASN1_BIT_STRING_get_bit
+ASN1_BIT_STRING_it
+ASN1_BIT_STRING_name_print
+ASN1_BIT_STRING_new
+ASN1_BIT_STRING_num_asc
+ASN1_BIT_STRING_set
+ASN1_BIT_STRING_set_asc
+ASN1_BIT_STRING_set_bit
+ASN1_BMPSTRING_free
+ASN1_BMPSTRING_it
+ASN1_BMPSTRING_new
+ASN1_BOOLEAN_it
+ASN1_check_infinite_end
+ASN1_const_check_infinite_end
+asn1_const_Finish
+ASN1_d2i_bio
+ASN1_d2i_fp
+ASN1_digest
+asn1_do_adb
+ASN1_dup
+asn1_enc_free
+asn1_enc_init
+asn1_enc_restore
+asn1_enc_save
+ASN1_ENUMERATED_free
+ASN1_ENUMERATED_get
+ASN1_ENUMERATED_it
+ASN1_ENUMERATED_new
+ASN1_ENUMERATED_set
+ASN1_ENUMERATED_to_BN
+asn1_ex_c2i
+asn1_ex_i2c
+ASN1_FBOOLEAN_it
+asn1_Finish
+ASN1_GENERALIZEDTIME_adj
+ASN1_GENERALIZEDTIME_check
+ASN1_GENERALIZEDTIME_free
+ASN1_GENERALIZEDTIME_it
+ASN1_GENERALIZEDTIME_new
+ASN1_GENERALIZEDTIME_print
+ASN1_GENERALIZEDTIME_set
+ASN1_GENERALIZEDTIME_set_string
+asn1_generalizedtime_to_tm
+ASN1_GENERALSTRING_free
+ASN1_GENERALSTRING_it
+ASN1_GENERALSTRING_new
+ASN1_generate_nconf
+ASN1_generate_v3
+asn1_get_choice_selector
+asn1_get_field_ptr
+ASN1_get_object
+asn1_GetSequence
+ASN1_i2d_bio
+ASN1_i2d_fp
+ASN1_IA5STRING_free
+ASN1_IA5STRING_it
+ASN1_IA5STRING_new
+ASN1_INTEGER_cmp
+ASN1_INTEGER_dup
+ASN1_INTEGER_free
+ASN1_INTEGER_get
+ASN1_INTEGER_it
+ASN1_INTEGER_new
+ASN1_INTEGER_set
+ASN1_INTEGER_to_BN
+ASN1_item_d2i
+ASN1_item_d2i_bio
+ASN1_item_d2i_fp
+ASN1_item_digest
+ASN1_item_dup
+ASN1_item_ex_d2i
+ASN1_item_ex_free
+ASN1_item_ex_i2d
+ASN1_item_ex_new
+ASN1_item_free
+ASN1_item_i2d
+ASN1_item_i2d_bio
+ASN1_item_i2d_fp
+ASN1_item_ndef_i2d
+ASN1_item_new
+ASN1_item_pack
+ASN1_item_print
+ASN1_item_sign
+ASN1_item_sign_ctx
+ASN1_item_unpack
+ASN1_item_verify
+ASN1_mbstring_copy
+ASN1_mbstring_ncopy
+ASN1_NULL_free
+ASN1_NULL_it
+ASN1_NULL_new
+ASN1_OBJECT_create
+ASN1_OBJECT_free
+ASN1_OBJECT_it
+ASN1_OBJECT_new
+ASN1_object_size
+ASN1_OCTET_STRING_cmp
+ASN1_OCTET_STRING_dup
+ASN1_OCTET_STRING_free
+ASN1_OCTET_STRING_it
+ASN1_OCTET_STRING_NDEF_it
+ASN1_OCTET_STRING_new
+ASN1_OCTET_STRING_set
+ASN1_parse
+ASN1_parse_dump
+ASN1_PCTX_free
+ASN1_PCTX_get_cert_flags
+ASN1_PCTX_get_flags
+ASN1_PCTX_get_nm_flags
+ASN1_PCTX_get_oid_flags
+ASN1_PCTX_get_str_flags
+ASN1_PCTX_new
+ASN1_PCTX_set_cert_flags
+ASN1_PCTX_set_flags
+ASN1_PCTX_set_nm_flags
+ASN1_PCTX_set_oid_flags
+ASN1_PCTX_set_str_flags
+ASN1_primitive_free
+ASN1_primitive_new
+ASN1_PRINTABLE_free
+ASN1_PRINTABLE_it
+ASN1_PRINTABLE_new
+ASN1_PRINTABLESTRING_free
+ASN1_PRINTABLESTRING_it
+ASN1_PRINTABLESTRING_new
+ASN1_PRINTABLE_type
+ASN1_put_eoc
+ASN1_put_object
+asn1_refcount_dec_and_test_zero
+asn1_refcount_set_one
+ASN1_SEQUENCE_ANY_it
+ASN1_SEQUENCE_it
+ASN1_SET_ANY_it
+asn1_set_choice_selector
+ASN1_STRING_cmp
+ASN1_STRING_copy
+ASN1_STRING_data
+ASN1_STRING_dup
+ASN1_STRING_free
+ASN1_STRING_get_default_mask
+ASN1_STRING_length
+ASN1_STRING_length_set
+ASN1_STRING_new
+ASN1_STRING_print
+ASN1_STRING_print_ex
+ASN1_STRING_print_ex_fp
+ASN1_STRING_set
+ASN1_STRING_set0
+ASN1_STRING_set_by_NID
+ASN1_STRING_set_default_mask
+ASN1_STRING_set_default_mask_asc
+ASN1_STRING_TABLE_add
+ASN1_STRING_TABLE_cleanup
+ASN1_STRING_TABLE_get
+ASN1_STRING_to_UTF8
+ASN1_STRING_type
+ASN1_STRING_type_new
+ASN1_T61STRING_free
+ASN1_T61STRING_it
+ASN1_T61STRING_new
+ASN1_tag2bit
+ASN1_tag2str
+ASN1_TBOOLEAN_it
+ASN1_template_d2i
+ASN1_template_free
+ASN1_template_i2d
+ASN1_template_new
+asn1_template_print_ctx
+ASN1_TIME_adj
+ASN1_TIME_check
+ASN1_TIME_diff
+ASN1_TIME_free
+ASN1_TIME_it
+ASN1_TIME_new
+ASN1_TIME_print
+ASN1_TIME_set
+ASN1_TIME_set_string
+ASN1_TIME_to_generalizedtime
+ASN1_TYPE_cmp
+ASN1_TYPE_free
+ASN1_TYPE_get
+ASN1_TYPE_new
+ASN1_TYPE_set
+ASN1_TYPE_set1
+ASN1_UNIVERSALSTRING_free
+ASN1_UNIVERSALSTRING_it
+ASN1_UNIVERSALSTRING_new
+ASN1_UNIVERSALSTRING_to_string
+ASN1_UTCTIME_adj
+ASN1_UTCTIME_check
+ASN1_UTCTIME_cmp_time_t
+ASN1_UTCTIME_free
+ASN1_UTCTIME_it
+ASN1_UTCTIME_new
+ASN1_UTCTIME_print
+ASN1_UTCTIME_set
+ASN1_UTCTIME_set_string
+asn1_utctime_to_tm
+ASN1_UTF8STRING_free
+ASN1_UTF8STRING_it
+ASN1_UTF8STRING_new
+ASN1_VISIBLESTRING_free
+ASN1_VISIBLESTRING_it
+ASN1_VISIBLESTRING_new
+AUTHORITY_INFO_ACCESS_free
+AUTHORITY_INFO_ACCESS_it
+AUTHORITY_INFO_ACCESS_new
+AUTHORITY_KEYID_free
+AUTHORITY_KEYID_it
+AUTHORITY_KEYID_new
+BASIC_CONSTRAINTS_free
+BASIC_CONSTRAINTS_it
+BASIC_CONSTRAINTS_new
+BIGNUM_it
+BIO_append_filename
+BIO_asn1_get_prefix
+BIO_asn1_get_suffix
+BIO_asn1_set_prefix
+BIO_asn1_set_suffix
+BIO_callback_ctrl
+BIO_clear_flags
+BIO_clear_retry_flags
+bio_clear_socket_error
+BIO_copy_next_retry
+BIO_ctrl
+BIO_ctrl_get_read_request
+BIO_ctrl_get_write_guarantee
+BIO_ctrl_pending
+BIO_do_connect
+BIO_f_asn1
+BIO_f_buffer
+bio_fd_should_retry
+BIO_find_type
+BIO_flush
+BIO_free
+BIO_free_all
+BIO_get_callback_arg
+BIO_get_fd
+BIO_get_fp
+BIO_get_mem_data
+BIO_get_mem_ptr
+BIO_get_retry_flags
+BIO_get_retry_reason
+BIO_gets
+BIO_hexdump
+BIO_indent
+BIO_int_ctrl
+bio_ip_and_port_to_socket_and_addr
+BIO_mem_contents
+BIO_method_type
+BIO_new
+BIO_new_bio_pair
+BIO_new_bio_pair_external_buf
+BIO_new_connect
+BIO_new_fd
+BIO_new_file
+BIO_new_fp
+BIO_new_mem_buf
+BIO_new_NDEF
+BIO_new_socket
+BIO_next
+BIO_number_read
+BIO_number_written
+BIO_pending
+BIO_pop
+BIO_print_errors
+BIO_printf
+BIO_ptr_ctrl
+BIO_push
+BIO_puts
+BIO_read
+BIO_read_asn1
+BIO_read_filename
+BIO_reset
+BIO_rw_filename
+BIO_s_connect
+BIO_set_callback
+BIO_set_callback_arg
+BIO_set_close
+BIO_set_conn_hostname
+BIO_set_conn_port
+BIO_set_fd
+BIO_set_flags
+BIO_set_fp
+BIO_set_mem_buf
+BIO_set_mem_eof_return
+BIO_set_nbio
+BIO_set_read_buffer_size
+BIO_set_retry_read
+BIO_set_retry_write
+BIO_set_write_buffer_size
+BIO_s_fd
+BIO_s_file
+BIO_should_io_special
+BIO_should_read
+BIO_should_retry
+BIO_should_write
+BIO_shutdown_wr
+BIO_s_mem
+BIO_snprintf
+bio_sock_error
+bio_socket_nbio
+BIO_s_socket
+BIO_test_flags
+BIO_up_ref
+BIO_vfree
+BIO_vsnprintf
+BIO_wpending
+BIO_write
+BIO_write_filename
+BIO_zero_copy_get_read_buf
+BIO_zero_copy_get_read_buf_done
+BIO_zero_copy_get_write_buf
+BIO_zero_copy_get_write_buf_done
+BN_abs_is_word
+BN_add
+BN_add_word
+bn_add_words
+BN_asc2bn
+BN_bin2bn
+BN_BLINDING_convert
+BN_BLINDING_free
+BN_BLINDING_invert
+BN_BLINDING_new
+BN_bn2bin
+BN_bn2bin_padded
+BN_bn2cbb_padded
+BN_bn2dec
+BN_bn2hex
+BN_bn2mpi
+BN_clear
+BN_clear_bit
+BN_clear_free
+BN_cmp
+bn_cmp_part_words
+bn_cmp_words
+BN_copy
+bn_correct_top
+BN_CTX_end
+BN_CTX_free
+BN_CTX_get
+BN_CTX_new
+BN_CTX_start
+BN_dec2bn
+BN_div
+BN_div_word
+BN_dup
+BN_exp
+bn_expand
+BN_free
+bn_from_montgomery
+BN_from_montgomery
+bn_gather5
+BN_gcd
+BN_GENCB_call
+BN_GENCB_set
+BN_generate_dsa_nonce
+BN_generate_prime_ex
+BN_get_flags
+BN_get_word
+BN_hex2bn
+BN_init
+BN_is_bit_set
+BN_is_negative
+BN_is_odd
+BN_is_one
+BN_is_prime_ex
+BN_is_prime_fasttest_ex
+BN_is_word
+BN_is_zero
+BN_kronecker
+BN_lshift
+BN_lshift1
+BN_marshal_asn1
+BN_mask_bits
+BN_mod_add
+BN_mod_add_quick
+BN_mod_exp
+BN_mod_exp2_mont
+BN_mod_exp_mont
+BN_mod_exp_mont_consttime
+BN_mod_exp_mont_word
+BN_mod_inverse
+BN_mod_inverse_ex
+BN_mod_lshift
+BN_mod_lshift1
+BN_mod_lshift1_quick
+BN_mod_lshift_quick
+BN_mod_mul
+BN_mod_mul_montgomery
+BN_mod_sqr
+BN_mod_sqrt
+BN_mod_sub
+BN_mod_sub_quick
+BN_mod_word
+BN_MONT_CTX_copy
+BN_MONT_CTX_free
+BN_MONT_CTX_new
+BN_MONT_CTX_set
+BN_MONT_CTX_set_locked
+BN_mpi2bn
+BN_mul
+bn_mul_add_words
+bn_mul_comba4
+bn_mul_comba8
+bn_mul_mont
+bn_mul_mont_gather5
+BN_mul_word
+bn_mul_words
+BN_new
+BN_nnmod
+BN_num_bits
+BN_num_bits_word
+BN_num_bytes
+BN_one
+BN_parse_asn1_unsigned
+BN_parse_asn1_unsigned_buggy
+bn_power5
+BN_primality_test
+BN_print
+BN_print_fp
+BN_pseudo_rand
+BN_pseudo_rand_range
+BN_rand
+BN_rand_range
+BN_rshift
+BN_rshift1
+bn_scatter5
+BN_set_bit
+BN_set_flags
+BN_set_negative
+BN_set_word
+bn_set_words
+BN_sqr
+bn_sqr8x_internal
+bn_sqr_comba4
+bn_sqr_comba8
+BN_sqrt
+bn_sqr_words
+BN_sub
+BN_sub_word
+bn_sub_words
+BN_to_ASN1_ENUMERATED
+BN_to_ASN1_INTEGER
+BN_to_montgomery
+BN_uadd
+BN_ucmp
+BN_usub
+BN_value_one
+bn_wexpand
+BN_with_flags
+BN_zero
+bsaes_cbc_encrypt
+bsaes_ctr32_encrypt_blocks
+bsaes_xts_decrypt
+bsaes_xts_encrypt
+BUF_memdup
+BUF_MEM_free
+BUF_MEM_grow
+BUF_MEM_grow_clean
+BUF_MEM_new
+BUF_strdup
+BUF_strlcat
+BUF_strlcpy
+BUF_strndup
+BUF_strnlen
+c2i_ASN1_BIT_STRING
+c2i_ASN1_INTEGER
+c2i_ASN1_OBJECT
+CBB_add_asn1
+CBB_add_asn1_uint64
+CBB_add_bytes
+CBB_add_space
+CBB_add_u16
+CBB_add_u16_length_prefixed
+CBB_add_u24
+CBB_add_u24_length_prefixed
+CBB_add_u8
+CBB_add_u8_length_prefixed
+CBB_cleanup
+CBB_data
+CBB_did_write
+CBB_discard_child
+CBB_finish
+CBB_finish_i2d
+CBB_flush
+CBB_init
+CBB_init_fixed
+CBB_len
+CBB_reserve
+CBB_zero
+CBIGNUM_it
+CBS_asn1_ber_to_der
+CBS_contains_zero_byte
+CBS_copy_bytes
+CBS_data
+CBS_get_any_asn1_element
+CBS_get_any_ber_asn1_element
+CBS_get_asn1
+CBS_get_asn1_element
+CBS_get_asn1_implicit_string
+CBS_get_asn1_uint64
+CBS_get_bytes
+CBS_get_optional_asn1
+CBS_get_optional_asn1_bool
+CBS_get_optional_asn1_octet_string
+CBS_get_optional_asn1_uint64
+CBS_get_u16
+CBS_get_u16_length_prefixed
+CBS_get_u24
+CBS_get_u24_length_prefixed
+CBS_get_u32
+CBS_get_u8
+CBS_get_u8_length_prefixed
+CBS_init
+CBS_len
+CBS_mem_equal
+CBS_peek_asn1_tag
+CBS_skip
+CBS_stow
+CBS_strdup
+CERTIFICATEPOLICIES_free
+CERTIFICATEPOLICIES_it
+CERTIFICATEPOLICIES_new
+ChaCha20_ctr32
+CMAC_CTX_free
+CMAC_CTX_new
+CMAC_Final
+CMAC_Init
+CMAC_Reset
+CMAC_Update
+CONF_modules_free
+CONF_modules_load_file
+CONF_parse_list
+CONF_VALUE_new
+CRL_DIST_POINTS_free
+CRL_DIST_POINTS_it
+CRL_DIST_POINTS_new
+CRYPTO_cbc128_decrypt
+CRYPTO_cbc128_encrypt
+CRYPTO_cfb128_1_encrypt
+CRYPTO_cfb128_8_encrypt
+CRYPTO_cfb128_encrypt
+CRYPTO_chacha_20
+CRYPTO_cleanup_all_ex_data
+CRYPTO_ctr128_encrypt
+CRYPTO_ctr128_encrypt_ctr32
+CRYPTO_dup_ex_data
+CRYPTO_free_ex_data
+CRYPTO_gcm128_aad
+CRYPTO_gcm128_decrypt
+CRYPTO_gcm128_decrypt_ctr32
+CRYPTO_gcm128_encrypt
+CRYPTO_gcm128_encrypt_ctr32
+CRYPTO_gcm128_finish
+CRYPTO_gcm128_init
+CRYPTO_gcm128_setiv
+CRYPTO_gcm128_tag
+crypto_gcm_clmul_enabled
+CRYPTO_get_ex_data
+CRYPTO_get_ex_new_index
+CRYPTO_get_lock_name
+CRYPTO_get_thread_local
+CRYPTO_library_init
+CRYPTO_malloc_init
+CRYPTO_memcmp
+CRYPTO_MUTEX_cleanup
+CRYPTO_MUTEX_init
+CRYPTO_MUTEX_lock_read
+CRYPTO_MUTEX_lock_write
+CRYPTO_MUTEX_unlock
+CRYPTO_new_ex_data
+CRYPTO_num_locks
+CRYPTO_ofb128_encrypt
+CRYPTO_once
+CRYPTO_poly1305_finish
+CRYPTO_poly1305_init
+CRYPTO_poly1305_update
+CRYPTO_rdrand
+CRYPTO_rdrand_multiple8_buf
+CRYPTO_refcount_dec_and_test_zero
+CRYPTO_refcount_inc
+CRYPTO_set_add_lock_callback
+CRYPTO_set_dynlock_create_callback
+CRYPTO_set_dynlock_destroy_callback
+CRYPTO_set_dynlock_lock_callback
+CRYPTO_set_ex_data
+CRYPTO_set_id_callback
+CRYPTO_set_locking_callback
+CRYPTO_set_thread_local
+CRYPTO_STATIC_MUTEX_lock_read
+CRYPTO_STATIC_MUTEX_lock_write
+CRYPTO_STATIC_MUTEX_unlock
+CRYPTO_sysrand
+CRYPTO_THREADID_current
+CRYPTO_THREADID_set_callback
+CRYPTO_THREADID_set_numeric
+CRYPTO_THREADID_set_pointer
+custom_ext_add_clienthello
+custom_ext_add_serverhello
+custom_ext_parse_clienthello
+custom_ext_parse_serverhello
+d2i_ACCESS_DESCRIPTION
+d2i_ASN1_BIT_STRING
+d2i_ASN1_BMPSTRING
+d2i_ASN1_BOOLEAN
+d2i_ASN1_bytes
+d2i_ASN1_ENUMERATED
+d2i_ASN1_GENERALIZEDTIME
+d2i_ASN1_GENERALSTRING
+d2i_ASN1_IA5STRING
+d2i_ASN1_INTEGER
+d2i_ASN1_NULL
+d2i_ASN1_OBJECT
+d2i_ASN1_OCTET_STRING
+d2i_ASN1_PRINTABLE
+d2i_ASN1_PRINTABLESTRING
+d2i_ASN1_SEQUENCE_ANY
+d2i_ASN1_SET_ANY
+d2i_ASN1_T61STRING
+d2i_ASN1_TIME
+d2i_ASN1_TYPE
+d2i_ASN1_type_bytes
+d2i_ASN1_UINTEGER
+d2i_ASN1_UNIVERSALSTRING
+d2i_ASN1_UTCTIME
+d2i_ASN1_UTF8STRING
+d2i_ASN1_VISIBLESTRING
+d2i_AUTHORITY_INFO_ACCESS
+d2i_AUTHORITY_KEYID
+d2i_AutoPrivateKey
+d2i_BASIC_CONSTRAINTS
+d2i_CERTIFICATEPOLICIES
+d2i_CRL_DIST_POINTS
+d2i_DHparams
+d2i_DIRECTORYSTRING
+d2i_DISPLAYTEXT
+d2i_DIST_POINT
+d2i_DIST_POINT_NAME
+d2i_DSAparams
+d2i_DSAPrivateKey
+d2i_DSAPrivateKey_bio
+d2i_DSAPrivateKey_fp
+d2i_DSA_PUBKEY
+d2i_DSA_PUBKEY_bio
+d2i_DSA_PUBKEY_fp
+d2i_DSAPublicKey
+d2i_DSA_SIG
+d2i_ECDSA_SIG
+d2i_ECParameters
+d2i_ECPrivateKey
+d2i_ECPrivateKey_bio
+d2i_ECPrivateKey_fp
+d2i_EC_PUBKEY
+d2i_EC_PUBKEY_bio
+d2i_EC_PUBKEY_fp
+d2i_EDIPARTYNAME
+d2i_EXTENDED_KEY_USAGE
+d2i_GENERAL_NAME
+d2i_GENERAL_NAMES
+d2i_ISSUING_DIST_POINT
+d2i_NETSCAPE_SPKAC
+d2i_NETSCAPE_SPKI
+d2i_NOTICEREF
+d2i_OTHERNAME
+d2i_PBE2PARAM
+d2i_PBEPARAM
+d2i_PBKDF2PARAM
+d2i_PKCS12
+d2i_PKCS12_bio
+d2i_PKCS12_fp
+d2i_PKCS8_bio
+d2i_PKCS8_fp
+d2i_PKCS8PrivateKey_bio
+d2i_PKCS8PrivateKey_fp
+d2i_PKCS8_PRIV_KEY_INFO
+d2i_PKCS8_PRIV_KEY_INFO_bio
+d2i_PKCS8_PRIV_KEY_INFO_fp
+d2i_PKEY_USAGE_PERIOD
+d2i_POLICYINFO
+d2i_POLICYQUALINFO
+d2i_PrivateKey
+d2i_PrivateKey_bio
+d2i_PrivateKey_fp
+d2i_PROXY_CERT_INFO_EXTENSION
+d2i_PROXY_POLICY
+d2i_PUBKEY
+d2i_PUBKEY_bio
+d2i_PUBKEY_fp
+d2i_RSAPrivateKey
+d2i_RSAPrivateKey_bio
+d2i_RSAPrivateKey_fp
+d2i_RSA_PSS_PARAMS
+d2i_RSA_PUBKEY
+d2i_RSA_PUBKEY_bio
+d2i_RSA_PUBKEY_fp
+d2i_RSAPublicKey
+d2i_RSAPublicKey_bio
+d2i_RSAPublicKey_fp
+d2i_SSL_SESSION
+d2i_SSL_SESSION_bio
+d2i_SXNET
+d2i_SXNETID
+d2i_USERNOTICE
+d2i_X509
+d2i_X509_ALGOR
+d2i_X509_ALGORS
+d2i_X509_ATTRIBUTE
+d2i_X509_AUX
+d2i_X509_bio
+d2i_X509_CERT_AUX
+d2i_X509_CERT_PAIR
+d2i_X509_CINF
+d2i_X509_CRL
+d2i_X509_CRL_bio
+d2i_X509_CRL_fp
+d2i_X509_CRL_INFO
+d2i_X509_EXTENSION
+d2i_X509_EXTENSIONS
+d2i_X509_fp
+d2i_X509_NAME
+d2i_X509_NAME_ENTRY
+d2i_X509_PUBKEY
+d2i_X509_REQ
+d2i_X509_REQ_bio
+d2i_X509_REQ_fp
+d2i_X509_REQ_INFO
+d2i_X509_REVOKED
+d2i_X509_SIG
+d2i_X509_VAL
+DES_decrypt3
+DES_ecb3_encrypt
+DES_ecb_encrypt
+DES_ede2_cbc_encrypt
+DES_ede3_cbc_encrypt
+DES_encrypt3
+DES_ncbc_encrypt
+DES_set_key
+DES_set_key_unchecked
+DES_set_odd_parity
+DH_check
+DH_check_pub_key
+DH_check_standard_parameters
+DH_compute_key
+DH_free
+DH_generate_key
+DH_generate_parameters_ex
+DH_get_1024_160
+DH_get_2048_224
+DH_get_2048_256
+DH_get_ex_data
+DH_get_ex_new_index
+DH_new
+DH_num_bits
+DHparams_dup
+DHparams_it
+DH_set_ex_data
+DH_size
+DH_up_ref
+DIRECTORYSTRING_free
+DIRECTORYSTRING_it
+DIRECTORYSTRING_new
+DISPLAYTEXT_free
+DISPLAYTEXT_it
+DISPLAYTEXT_new
+DIST_POINT_free
+DIST_POINT_it
+DIST_POINT_NAME_free
+DIST_POINT_NAME_it
+DIST_POINT_NAME_new
+DIST_POINT_new
+DIST_POINT_set_dpname
+dsa_asn1_meth
+DSA_check_signature
+DSA_do_check_signature
+DSA_do_sign
+DSA_do_verify
+DSA_dup_DH
+DSA_free
+DSA_generate_key
+DSA_generate_parameters_ex
+DSA_get_ex_data
+DSA_get_ex_new_index
+DSA_marshal_parameters
+DSA_marshal_private_key
+DSA_marshal_public_key
+DSA_new
+DSAparams_dup
+DSA_parse_parameters
+DSA_parse_private_key
+DSA_parse_public_key
+DSA_set_ex_data
+DSA_SIG_free
+DSA_SIG_marshal
+DSA_sign
+DSA_SIG_new
+DSA_sign_setup
+DSA_SIG_parse
+DSA_size
+DSA_up_ref
+DSA_verify
+dtls1_accept
+dtls1_buffer_message
+dtls1_check_timeout_num
+dtls1_clear_record_buffer
+dtls1_connect
+dtls1_dispatch_alert
+dtls1_do_handshake_write
+dtls1_double_timeout
+dtls1_free
+dtls1_get_message
+dtls1_get_message_header
+dtls1_handshake_write
+dtls1_hm_fragment_free
+dtls1_is_timer_expired
+dtls1_min_mtu
+dtls1_new
+dtls1_read_app_data
+dtls1_read_bytes
+dtls1_read_change_cipher_spec
+dtls1_read_close_notify
+dtls1_read_failed
+dtls1_retransmit_buffered_messages
+dtls1_send_change_cipher_spec
+dtls1_set_handshake_header
+dtls1_set_message_header
+dtls1_start_timer
+dtls1_stop_timer
+dtls1_supports_cipher
+dtls1_write_app_data
+dtls1_write_bytes
+DTLS_client_method
+DTLS_method
+dtls_open_record
+dtls_seal_record
+DTLS_server_method
+DTLSv1_2_client_method
+DTLSv1_2_method
+DTLSv1_2_server_method
+DTLSv1_client_method
+DTLSv1_get_timeout
+DTLSv1_handle_timeout
+DTLSv1_method
+DTLSv1_server_method
+ec_asn1_meth
+ECDH_compute_key
+ECDSA_do_sign
+ECDSA_do_sign_ex
+ECDSA_do_verify
+ECDSA_SIG_free
+ECDSA_SIG_from_bytes
+ECDSA_SIG_marshal
+ECDSA_SIG_max_len
+ECDSA_sign
+ECDSA_SIG_new
+ECDSA_sign_ex
+ECDSA_sign_setup
+ECDSA_SIG_parse
+ECDSA_SIG_to_bytes
+ECDSA_size
+ECDSA_verify
+EC_get_builtin_curves
+ec_GFp_mont_field_decode
+ec_GFp_mont_field_encode
+ec_GFp_mont_field_mul
+ec_GFp_mont_field_sqr
+ec_GFp_mont_group_copy
+ec_GFp_mont_group_finish
+ec_GFp_mont_group_init
+ec_GFp_mont_group_set_curve
+EC_GFp_mont_method
+EC_GFp_nistp224_method
+EC_GFp_nistp256_method
+ec_GFp_nistp_recode_scalar_bits
+EC_GFp_nistz256_method
+ec_GFp_simple_add
+ec_GFp_simple_cmp
+ec_GFp_simple_dbl
+ec_GFp_simple_field_mul
+ec_GFp_simple_field_sqr
+ec_GFp_simple_get_Jprojective_coordinates_GFp
+ec_GFp_simple_group_copy
+ec_GFp_simple_group_finish
+ec_GFp_simple_group_get_curve
+ec_GFp_simple_group_get_degree
+ec_GFp_simple_group_init
+ec_GFp_simple_group_set_curve
+ec_GFp_simple_invert
+ec_GFp_simple_is_at_infinity
+ec_GFp_simple_is_on_curve
+ec_GFp_simple_make_affine
+ec_GFp_simple_point_clear_finish
+ec_GFp_simple_point_copy
+ec_GFp_simple_point_finish
+ec_GFp_simple_point_init
+ec_GFp_simple_point_set_affine_coordinates
+ec_GFp_simple_point_set_to_infinity
+ec_GFp_simple_points_make_affine
+ec_GFp_simple_set_compressed_coordinates
+ec_GFp_simple_set_Jprojective_coordinates_GFp
+EC_GROUP_cmp
+ec_group_copy
+EC_GROUP_dup
+EC_GROUP_free
+EC_GROUP_get0_generator
+EC_GROUP_get0_order
+EC_GROUP_get_cofactor
+EC_GROUP_get_curve_GFp
+EC_GROUP_get_curve_name
+EC_GROUP_get_degree
+ec_group_get_mont_data
+EC_GROUP_get_order
+EC_GROUP_method_of
+ec_group_new
+EC_GROUP_new_arbitrary
+EC_GROUP_new_by_curve_name
+EC_GROUP_new_curve_GFp
+EC_GROUP_set_asn1_flag
+EC_GROUP_set_generator
+EC_GROUP_set_point_conversion_form
+EC_KEY_check_key
+EC_KEY_copy
+EC_KEY_dup
+EC_KEY_free
+EC_KEY_generate_key
+EC_KEY_get0_group
+EC_KEY_get0_private_key
+EC_KEY_get0_public_key
+EC_KEY_get_conv_form
+EC_KEY_get_enc_flags
+EC_KEY_get_ex_data
+EC_KEY_get_ex_new_index
+EC_KEY_is_opaque
+EC_KEY_marshal_curve_name
+EC_KEY_marshal_private_key
+EC_KEY_new
+EC_KEY_new_by_curve_name
+EC_KEY_new_method
+EC_KEY_parse_curve_name
+EC_KEY_parse_parameters
+EC_KEY_parse_private_key
+EC_KEY_set_asn1_flag
+EC_KEY_set_conv_form
+EC_KEY_set_enc_flags
+EC_KEY_set_ex_data
+EC_KEY_set_group
+EC_KEY_set_private_key
+EC_KEY_set_public_key
+EC_KEY_set_public_key_affine_coordinates
+EC_KEY_up_ref
+EC_METHOD_get_field_type
+ec_pkey_meth
+ecp_nistz256_avx2_select_w7
+ecp_nistz256_from_mont
+ecp_nistz256_mul_mont
+ecp_nistz256_neg
+ecp_nistz256_point_add
+ecp_nistz256_point_add_affine
+ecp_nistz256_point_double
+ecp_nistz256_select_w5
+ecp_nistz256_select_w7
+ecp_nistz256_sqr_mont
+EC_POINT_add
+EC_POINT_clear_free
+EC_POINT_cmp
+EC_POINT_copy
+EC_POINT_dbl
+EC_POINT_dup
+EC_POINT_free
+EC_POINT_get_affine_coordinates_GFp
+EC_POINT_invert
+EC_POINT_is_at_infinity
+EC_POINT_is_on_curve
+EC_POINT_make_affine
+EC_POINT_mul
+EC_POINT_new
+EC_POINT_oct2point
+EC_POINT_point2cbb
+EC_POINT_point2oct
+EC_POINT_set_affine_coordinates_GFp
+EC_POINT_set_compressed_coordinates_GFp
+ec_point_set_Jprojective_coordinates_GFp
+EC_POINT_set_to_infinity
+EC_POINTs_make_affine
+ec_wNAF_mul
+ED25519_keypair
+ED25519_sign
+ED25519_verify
+EDIPARTYNAME_free
+EDIPARTYNAME_it
+EDIPARTYNAME_new
+ENGINE_free
+ENGINE_get_ECDSA_method
+ENGINE_get_RSA_method
+ENGINE_load_builtin_engines
+ENGINE_new
+ENGINE_set_ECDSA_method
+ENGINE_set_RSA_method
+ERR_add_error_data
+ERR_add_error_dataf
+ERR_clear_error
+ERR_clear_system_error
+ERR_error_string
+ERR_error_string_n
+ERR_free_strings
+ERR_func_error_string
+ERR_get_error
+ERR_get_error_line
+ERR_get_error_line_data
+ERR_get_next_error_library
+ERR_lib_error_string
+ERR_load_BIO_strings
+ERR_load_crypto_strings
+ERR_load_ERR_strings
+ERR_load_SSL_strings
+ERR_peek_error
+ERR_peek_error_line
+ERR_peek_error_line_data
+ERR_peek_last_error
+ERR_peek_last_error_line
+ERR_peek_last_error_line_data
+ERR_pop_to_mark
+ERR_print_errors
+ERR_print_errors_cb
+ERR_print_errors_fp
+ERR_put_error
+ERR_reason_error_string
+ERR_remove_state
+ERR_remove_thread_state
+ERR_set_mark
+EVP_add_cipher_alias
+EVP_add_digest
+EVP_aead_aes_128_cbc_sha1_ssl3
+EVP_aead_aes_128_cbc_sha1_tls
+EVP_aead_aes_128_cbc_sha1_tls_implicit_iv
+EVP_aead_aes_128_cbc_sha256_tls
+EVP_aead_aes_128_ctr_hmac_sha256
+EVP_aead_aes_128_gcm
+EVP_aead_aes_128_key_wrap
+EVP_aead_aes_256_cbc_sha1_ssl3
+EVP_aead_aes_256_cbc_sha1_tls
+EVP_aead_aes_256_cbc_sha1_tls_implicit_iv
+EVP_aead_aes_256_cbc_sha256_tls
+EVP_aead_aes_256_cbc_sha384_tls
+EVP_aead_aes_256_ctr_hmac_sha256
+EVP_aead_aes_256_gcm
+EVP_aead_aes_256_key_wrap
+EVP_aead_chacha20_poly1305
+EVP_aead_chacha20_poly1305_old
+EVP_AEAD_CTX_cleanup
+EVP_AEAD_CTX_get_iv
+EVP_AEAD_CTX_get_rc4_state
+EVP_AEAD_CTX_init
+EVP_AEAD_CTX_init_with_direction
+EVP_AEAD_CTX_open
+EVP_AEAD_CTX_seal
+EVP_AEAD_CTX_zero
+EVP_aead_des_ede3_cbc_sha1_ssl3
+EVP_aead_des_ede3_cbc_sha1_tls
+EVP_aead_des_ede3_cbc_sha1_tls_implicit_iv
+EVP_AEAD_key_length
+EVP_AEAD_max_overhead
+EVP_AEAD_max_tag_len
+EVP_AEAD_nonce_length
+EVP_aead_null_sha1_ssl3
+EVP_aead_null_sha1_tls
+EVP_aead_rc4_md5_ssl3
+EVP_aead_rc4_md5_tls
+EVP_aead_rc4_sha1_ssl3
+EVP_aead_rc4_sha1_tls
+EVP_aes_128_cbc
+EVP_aes_128_ctr
+EVP_aes_128_ecb
+EVP_aes_128_gcm
+EVP_aes_128_ofb
+EVP_aes_192_cbc
+EVP_aes_192_ctr
+EVP_aes_192_ecb
+EVP_aes_192_gcm
+EVP_aes_256_cbc
+EVP_aes_256_ctr
+EVP_aes_256_ecb
+EVP_aes_256_gcm
+EVP_aes_256_ofb
+EVP_BytesToKey
+EVP_Cipher
+EVP_CIPHER_block_size
+EVP_CIPHER_CTX_block_size
+EVP_CIPHER_CTX_cipher
+EVP_CIPHER_CTX_cleanup
+EVP_CIPHER_CTX_copy
+EVP_CIPHER_CTX_ctrl
+EVP_CIPHER_CTX_flags
+EVP_CIPHER_CTX_free
+EVP_CIPHER_CTX_get_app_data
+EVP_CIPHER_CTX_init
+EVP_CIPHER_CTX_iv_length
+EVP_CIPHER_CTX_key_length
+EVP_CIPHER_CTX_mode
+EVP_CIPHER_CTX_new
+EVP_CIPHER_CTX_nid
+EVP_CIPHER_CTX_set_app_data
+EVP_CIPHER_CTX_set_key_length
+EVP_CIPHER_CTX_set_padding
+EVP_CipherFinal_ex
+EVP_CIPHER_flags
+EVP_CipherInit
+EVP_CipherInit_ex
+EVP_CIPHER_iv_length
+EVP_CIPHER_key_length
+EVP_CIPHER_mode
+EVP_CIPHER_nid
+EVP_CipherUpdate
+EVP_cleanup
+EVP_DecodeBase64
+EVP_DecodeBlock
+EVP_DecodedLength
+EVP_DecodeFinal
+EVP_DecodeInit
+EVP_DecodeUpdate
+EVP_DecryptFinal_ex
+EVP_DecryptInit
+EVP_DecryptInit_ex
+EVP_DecryptUpdate
+EVP_des_cbc
+EVP_des_ecb
+EVP_des_ede
+EVP_des_ede3_cbc
+EVP_des_ede_cbc
+EVP_Digest
+EVP_DigestFinal
+EVP_DigestFinal_ex
+EVP_DigestInit
+EVP_DigestInit_ex
+EVP_DigestSignFinal
+EVP_DigestSignInit
+EVP_DigestSignUpdate
+EVP_DigestUpdate
+EVP_DigestVerifyFinal
+EVP_DigestVerifyInit
+EVP_DigestVerifyUpdate
+EVP_enc_null
+EVP_EncodeBlock
+EVP_EncodedLength
+EVP_EncodeFinal
+EVP_EncodeInit
+EVP_EncodeUpdate
+EVP_EncryptFinal_ex
+EVP_EncryptInit
+EVP_EncryptInit_ex
+EVP_EncryptUpdate
+EVP_get_cipherbyname
+EVP_get_cipherbynid
+EVP_get_digestbyname
+EVP_get_digestbynid
+EVP_get_digestbyobj
+EVP_has_aes_hardware
+EVP_marshal_private_key
+EVP_marshal_public_key
+EVP_md4
+EVP_md5
+EVP_md5_sha1
+EVP_MD_block_size
+EVP_MD_CTX_block_size
+EVP_MD_CTX_cleanup
+EVP_MD_CTX_copy
+EVP_MD_CTX_copy_ex
+EVP_MD_CTX_create
+EVP_MD_CTX_destroy
+EVP_MD_CTX_init
+EVP_MD_CTX_md
+EVP_MD_CTX_size
+EVP_MD_CTX_type
+EVP_MD_flags
+EVP_MD_size
+EVP_MD_type
+EVP_parse_private_key
+EVP_parse_public_key
+EVP_PKCS82PKEY
+EVP_PKEY2PKCS8
+EVP_PKEY_assign
+EVP_PKEY_assign_DSA
+EVP_PKEY_assign_EC_KEY
+EVP_PKEY_assign_RSA
+EVP_PKEY_bits
+EVP_PKEY_cmp
+EVP_PKEY_cmp_parameters
+EVP_PKEY_copy_parameters
+EVP_PKEY_CTX_ctrl
+EVP_PKEY_CTX_dup
+EVP_PKEY_CTX_free
+EVP_PKEY_CTX_get0_pkey
+EVP_PKEY_CTX_get0_rsa_oaep_label
+EVP_PKEY_CTX_get_rsa_mgf1_md
+EVP_PKEY_CTX_get_rsa_oaep_md
+EVP_PKEY_CTX_get_rsa_padding
+EVP_PKEY_CTX_get_rsa_pss_saltlen
+EVP_PKEY_CTX_get_signature_md
+EVP_PKEY_CTX_new
+EVP_PKEY_CTX_new_id
+EVP_PKEY_CTX_set0_rsa_oaep_label
+EVP_PKEY_CTX_set_rsa_keygen_bits
+EVP_PKEY_CTX_set_rsa_keygen_pubexp
+EVP_PKEY_CTX_set_rsa_mgf1_md
+EVP_PKEY_CTX_set_rsa_oaep_md
+EVP_PKEY_CTX_set_rsa_padding
+EVP_PKEY_CTX_set_rsa_pss_saltlen
+EVP_PKEY_CTX_set_signature_md
+EVP_PKEY_decrypt
+EVP_PKEY_decrypt_init
+EVP_PKEY_derive
+EVP_PKEY_derive_init
+EVP_PKEY_derive_set_peer
+EVP_PKEY_encrypt
+EVP_PKEY_encrypt_init
+EVP_PKEY_free
+EVP_PKEY_get0_DSA
+EVP_PKEY_get0_EC_KEY
+EVP_PKEY_get0_RSA
+EVP_PKEY_get1_DSA
+EVP_PKEY_get1_EC_KEY
+EVP_PKEY_get1_RSA
+EVP_PKEY_id
+EVP_PKEY_is_opaque
+EVP_PKEY_keygen
+EVP_PKEY_keygen_init
+EVP_PKEY_missing_parameters
+EVP_PKEY_new
+EVP_PKEY_print_params
+EVP_PKEY_print_private
+EVP_PKEY_print_public
+EVP_PKEY_set1_DSA
+EVP_PKEY_set1_EC_KEY
+EVP_PKEY_set1_RSA
+EVP_PKEY_set_type
+EVP_PKEY_sign
+EVP_PKEY_sign_init
+EVP_PKEY_size
+EVP_PKEY_supports_digest
+EVP_PKEY_type
+EVP_PKEY_up_ref
+EVP_PKEY_verify
+EVP_PKEY_verify_init
+EVP_PKEY_verify_recover
+EVP_PKEY_verify_recover_init
+EVP_rc2_40_cbc
+EVP_rc2_cbc
+EVP_rc4
+EVP_sha1
+EVP_sha224
+EVP_sha256
+EVP_sha384
+EVP_sha512
+EVP_SignFinal
+EVP_SignInit
+EVP_SignInit_ex
+EVP_SignUpdate
+EVP_tls_cbc_copy_mac
+EVP_tls_cbc_digest_record
+EVP_tls_cbc_record_digest_supported
+EVP_tls_cbc_remove_padding
+EVP_VerifyFinal
+EVP_VerifyInit
+EVP_VerifyInit_ex
+EVP_VerifyUpdate
+EXTENDED_KEY_USAGE_free
+EXTENDED_KEY_USAGE_it
+EXTENDED_KEY_USAGE_new
+FIPS_mode
+gcm_ghash_4bit
+gcm_ghash_avx
+gcm_ghash_clmul
+gcm_gmult_4bit
+gcm_gmult_avx
+gcm_gmult_clmul
+gcm_init_avx
+gcm_init_clmul
+GENERAL_NAME_cmp
+GENERAL_NAME_dup
+GENERAL_NAME_free
+GENERAL_NAME_get0_otherName
+GENERAL_NAME_get0_value
+GENERAL_NAME_it
+GENERAL_NAME_new
+GENERAL_NAME_print
+GENERAL_NAME_set0_othername
+GENERAL_NAME_set0_value
+GENERAL_NAMES_free
+GENERAL_NAMES_it
+GENERAL_NAMES_new
+GENERAL_SUBTREE_free
+GENERAL_SUBTREE_it
+GENERAL_SUBTREE_new
+hex_to_string
+HKDF
+HMAC
+HMAC_CTX_cleanup
+HMAC_CTX_copy
+HMAC_CTX_copy_ex
+HMAC_CTX_init
+HMAC_Final
+HMAC_Init
+HMAC_Init_ex
+HMAC_size
+HMAC_Update
+i2a_ACCESS_DESCRIPTION
+i2a_ASN1_ENUMERATED
+i2a_ASN1_INTEGER
+i2a_ASN1_OBJECT
+i2a_ASN1_STRING
+i2c_ASN1_BIT_STRING
+i2c_ASN1_INTEGER
+i2d_ACCESS_DESCRIPTION
+i2d_ASN1_BIT_STRING
+i2d_ASN1_BMPSTRING
+i2d_ASN1_BOOLEAN
+i2d_ASN1_bytes
+i2d_ASN1_ENUMERATED
+i2d_ASN1_GENERALIZEDTIME
+i2d_ASN1_GENERALSTRING
+i2d_ASN1_IA5STRING
+i2d_ASN1_INTEGER
+i2d_ASN1_NULL
+i2d_ASN1_OBJECT
+i2d_ASN1_OCTET_STRING
+i2d_ASN1_PRINTABLE
+i2d_ASN1_PRINTABLESTRING
+i2d_ASN1_SEQUENCE_ANY
+i2d_ASN1_SET_ANY
+i2d_ASN1_T61STRING
+i2d_ASN1_TIME
+i2d_ASN1_TYPE
+i2d_ASN1_UNIVERSALSTRING
+i2d_ASN1_UTCTIME
+i2d_ASN1_UTF8STRING
+i2d_ASN1_VISIBLESTRING
+i2d_AUTHORITY_INFO_ACCESS
+i2d_AUTHORITY_KEYID
+i2d_BASIC_CONSTRAINTS
+i2d_CERTIFICATEPOLICIES
+i2d_CRL_DIST_POINTS
+i2d_DHparams
+i2d_DIRECTORYSTRING
+i2d_DISPLAYTEXT
+i2d_DIST_POINT
+i2d_DIST_POINT_NAME
+i2d_DSAparams
+i2d_DSAPrivateKey
+i2d_DSAPrivateKey_bio
+i2d_DSAPrivateKey_fp
+i2d_DSA_PUBKEY
+i2d_DSA_PUBKEY_bio
+i2d_DSA_PUBKEY_fp
+i2d_DSAPublicKey
+i2d_DSA_SIG
+i2d_ECDSA_SIG
+i2d_ECParameters
+i2d_ECPrivateKey
+i2d_ECPrivateKey_bio
+i2d_ECPrivateKey_fp
+i2d_EC_PUBKEY
+i2d_EC_PUBKEY_bio
+i2d_EC_PUBKEY_fp
+i2d_EDIPARTYNAME
+i2d_EXTENDED_KEY_USAGE
+i2d_GENERAL_NAME
+i2d_GENERAL_NAMES
+i2d_ISSUING_DIST_POINT
+i2d_NETSCAPE_SPKAC
+i2d_NETSCAPE_SPKI
+i2d_NOTICEREF
+i2d_OTHERNAME
+i2d_PBE2PARAM
+i2d_PBEPARAM
+i2d_PBKDF2PARAM
+i2d_PKCS8_bio
+i2d_PKCS8_fp
+i2d_PKCS8PrivateKey_bio
+i2d_PKCS8PrivateKey_fp
+i2d_PKCS8PrivateKeyInfo_bio
+i2d_PKCS8PrivateKeyInfo_fp
+i2d_PKCS8PrivateKey_nid_bio
+i2d_PKCS8PrivateKey_nid_fp
+i2d_PKCS8_PRIV_KEY_INFO
+i2d_PKCS8_PRIV_KEY_INFO_bio
+i2d_PKCS8_PRIV_KEY_INFO_fp
+i2d_PKEY_USAGE_PERIOD
+i2d_POLICYINFO
+i2d_POLICYQUALINFO
+i2d_PrivateKey
+i2d_PrivateKey_bio
+i2d_PrivateKey_fp
+i2d_PROXY_CERT_INFO_EXTENSION
+i2d_PROXY_POLICY
+i2d_PUBKEY
+i2d_PUBKEY_bio
+i2d_PUBKEY_fp
+i2d_PublicKey
+i2d_RSAPrivateKey
+i2d_RSAPrivateKey_bio
+i2d_RSAPrivateKey_fp
+i2d_RSA_PSS_PARAMS
+i2d_RSA_PUBKEY
+i2d_RSA_PUBKEY_bio
+i2d_RSA_PUBKEY_fp
+i2d_RSAPublicKey
+i2d_RSAPublicKey_bio
+i2d_RSAPublicKey_fp
+i2d_SSL_SESSION
+i2d_SSL_SESSION_bio
+i2d_SXNET
+i2d_SXNETID
+i2d_USERNOTICE
+i2d_X509
+i2d_X509_ALGOR
+i2d_X509_ALGORS
+i2d_X509_ATTRIBUTE
+i2d_X509_AUX
+i2d_X509_bio
+i2d_X509_CERT_AUX
+i2d_X509_CERT_PAIR
+i2d_X509_CINF
+i2d_X509_CRL
+i2d_X509_CRL_bio
+i2d_X509_CRL_fp
+i2d_X509_CRL_INFO
+i2d_X509_EXTENSION
+i2d_X509_EXTENSIONS
+i2d_X509_fp
+i2d_X509_NAME
+i2d_X509_NAME_ENTRY
+i2d_X509_PUBKEY
+i2d_X509_REQ
+i2d_X509_REQ_bio
+i2d_X509_REQ_fp
+i2d_X509_REQ_INFO
+i2d_X509_REVOKED
+i2d_X509_SIG
+i2d_X509_VAL
+i2o_ECPublicKey
+i2s_ASN1_ENUMERATED
+i2s_ASN1_ENUMERATED_TABLE
+i2s_ASN1_INTEGER
+i2s_ASN1_OCTET_STRING
+i2t_ASN1_OBJECT
+i2v_ASN1_BIT_STRING
+i2v_GENERAL_NAME
+i2v_GENERAL_NAMES
+ISSUING_DIST_POINT_free
+ISSUING_DIST_POINT_it
+ISSUING_DIST_POINT_new
+kOpenSSLReasonStringData
+kOpenSSLReasonValues
+kOpenSSLReasonValuesLen
+kSRTPProfiles
+level_add_node
+level_find_node
+lh_delete
+lh_doall
+lh_doall_arg
+lh_free
+lh_insert
+lh_new
+lh_num_items
+lh_retrieve
+lh_strhash
+LONG_it
+MD4
+md4_block_data_order
+MD4_Final
+MD4_Init
+MD4_Transform
+MD4_Update
+MD5
+md5_block_asm_data_order
+MD5_Final
+MD5_Init
+MD5_Transform
+MD5_Update
+METHOD_ref
+METHOD_unref
+name_cmp
+NAME_CONSTRAINTS_check
+NAME_CONSTRAINTS_free
+NAME_CONSTRAINTS_it
+NAME_CONSTRAINTS_new
+NCONF_free
+NCONF_get_section
+NCONF_get_string
+NCONF_load
+NCONF_load_bio
+NCONF_new
+NETSCAPE_SPKAC_free
+NETSCAPE_SPKAC_it
+NETSCAPE_SPKAC_new
+NETSCAPE_SPKI_b64_decode
+NETSCAPE_SPKI_b64_encode
+NETSCAPE_SPKI_free
+NETSCAPE_SPKI_get_pubkey
+NETSCAPE_SPKI_it
+NETSCAPE_SPKI_new
+NETSCAPE_SPKI_set_pubkey
+NETSCAPE_SPKI_sign
+NETSCAPE_SPKI_verify
+newhope_barrett_reduce
+newhope_bitrev_vector
+NEWHOPE_client_compute_key
+newhope_helprec
+NEWHOPE_keygen
+newhope_montgomery_reduce
+newhope_mul_coefficients
+newhope_ntt
+newhope_omegas_inv_montgomery
+newhope_omegas_montgomery
+newhope_poly_add
+NEWHOPE_POLY_free
+newhope_poly_frombytes
+newhope_poly_getnoise
+newhope_poly_invntt
+NEWHOPE_POLY_new
+newhope_poly_ntt
+newhope_poly_pointwise
+newhope_poly_tobytes
+newhope_poly_uniform
+newhope_psis_bitrev_montgomery
+newhope_psis_inv_montgomery
+newhope_reconcile
+NEWHOPE_server_compute_key
+NOTICEREF_free
+NOTICEREF_it
+NOTICEREF_new
+o2i_ECPublicKey
+OBJ_cbs2nid
+OBJ_cmp
+OBJ_create
+OBJ_dup
+OBJ_find_sigid_algs
+OBJ_find_sigid_by_algs
+OBJ_ln2nid
+OBJ_nid2cbb
+OBJ_nid2ln
+OBJ_nid2obj
+OBJ_nid2sn
+OBJ_obj2nid
+OBJ_obj2txt
+OBJ_sn2nid
+OBJ_txt2nid
+OBJ_txt2obj
+OpenSSL_add_all_algorithms
+OpenSSL_add_all_ciphers
+OpenSSL_add_all_digests
+OPENSSL_built_in_curves
+OPENSSL_cleanse
+OPENSSL_config
+OPENSSL_cpuid_setup
+OPENSSL_gmtime
+OPENSSL_gmtime_adj
+OPENSSL_gmtime_diff
+OPENSSL_hash32
+OPENSSL_ia32cap_P
+OPENSSL_load_builtin_modules
+OPENSSL_realloc_clean
+OPENSSL_strcasecmp
+OPENSSL_strdup
+OPENSSL_strncasecmp
+OPENSSL_strnlen
+OTHERNAME_cmp
+OTHERNAME_free
+OTHERNAME_it
+OTHERNAME_new
+PBE2PARAM_free
+PBE2PARAM_it
+PBE2PARAM_new
+PBEPARAM_free
+PBEPARAM_it
+PBEPARAM_new
+PBKDF2PARAM_free
+PBKDF2PARAM_it
+PBKDF2PARAM_new
+PEM_ASN1_read
+PEM_ASN1_read_bio
+PEM_ASN1_write
+PEM_ASN1_write_bio
+PEM_bytes_read_bio
+PEM_def_callback
+PEM_dek_info
+PEM_do_header
+PEM_get_EVP_CIPHER_INFO
+PEM_proc_type
+PEM_read
+PEM_read_bio
+PEM_read_bio_DHparams
+PEM_read_bio_DSAparams
+PEM_read_bio_DSAPrivateKey
+PEM_read_bio_DSA_PUBKEY
+PEM_read_bio_ECPrivateKey
+PEM_read_bio_EC_PUBKEY
+PEM_read_bio_PKCS8
+PEM_read_bio_PKCS8_PRIV_KEY_INFO
+PEM_read_bio_PrivateKey
+PEM_read_bio_PUBKEY
+PEM_read_bio_RSAPrivateKey
+PEM_read_bio_RSA_PUBKEY
+PEM_read_bio_RSAPublicKey
+PEM_read_bio_SSL_SESSION
+PEM_read_bio_X509
+PEM_read_bio_X509_AUX
+PEM_read_bio_X509_CERT_PAIR
+PEM_read_bio_X509_CRL
+PEM_read_bio_X509_REQ
+PEM_read_DHparams
+PEM_read_DSAparams
+PEM_read_DSAPrivateKey
+PEM_read_DSA_PUBKEY
+PEM_read_ECPrivateKey
+PEM_read_EC_PUBKEY
+PEM_read_PKCS8
+PEM_read_PKCS8_PRIV_KEY_INFO
+PEM_read_PrivateKey
+PEM_read_PUBKEY
+PEM_read_RSAPrivateKey
+PEM_read_RSA_PUBKEY
+PEM_read_RSAPublicKey
+PEM_read_SSL_SESSION
+PEM_read_X509
+PEM_read_X509_AUX
+PEM_read_X509_CERT_PAIR
+PEM_read_X509_CRL
+PEM_read_X509_REQ
+PEM_write
+PEM_write_bio
+PEM_write_bio_DHparams
+PEM_write_bio_DSAparams
+PEM_write_bio_DSAPrivateKey
+PEM_write_bio_DSA_PUBKEY
+PEM_write_bio_ECPrivateKey
+PEM_write_bio_EC_PUBKEY
+PEM_write_bio_PKCS8
+PEM_write_bio_PKCS8PrivateKey
+PEM_write_bio_PKCS8PrivateKey_nid
+PEM_write_bio_PKCS8_PRIV_KEY_INFO
+PEM_write_bio_PrivateKey
+PEM_write_bio_PUBKEY
+PEM_write_bio_RSAPrivateKey
+PEM_write_bio_RSA_PUBKEY
+PEM_write_bio_RSAPublicKey
+PEM_write_bio_SSL_SESSION
+PEM_write_bio_X509
+PEM_write_bio_X509_AUX
+PEM_write_bio_X509_CERT_PAIR
+PEM_write_bio_X509_CRL
+PEM_write_bio_X509_REQ
+PEM_write_bio_X509_REQ_NEW
+PEM_write_DHparams
+PEM_write_DSAparams
+PEM_write_DSAPrivateKey
+PEM_write_DSA_PUBKEY
+PEM_write_ECPrivateKey
+PEM_write_EC_PUBKEY
+PEM_write_PKCS8
+PEM_write_PKCS8PrivateKey
+PEM_write_PKCS8PrivateKey_nid
+PEM_write_PKCS8_PRIV_KEY_INFO
+PEM_write_PrivateKey
+PEM_write_PUBKEY
+PEM_write_RSAPrivateKey
+PEM_write_RSA_PUBKEY
+PEM_write_RSAPublicKey
+PEM_write_SSL_SESSION
+PEM_write_X509
+PEM_write_X509_AUX
+PEM_write_X509_CERT_PAIR
+PEM_write_X509_CRL
+PEM_write_X509_REQ
+PEM_write_X509_REQ_NEW
+PEM_X509_INFO_read
+PEM_X509_INFO_read_bio
+PEM_X509_INFO_write_bio
+pitem_free
+pitem_new
+PKCS12_free
+PKCS12_get_key_and_certs
+PKCS12_parse
+PKCS12_PBE_add
+PKCS12_verify_mac
+PKCS5_pbe2_set
+PKCS5_pbe2_set_iv
+PKCS5_pbe_set
+PKCS5_pbe_set0_algor
+PKCS5_PBKDF2_HMAC
+PKCS5_PBKDF2_HMAC_SHA1
+PKCS5_pbkdf2_set
+PKCS5_v2_PBE_keyivgen
+PKCS7_bundle_certificates
+PKCS7_bundle_CRLs
+PKCS7_get_certificates
+PKCS7_get_CRLs
+PKCS7_get_PEM_certificates
+PKCS7_get_PEM_CRLs
+PKCS8_decrypt
+PKCS8_decrypt_pbe
+PKCS8_encrypt
+PKCS8_encrypt_pbe
+PKCS8_pkey_get0
+PKCS8_pkey_set0
+PKCS8_PRIV_KEY_INFO_free
+PKCS8_PRIV_KEY_INFO_it
+PKCS8_PRIV_KEY_INFO_new
+PKEY_USAGE_PERIOD_free
+PKEY_USAGE_PERIOD_it
+PKEY_USAGE_PERIOD_new
+policy_cache_find_data
+policy_cache_free
+policy_cache_set
+policy_cache_set_mapping
+POLICY_CONSTRAINTS_free
+POLICY_CONSTRAINTS_it
+POLICY_CONSTRAINTS_new
+policy_data_free
+policy_data_new
+POLICYINFO_free
+POLICYINFO_it
+POLICYINFO_new
+POLICY_MAPPING_free
+POLICY_MAPPING_it
+POLICY_MAPPING_new
+POLICY_MAPPINGS_it
+policy_node_cmp_new
+policy_node_free
+policy_node_match
+POLICYQUALINFO_free
+POLICYQUALINFO_it
+POLICYQUALINFO_new
+pqueue_find
+pqueue_free
+pqueue_insert
+pqueue_iterator
+pqueue_new
+pqueue_next
+pqueue_peek
+pqueue_pop
+pqueue_size
+PROXY_CERT_INFO_EXTENSION_free
+PROXY_CERT_INFO_EXTENSION_it
+PROXY_CERT_INFO_EXTENSION_new
+PROXY_POLICY_free
+PROXY_POLICY_it
+PROXY_POLICY_new
+RAND_add
+RAND_bytes
+RAND_cleanup
+RAND_egd
+RAND_enable_fork_unsafe_buffering
+RAND_file_name
+RAND_load_file
+RAND_poll
+RAND_pseudo_bytes
+RAND_seed
+RAND_set_rand_method
+RAND_set_urandom_fd
+RAND_SSLeay
+RAND_status
+RC4
+RC4_set_key
+RSA_additional_prime_free
+RSA_add_pkcs1_prefix
+rsa_asn1_meth
+RSA_blinding_on
+RSA_check_key
+RSA_decrypt
+rsa_default_decrypt
+rsa_default_encrypt
+rsa_default_keygen
+RSA_default_method
+rsa_default_multi_prime_keygen
+rsa_default_private_transform
+rsa_default_sign_raw
+rsa_default_size
+RSA_encrypt
+RSA_free
+RSA_generate_key_ex
+RSA_generate_multi_prime_key
+RSA_get_ex_data
+RSA_get_ex_new_index
+RSA_is_opaque
+RSA_marshal_private_key
+RSA_marshal_public_key
+RSA_new
+RSA_new_method
+RSA_padding_add_none
+RSA_padding_add_PKCS1_OAEP_mgf1
+RSA_padding_add_PKCS1_PSS_mgf1
+RSA_padding_add_PKCS1_type_1
+RSA_padding_add_PKCS1_type_2
+RSA_padding_check_PKCS1_OAEP_mgf1
+RSA_padding_check_PKCS1_type_1
+RSA_padding_check_PKCS1_type_2
+RSA_parse_private_key
+RSA_parse_public_key
+RSA_parse_public_key_buggy
+rsa_pkey_meth
+RSA_private_decrypt
+RSA_private_encrypt
+RSAPrivateKey_dup
+RSA_private_key_from_bytes
+RSA_private_key_to_bytes
+RSA_private_transform
+RSA_PSS_PARAMS_free
+RSA_PSS_PARAMS_it
+RSA_PSS_PARAMS_new
+RSA_public_decrypt
+RSA_public_encrypt
+RSAPublicKey_dup
+RSA_public_key_from_bytes
+RSA_public_key_to_bytes
+RSA_recover_crt_params
+RSA_set_ex_data
+RSA_sign
+RSA_sign_raw
+RSA_size
+RSA_supports_digest
+RSA_up_ref
+RSA_verify
+RSA_verify_PKCS1_PSS_mgf1
+RSA_verify_raw
+rsaz_1024_gather5_avx2
+RSAZ_1024_mod_exp_avx2
+rsaz_1024_mul_avx2
+rsaz_1024_norm2red_avx2
+rsaz_1024_red2norm_avx2
+rsaz_1024_scatter5_avx2
+rsaz_1024_sqr_avx2
+rsaz_512_gather4
+RSAZ_512_mod_exp
+rsaz_512_mul
+rsaz_512_mul_by_one
+rsaz_512_mul_gather4
+rsaz_512_mul_scatter4
+rsaz_512_scatter4
+rsaz_512_sqr
+rsaz_avx2_eligible
+s2i_ASN1_INTEGER
+s2i_ASN1_OCTET_STRING
+SHA1
+sha1_block_data_order
+SHA1_Final
+SHA1_Init
+SHA1_Transform
+SHA1_Update
+SHA224
+SHA224_Final
+SHA224_Init
+SHA224_Update
+SHA256
+sha256_block_data_order
+SHA256_Final
+SHA256_Init
+SHA256_Transform
+SHA256_Update
+SHA384
+SHA384_Final
+SHA384_Init
+SHA384_Update
+SHA512
+sha512_block_data_order
+SHA512_Final
+SHA512_Init
+SHA512_Transform
+SHA512_Update
+sk_deep_copy
+sk_delete
+sk_delete_ptr
+sk_dup
+sk_find
+sk_free
+sk_insert
+sk_is_sorted
+sk_new
+sk_new_null
+sk_num
+sk_pop
+sk_pop_free
+sk_push
+sk_set
+sk_set_cmp_func
+sk_shift
+sk_sort
+sk_value
+sk_zero
+SPAKE2_CTX_free
+SPAKE2_CTX_new
+SPAKE2_generate_msg
+SPAKE2_process_msg
+ssl3_accept
+ssl3_can_false_start
+ssl3_cert_verify_hash
+ssl3_choose_cipher
+ssl3_cleanup_key_block
+ssl3_connect
+ssl3_dispatch_alert
+ssl3_do_write
+ssl3_free
+ssl3_free_handshake_buffer
+ssl3_free_handshake_hash
+ssl3_get_certificate_request
+ssl3_get_cert_status
+ssl3_get_cert_verify
+ssl3_get_channel_id
+ssl3_get_client_certificate
+ssl3_get_client_hello
+ssl3_get_client_key_exchange
+ssl3_get_enc_method
+ssl3_get_finished
+ssl3_get_initial_bytes
+ssl3_get_max_client_version
+ssl3_get_max_server_version
+ssl3_get_message
+ssl3_get_mutual_version
+ssl3_get_new_session_ticket
+ssl3_get_next_proto
+ssl3_get_req_cert_type
+ssl3_get_server_certificate
+ssl3_get_server_done
+ssl3_get_server_hello
+ssl3_get_server_key_exchange
+ssl3_get_v2_client_hello
+ssl3_handshake_write
+ssl3_hash_current_message
+ssl3_init_handshake_buffer
+ssl3_init_handshake_hash
+ssl3_is_version_enabled
+ssl3_new
+ssl3_output_cert_chain
+ssl3_protocol_version
+ssl3_read_app_data
+ssl3_read_bytes
+ssl3_read_change_cipher_spec
+ssl3_read_close_notify
+ssl3_send_alert
+ssl3_send_certificate_request
+ssl3_send_certificate_status
+ssl3_send_cert_verify
+ssl3_send_change_cipher_spec
+ssl3_send_channel_id
+ssl3_send_client_certificate
+ssl3_send_client_hello
+ssl3_send_client_key_exchange
+ssl3_send_finished
+ssl3_send_new_session_ticket
+ssl3_send_next_proto
+ssl3_send_server_certificate
+ssl3_send_server_done
+ssl3_send_server_hello
+ssl3_send_server_key_exchange
+ssl3_set_handshake_header
+ssl3_supports_cipher
+ssl3_update_handshake_hash
+ssl3_verify_server_cert
+ssl3_version_from_wire
+ssl3_write_app_data
+ssl3_write_bytes
+SSL_accept
+SSL_add0_chain_cert
+SSL_add1_chain_cert
+ssl_add_cert_chain
+SSL_add_client_CA
+ssl_add_clienthello_tlsext
+SSL_add_file_cert_subjects_to_stack
+ssl_add_serverhello_tlsext
+SSL_AEAD_CTX_explicit_nonce_len
+SSL_AEAD_CTX_free
+SSL_AEAD_CTX_max_overhead
+SSL_AEAD_CTX_new
+SSL_AEAD_CTX_open
+SSL_AEAD_CTX_seal
+SSL_alert_desc_string
+SSL_alert_desc_string_long
+SSL_alert_type_string
+SSL_alert_type_string_long
+ssl_bytes_to_cipher_list
+SSL_cache_hit
+ssl_cert_add0_chain_cert
+ssl_cert_add1_chain_cert
+ssl_cert_clear_certs
+ssl_cert_dup
+ssl_cert_free
+ssl_cert_new
+SSL_certs_clear
+ssl_cert_set0_chain
+ssl_cert_set1_chain
+ssl_cert_set_cert_cb
+SSL_check_private_key
+SSL_CIPHER_description
+SSL_CIPHER_get_bits
+ssl_cipher_get_evp_aead
+SSL_CIPHER_get_id
+ssl_cipher_get_key_type
+SSL_CIPHER_get_kx_name
+SSL_CIPHER_get_min_version
+SSL_CIPHER_get_name
+ssl_cipher_get_record_split_len
+SSL_CIPHER_get_rfc_name
+ssl_cipher_get_value
+SSL_CIPHER_get_version
+SSL_CIPHER_has_MD5_HMAC
+ssl_cipher_has_server_public_key
+SSL_CIPHER_has_SHA1_HMAC
+SSL_CIPHER_has_SHA256_HMAC
+SSL_CIPHER_is_AES
+SSL_CIPHER_is_AES128CBC
+SSL_CIPHER_is_AES128GCM
+SSL_CIPHER_is_AES256CBC
+SSL_CIPHER_is_AESGCM
+SSL_CIPHER_is_block_cipher
+SSL_CIPHER_is_CHACHA20POLY1305
+SSL_CIPHER_is_ECDHE
+SSL_CIPHER_is_ECDSA
+SSL_CIPHER_is_NULL
+SSL_CIPHER_is_RC4
+ssl_cipher_preference_list_free
+ssl_cipher_requires_server_key_exchange
+SSL_clear
+ssl_clear_bad_session
+SSL_clear_chain_certs
+SSL_clear_mode
+SSL_clear_options
+SSL_COMP_add_compression_method
+SSL_COMP_get_compression_methods
+SSL_COMP_get_name
+SSL_connect
+ssl_create_cipher_list
+SSL_CTX_add0_chain_cert
+SSL_CTX_add1_chain_cert
+SSL_CTX_add_client_CA
+SSL_CTX_add_client_custom_ext
+SSL_CTX_add_extra_chain_cert
+SSL_CTX_add_server_custom_ext
+SSL_CTX_add_session
+SSL_CTX_check_private_key
+SSL_CTX_clear_chain_certs
+SSL_CTX_clear_extra_chain_certs
+SSL_CTX_clear_mode
+SSL_CTX_clear_options
+SSL_CTX_enable_ocsp_stapling
+SSL_CTX_enable_signed_cert_timestamps
+SSL_CTX_enable_tls_channel_id
+SSL_CTX_flush_sessions
+SSL_CTX_free
+SSL_CTX_get0_certificate
+SSL_CTX_get0_chain_certs
+SSL_CTX_get0_param
+SSL_CTX_get0_privatekey
+SSL_CTX_get_cert_store
+SSL_CTX_get_channel_id_cb
+SSL_CTX_get_client_CA_list
+SSL_CTX_get_client_cert_cb
+SSL_CTX_get_ex_data
+SSL_CTX_get_ex_new_index
+SSL_CTX_get_extra_chain_certs
+SSL_CTX_get_info_callback
+SSL_CTX_get_max_cert_list
+SSL_CTX_get_mode
+SSL_CTX_get_options
+SSL_CTX_get_quiet_shutdown
+SSL_CTX_get_read_ahead
+SSL_CTX_get_session_cache_mode
+SSL_CTX_get_timeout
+SSL_CTX_get_tlsext_ticket_keys
+SSL_CTX_get_verify_callback
+SSL_CTX_get_verify_depth
+SSL_CTX_get_verify_mode
+SSL_CTX_load_verify_locations
+SSL_CTX_need_tmp_RSA
+SSL_CTX_new
+SSL_CTX_remove_session
+SSL_CTX_sess_accept
+SSL_CTX_sess_accept_good
+SSL_CTX_sess_accept_renegotiate
+SSL_CTX_sess_cache_full
+SSL_CTX_sess_cb_hits
+SSL_CTX_sess_connect
+SSL_CTX_sess_connect_good
+SSL_CTX_sess_connect_renegotiate
+SSL_CTX_sess_get_cache_size
+SSL_CTX_sess_get_get_cb
+SSL_CTX_sess_get_new_cb
+SSL_CTX_sess_get_remove_cb
+SSL_CTX_sess_hits
+SSL_CTX_sessions
+SSL_CTX_sess_misses
+SSL_CTX_sess_number
+SSL_CTX_sess_set_cache_size
+SSL_CTX_sess_set_get_cb
+SSL_CTX_sess_set_new_cb
+SSL_CTX_sess_set_remove_cb
+SSL_CTX_sess_timeouts
+SSL_CTX_set0_chain
+SSL_CTX_set0_verify_cert_store
+SSL_CTX_set1_chain
+SSL_CTX_set1_curves
+SSL_CTX_set1_param
+SSL_CTX_set1_tls_channel_id
+SSL_CTX_set1_verify_cert_store
+SSL_CTX_set_alpn_protos
+SSL_CTX_set_alpn_select_cb
+SSL_CTX_set_cert_cb
+SSL_CTX_set_cert_store
+SSL_CTX_set_cert_verify_callback
+SSL_CTX_set_channel_id_cb
+SSL_CTX_set_cipher_list
+SSL_CTX_set_cipher_list_tls10
+SSL_CTX_set_cipher_list_tls11
+SSL_CTX_set_client_CA_list
+SSL_CTX_set_client_cert_cb
+SSL_CTX_set_default_passwd_cb
+SSL_CTX_set_default_passwd_cb_userdata
+SSL_CTX_set_default_verify_paths
+SSL_CTX_set_dos_protection_cb
+SSL_CTX_set_ex_data
+SSL_CTX_set_info_callback
+SSL_CTX_set_keylog_callback
+SSL_CTX_set_max_cert_list
+SSL_CTX_set_max_send_fragment
+SSL_CTX_set_max_version
+SSL_CTX_set_min_version
+SSL_CTX_set_mode
+SSL_CTX_set_msg_callback
+SSL_CTX_set_msg_callback_arg
+SSL_CTX_set_next_protos_advertised_cb
+SSL_CTX_set_next_proto_select_cb
+SSL_CTX_set_ocsp_response
+SSL_CTX_set_options
+SSL_CTX_set_private_key_method
+SSL_CTX_set_psk_client_callback
+SSL_CTX_set_psk_server_callback
+SSL_CTX_set_purpose
+SSL_CTX_set_quiet_shutdown
+SSL_CTX_set_read_ahead
+SSL_CTX_set_retain_only_sha256_of_client_certs
+SSL_CTX_set_select_certificate_cb
+SSL_CTX_set_session_cache_mode
+SSL_CTX_set_session_id_context
+SSL_CTX_set_signed_cert_timestamp_list
+SSL_CTX_set_srtp_profiles
+SSL_CTX_set_timeout
+SSL_CTX_set_tlsext_servername_arg
+SSL_CTX_set_tlsext_servername_callback
+SSL_CTX_set_tlsext_ticket_key_cb
+SSL_CTX_set_tlsext_ticket_keys
+SSL_CTX_set_tlsext_use_srtp
+SSL_CTX_set_tmp_dh
+SSL_CTX_set_tmp_dh_callback
+SSL_CTX_set_tmp_ecdh
+SSL_CTX_set_tmp_rsa
+SSL_CTX_set_tmp_rsa_callback
+SSL_CTX_set_trust
+SSL_CTX_set_verify
+SSL_CTX_set_verify_depth
+SSL_CTX_use_certificate
+SSL_CTX_use_certificate_ASN1
+SSL_CTX_use_certificate_chain_file
+SSL_CTX_use_certificate_file
+SSL_CTX_use_PrivateKey
+SSL_CTX_use_PrivateKey_ASN1
+SSL_CTX_use_PrivateKey_file
+SSL_CTX_use_psk_identity_hint
+SSL_CTX_use_RSAPrivateKey
+SSL_CTX_use_RSAPrivateKey_ASN1
+SSL_CTX_use_RSAPrivateKey_file
+SSL_CUSTOM_EXTENSION_free
+SSL_cutthrough_complete
+ssl_do_client_cert_cb
+SSL_do_handshake
+SSL_dup_CA_list
+SSL_early_callback_ctx_extension_get
+ssl_early_callback_init
+SSLeay
+SSLeay_version
+SSL_ECDH_CTX_cleanup
+SSL_ECDH_CTX_compute_secret
+SSL_ECDH_CTX_generate_keypair
+SSL_ECDH_CTX_init
+SSL_ECDH_CTX_init_for_dhe
+SSL_enable_ocsp_stapling
+SSL_enable_signed_cert_timestamps
+SSL_enable_tls_channel_id
+SSL_export_keying_material
+SSL_extension_supported
+ssl_fill_hello_random
+SSL_free
+ssl_free_wbio_buffer
+SSL_generate_key_block
+SSL_get0_alpn_selected
+SSL_get0_certificate_types
+SSL_get0_chain_certs
+SSL_get0_next_proto_negotiated
+SSL_get0_ocsp_response
+SSL_get0_param
+SSL_get0_signed_cert_timestamp_list
+SSL_get1_session
+ssl_get_algorithm_prf
+SSL_get_certificate
+SSL_get_cipher_by_value
+SSL_get_cipher_list
+ssl_get_cipher_preferences
+SSL_get_ciphers
+ssl_get_ciphers_by_id
+SSL_get_client_CA_list
+SSL_get_client_random
+ssl_get_compatible_server_ciphers
+SSL_get_current_cipher
+SSL_get_current_compression
+SSL_get_current_expansion
+SSL_get_curve_name
+SSL_get_default_timeout
+SSL_get_error
+SSL_get_ex_data
+SSL_get_ex_data_X509_STORE_CTX_idx
+SSL_get_ex_new_index
+SSL_get_extms_support
+SSL_get_fd
+SSL_get_finished
+ssl_get_handshake_digest
+SSL_get_info_callback
+SSL_get_ivs
+SSL_get_key_block_len
+SSL_get_max_cert_list
+SSL_get_mode
+ssl_get_new_session
+SSL_get_options
+SSL_get_peer_cert_chain
+SSL_get_peer_certificate
+SSL_get_peer_finished
+SSL_get_pending_cipher
+ssl_get_prev_session
+SSL_get_privatekey
+SSL_get_psk_identity
+SSL_get_psk_identity_hint
+SSL_get_quiet_shutdown
+SSL_get_rbio
+SSL_get_rc4_state
+SSL_get_read_ahead
+SSL_get_read_sequence
+SSL_get_rfd
+SSL_get_secure_renegotiation_support
+SSL_get_selected_srtp_profile
+SSL_get_server_key_exchange_hash
+SSL_get_servername
+SSL_get_servername_type
+SSL_get_server_random
+SSL_get_server_tmp_key
+SSL_get_session
+SSL_get_shared_ciphers
+SSL_get_shutdown
+SSL_get_srtp_profiles
+SSL_get_SSL_CTX
+SSL_get_structure_sizes
+SSL_get_tls_channel_id
+SSL_get_tls_unique
+SSL_get_verify_callback
+SSL_get_verify_depth
+SSL_get_verify_mode
+SSL_get_verify_result
+SSL_get_version
+SSL_get_wbio
+SSL_get_wfd
+SSL_get_write_sequence
+ssl_has_private_key
+SSL_in_false_start
+SSL_in_init
+ssl_init_wbio_buffer
+SSL_is_init_finished
+SSL_is_server
+SSL_library_init
+SSL_load_client_CA_file
+SSL_load_error_strings
+ssl_log_master_secret
+ssl_log_rsa_client_key_exchange
+SSL_magic_pending_session_ptr
+ssl_max_seal_overhead
+SSL_need_tmp_RSA
+SSL_new
+ssl_nid_to_curve_id
+SSL_num_renegotiations
+ssl_parse_clienthello_tlsext
+ssl_parse_serverhello_tlsext
+SSL_peek
+SSL_pending
+ssl_private_key_decrypt
+ssl_private_key_decrypt_complete
+ssl_private_key_max_signature_len
+ssl_private_key_sign
+ssl_private_key_sign_complete
+ssl_private_key_type
+SSL_read
+ssl_read_buffer
+ssl_read_buffer_clear
+ssl_read_buffer_consume
+ssl_read_buffer_discard
+ssl_read_buffer_extend_to
+ssl_read_buffer_len
+ssl_record_prefix_len
+ssl_record_sequence_update
+SSL_renegotiate
+SSL_renegotiate_pending
+ssl_seal_prefix_len
+SSL_select_next_proto
+SSL_SESSION_free
+SSL_SESSION_from_bytes
+SSL_SESSION_get0_peer
+SSL_SESSION_get_ex_data
+SSL_SESSION_get_ex_new_index
+SSL_SESSION_get_id
+SSL_SESSION_get_key_exchange_info
+SSL_SESSION_get_master_key
+SSL_SESSION_get_time
+SSL_SESSION_get_timeout
+SSL_SESSION_get_version
+SSL_SESSION_new
+SSL_session_reused
+SSL_SESSION_set1_id_context
+SSL_SESSION_set_ex_data
+SSL_SESSION_set_time
+SSL_SESSION_set_timeout
+SSL_SESSION_to_bytes
+SSL_SESSION_to_bytes_for_ticket
+SSL_SESSION_up_ref
+SSL_set0_chain
+SSL_set0_verify_cert_store
+SSL_set1_chain
+SSL_set1_curves
+SSL_set1_param
+SSL_set1_tls_channel_id
+SSL_set1_verify_cert_store
+SSL_set_accept_state
+SSL_set_alpn_protos
+SSL_set_bio
+SSL_set_cert_cb
+SSL_set_cipher_list
+SSL_set_client_CA_list
+ssl_set_client_disabled
+SSL_set_connect_state
+SSL_set_ex_data
+SSL_set_fd
+SSL_set_info_callback
+SSL_set_max_cert_list
+SSL_set_max_send_fragment
+SSL_set_max_version
+SSL_set_min_version
+SSL_set_mode
+SSL_set_msg_callback
+SSL_set_msg_callback_arg
+SSL_set_mtu
+SSL_set_options
+SSL_set_private_key_digest_prefs
+SSL_set_private_key_method
+SSL_set_psk_client_callback
+SSL_set_psk_server_callback
+SSL_set_purpose
+SSL_set_quiet_shutdown
+SSL_set_read_ahead
+ssl_set_read_state
+SSL_set_reject_peer_renegotiations
+SSL_set_renegotiate_mode
+SSL_set_rfd
+SSL_set_session
+SSL_set_session_id_context
+SSL_set_shutdown
+SSL_set_srtp_profiles
+SSL_set_SSL_CTX
+SSL_set_state
+SSL_set_tlsext_host_name
+SSL_set_tlsext_use_srtp
+SSL_set_tmp_dh
+SSL_set_tmp_dh_callback
+SSL_set_tmp_ecdh
+SSL_set_tmp_rsa
+SSL_set_tmp_rsa_callback
+SSL_set_trust
+SSL_set_verify
+SSL_set_verify_depth
+SSL_set_verify_result
+SSL_set_wfd
+ssl_set_write_state
+SSL_shutdown
+SSL_state
+SSL_state_string
+SSL_state_string_long
+SSL_total_renegotiations
+ssl_update_cache
+SSL_use_certificate
+SSL_use_certificate_ASN1
+SSL_use_certificate_file
+SSL_use_PrivateKey
+SSL_use_PrivateKey_ASN1
+SSL_use_PrivateKey_file
+SSL_use_psk_identity_hint
+SSL_use_RSAPrivateKey
+SSL_use_RSAPrivateKey_ASN1
+SSL_use_RSAPrivateKey_file
+SSLv23_client_method
+SSLv23_method
+SSLv23_server_method
+SSLv3_client_method
+SSLv3_enc_data
+SSLv3_method
+SSLv3_server_method
+ssl_verify_alarm_type
+ssl_verify_cert_chain
+SSL_version
+SSL_want
+SSL_write
+ssl_write_buffer_clear
+ssl_write_buffer_flush
+ssl_write_buffer_init
+ssl_write_buffer_is_pending
+ssl_write_buffer_set_len
+string_to_hex
+SXNET_add_id_asc
+SXNET_add_id_INTEGER
+SXNET_add_id_ulong
+SXNET_free
+SXNET_get_id_asc
+SXNET_get_id_INTEGER
+SXNET_get_id_ulong
+SXNETID_free
+SXNETID_it
+SXNETID_new
+SXNET_it
+SXNET_new
+tls12_add_sigandhash
+tls12_check_peer_sigalg
+tls12_get_hash
+tls12_get_psigalgs
+tls12_get_sigid
+tls1_change_cipher_state
+tls1_channel_id_hash
+tls1_check_curve_id
+tls1_check_ec_cert
+tls1_choose_signing_digest
+tls1_generate_master_secret
+tls1_get_shared_curve
+tls1_handshake_digest
+tls1_parse_peer_sigalgs
+tls1_record_handshake_hashes_for_channel_id
+tls1_set_curves
+tls1_setup_key_block
+TLS_method
+tls_open_record
+tls_process_ticket
+tls_seal_record
+TLSv1_1_client_method
+TLSv1_1_method
+TLSv1_1_server_method
+TLSv1_2_client_method
+TLSv1_2_method
+TLSv1_2_server_method
+TLSv1_client_method
+TLSv1_enc_data
+TLSv1_method
+TLSv1_server_method
+tree_find_sk
+USERNOTICE_free
+USERNOTICE_it
+USERNOTICE_new
+UTF8_getc
+UTF8_putc
+v2i_ASN1_BIT_STRING
+v2i_GENERAL_NAME
+v2i_GENERAL_NAME_ex
+v2i_GENERAL_NAMES
+v3_akey_id
+v3_alt
+v3_bcons
+v3_cpols
+v3_crld
+v3_crl_num
+v3_crl_reason
+v3_delta_crl
+v3_ext_ku
+v3_freshest_crl
+v3_idp
+v3_info
+v3_inhibit_anyp
+v3_key_usage
+v3_name_constraints
+v3_nscert
+v3_ns_ia5_list
+v3_ocsp_accresp
+v3_pci
+v3_pkey_usage_period
+v3_policy_constraints
+v3_policy_mappings
+v3_sinfo
+v3_skey_id
+v3_sxnet
+vpaes_cbc_encrypt
+vpaes_decrypt
+vpaes_encrypt
+vpaes_set_decrypt_key
+vpaes_set_encrypt_key
+X25519
+x25519_ge_add
+x25519_ge_frombytes_vartime
+x25519_ge_p1p1_to_p2
+x25519_ge_p1p1_to_p3
+x25519_ge_p3_to_cached
+x25519_ge_scalarmult
+x25519_ge_scalarmult_base
+x25519_ge_scalarmult_small_precomp
+x25519_ge_sub
+x25519_ge_tobytes
+X25519_keypair
+X25519_public_from_private
+x25519_sc_reduce
+x25519_x86_64
+x25519_x86_64_freeze
+x25519_x86_64_ladderstep
+x25519_x86_64_mul
+x25519_x86_64_square
+x25519_x86_64_work_cswap
+X509_add1_ext_i2d
+X509_add1_reject_object
+X509_add1_trust_object
+X509_add_ext
+X509_ALGOR_cmp
+X509_ALGOR_dup
+X509_ALGOR_free
+X509_ALGOR_get0
+X509_ALGOR_it
+X509_ALGOR_new
+X509_ALGOR_set0
+X509_ALGOR_set_md
+X509_ALGORS_it
+X509_alias_get0
+X509_alias_set1
+X509at_add1_attr
+X509at_add1_attr_by_NID
+X509at_add1_attr_by_OBJ
+X509at_add1_attr_by_txt
+X509at_delete_attr
+X509at_get0_data_by_OBJ
+X509at_get_attr
+X509at_get_attr_by_NID
+X509at_get_attr_by_OBJ
+X509at_get_attr_count
+X509_ATTRIBUTE_count
+X509_ATTRIBUTE_create
+X509_ATTRIBUTE_create_by_NID
+X509_ATTRIBUTE_create_by_OBJ
+X509_ATTRIBUTE_create_by_txt
+X509_ATTRIBUTE_dup
+X509_ATTRIBUTE_free
+X509_ATTRIBUTE_get0_data
+X509_ATTRIBUTE_get0_object
+X509_ATTRIBUTE_get0_type
+X509_ATTRIBUTE_it
+X509_ATTRIBUTE_new
+X509_ATTRIBUTE_set1_data
+X509_ATTRIBUTE_set1_object
+X509_ATTRIBUTE_SET_it
+X509_CERT_AUX_free
+X509_CERT_AUX_it
+X509_CERT_AUX_new
+X509_CERT_AUX_print
+X509_certificate_type
+X509_CERT_PAIR_free
+X509_CERT_PAIR_it
+X509_CERT_PAIR_new
+X509_chain_check_suiteb
+X509_chain_up_ref
+X509_check_akid
+X509_check_ca
+X509_check_email
+X509_check_host
+X509_check_ip
+X509_check_ip_asc
+X509_check_issued
+X509_check_private_key
+X509_check_purpose
+X509_check_trust
+X509_CINF_free
+X509_CINF_it
+X509_CINF_new
+X509_cmp
+X509_cmp_current_time
+X509_cmp_time
+X509_CRL_add0_revoked
+X509_CRL_add1_ext_i2d
+X509_CRL_add_ext
+X509_CRL_check_suiteb
+X509_CRL_cmp
+X509_CRL_delete_ext
+X509_CRL_diff
+X509_CRL_digest
+X509_CRL_dup
+X509_CRL_free
+X509_CRL_get0_by_cert
+X509_CRL_get0_by_serial
+X509_CRL_get_ext
+X509_CRL_get_ext_by_critical
+X509_CRL_get_ext_by_NID
+X509_CRL_get_ext_by_OBJ
+X509_CRL_get_ext_count
+X509_CRL_get_ext_d2i
+X509_CRL_get_meth_data
+X509_CRL_INFO_free
+X509_CRL_INFO_it
+X509_CRL_INFO_new
+X509_CRL_it
+X509_CRL_match
+X509_CRL_METHOD_free
+X509_CRL_METHOD_new
+X509_CRL_new
+X509_CRL_print
+X509_CRL_print_fp
+X509_CRL_set_default_method
+X509_CRL_set_issuer_name
+X509_CRL_set_lastUpdate
+X509_CRL_set_meth_data
+X509_CRL_set_nextUpdate
+X509_CRL_set_version
+X509_CRL_sign
+X509_CRL_sign_ctx
+X509_CRL_sort
+X509_CRL_up_ref
+X509_CRL_verify
+X509_delete_ext
+X509_digest
+x509_digest_sign_algorithm
+x509_digest_verify_init
+X509_dup
+X509_email_free
+X509_EXTENSION_create_by_NID
+X509_EXTENSION_create_by_OBJ
+X509_EXTENSION_dup
+X509_EXTENSION_free
+X509_EXTENSION_get_critical
+X509_EXTENSION_get_data
+X509_EXTENSION_get_object
+X509_EXTENSION_it
+X509_EXTENSION_new
+X509_EXTENSION_set_critical
+X509_EXTENSION_set_data
+X509_EXTENSION_set_object
+X509_EXTENSIONS_it
+X509_find_by_issuer_and_serial
+X509_find_by_subject
+X509_free
+X509_get0_pubkey_bitstr
+X509_get0_signature
+X509_get1_email
+X509_get1_ocsp
+X509_get_default_cert_area
+X509_get_default_cert_dir
+X509_get_default_cert_dir_env
+X509_get_default_cert_file
+X509_get_default_cert_file_env
+X509_get_default_private_dir
+X509_get_ex_data
+X509_get_ex_new_index
+X509_get_ext
+X509_get_ext_by_critical
+X509_get_ext_by_NID
+X509_get_ext_by_OBJ
+X509_get_ext_count
+X509_get_ext_d2i
+X509_get_issuer_name
+X509_get_pubkey
+X509_get_serialNumber
+X509_get_signature_nid
+X509_get_subject_name
+X509_gmtime_adj
+X509_INFO_free
+X509_INFO_new
+X509_issuer_and_serial_cmp
+X509_issuer_and_serial_hash
+X509_issuer_name_cmp
+X509_issuer_name_hash
+X509_issuer_name_hash_old
+X509_it
+X509_keyid_get0
+X509_keyid_set1
+X509_load_cert_crl_file
+X509_load_cert_file
+X509_load_crl_file
+X509_LOOKUP_by_alias
+X509_LOOKUP_by_fingerprint
+X509_LOOKUP_by_issuer_serial
+X509_LOOKUP_by_subject
+X509_LOOKUP_ctrl
+X509_LOOKUP_file
+X509_LOOKUP_free
+X509_LOOKUP_hash_dir
+X509_LOOKUP_init
+X509_LOOKUP_new
+X509_LOOKUP_shutdown
+X509_NAME_add_entry
+X509_NAME_add_entry_by_NID
+X509_NAME_add_entry_by_OBJ
+X509_NAME_add_entry_by_txt
+X509_NAME_cmp
+X509_NAME_delete_entry
+X509_NAME_digest
+X509_NAME_dup
+X509_NAME_ENTRIES_it
+X509_NAME_entry_count
+X509_NAME_ENTRY_create_by_NID
+X509_NAME_ENTRY_create_by_OBJ
+X509_NAME_ENTRY_create_by_txt
+X509_NAME_ENTRY_dup
+X509_NAME_ENTRY_free
+X509_NAME_ENTRY_get_data
+X509_NAME_ENTRY_get_object
+X509_NAME_ENTRY_it
+X509_NAME_ENTRY_new
+X509_NAME_ENTRY_set_data
+X509_NAME_ENTRY_set_object
+X509_NAME_free
+X509_NAME_get_entry
+X509_NAME_get_index_by_NID
+X509_NAME_get_index_by_OBJ
+X509_NAME_get_text_by_NID
+X509_NAME_get_text_by_OBJ
+X509_NAME_hash
+X509_NAME_hash_old
+X509_NAME_INTERNAL_it
+X509_NAME_it
+X509_NAME_new
+X509_NAME_oneline
+X509_NAME_print
+X509_NAME_print_ex
+X509_NAME_print_ex_fp
+X509_NAME_set
+X509_new
+X509_OBJECT_free_contents
+X509_OBJECT_idx_by_subject
+X509_OBJECT_retrieve_by_subject
+X509_OBJECT_retrieve_match
+X509_OBJECT_up_ref_count
+X509_ocspid_print
+X509_PKEY_free
+X509_PKEY_new
+X509_policy_check
+X509_policy_level_get0_node
+X509_policy_level_node_count
+X509_policy_node_get0_parent
+X509_policy_node_get0_policy
+X509_policy_node_get0_qualifiers
+X509_POLICY_NODE_print
+X509_policy_tree_free
+X509_policy_tree_get0_level
+X509_policy_tree_get0_policies
+X509_policy_tree_get0_user_policies
+X509_policy_tree_level_count
+X509_print
+X509_print_ex
+X509_print_ex_fp
+X509_print_fp
+x509_print_rsa_pss_params
+X509_pubkey_digest
+X509_PUBKEY_free
+X509_PUBKEY_get
+X509_PUBKEY_get0_param
+X509_PUBKEY_it
+X509_PUBKEY_new
+X509_PUBKEY_set
+X509_PUBKEY_set0_param
+X509_PURPOSE_add
+X509_PURPOSE_cleanup
+X509_PURPOSE_get0
+X509_PURPOSE_get0_name
+X509_PURPOSE_get0_sname
+X509_PURPOSE_get_by_id
+X509_PURPOSE_get_by_sname
+X509_PURPOSE_get_count
+X509_PURPOSE_get_id
+X509_PURPOSE_get_trust
+X509_PURPOSE_set
+X509_reject_clear
+X509_REQ_add1_attr
+X509_REQ_add1_attr_by_NID
+X509_REQ_add1_attr_by_OBJ
+X509_REQ_add1_attr_by_txt
+X509_REQ_add_extensions
+X509_REQ_add_extensions_nid
+X509_REQ_check_private_key
+X509_REQ_delete_attr
+X509_REQ_digest
+X509_REQ_dup
+X509_REQ_extension_nid
+X509_REQ_free
+X509_REQ_get1_email
+X509_REQ_get_attr
+X509_REQ_get_attr_by_NID
+X509_REQ_get_attr_by_OBJ
+X509_REQ_get_attr_count
+X509_REQ_get_extension_nids
+X509_REQ_get_extensions
+X509_REQ_get_pubkey
+X509_REQ_INFO_free
+X509_REQ_INFO_it
+X509_REQ_INFO_new
+X509_REQ_it
+X509_REQ_new
+X509_REQ_print
+X509_REQ_print_ex
+X509_REQ_print_fp
+X509_REQ_set_extension_nids
+X509_REQ_set_pubkey
+X509_REQ_set_subject_name
+X509_REQ_set_version
+X509_REQ_sign
+X509_REQ_sign_ctx
+X509_REQ_to_X509
+X509_REQ_verify
+X509_REVOKED_add1_ext_i2d
+X509_REVOKED_add_ext
+X509_REVOKED_delete_ext
+X509_REVOKED_dup
+X509_REVOKED_free
+X509_REVOKED_get_ext
+X509_REVOKED_get_ext_by_critical
+X509_REVOKED_get_ext_by_NID
+X509_REVOKED_get_ext_by_OBJ
+X509_REVOKED_get_ext_count
+X509_REVOKED_get_ext_d2i
+X509_REVOKED_it
+X509_REVOKED_new
+X509_REVOKED_set_revocationDate
+X509_REVOKED_set_serialNumber
+x509_rsa_ctx_to_pss
+x509_rsa_pss_to_ctx
+X509_set_ex_data
+X509_set_issuer_name
+X509_set_notAfter
+X509_set_notBefore
+X509_set_pubkey
+X509_set_serialNumber
+X509_set_subject_name
+X509_set_version
+X509_SIG_free
+X509_SIG_it
+X509_sign
+X509_signature_dump
+X509_signature_print
+X509_sign_ctx
+X509_SIG_new
+X509_STORE_add_cert
+X509_STORE_add_crl
+X509_STORE_add_lookup
+X509_STORE_CTX_cleanup
+X509_STORE_CTX_free
+X509_STORE_CTX_get0_current_crl
+X509_STORE_CTX_get0_current_issuer
+X509_STORE_CTX_get0_param
+X509_STORE_CTX_get0_parent_ctx
+X509_STORE_CTX_get0_policy_tree
+X509_STORE_CTX_get0_store
+X509_STORE_CTX_get1_chain
+X509_STORE_CTX_get1_issuer
+X509_STORE_CTX_get_chain
+X509_STORE_CTX_get_current_cert
+X509_STORE_CTX_get_error
+X509_STORE_CTX_get_error_depth
+X509_STORE_CTX_get_ex_data
+X509_STORE_CTX_get_ex_new_index
+X509_STORE_CTX_get_explicit_policy
+X509_STORE_CTX_init
+X509_STORE_CTX_new
+X509_STORE_CTX_purpose_inherit
+X509_STORE_CTX_set0_crls
+X509_STORE_CTX_set0_param
+X509_STORE_CTX_set_cert
+X509_STORE_CTX_set_chain
+X509_STORE_CTX_set_default
+X509_STORE_CTX_set_depth
+X509_STORE_CTX_set_error
+X509_STORE_CTX_set_ex_data
+X509_STORE_CTX_set_flags
+X509_STORE_CTX_set_purpose
+X509_STORE_CTX_set_time
+X509_STORE_CTX_set_trust
+X509_STORE_CTX_set_verify_cb
+X509_STORE_CTX_trusted_stack
+X509_STORE_free
+X509_STORE_get1_certs
+X509_STORE_get1_crls
+X509_STORE_get_by_subject
+X509_STORE_load_locations
+X509_STORE_new
+X509_STORE_set1_param
+X509_STORE_set_default_paths
+X509_STORE_set_depth
+X509_STORE_set_flags
+X509_STORE_set_lookup_crls_cb
+X509_STORE_set_purpose
+X509_STORE_set_trust
+X509_STORE_set_verify_cb
+X509_STORE_up_ref
+X509_subject_name_cmp
+X509_subject_name_hash
+X509_subject_name_hash_old
+X509_supported_extension
+X509_time_adj
+X509_time_adj_ex
+X509_to_X509_REQ
+X509_TRUST_add
+X509_TRUST_cleanup
+X509_trust_clear
+X509_TRUST_get0
+X509_TRUST_get0_name
+X509_TRUST_get_by_id
+X509_TRUST_get_count
+X509_TRUST_get_flags
+X509_TRUST_get_trust
+X509_TRUST_set
+X509_TRUST_set_default
+X509_up_ref
+X509V3_add1_i2d
+X509v3_add_ext
+X509V3_add_standard_extensions
+X509V3_add_value
+X509V3_add_value_bool
+X509V3_add_value_bool_nf
+X509V3_add_value_int
+X509V3_add_value_uchar
+X509V3_conf_free
+X509v3_delete_ext
+X509V3_EXT_add
+X509V3_EXT_add_alias
+X509V3_EXT_add_list
+X509V3_EXT_add_nconf
+X509V3_EXT_add_nconf_sk
+X509V3_EXT_cleanup
+X509V3_EXT_CRL_add_nconf
+X509V3_EXT_d2i
+X509V3_extensions_print
+X509V3_EXT_free
+X509V3_EXT_get
+X509V3_EXT_get_nid
+X509V3_EXT_i2d
+X509V3_EXT_nconf
+X509V3_EXT_nconf_nid
+X509V3_EXT_print
+X509V3_EXT_print_fp
+X509V3_EXT_REQ_add_nconf
+X509V3_EXT_val_prn
+X509V3_get_d2i
+X509v3_get_ext
+X509v3_get_ext_by_critical
+X509v3_get_ext_by_NID
+X509v3_get_ext_by_OBJ
+X509v3_get_ext_count
+X509V3_get_section
+X509V3_get_string
+X509V3_get_value_bool
+X509V3_get_value_int
+X509V3_NAME_from_section
+X509V3_parse_list
+X509V3_section_free
+X509V3_set_ctx
+X509V3_set_nconf
+X509V3_string_free
+X509_VAL_free
+X509_VAL_it
+X509_VAL_new
+X509_verify
+X509_verify_cert
+X509_verify_cert_error_string
+X509_VERIFY_PARAM_add0_policy
+X509_VERIFY_PARAM_add0_table
+X509_VERIFY_PARAM_add1_host
+X509_VERIFY_PARAM_clear_flags
+X509_VERIFY_PARAM_free
+X509_VERIFY_PARAM_get0
+X509_VERIFY_PARAM_get0_name
+X509_VERIFY_PARAM_get0_peername
+X509_VERIFY_PARAM_get_count
+X509_VERIFY_PARAM_get_depth
+X509_VERIFY_PARAM_get_flags
+X509_VERIFY_PARAM_inherit
+X509_VERIFY_PARAM_lookup
+X509_VERIFY_PARAM_new
+X509_VERIFY_PARAM_set1
+X509_VERIFY_PARAM_set1_email
+X509_VERIFY_PARAM_set1_host
+X509_VERIFY_PARAM_set1_ip
+X509_VERIFY_PARAM_set1_ip_asc
+X509_VERIFY_PARAM_set1_name
+X509_VERIFY_PARAM_set1_policies
+X509_VERIFY_PARAM_set_depth
+X509_VERIFY_PARAM_set_flags
+X509_VERIFY_PARAM_set_hostflags
+X509_VERIFY_PARAM_set_purpose
+X509_VERIFY_PARAM_set_time
+X509_VERIFY_PARAM_set_trust
+X509_VERIFY_PARAM_table_cleanup
+ZLONG_it
diff --git a/boringssl/bssl-fix-ssl-h.py b/boringssl/bssl-fix-ssl-h.py
new file mode 100755
index 00000000..ced12e47
--- /dev/null
+++ b/boringssl/bssl-fix-ssl-h.py
@@ -0,0 +1,22 @@
+#!/usr/bin/env python
+
+# stdin is a list of symbols that boringssl has naughtily appropriated
+# and potentially changed the semantics for
+#
+# separately, openssl decided to make ifdefs for some of their symbols
+# that were previously macros, so we need to fix that first
+#
+# this program removes the pointless openssl defines
+#
+# some of them are multi-line and there are many, so sed is too slow/fiddly
+
+import sys
+import re
+
+header = open(sys.argv[1]).read()
+
+for line in sys.stdin:
+    line = line.strip()
+    header = re.sub(r'^#define {0}(\s\\\n)?\s+{1}$'.format(line, line), '', header, flags=re.MULTILINE)
+
+open(sys.argv[1], 'w').write(header)
diff --git a/boringssl/bssl-fix.sh b/boringssl/bssl-fix.sh
new file mode 100755
index 00000000..380cdf3f
--- /dev/null
+++ b/boringssl/bssl-fix.sh
@@ -0,0 +1,67 @@
+#!/bin/bash
+
+if ! [ -d include/boringssl ]; then
+    if ! [ -d include/openssl ]; then
+        echo "[-] Couldn't find openssl include dir"
+        exit 1
+    fi
+    mv include/openssl include/boringssl
+fi
+# just to be sure
+rm -rf include/openssl
+
+if [ ! -f ../build/boringssl/crypto/libcrypto.a -o ! -f ../build/boringssl/ssl/libssl.a ]; then
+    if ! [ -f bssl-badsyms.txt ]; then
+        echo '[-] Need either bssl-badsysm.txt or existing libs - please build libquic first.'
+        exit 1
+    else
+        echo '[+] Using bootstrap bssl-badsym.txt file'
+    fi
+else
+    echo '[*] Finding exported symbols from previously built libraries'
+    ( cat <(nm ../build/boringssl/crypto/libcrypto.a) <(nm ../build/boringssl/ssl/libssl.a) ) | grep -vE ' [A-Z] ' | grep -vE '^(      |$)' | grep -vF '.o:' | grep -vF ' r .L' | awk '{print $3}' | sed 's/^bssl_//' | sort >bssl-badsyms.txt
+fi
+
+echo '[*] Replacing QUIC openssl header includes with boringssl equivalent'
+find .. -name '*.h' -print0 -o -name '*.c' -print0 -o -name '*.cc' -print0 -o -name '*.cpp' -print0 -o -name '*.S' -print0 -o -name '*.s' -print0 -o -name '*.go' -print0 \
+    | xargs -0 sed -i 's#<openssl/#<boringssl/#'
+
+echo '[*] Adding bssl.h to boringssl source files'
+for f in $(find -name '*.h' -o -name '*.c' -o -name '*.cc' -o -name '*.S' -o -name '*.s'); do
+    if grep -q '#include <boringssl/bssl.h>' $f; then
+      continue
+    fi
+    cp $f mytmpf.txt;
+    echo '#include <boringssl/bssl.h>' >$f
+    cat mytmpf.txt >>$f
+done
+rm mytmpf.txt
+
+echo '[*] Adding bssl.h to boringssl perl asm generator files'
+for f in $(find -name '*.pl'); do
+    if grep -q '#include <boringssl/bssl.h>' $f; then
+        continue
+    fi
+
+    # FIXME: these seds don't work for all .pls, but they were sufficient for my build
+
+    sed -i -e 's@^\.text$@.text\n#include <boringssl/bssl.h>@' \
+        -e 's@^print STDOUT "#if defined(__x86_64__)\\n" if ($gas);$@print STDOUT "#include <boringssl/bssl.h>\\n" if ($gas);\nprint STDOUT "#if defined(__x86_64__)\\n" if ($gas);@' $f
+done
+
+echo '[*] Creating a header to put boringssl under a bssl prefix'
+( echo '#ifndef _BSSL_H'; echo '#define _BSSL_H'; cat bssl-badsyms.txt | awk '{print "#define "$1" bssl_"$1}'; echo '#endif' ) >include/boringssl/bssl.h
+
+echo '[*] Removing pointless noop defines in ssl.h so our redefines work'
+$(dirname $0)/bssl-fix-ssl-h.py include/boringssl/ssl.h <bssl-badsyms.txt
+
+echo '[*] Giving boringssl considerate library naming'
+sed -i -e 's/^  bssl$/  bssl_test/' -e 's/(bssl /(bssl_test /' tool/CMakeLists.txt
+sed -i 's/^  crypto$/  bsslcrypto/' crypto/CMakeLists.txt
+sed -i 's/^  ssl$/  bssl/' ssl/CMakeLists.txt
+
+# yes, ming
+find .. -name CMakeLists.txt -print0 | xargs -0 sed -i -e 's/(crypto /(bsslcrypto /' -e 's/ crypto / bsslcrypto /' -e 's/ crypto)/ bsslcrypto)/' \
+                                             -e 's/(ssl /(bssl /' -e 's/ ssl / bssl /' -e 's/ ssl)/ bssl)/'
+
+echo '[+] Done'
diff --git a/boringssl/crypto/CMakeLists.txt b/boringssl/crypto/CMakeLists.txt
index 3b4413cb..795a2a55 100644
--- a/boringssl/crypto/CMakeLists.txt
+++ b/boringssl/crypto/CMakeLists.txt
@@ -110,7 +110,7 @@ add_subdirectory(pkcs8)
 add_subdirectory(test)
 
 add_library(
-  crypto
+  bsslcrypto
 
   cpu-aarch64-linux.c
   cpu-arm.c
@@ -170,7 +170,7 @@ add_library(
 )
 
 if(NOT MSVC AND NOT ANDROID)
-  target_link_libraries(crypto pthread)
+  target_link_libraries(bsslcrypto pthread)
 endif()
 
 add_executable(
@@ -181,7 +181,7 @@ add_executable(
   $<TARGET_OBJECTS:test_support>
 )
 
-target_link_libraries(constant_time_test crypto)
+target_link_libraries(constant_time_test bsslcrypto)
 add_dependencies(all_tests constant_time_test)
 
 add_executable(
@@ -192,7 +192,7 @@ add_executable(
   $<TARGET_OBJECTS:test_support>
 )
 
-target_link_libraries(thread_test crypto)
+target_link_libraries(thread_test bsslcrypto)
 add_dependencies(all_tests thread_test)
 
 add_executable(
@@ -201,5 +201,5 @@ add_executable(
   refcount_test.c
 )
 
-target_link_libraries(refcount_test crypto)
+target_link_libraries(refcount_test bsslcrypto)
 add_dependencies(all_tests refcount_test)
diff --git a/boringssl/crypto/aes/CMakeLists.txt b/boringssl/crypto/aes/CMakeLists.txt
index 0566e398..920cba41 100644
--- a/boringssl/crypto/aes/CMakeLists.txt
+++ b/boringssl/crypto/aes/CMakeLists.txt
@@ -68,5 +68,5 @@ add_executable(
   $<TARGET_OBJECTS:test_support>
 )
 
-target_link_libraries(aes_test crypto)
+target_link_libraries(aes_test bsslcrypto)
 add_dependencies(all_tests aes_test)
diff --git a/boringssl/crypto/aes/aes.c b/boringssl/crypto/aes/aes.c
index 88239198..acc526c6 100644
--- a/boringssl/crypto/aes/aes.c
+++ b/boringssl/crypto/aes/aes.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* ====================================================================
  * Copyright (c) 2002-2006 The OpenSSL Project.  All rights reserved.
  *
@@ -46,12 +47,12 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  * ==================================================================== */
 
-#include <openssl/aes.h>
+#include <boringssl/aes.h>
 
 #include <assert.h>
 #include <stdlib.h>
 
-#include <openssl/cpu.h>
+#include <boringssl/cpu.h>
 
 #include "internal.h"
 
diff --git a/boringssl/crypto/aes/aes_test.cc b/boringssl/crypto/aes/aes_test.cc
index e488d81d..803a123f 100644
--- a/boringssl/crypto/aes/aes_test.cc
+++ b/boringssl/crypto/aes/aes_test.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2015, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,8 +16,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <openssl/aes.h>
-#include <openssl/crypto.h>
+#include <boringssl/aes.h>
+#include <boringssl/crypto.h>
 
 
 static bool TestAES(const uint8_t *key, size_t key_len,
diff --git a/boringssl/crypto/aes/asm/aes-armv4.pl b/boringssl/crypto/aes/asm/aes-armv4.pl
index a60ed4cf..d9e09d8d 100644
--- a/boringssl/crypto/aes/asm/aes-armv4.pl
+++ b/boringssl/crypto/aes/asm/aes-armv4.pl
@@ -71,6 +71,7 @@
 #endif
 
 .text
+#include <boringssl/bssl.h>
 #if __ARM_ARCH__<7
 .code	32
 #else
diff --git a/boringssl/crypto/aes/asm/aesv8-armx.pl b/boringssl/crypto/aes/asm/aesv8-armx.pl
index 121154a4..28f1a24c 100644
--- a/boringssl/crypto/aes/asm/aesv8-armx.pl
+++ b/boringssl/crypto/aes/asm/aesv8-armx.pl
@@ -49,6 +49,7 @@
 
 #if __ARM_MAX_ARCH__>=7
 .text
+#include <boringssl/bssl.h>
 ___
 $code.=<<___ if ($flavour =~ /64/);
 #if !defined(__clang__)
diff --git a/boringssl/crypto/aes/asm/bsaes-armv7.pl b/boringssl/crypto/aes/asm/bsaes-armv7.pl
index 22362f51..3457594a 100644
--- a/boringssl/crypto/aes/asm/bsaes-armv7.pl
+++ b/boringssl/crypto/aes/asm/bsaes-armv7.pl
@@ -726,6 +726,7 @@ sub bitslice {
 .fpu	neon
 
 .text
+#include <boringssl/bssl.h>
 .syntax	unified 	@ ARMv7-capable assembler is expected to handle this
 #if defined(__thumb2__) && !defined(__APPLE__)
 .thumb
diff --git a/boringssl/crypto/aes/asm/bsaes-x86_64.pl b/boringssl/crypto/aes/asm/bsaes-x86_64.pl
index 3f7d33c4..db60e766 100644
--- a/boringssl/crypto/aes/asm/bsaes-x86_64.pl
+++ b/boringssl/crypto/aes/asm/bsaes-x86_64.pl
@@ -800,6 +800,7 @@ sub bitslice {
 
 $code.=<<___;
 .text
+#include <boringssl/bssl.h>
 
 .extern	asm_AES_encrypt
 .extern	asm_AES_decrypt
diff --git a/boringssl/crypto/aes/asm/vpaes-x86_64.pl b/boringssl/crypto/aes/asm/vpaes-x86_64.pl
index f2ef318f..b2a6e472 100644
--- a/boringssl/crypto/aes/asm/vpaes-x86_64.pl
+++ b/boringssl/crypto/aes/asm/vpaes-x86_64.pl
@@ -64,6 +64,7 @@
 
 $code.=<<___;
 .text
+#include <boringssl/bssl.h>
 
 ##
 ##  _aes_encrypt_core
diff --git a/boringssl/crypto/aes/internal.h b/boringssl/crypto/aes/internal.h
index 3dc5c637..141f8a47 100644
--- a/boringssl/crypto/aes/internal.h
+++ b/boringssl/crypto/aes/internal.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* ====================================================================
  * Copyright (c) 2002-2006 The OpenSSL Project.  All rights reserved.
  *
@@ -49,7 +50,7 @@
 #ifndef OPENSSL_HEADER_AES_INTERNAL_H
 #define OPENSSL_HEADER_AES_INTERNAL_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/boringssl/crypto/aes/mode_wrappers.c b/boringssl/crypto/aes/mode_wrappers.c
index 4929920f..572afcc3 100644
--- a/boringssl/crypto/aes/mode_wrappers.c
+++ b/boringssl/crypto/aes/mode_wrappers.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* ====================================================================
  * Copyright (c) 2002-2006 The OpenSSL Project.  All rights reserved.
  *
@@ -46,7 +47,7 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  * ==================================================================== */
 
-#include <openssl/aes.h>
+#include <boringssl/aes.h>
 
 #include <assert.h>
 
diff --git a/boringssl/crypto/asn1/CMakeLists.txt b/boringssl/crypto/asn1/CMakeLists.txt
index f0667fcd..c1bf966d 100644
--- a/boringssl/crypto/asn1/CMakeLists.txt
+++ b/boringssl/crypto/asn1/CMakeLists.txt
@@ -51,5 +51,5 @@ add_executable(
   $<TARGET_OBJECTS:test_support>
 )
 
-target_link_libraries(asn1_test crypto)
+target_link_libraries(asn1_test bsslcrypto)
 add_dependencies(all_tests asn1_test)
diff --git a/boringssl/crypto/asn1/a_bitstr.c b/boringssl/crypto/asn1/a_bitstr.c
index 2705ea56..0fcb2adc 100644
--- a/boringssl/crypto/asn1/a_bitstr.c
+++ b/boringssl/crypto/asn1/a_bitstr.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,12 +55,12 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/asn1.h>
+#include <boringssl/asn1.h>
 
 #include <string.h>
 
-#include <openssl/err.h>
-#include <openssl/mem.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
 
 int ASN1_BIT_STRING_set(ASN1_BIT_STRING *x, unsigned char *d, int len)
 {
diff --git a/boringssl/crypto/asn1/a_bool.c b/boringssl/crypto/asn1/a_bool.c
index 64a079ec..fce8da64 100644
--- a/boringssl/crypto/asn1/a_bool.c
+++ b/boringssl/crypto/asn1/a_bool.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,10 +55,10 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/asn1.h>
+#include <boringssl/asn1.h>
 
-#include <openssl/err.h>
-#include <openssl/mem.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
 
 int i2d_ASN1_BOOLEAN(int a, unsigned char **pp)
 {
diff --git a/boringssl/crypto/asn1/a_bytes.c b/boringssl/crypto/asn1/a_bytes.c
index 7e2f85dc..f95702de 100644
--- a/boringssl/crypto/asn1/a_bytes.c
+++ b/boringssl/crypto/asn1/a_bytes.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,13 +55,13 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/asn1.h>
+#include <boringssl/asn1.h>
 
 #include <string.h>
 
-#include <openssl/buf.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
+#include <boringssl/buf.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
 
 static int asn1_collate_primitive(ASN1_STRING *a, ASN1_const_CTX *c);
 /*
diff --git a/boringssl/crypto/asn1/a_d2i_fp.c b/boringssl/crypto/asn1/a_d2i_fp.c
index b5449719..90dcad8a 100644
--- a/boringssl/crypto/asn1/a_d2i_fp.c
+++ b/boringssl/crypto/asn1/a_d2i_fp.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,13 +55,13 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/asn1.h>
+#include <boringssl/asn1.h>
 
 #include <limits.h>
 
-#include <openssl/buf.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
+#include <boringssl/buf.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
 
 static int asn1_d2i_read_bio(BIO *in, BUF_MEM **pb);
 
diff --git a/boringssl/crypto/asn1/a_dup.c b/boringssl/crypto/asn1/a_dup.c
index 57394f58..5753208c 100644
--- a/boringssl/crypto/asn1/a_dup.c
+++ b/boringssl/crypto/asn1/a_dup.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,10 +55,10 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/asn1.h>
+#include <boringssl/asn1.h>
 
-#include <openssl/err.h>
-#include <openssl/mem.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
 
 void *ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, void *x)
 {
diff --git a/boringssl/crypto/asn1/a_enum.c b/boringssl/crypto/asn1/a_enum.c
index 0b95fc95..5fd32413 100644
--- a/boringssl/crypto/asn1/a_enum.c
+++ b/boringssl/crypto/asn1/a_enum.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,12 +55,12 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/asn1.h>
+#include <boringssl/asn1.h>
 
 #include <string.h>
 
-#include <openssl/err.h>
-#include <openssl/mem.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
 
 /*
  * Code for ENUMERATED type: identical to INTEGER apart from a different tag.
diff --git a/boringssl/crypto/asn1/a_gentm.c b/boringssl/crypto/asn1/a_gentm.c
index ee6b3db5..f9204473 100644
--- a/boringssl/crypto/asn1/a_gentm.c
+++ b/boringssl/crypto/asn1/a_gentm.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,14 +55,14 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/asn1.h>
+#include <boringssl/asn1.h>
 
 #include <string.h>
 #include <time.h>
 
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/time_support.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/time_support.h>
 
 #include "asn1_locl.h"
 
diff --git a/boringssl/crypto/asn1/a_i2d_fp.c b/boringssl/crypto/asn1/a_i2d_fp.c
index 486207ed..fc21d8a0 100644
--- a/boringssl/crypto/asn1/a_i2d_fp.c
+++ b/boringssl/crypto/asn1/a_i2d_fp.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,10 +55,10 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/asn1.h>
+#include <boringssl/asn1.h>
 
-#include <openssl/err.h>
-#include <openssl/mem.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
 
 int ASN1_i2d_fp(i2d_of_void *i2d, FILE *out, void *x)
 {
diff --git a/boringssl/crypto/asn1/a_int.c b/boringssl/crypto/asn1/a_int.c
index 38a01bcb..1eb96590 100644
--- a/boringssl/crypto/asn1/a_int.c
+++ b/boringssl/crypto/asn1/a_int.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,12 +55,12 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/asn1.h>
+#include <boringssl/asn1.h>
 
 #include <string.h>
 
-#include <openssl/err.h>
-#include <openssl/mem.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
 
 ASN1_INTEGER *ASN1_INTEGER_dup(const ASN1_INTEGER *x)
 {
diff --git a/boringssl/crypto/asn1/a_mbstr.c b/boringssl/crypto/asn1/a_mbstr.c
index 30fff82a..e0e745cc 100644
--- a/boringssl/crypto/asn1/a_mbstr.c
+++ b/boringssl/crypto/asn1/a_mbstr.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,12 +55,12 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/asn1.h>
+#include <boringssl/asn1.h>
 
 #include <string.h>
 
-#include <openssl/err.h>
-#include <openssl/mem.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
 
 static int traverse_string(const unsigned char *p, int len, int inform,
                            int (*rfunc) (unsigned long value, void *in),
diff --git a/boringssl/crypto/asn1/a_object.c b/boringssl/crypto/asn1/a_object.c
index 10f38398..abf08088 100644
--- a/boringssl/crypto/asn1/a_object.c
+++ b/boringssl/crypto/asn1/a_object.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,14 +55,14 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/asn1.h>
+#include <boringssl/asn1.h>
 
 #include <limits.h>
 #include <string.h>
 
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/obj.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/obj.h>
 
 int i2d_ASN1_OBJECT(ASN1_OBJECT *a, unsigned char **pp)
 {
diff --git a/boringssl/crypto/asn1/a_octet.c b/boringssl/crypto/asn1/a_octet.c
index 2e74d6bf..56087167 100644
--- a/boringssl/crypto/asn1/a_octet.c
+++ b/boringssl/crypto/asn1/a_octet.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,10 +55,10 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/asn1.h>
+#include <boringssl/asn1.h>
 
-#include <openssl/err.h>
-#include <openssl/mem.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
 
 ASN1_OCTET_STRING *ASN1_OCTET_STRING_dup(const ASN1_OCTET_STRING *x)
 {
diff --git a/boringssl/crypto/asn1/a_print.c b/boringssl/crypto/asn1/a_print.c
index aee54fa4..96f25dc7 100644
--- a/boringssl/crypto/asn1/a_print.c
+++ b/boringssl/crypto/asn1/a_print.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,10 +55,10 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/asn1.h>
+#include <boringssl/asn1.h>
 
-#include <openssl/err.h>
-#include <openssl/mem.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
 
 int ASN1_PRINTABLE_type(const unsigned char *s, int len)
 {
diff --git a/boringssl/crypto/asn1/a_strnid.c b/boringssl/crypto/asn1/a_strnid.c
index ba1224ef..33918351 100644
--- a/boringssl/crypto/asn1/a_strnid.c
+++ b/boringssl/crypto/asn1/a_strnid.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,14 +55,14 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/asn1.h>
+#include <boringssl/asn1.h>
 
 #include <stdlib.h>             /* For bsearch */
 #include <string.h>
 
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/obj.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/obj.h>
 
 static STACK_OF(ASN1_STRING_TABLE) *stable = NULL;
 static void st_free(ASN1_STRING_TABLE *tbl);
diff --git a/boringssl/crypto/asn1/a_time.c b/boringssl/crypto/asn1/a_time.c
index 4391092a..236dab3e 100644
--- a/boringssl/crypto/asn1/a_time.c
+++ b/boringssl/crypto/asn1/a_time.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,16 +55,16 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/asn1.h>
+#include <boringssl/asn1.h>
 
 #include <string.h>
 #include <time.h>
 
-#include <openssl/asn1t.h>
-#include <openssl/buf.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/time_support.h>
+#include <boringssl/asn1t.h>
+#include <boringssl/buf.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/time_support.h>
 
 #include "asn1_locl.h"
 
diff --git a/boringssl/crypto/asn1/a_type.c b/boringssl/crypto/asn1/a_type.c
index ecd47342..f9fe9fa7 100644
--- a/boringssl/crypto/asn1/a_type.c
+++ b/boringssl/crypto/asn1/a_type.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,12 +55,12 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/asn1.h>
+#include <boringssl/asn1.h>
 
-#include <openssl/asn1t.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/obj.h>
+#include <boringssl/asn1t.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/obj.h>
 
 int ASN1_TYPE_get(ASN1_TYPE *a)
 {
diff --git a/boringssl/crypto/asn1/a_utctm.c b/boringssl/crypto/asn1/a_utctm.c
index 5a55bd24..3a327774 100644
--- a/boringssl/crypto/asn1/a_utctm.c
+++ b/boringssl/crypto/asn1/a_utctm.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,14 +55,14 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/asn1.h>
+#include <boringssl/asn1.h>
 
 #include <string.h>
 #include <time.h>
 
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/time_support.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/time_support.h>
 
 #include "asn1_locl.h"
 
diff --git a/boringssl/crypto/asn1/a_utf8.c b/boringssl/crypto/asn1/a_utf8.c
index 17027686..3cef4fb0 100644
--- a/boringssl/crypto/asn1/a_utf8.c
+++ b/boringssl/crypto/asn1/a_utf8.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,10 +55,10 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/asn1.h>
+#include <boringssl/asn1.h>
 
-#include <openssl/err.h>
-#include <openssl/mem.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
 
 /* UTF8 utilities */
 
diff --git a/boringssl/crypto/asn1/asn1_lib.c b/boringssl/crypto/asn1/asn1_lib.c
index b637e795..b41c8426 100644
--- a/boringssl/crypto/asn1/asn1_lib.c
+++ b/boringssl/crypto/asn1/asn1_lib.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,14 +55,14 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/asn1.h>
+#include <boringssl/asn1.h>
 
 #include <limits.h>
 #include <string.h>
 
-#include <openssl/asn1_mac.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
+#include <boringssl/asn1_mac.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
 
 /* Cross-module errors from crypto/x509/i2d_pr.c. */
 OPENSSL_DECLARE_ERROR_REASON(ASN1, UNSUPPORTED_PUBLIC_KEY_TYPE);
diff --git a/boringssl/crypto/asn1/asn1_locl.h b/boringssl/crypto/asn1/asn1_locl.h
index 49eceb6b..30b55416 100644
--- a/boringssl/crypto/asn1/asn1_locl.h
+++ b/boringssl/crypto/asn1/asn1_locl.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* asn1t.h */
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
diff --git a/boringssl/crypto/asn1/asn1_par.c b/boringssl/crypto/asn1/asn1_par.c
index d1f66402..081b56ce 100644
--- a/boringssl/crypto/asn1/asn1_par.c
+++ b/boringssl/crypto/asn1/asn1_par.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,11 +55,11 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/asn1.h>
+#include <boringssl/asn1.h>
 
-#include <openssl/bio.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
+#include <boringssl/bio.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
 
 #define ASN1_PARSE_MAXDEPTH 128
 
diff --git a/boringssl/crypto/asn1/asn1_test.cc b/boringssl/crypto/asn1/asn1_test.cc
index 8b024427..c8061642 100644
--- a/boringssl/crypto/asn1/asn1_test.cc
+++ b/boringssl/crypto/asn1/asn1_test.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2016, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -14,9 +15,9 @@
 
 #include <stdio.h>
 
-#include <openssl/asn1.h>
-#include <openssl/crypto.h>
-#include <openssl/err.h>
+#include <boringssl/asn1.h>
+#include <boringssl/crypto.h>
+#include <boringssl/err.h>
 
 #include "../test/scoped_types.h"
 
diff --git a/boringssl/crypto/asn1/asn_pack.c b/boringssl/crypto/asn1/asn_pack.c
index eff54e55..a3f2d27d 100644
--- a/boringssl/crypto/asn1/asn_pack.c
+++ b/boringssl/crypto/asn1/asn_pack.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,10 +55,10 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/asn1.h>
+#include <boringssl/asn1.h>
 
-#include <openssl/err.h>
-#include <openssl/mem.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
 
 /* ASN1_ITEM versions of the above */
 
diff --git a/boringssl/crypto/asn1/bio_asn1.c b/boringssl/crypto/asn1/bio_asn1.c
index 03cc9a6e..72ef0ba1 100644
--- a/boringssl/crypto/asn1/bio_asn1.c
+++ b/boringssl/crypto/asn1/bio_asn1.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,13 +55,13 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/asn1.h>
+#include <boringssl/asn1.h>
 
 #include <assert.h>
 #include <string.h>
 
-#include <openssl/bio.h>
-#include <openssl/mem.h>
+#include <boringssl/bio.h>
+#include <boringssl/mem.h>
 
 /* Must be large enough for biggest tag+length */
 #define DEFAULT_ASN1_BUF_SIZE 20
diff --git a/boringssl/crypto/asn1/bio_ndef.c b/boringssl/crypto/asn1/bio_ndef.c
index 81a8aa7c..fe93a06e 100644
--- a/boringssl/crypto/asn1/bio_ndef.c
+++ b/boringssl/crypto/asn1/bio_ndef.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,14 +55,14 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/asn1.h>
+#include <boringssl/asn1.h>
 
 #include <assert.h>
 
-#include <openssl/asn1t.h>
-#include <openssl/bio.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
+#include <boringssl/asn1t.h>
+#include <boringssl/bio.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
 
 /* Experimental NDEF ASN1 BIO support routines */
 
diff --git a/boringssl/crypto/asn1/f_enum.c b/boringssl/crypto/asn1/f_enum.c
index 3af16f8a..8b8e2b49 100644
--- a/boringssl/crypto/asn1/f_enum.c
+++ b/boringssl/crypto/asn1/f_enum.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,10 +55,10 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/asn1.h>
+#include <boringssl/asn1.h>
 
-#include <openssl/err.h>
-#include <openssl/mem.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
 
 /* Based on a_int.c: equivalent ENUMERATED functions */
 
diff --git a/boringssl/crypto/asn1/f_int.c b/boringssl/crypto/asn1/f_int.c
index 60c0f2f2..6c41e21d 100644
--- a/boringssl/crypto/asn1/f_int.c
+++ b/boringssl/crypto/asn1/f_int.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,10 +55,10 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/asn1.h>
+#include <boringssl/asn1.h>
 
-#include <openssl/err.h>
-#include <openssl/mem.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
 
 int i2a_ASN1_INTEGER(BIO *bp, ASN1_INTEGER *a)
 {
diff --git a/boringssl/crypto/asn1/f_string.c b/boringssl/crypto/asn1/f_string.c
index ec9cb83d..2edb7120 100644
--- a/boringssl/crypto/asn1/f_string.c
+++ b/boringssl/crypto/asn1/f_string.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,10 +55,10 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/asn1.h>
+#include <boringssl/asn1.h>
 
-#include <openssl/err.h>
-#include <openssl/mem.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
 
 int i2a_ASN1_STRING(BIO *bp, ASN1_STRING *a, int type)
 {
diff --git a/boringssl/crypto/asn1/t_bitst.c b/boringssl/crypto/asn1/t_bitst.c
index e754ca73..509fcfc4 100644
--- a/boringssl/crypto/asn1/t_bitst.c
+++ b/boringssl/crypto/asn1/t_bitst.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,11 +55,11 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/asn1.h>
+#include <boringssl/asn1.h>
 
 #include <string.h>
 
-#include <openssl/mem.h>
+#include <boringssl/mem.h>
 
 int ASN1_BIT_STRING_name_print(BIO *out, ASN1_BIT_STRING *bs,
                                BIT_STRING_BITNAME *tbl, int indent)
diff --git a/boringssl/crypto/asn1/tasn_dec.c b/boringssl/crypto/asn1/tasn_dec.c
index 40d575d2..cf5e827c 100644
--- a/boringssl/crypto/asn1/tasn_dec.c
+++ b/boringssl/crypto/asn1/tasn_dec.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,14 +55,14 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/asn1.h>
+#include <boringssl/asn1.h>
 
 #include <string.h>
 
-#include <openssl/asn1t.h>
-#include <openssl/buf.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
+#include <boringssl/asn1t.h>
+#include <boringssl/buf.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
 
 #include "../internal.h"
 
diff --git a/boringssl/crypto/asn1/tasn_enc.c b/boringssl/crypto/asn1/tasn_enc.c
index a56d08ed..bc5420c0 100644
--- a/boringssl/crypto/asn1/tasn_enc.c
+++ b/boringssl/crypto/asn1/tasn_enc.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,12 +55,12 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/asn1.h>
+#include <boringssl/asn1.h>
 
 #include <string.h>
 
-#include <openssl/asn1t.h>
-#include <openssl/mem.h>
+#include <boringssl/asn1t.h>
+#include <boringssl/mem.h>
 
 static int asn1_i2d_ex_primitive(ASN1_VALUE **pval, unsigned char **out,
                                  const ASN1_ITEM *it, int tag, int aclass);
diff --git a/boringssl/crypto/asn1/tasn_fre.c b/boringssl/crypto/asn1/tasn_fre.c
index 609cb9f9..5c7a61ee 100644
--- a/boringssl/crypto/asn1/tasn_fre.c
+++ b/boringssl/crypto/asn1/tasn_fre.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,10 +55,10 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/asn1.h>
+#include <boringssl/asn1.h>
 
-#include <openssl/asn1t.h>
-#include <openssl/mem.h>
+#include <boringssl/asn1t.h>
+#include <boringssl/mem.h>
 
 static void asn1_item_combine_free(ASN1_VALUE **pval, const ASN1_ITEM *it,
                                    int combine);
diff --git a/boringssl/crypto/asn1/tasn_new.c b/boringssl/crypto/asn1/tasn_new.c
index 232fe46a..5472527a 100644
--- a/boringssl/crypto/asn1/tasn_new.c
+++ b/boringssl/crypto/asn1/tasn_new.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,14 +55,14 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/asn1.h>
+#include <boringssl/asn1.h>
 
 #include <string.h>
 
-#include <openssl/asn1t.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/obj.h>
+#include <boringssl/asn1t.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/obj.h>
 
 static int asn1_item_ex_combine_new(ASN1_VALUE **pval, const ASN1_ITEM *it,
                                     int combine);
diff --git a/boringssl/crypto/asn1/tasn_prn.c b/boringssl/crypto/asn1/tasn_prn.c
index dd20cb4d..6c1e37ef 100644
--- a/boringssl/crypto/asn1/tasn_prn.c
+++ b/boringssl/crypto/asn1/tasn_prn.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,14 +55,14 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/asn1.h>
+#include <boringssl/asn1.h>
 
 #include <time.h>
 
-#include <openssl/asn1t.h>
-#include <openssl/err.h>
-#include <openssl/obj.h>
-#include <openssl/mem.h>
+#include <boringssl/asn1t.h>
+#include <boringssl/err.h>
+#include <boringssl/obj.h>
+#include <boringssl/mem.h>
 
 #include "asn1_locl.h"
 
diff --git a/boringssl/crypto/asn1/tasn_typ.c b/boringssl/crypto/asn1/tasn_typ.c
index daf02eae..ac0e36ea 100644
--- a/boringssl/crypto/asn1/tasn_typ.c
+++ b/boringssl/crypto/asn1/tasn_typ.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,9 +55,9 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/asn1.h>
+#include <boringssl/asn1.h>
 
-#include <openssl/asn1t.h>
+#include <boringssl/asn1t.h>
 
 /* Declarations for string types */
 
diff --git a/boringssl/crypto/asn1/tasn_utl.c b/boringssl/crypto/asn1/tasn_utl.c
index 960cdbb7..96aff2fe 100644
--- a/boringssl/crypto/asn1/tasn_utl.c
+++ b/boringssl/crypto/asn1/tasn_utl.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,15 +55,15 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/asn1.h>
+#include <boringssl/asn1.h>
 
 #include <string.h>
 
-#include <openssl/asn1t.h>
-#include <openssl/mem.h>
-#include <openssl/obj.h>
-#include <openssl/err.h>
-#include <openssl/thread.h>
+#include <boringssl/asn1t.h>
+#include <boringssl/mem.h>
+#include <boringssl/obj.h>
+#include <boringssl/err.h>
+#include <boringssl/thread.h>
 
 #include "../internal.h"
 
diff --git a/boringssl/crypto/asn1/x_bignum.c b/boringssl/crypto/asn1/x_bignum.c
index 585d9d4a..209e2b29 100644
--- a/boringssl/crypto/asn1/x_bignum.c
+++ b/boringssl/crypto/asn1/x_bignum.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,10 +55,10 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/asn1.h>
+#include <boringssl/asn1.h>
 
-#include <openssl/asn1t.h>
-#include <openssl/bn.h>
+#include <boringssl/asn1t.h>
+#include <boringssl/bn.h>
 
 /*
  * Custom primitive type for BIGNUM handling. This reads in an ASN1_INTEGER
diff --git a/boringssl/crypto/asn1/x_long.c b/boringssl/crypto/asn1/x_long.c
index bc4d2751..06eadde6 100644
--- a/boringssl/crypto/asn1/x_long.c
+++ b/boringssl/crypto/asn1/x_long.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,14 +55,14 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/asn1.h>
+#include <boringssl/asn1.h>
 
 #include <string.h>
 
-#include <openssl/asn1t.h>
-#include <openssl/bn.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
+#include <boringssl/asn1t.h>
+#include <boringssl/bn.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
 
 /*
  * Custom primitive type for long handling. This converts between an
diff --git a/boringssl/crypto/base64/CMakeLists.txt b/boringssl/crypto/base64/CMakeLists.txt
index 15ee6916..4733758a 100644
--- a/boringssl/crypto/base64/CMakeLists.txt
+++ b/boringssl/crypto/base64/CMakeLists.txt
@@ -16,5 +16,5 @@ add_executable(
   $<TARGET_OBJECTS:test_support>
 )
 
-target_link_libraries(base64_test crypto)
+target_link_libraries(base64_test bsslcrypto)
 add_dependencies(all_tests base64_test)
diff --git a/boringssl/crypto/base64/base64.c b/boringssl/crypto/base64/base64.c
index 4822fb89..457fd817 100644
--- a/boringssl/crypto/base64/base64.c
+++ b/boringssl/crypto/base64/base64.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,7 +55,7 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/base64.h>
+#include <boringssl/base64.h>
 
 #include <assert.h>
 #include <limits.h>
diff --git a/boringssl/crypto/base64/base64_test.cc b/boringssl/crypto/base64/base64_test.cc
index da016e66..6f6c578d 100644
--- a/boringssl/crypto/base64/base64_test.cc
+++ b/boringssl/crypto/base64/base64_test.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,9 +16,9 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <openssl/base64.h>
-#include <openssl/crypto.h>
-#include <openssl/err.h>
+#include <boringssl/base64.h>
+#include <boringssl/crypto.h>
+#include <boringssl/err.h>
 
 
 struct TestVector {
diff --git a/boringssl/crypto/bio/CMakeLists.txt b/boringssl/crypto/bio/CMakeLists.txt
index 7859b58d..e1b63220 100644
--- a/boringssl/crypto/bio/CMakeLists.txt
+++ b/boringssl/crypto/bio/CMakeLists.txt
@@ -26,7 +26,7 @@ add_executable(
   $<TARGET_OBJECTS:test_support>
 )
 
-target_link_libraries(bio_test crypto)
+target_link_libraries(bio_test bsslcrypto)
 if (WIN32)
   target_link_libraries(bio_test ws2_32)
 endif()
diff --git a/boringssl/crypto/bio/bio.c b/boringssl/crypto/bio/bio.c
index 7a1a9e3b..b2e99dfa 100644
--- a/boringssl/crypto/bio/bio.c
+++ b/boringssl/crypto/bio/bio.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,16 +55,16 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/bio.h>
+#include <boringssl/bio.h>
 
 #include <assert.h>
 #include <errno.h>
 #include <limits.h>
 #include <string.h>
 
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/thread.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/thread.h>
 
 #include "../internal.h"
 
diff --git a/boringssl/crypto/bio/bio_mem.c b/boringssl/crypto/bio/bio_mem.c
index 844fba7e..dfcffc92 100644
--- a/boringssl/crypto/bio/bio_mem.c
+++ b/boringssl/crypto/bio/bio_mem.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,14 +55,14 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/bio.h>
+#include <boringssl/bio.h>
 
 #include <limits.h>
 #include <string.h>
 
-#include <openssl/buf.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
+#include <boringssl/buf.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
 
 
 BIO *BIO_new_mem_buf(const void *buf, int len) {
diff --git a/boringssl/crypto/bio/bio_test.cc b/boringssl/crypto/bio/bio_test.cc
index 3615ab46..dbf04de8 100644
--- a/boringssl/crypto/bio/bio_test.cc
+++ b/boringssl/crypto/bio/bio_test.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -16,7 +17,7 @@
 #define _POSIX_C_SOURCE 201410L
 #endif
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #if !defined(OPENSSL_WINDOWS)
 #include <arpa/inet.h>
@@ -33,10 +34,10 @@
 #pragma warning(pop)
 #endif
 
-#include <openssl/bio.h>
-#include <openssl/crypto.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
+#include <boringssl/bio.h>
+#include <boringssl/crypto.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
 
 #include <algorithm>
 
diff --git a/boringssl/crypto/bio/buffer.c b/boringssl/crypto/bio/buffer.c
index 15574510..4978b48c 100644
--- a/boringssl/crypto/bio/buffer.c
+++ b/boringssl/crypto/bio/buffer.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,13 +55,13 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/bio.h>
+#include <boringssl/bio.h>
 
 #include <string.h>
 
-#include <openssl/buf.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
+#include <boringssl/buf.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
 
 
 #define DEFAULT_BUFFER_SIZE 4096
diff --git a/boringssl/crypto/bio/connect.c b/boringssl/crypto/bio/connect.c
index 01d49b1b..c2d39b07 100644
--- a/boringssl/crypto/bio/connect.c
+++ b/boringssl/crypto/bio/connect.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,7 +55,7 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/bio.h>
+#include <boringssl/bio.h>
 
 #include <assert.h>
 #include <errno.h>
@@ -72,9 +73,9 @@
 #pragma warning(pop)
 #endif
 
-#include <openssl/buf.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
+#include <boringssl/buf.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
 
 #include "internal.h"
 
diff --git a/boringssl/crypto/bio/fd.c b/boringssl/crypto/bio/fd.c
index 12e6a72b..ef08142f 100644
--- a/boringssl/crypto/bio/fd.c
+++ b/boringssl/crypto/bio/fd.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,7 +55,7 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/bio.h>
+#include <boringssl/bio.h>
 
 #include <errno.h>
 #include <string.h>
@@ -68,9 +69,9 @@
 #pragma warning(pop)
 #endif
 
-#include <openssl/buf.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
+#include <boringssl/buf.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
 
 #include "internal.h"
 
diff --git a/boringssl/crypto/bio/file.c b/boringssl/crypto/bio/file.c
index b903bc28..8302944c 100644
--- a/boringssl/crypto/bio/file.c
+++ b/boringssl/crypto/bio/file.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -72,15 +73,15 @@
 #endif
 #endif
 
-#include <openssl/bio.h>
+#include <boringssl/bio.h>
 
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
 
-#include <openssl/buf.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
+#include <boringssl/buf.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
 
 
 #define BIO_FP_READ 0x02
diff --git a/boringssl/crypto/bio/hexdump.c b/boringssl/crypto/bio/hexdump.c
index 17f55183..ae6faf54 100644
--- a/boringssl/crypto/bio/hexdump.c
+++ b/boringssl/crypto/bio/hexdump.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,7 +55,7 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/bio.h>
+#include <boringssl/bio.h>
 
 #include <limits.h>
 #include <string.h>
diff --git a/boringssl/crypto/bio/internal.h b/boringssl/crypto/bio/internal.h
index eb6b26f6..02d4734f 100644
--- a/boringssl/crypto/bio/internal.h
+++ b/boringssl/crypto/bio/internal.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -57,7 +58,7 @@
 #ifndef OPENSSL_HEADER_BIO_INTERNAL_H
 #define OPENSSL_HEADER_BIO_INTERNAL_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #if !defined(OPENSSL_WINDOWS)
 #if defined(OPENSSL_PNACL)
diff --git a/boringssl/crypto/bio/pair.c b/boringssl/crypto/bio/pair.c
index 2da2d203..bdc916d8 100644
--- a/boringssl/crypto/bio/pair.c
+++ b/boringssl/crypto/bio/pair.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* ====================================================================
  * Copyright (c) 1998-2003 The OpenSSL Project.  All rights reserved.
  *
@@ -50,14 +51,14 @@
  * (eay@cryptsoft.com).  This product includes software written by Tim
  * Hudson (tjh@cryptsoft.com). */
 
-#include <openssl/bio.h>
+#include <boringssl/bio.h>
 
 #include <assert.h>
 #include <string.h>
 
-#include <openssl/buf.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
+#include <boringssl/buf.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
 
 
 struct bio_bio_st {
diff --git a/boringssl/crypto/bio/printf.c b/boringssl/crypto/bio/printf.c
index 3709fcb2..aab89743 100644
--- a/boringssl/crypto/bio/printf.c
+++ b/boringssl/crypto/bio/printf.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -58,14 +59,14 @@
 #define _POSIX_C_SOURCE 201410L  /* for snprintf, vprintf etc */
 #endif
 
-#include <openssl/bio.h>
+#include <boringssl/bio.h>
 
 #include <assert.h>
 #include <stdarg.h>
 #include <stdio.h>
 
-#include <openssl/err.h>
-#include <openssl/mem.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
 
 int BIO_printf(BIO *bio, const char *format, ...) {
   va_list args;
diff --git a/boringssl/crypto/bio/socket.c b/boringssl/crypto/bio/socket.c
index 3ef69674..d6d88f4c 100644
--- a/boringssl/crypto/bio/socket.c
+++ b/boringssl/crypto/bio/socket.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* crypto/bio/bss_sock.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
@@ -55,7 +56,7 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/bio.h>
+#include <boringssl/bio.h>
 
 #include <fcntl.h>
 #include <string.h>
diff --git a/boringssl/crypto/bio/socket_helper.c b/boringssl/crypto/bio/socket_helper.c
index 4ddc094d..46659a6c 100644
--- a/boringssl/crypto/bio/socket_helper.c
+++ b/boringssl/crypto/bio/socket_helper.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,8 +16,8 @@
 #undef _POSIX_C_SOURCE
 #define _POSIX_C_SOURCE 200112L
 
-#include <openssl/bio.h>
-#include <openssl/err.h>
+#include <boringssl/bio.h>
+#include <boringssl/err.h>
 
 #include <fcntl.h>
 #include <string.h>
diff --git a/boringssl/crypto/bn/CMakeLists.txt b/boringssl/crypto/bn/CMakeLists.txt
index b9875d6d..efba67b6 100644
--- a/boringssl/crypto/bn/CMakeLists.txt
+++ b/boringssl/crypto/bn/CMakeLists.txt
@@ -84,5 +84,5 @@ add_executable(
   $<TARGET_OBJECTS:test_support>
 )
 
-target_link_libraries(bn_test crypto)
+target_link_libraries(bn_test bsslcrypto)
 add_dependencies(all_tests bn_test)
diff --git a/boringssl/crypto/bn/add.c b/boringssl/crypto/bn/add.c
index 23f9f802..94f099c2 100644
--- a/boringssl/crypto/bn/add.c
+++ b/boringssl/crypto/bn/add.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,12 +55,12 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/bn.h>
+#include <boringssl/bn.h>
 
 #include <string.h>
 
-#include <openssl/err.h>
-#include <openssl/mem.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
 
 #include "internal.h"
 
diff --git a/boringssl/crypto/bn/asm/armv4-mont.pl b/boringssl/crypto/bn/asm/armv4-mont.pl
index b7511128..1cce93be 100644
--- a/boringssl/crypto/bn/asm/armv4-mont.pl
+++ b/boringssl/crypto/bn/asm/armv4-mont.pl
@@ -82,6 +82,7 @@
 #include <openssl/arm_arch.h>
 
 .text
+#include <boringssl/bssl.h>
 .code	32
 
 #if __ARM_MAX_ARCH__>=7
diff --git a/boringssl/crypto/bn/asm/armv8-mont.pl b/boringssl/crypto/bn/asm/armv8-mont.pl
index f04aab16..e22ccb66 100644
--- a/boringssl/crypto/bn/asm/armv8-mont.pl
+++ b/boringssl/crypto/bn/asm/armv8-mont.pl
@@ -58,6 +58,7 @@
 
 $code.=<<___;
 .text
+#include <boringssl/bssl.h>
 
 .globl	bn_mul_mont
 .type	bn_mul_mont,%function
diff --git a/boringssl/crypto/bn/asm/rsaz-avx2.pl b/boringssl/crypto/bn/asm/rsaz-avx2.pl
index 6b57bd0b..cb19e121 100755
--- a/boringssl/crypto/bn/asm/rsaz-avx2.pl
+++ b/boringssl/crypto/bn/asm/rsaz-avx2.pl
@@ -140,6 +140,7 @@
 
 $code.=<<___;
 .text
+#include <boringssl/bssl.h>
 
 .globl	rsaz_1024_sqr_avx2
 .type	rsaz_1024_sqr_avx2,\@function,5
@@ -1915,6 +1916,7 @@
 }}} else {{{
 print <<___;	# assembler is too old
 .text
+#include <boringssl/bssl.h>
 
 .globl	rsaz_avx2_eligible
 .type	rsaz_avx2_eligible,\@abi-omnipotent
diff --git a/boringssl/crypto/bn/asm/rsaz-x86_64.pl b/boringssl/crypto/bn/asm/rsaz-x86_64.pl
index c38bde95..7c7a64bb 100755
--- a/boringssl/crypto/bn/asm/rsaz-x86_64.pl
+++ b/boringssl/crypto/bn/asm/rsaz-x86_64.pl
@@ -111,6 +111,7 @@
 
 $code.=<<___;
 .text
+#include <boringssl/bssl.h>
 
 .extern	OPENSSL_ia32cap_P
 
diff --git a/boringssl/crypto/bn/asm/x86_64-gcc.c b/boringssl/crypto/bn/asm/x86_64-gcc.c
index 214c12af..4e9c1a35 100644
--- a/boringssl/crypto/bn/asm/x86_64-gcc.c
+++ b/boringssl/crypto/bn/asm/x86_64-gcc.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* x86_64 BIGNUM accelerator version 0.1, December 2002.
  *
  * Implemented by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
@@ -50,7 +51,7 @@
  *    machine.
  */
 
-#include <openssl/bn.h>
+#include <boringssl/bn.h>
 
 /* TODO(davidben): Get this file working on Windows x64. */
 #if !defined(OPENSSL_NO_ASM) && defined(OPENSSL_X86_64) && defined(__GNUC__)
diff --git a/boringssl/crypto/bn/asm/x86_64-mont.pl b/boringssl/crypto/bn/asm/x86_64-mont.pl
index 1ca2b1ef..969c2443 100755
--- a/boringssl/crypto/bn/asm/x86_64-mont.pl
+++ b/boringssl/crypto/bn/asm/x86_64-mont.pl
@@ -77,6 +77,7 @@
 
 $code=<<___;
 .text
+#include <boringssl/bssl.h>
 
 .extern	OPENSSL_ia32cap_P
 
diff --git a/boringssl/crypto/bn/asm/x86_64-mont5.pl b/boringssl/crypto/bn/asm/x86_64-mont5.pl
index ced3acba..7b2b5a4f 100755
--- a/boringssl/crypto/bn/asm/x86_64-mont5.pl
+++ b/boringssl/crypto/bn/asm/x86_64-mont5.pl
@@ -66,6 +66,7 @@
 
 $code=<<___;
 .text
+#include <boringssl/bssl.h>
 
 .extern	OPENSSL_ia32cap_P
 
diff --git a/boringssl/crypto/bn/bn.c b/boringssl/crypto/bn/bn.c
index 0ecaf825..fbabde72 100644
--- a/boringssl/crypto/bn/bn.c
+++ b/boringssl/crypto/bn/bn.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,13 +55,13 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/bn.h>
+#include <boringssl/bn.h>
 
 #include <limits.h>
 #include <string.h>
 
-#include <openssl/err.h>
-#include <openssl/mem.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
 
 #include "internal.h"
 
diff --git a/boringssl/crypto/bn/bn_asn1.c b/boringssl/crypto/bn/bn_asn1.c
index efb23355..d2862efb 100644
--- a/boringssl/crypto/bn/bn_asn1.c
+++ b/boringssl/crypto/bn/bn_asn1.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2015, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -12,10 +13,10 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
 
-#include <openssl/bn.h>
+#include <boringssl/bn.h>
 
-#include <openssl/bytestring.h>
-#include <openssl/err.h>
+#include <boringssl/bytestring.h>
+#include <boringssl/err.h>
 
 
 int BN_parse_asn1_unsigned(CBS *cbs, BIGNUM *ret) {
diff --git a/boringssl/crypto/bn/bn_test.cc b/boringssl/crypto/bn/bn_test.cc
index fe8cfd05..84497824 100644
--- a/boringssl/crypto/bn/bn_test.cc
+++ b/boringssl/crypto/bn/bn_test.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -78,10 +79,10 @@
 
 #include <utility>
 
-#include <openssl/bn.h>
-#include <openssl/crypto.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
+#include <boringssl/bn.h>
+#include <boringssl/crypto.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
 
 #include "../crypto/test/scoped_types.h"
 #include "../crypto/test/test_util.h"
diff --git a/boringssl/crypto/bn/cmp.c b/boringssl/crypto/bn/cmp.c
index fce72339..b88a81c3 100644
--- a/boringssl/crypto/bn/cmp.c
+++ b/boringssl/crypto/bn/cmp.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,7 +55,7 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/bn.h>
+#include <boringssl/bn.h>
 
 #include "internal.h"
 
diff --git a/boringssl/crypto/bn/convert.c b/boringssl/crypto/bn/convert.c
index 542f523f..842fc343 100644
--- a/boringssl/crypto/bn/convert.c
+++ b/boringssl/crypto/bn/convert.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,7 +55,7 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/bn.h>
+#include <boringssl/bn.h>
 
 #include <assert.h>
 #include <ctype.h>
@@ -62,10 +63,10 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <openssl/bio.h>
-#include <openssl/bytestring.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
+#include <boringssl/bio.h>
+#include <boringssl/bytestring.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
 
 #include "internal.h"
 
diff --git a/boringssl/crypto/bn/ctx.c b/boringssl/crypto/bn/ctx.c
index 48d9adf6..197d58af 100644
--- a/boringssl/crypto/bn/ctx.c
+++ b/boringssl/crypto/bn/ctx.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Written by Ulf Moeller for the OpenSSL project. */
 /* ====================================================================
  * Copyright (c) 1998-2004 The OpenSSL Project.  All rights reserved.
@@ -52,12 +53,12 @@
  * Hudson (tjh@cryptsoft.com). */
 
 
-#include <openssl/bn.h>
+#include <boringssl/bn.h>
 
 #include <string.h>
 
-#include <openssl/err.h>
-#include <openssl/mem.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
 
 
 /* How many bignums are in each "pool item"; */
diff --git a/boringssl/crypto/bn/div.c b/boringssl/crypto/bn/div.c
index 6f672914..4e4e7a4b 100644
--- a/boringssl/crypto/bn/div.c
+++ b/boringssl/crypto/bn/div.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,11 +55,11 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/bn.h>
+#include <boringssl/bn.h>
 
 #include <assert.h>
 #include <limits.h>
-#include <openssl/err.h>
+#include <boringssl/err.h>
 
 #include "internal.h"
 
diff --git a/boringssl/crypto/bn/exponentiation.c b/boringssl/crypto/bn/exponentiation.c
index bb7a2f40..51801c33 100644
--- a/boringssl/crypto/bn/exponentiation.c
+++ b/boringssl/crypto/bn/exponentiation.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -106,14 +107,14 @@
  * (eay@cryptsoft.com).  This product includes software written by Tim
  * Hudson (tjh@cryptsoft.com). */
 
-#include <openssl/bn.h>
+#include <boringssl/bn.h>
 
 #include <assert.h>
 #include <string.h>
 
-#include <openssl/cpu.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
+#include <boringssl/cpu.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
 
 #include "internal.h"
 
diff --git a/boringssl/crypto/bn/gcd.c b/boringssl/crypto/bn/gcd.c
index 41ca6d21..a900b4ae 100644
--- a/boringssl/crypto/bn/gcd.c
+++ b/boringssl/crypto/bn/gcd.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -106,9 +107,9 @@
  * (eay@cryptsoft.com).  This product includes software written by Tim
  * Hudson (tjh@cryptsoft.com). */
 
-#include <openssl/bn.h>
+#include <boringssl/bn.h>
 
-#include <openssl/err.h>
+#include <boringssl/err.h>
 
 #include "internal.h"
 
diff --git a/boringssl/crypto/bn/generic.c b/boringssl/crypto/bn/generic.c
index f552d99f..2af7a170 100644
--- a/boringssl/crypto/bn/generic.c
+++ b/boringssl/crypto/bn/generic.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,7 +55,7 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/bn.h>
+#include <boringssl/bn.h>
 
 #include <assert.h>
 
diff --git a/boringssl/crypto/bn/internal.h b/boringssl/crypto/bn/internal.h
index 0a2982c7..56d8fac9 100644
--- a/boringssl/crypto/bn/internal.h
+++ b/boringssl/crypto/bn/internal.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -123,7 +124,7 @@
 #ifndef OPENSSL_HEADER_BN_INTERNAL_H
 #define OPENSSL_HEADER_BN_INTERNAL_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #if defined(OPENSSL_X86_64) && defined(_MSC_VER)
 #pragma warning(push, 3)
diff --git a/boringssl/crypto/bn/kronecker.c b/boringssl/crypto/bn/kronecker.c
index 23ef79af..02c93253 100644
--- a/boringssl/crypto/bn/kronecker.c
+++ b/boringssl/crypto/bn/kronecker.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* ====================================================================
  * Copyright (c) 1998-2000 The OpenSSL Project.  All rights reserved.
  *
@@ -50,7 +51,7 @@
  * (eay@cryptsoft.com).  This product includes software written by Tim
  * Hudson (tjh@cryptsoft.com). */
 
-#include <openssl/bn.h>
+#include <boringssl/bn.h>
 
 #include "internal.h"
 
diff --git a/boringssl/crypto/bn/montgomery.c b/boringssl/crypto/bn/montgomery.c
index f56998e0..63b176ff 100644
--- a/boringssl/crypto/bn/montgomery.c
+++ b/boringssl/crypto/bn/montgomery.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -106,13 +107,13 @@
  * (eay@cryptsoft.com).  This product includes software written by Tim
  * Hudson (tjh@cryptsoft.com). */
 
-#include <openssl/bn.h>
+#include <boringssl/bn.h>
 
 #include <string.h>
 
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/thread.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/thread.h>
 
 #include "internal.h"
 #include "../internal.h"
diff --git a/boringssl/crypto/bn/mul.c b/boringssl/crypto/bn/mul.c
index 06e53ee0..642b82c5 100644
--- a/boringssl/crypto/bn/mul.c
+++ b/boringssl/crypto/bn/mul.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,7 +55,7 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/bn.h>
+#include <boringssl/bn.h>
 
 #include <assert.h>
 #include <string.h>
diff --git a/boringssl/crypto/bn/prime.c b/boringssl/crypto/bn/prime.c
index d07e6094..2b70c0b8 100644
--- a/boringssl/crypto/bn/prime.c
+++ b/boringssl/crypto/bn/prime.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -106,10 +107,10 @@
  * (eay@cryptsoft.com).  This product includes software written by Tim
  * Hudson (tjh@cryptsoft.com). */
 
-#include <openssl/bn.h>
+#include <boringssl/bn.h>
 
-#include <openssl/err.h>
-#include <openssl/mem.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
 
 #include "internal.h"
 
diff --git a/boringssl/crypto/bn/random.c b/boringssl/crypto/bn/random.c
index 3116e547..eda5049a 100644
--- a/boringssl/crypto/bn/random.c
+++ b/boringssl/crypto/bn/random.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -106,14 +107,14 @@
  * (eay@cryptsoft.com).  This product includes software written by Tim
  * Hudson (tjh@cryptsoft.com). */
 
-#include <openssl/bn.h>
+#include <boringssl/bn.h>
 
 #include <string.h>
 
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/rand.h>
-#include <openssl/sha.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/rand.h>
+#include <boringssl/sha.h>
 
 int BN_rand(BIGNUM *rnd, int bits, int top, int bottom) {
   uint8_t *buf = NULL;
diff --git a/boringssl/crypto/bn/rsaz_exp.c b/boringssl/crypto/bn/rsaz_exp.c
index 30f08e5f..38d27ef2 100644
--- a/boringssl/crypto/bn/rsaz_exp.c
+++ b/boringssl/crypto/bn/rsaz_exp.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /*****************************************************************************
 *                                                                            *
 *  Copyright (c) 2012, Intel Corporation                                     *
@@ -40,13 +41,13 @@
 * (2) University of Haifa, Israel                                            *
 *****************************************************************************/
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #if !defined(OPENSSL_NO_ASM) && defined(OPENSSL_X86_64)
 
 #include "rsaz_exp.h"
 
-#include <openssl/mem.h>
+#include <boringssl/mem.h>
 
 #include "../internal.h"
 
diff --git a/boringssl/crypto/bn/rsaz_exp.h b/boringssl/crypto/bn/rsaz_exp.h
index c752b45f..efa99699 100644
--- a/boringssl/crypto/bn/rsaz_exp.h
+++ b/boringssl/crypto/bn/rsaz_exp.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /*****************************************************************************
 *                                                                            *
 *  Copyright (c) 2012, Intel Corporation                                     *
@@ -43,7 +44,7 @@
 #ifndef RSAZ_EXP_H
 #define RSAZ_EXP_H
 
-#include <openssl/bn.h>
+#include <boringssl/bn.h>
 
 void RSAZ_1024_mod_exp_avx2(BN_ULONG result[16],
 	const BN_ULONG base_norm[16], const BN_ULONG exponent[16],
diff --git a/boringssl/crypto/bn/shift.c b/boringssl/crypto/bn/shift.c
index defec929..6547fec7 100644
--- a/boringssl/crypto/bn/shift.c
+++ b/boringssl/crypto/bn/shift.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,11 +55,11 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/bn.h>
+#include <boringssl/bn.h>
 
 #include <string.h>
 
-#include <openssl/err.h>
+#include <boringssl/err.h>
 
 #include "internal.h"
 
diff --git a/boringssl/crypto/bn/sqrt.c b/boringssl/crypto/bn/sqrt.c
index 2ed66c22..6c650c54 100644
--- a/boringssl/crypto/bn/sqrt.c
+++ b/boringssl/crypto/bn/sqrt.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Written by Lenka Fibikova <fibikova@exp-math.uni-essen.de>
  * and Bodo Moeller for the OpenSSL project. */
 /* ====================================================================
@@ -52,9 +53,9 @@
  * (eay@cryptsoft.com).  This product includes software written by Tim
  * Hudson (tjh@cryptsoft.com). */
 
-#include <openssl/bn.h>
+#include <boringssl/bn.h>
 
-#include <openssl/err.h>
+#include <boringssl/err.h>
 
 
 /* Returns 'ret' such that
diff --git a/boringssl/crypto/buf/buf.c b/boringssl/crypto/buf/buf.c
index b918f01f..7ef7ed2b 100644
--- a/boringssl/crypto/buf/buf.c
+++ b/boringssl/crypto/buf/buf.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,12 +55,12 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/buf.h>
+#include <boringssl/buf.h>
 
 #include <string.h>
 
-#include <openssl/mem.h>
-#include <openssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/err.h>
 
 
 BUF_MEM *BUF_MEM_new(void) {
diff --git a/boringssl/crypto/bytestring/CMakeLists.txt b/boringssl/crypto/bytestring/CMakeLists.txt
index 362e702f..432be3b1 100644
--- a/boringssl/crypto/bytestring/CMakeLists.txt
+++ b/boringssl/crypto/bytestring/CMakeLists.txt
@@ -19,5 +19,5 @@ add_executable(
   $<TARGET_OBJECTS:test_support>
 )
 
-target_link_libraries(bytestring_test crypto)
+target_link_libraries(bytestring_test bsslcrypto)
 add_dependencies(all_tests bytestring_test)
diff --git a/boringssl/crypto/bytestring/asn1_compat.c b/boringssl/crypto/bytestring/asn1_compat.c
index b17d2d12..b350c76b 100644
--- a/boringssl/crypto/bytestring/asn1_compat.c
+++ b/boringssl/crypto/bytestring/asn1_compat.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2016, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -13,13 +14,13 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
 
 
-#include <openssl/bytestring.h>
+#include <boringssl/bytestring.h>
 
 #include <assert.h>
 #include <limits.h>
 #include <string.h>
 
-#include <openssl/mem.h>
+#include <boringssl/mem.h>
 
 #include "internal.h"
 
diff --git a/boringssl/crypto/bytestring/ber.c b/boringssl/crypto/bytestring/ber.c
index 04fcac6a..7455f7de 100644
--- a/boringssl/crypto/bytestring/ber.c
+++ b/boringssl/crypto/bytestring/ber.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -12,7 +13,7 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
 
-#include <openssl/bytestring.h>
+#include <boringssl/bytestring.h>
 
 #include <assert.h>
 #include <string.h>
diff --git a/boringssl/crypto/bytestring/bytestring_test.cc b/boringssl/crypto/bytestring/bytestring_test.cc
index 84ecffcd..7bcb83c0 100644
--- a/boringssl/crypto/bytestring/bytestring_test.cc
+++ b/boringssl/crypto/bytestring/bytestring_test.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -22,8 +23,8 @@
 
 #include <vector>
 
-#include <openssl/crypto.h>
-#include <openssl/bytestring.h>
+#include <boringssl/crypto.h>
+#include <boringssl/bytestring.h>
 
 #include "internal.h"
 #include "../test/scoped_types.h"
diff --git a/boringssl/crypto/bytestring/cbb.c b/boringssl/crypto/bytestring/cbb.c
index 8fc51879..76c3b514 100644
--- a/boringssl/crypto/bytestring/cbb.c
+++ b/boringssl/crypto/bytestring/cbb.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -12,12 +13,12 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
 
-#include <openssl/bytestring.h>
+#include <boringssl/bytestring.h>
 
 #include <assert.h>
 #include <string.h>
 
-#include <openssl/mem.h>
+#include <boringssl/mem.h>
 
 
 void CBB_zero(CBB *cbb) {
diff --git a/boringssl/crypto/bytestring/cbs.c b/boringssl/crypto/bytestring/cbs.c
index 5e0c538a..73391ef2 100644
--- a/boringssl/crypto/bytestring/cbs.c
+++ b/boringssl/crypto/bytestring/cbs.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -12,9 +13,9 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
 
-#include <openssl/buf.h>
-#include <openssl/mem.h>
-#include <openssl/bytestring.h>
+#include <boringssl/buf.h>
+#include <boringssl/mem.h>
+#include <boringssl/bytestring.h>
 
 #include <assert.h>
 #include <string.h>
diff --git a/boringssl/crypto/bytestring/internal.h b/boringssl/crypto/bytestring/internal.h
index 2fed4139..48264862 100644
--- a/boringssl/crypto/bytestring/internal.h
+++ b/boringssl/crypto/bytestring/internal.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +16,7 @@
 #ifndef OPENSSL_HEADER_BYTESTRING_INTERNAL_H
 #define OPENSSL_HEADER_BYTESTRING_INTERNAL_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/boringssl/crypto/chacha/CMakeLists.txt b/boringssl/crypto/chacha/CMakeLists.txt
index 39d1defb..0ecc7051 100644
--- a/boringssl/crypto/chacha/CMakeLists.txt
+++ b/boringssl/crypto/chacha/CMakeLists.txt
@@ -49,7 +49,7 @@ add_executable(
   $<TARGET_OBJECTS:test_support>
 )
 
-target_link_libraries(chacha_test crypto)
+target_link_libraries(chacha_test bsslcrypto)
 add_dependencies(all_tests chacha_test)
 
 perlasm(chacha-armv4.${ASM_EXT} asm/chacha-armv4.pl)
diff --git a/boringssl/crypto/chacha/asm/chacha-armv4.pl b/boringssl/crypto/chacha/asm/chacha-armv4.pl
index b190445d..170aefdd 100755
--- a/boringssl/crypto/chacha/asm/chacha-armv4.pl
+++ b/boringssl/crypto/chacha/asm/chacha-armv4.pl
@@ -165,6 +165,7 @@ sub ROUND {
 #include <openssl/arm_arch.h>
 
 .text
+#include <boringssl/bssl.h>
 #if defined(__thumb2__)
 .syntax	unified
 .thumb
diff --git a/boringssl/crypto/chacha/asm/chacha-armv8.pl b/boringssl/crypto/chacha/asm/chacha-armv8.pl
index 215d9657..01e86bdc 100755
--- a/boringssl/crypto/chacha/asm/chacha-armv8.pl
+++ b/boringssl/crypto/chacha/asm/chacha-armv8.pl
@@ -114,6 +114,7 @@ sub ROUND {
 #include <openssl/arm_arch.h>
 
 .text
+#include <boringssl/bssl.h>
 
 .extern	OPENSSL_armcap_P
 
diff --git a/boringssl/crypto/chacha/asm/chacha-x86_64.pl b/boringssl/crypto/chacha/asm/chacha-x86_64.pl
index 55b726d2..dc025a5e 100755
--- a/boringssl/crypto/chacha/asm/chacha-x86_64.pl
+++ b/boringssl/crypto/chacha/asm/chacha-x86_64.pl
@@ -60,6 +60,7 @@
 
 $code.=<<___;
 .text
+#include <boringssl/bssl.h>
 
 .extern OPENSSL_ia32cap_P
 
diff --git a/boringssl/crypto/chacha/chacha.c b/boringssl/crypto/chacha/chacha.c
index afe1b2ad..a8b53586 100644
--- a/boringssl/crypto/chacha/chacha.c
+++ b/boringssl/crypto/chacha/chacha.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -14,11 +15,11 @@
 
 /* Adapted from the public domain, estream code by D. Bernstein. */
 
-#include <openssl/chacha.h>
+#include <boringssl/chacha.h>
 
 #include <string.h>
 
-#include <openssl/cpu.h>
+#include <boringssl/cpu.h>
 
 
 #define U8TO32_LITTLE(p)                              \
diff --git a/boringssl/crypto/chacha/chacha_test.cc b/boringssl/crypto/chacha/chacha_test.cc
index f364f982..f431807a 100644
--- a/boringssl/crypto/chacha/chacha_test.cc
+++ b/boringssl/crypto/chacha/chacha_test.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2016, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -18,8 +19,8 @@
 
 #include <memory>
 
-#include <openssl/crypto.h>
-#include <openssl/chacha.h>
+#include <boringssl/crypto.h>
+#include <boringssl/chacha.h>
 
 
 static const uint8_t kKey[32] = {
diff --git a/boringssl/crypto/cipher/CMakeLists.txt b/boringssl/crypto/cipher/CMakeLists.txt
index 52b87b66..ade75914 100644
--- a/boringssl/crypto/cipher/CMakeLists.txt
+++ b/boringssl/crypto/cipher/CMakeLists.txt
@@ -35,6 +35,6 @@ add_executable(
   $<TARGET_OBJECTS:test_support>
 )
 
-target_link_libraries(cipher_test crypto)
-target_link_libraries(aead_test crypto)
+target_link_libraries(cipher_test bsslcrypto)
+target_link_libraries(aead_test bsslcrypto)
 add_dependencies(all_tests cipher_test aead_test)
diff --git a/boringssl/crypto/cipher/aead.c b/boringssl/crypto/cipher/aead.c
index b1db83d2..9e17d5fc 100644
--- a/boringssl/crypto/cipher/aead.c
+++ b/boringssl/crypto/cipher/aead.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -12,12 +13,12 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
 
-#include <openssl/aead.h>
+#include <boringssl/aead.h>
 
 #include <string.h>
 
-#include <openssl/cipher.h>
-#include <openssl/err.h>
+#include <boringssl/cipher.h>
+#include <boringssl/err.h>
 
 #include "internal.h"
 
diff --git a/boringssl/crypto/cipher/aead_test.cc b/boringssl/crypto/cipher/aead_test.cc
index f21291e7..701c85a8 100644
--- a/boringssl/crypto/cipher/aead_test.cc
+++ b/boringssl/crypto/cipher/aead_test.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -17,9 +18,9 @@
 
 #include <vector>
 
-#include <openssl/aead.h>
-#include <openssl/crypto.h>
-#include <openssl/err.h>
+#include <boringssl/aead.h>
+#include <boringssl/crypto.h>
+#include <boringssl/err.h>
 
 #include "../test/file_test.h"
 #include "../test/scoped_types.h"
diff --git a/boringssl/crypto/cipher/cipher.c b/boringssl/crypto/cipher/cipher.c
index 341516a7..d2a46a69 100644
--- a/boringssl/crypto/cipher/cipher.c
+++ b/boringssl/crypto/cipher/cipher.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,14 +55,14 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/cipher.h>
+#include <boringssl/cipher.h>
 
 #include <assert.h>
 #include <string.h>
 
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/nid.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/nid.h>
 
 #include "internal.h"
 
diff --git a/boringssl/crypto/cipher/cipher_test.cc b/boringssl/crypto/cipher/cipher_test.cc
index fa384c69..6a8b5500 100644
--- a/boringssl/crypto/cipher/cipher_test.cc
+++ b/boringssl/crypto/cipher/cipher_test.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
@@ -57,9 +58,9 @@
 #include <string>
 #include <vector>
 
-#include <openssl/cipher.h>
-#include <openssl/crypto.h>
-#include <openssl/err.h>
+#include <boringssl/cipher.h>
+#include <boringssl/crypto.h>
+#include <boringssl/err.h>
 
 #include "../test/file_test.h"
 #include "../test/scoped_types.h"
diff --git a/boringssl/crypto/cipher/derive_key.c b/boringssl/crypto/cipher/derive_key.c
index 9e1634ab..505259d8 100644
--- a/boringssl/crypto/cipher/derive_key.c
+++ b/boringssl/crypto/cipher/derive_key.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,12 +55,12 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/cipher.h>
+#include <boringssl/cipher.h>
 
 #include <assert.h>
 
-#include <openssl/digest.h>
-#include <openssl/mem.h>
+#include <boringssl/digest.h>
+#include <boringssl/mem.h>
 
 #include "internal.h"
 
diff --git a/boringssl/crypto/cipher/e_aes.c b/boringssl/crypto/cipher/e_aes.c
index d61d0482..da8dc1c6 100644
--- a/boringssl/crypto/cipher/e_aes.c
+++ b/boringssl/crypto/cipher/e_aes.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* ====================================================================
  * Copyright (c) 2001-2011 The OpenSSL Project.  All rights reserved.
  *
@@ -48,22 +49,22 @@
 
 #include <string.h>
 
-#include <openssl/aead.h>
-#include <openssl/aes.h>
-#include <openssl/cipher.h>
-#include <openssl/cpu.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/nid.h>
-#include <openssl/rand.h>
-#include <openssl/sha.h>
+#include <boringssl/aead.h>
+#include <boringssl/aes.h>
+#include <boringssl/cipher.h>
+#include <boringssl/cpu.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/nid.h>
+#include <boringssl/rand.h>
+#include <boringssl/sha.h>
 
 #include "internal.h"
 #include "../internal.h"
 #include "../modes/internal.h"
 
 #if defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64)
-#include <openssl/arm_arch.h>
+#include <boringssl/arm_arch.h>
 #endif
 
 
diff --git a/boringssl/crypto/cipher/e_chacha20poly1305.c b/boringssl/crypto/cipher/e_chacha20poly1305.c
index 852b2c64..cbef21b5 100644
--- a/boringssl/crypto/cipher/e_chacha20poly1305.c
+++ b/boringssl/crypto/cipher/e_chacha20poly1305.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -12,15 +13,15 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
 
-#include <openssl/aead.h>
+#include <boringssl/aead.h>
 
 #include <string.h>
 
-#include <openssl/chacha.h>
-#include <openssl/cipher.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/poly1305.h>
+#include <boringssl/chacha.h>
+#include <boringssl/cipher.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/poly1305.h>
 
 #include "internal.h"
 #include "../internal.h"
diff --git a/boringssl/crypto/cipher/e_des.c b/boringssl/crypto/cipher/e_des.c
index 2ba2bed3..519b39ed 100644
--- a/boringssl/crypto/cipher/e_des.c
+++ b/boringssl/crypto/cipher/e_des.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,9 +55,9 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/cipher.h>
-#include <openssl/des.h>
-#include <openssl/nid.h>
+#include <boringssl/cipher.h>
+#include <boringssl/des.h>
+#include <boringssl/nid.h>
 
 #include "internal.h"
 
diff --git a/boringssl/crypto/cipher/e_null.c b/boringssl/crypto/cipher/e_null.c
index 3d6a24c3..6e6f998c 100644
--- a/boringssl/crypto/cipher/e_null.c
+++ b/boringssl/crypto/cipher/e_null.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,11 +55,11 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/cipher.h>
+#include <boringssl/cipher.h>
 
 #include <string.h>
 
-#include <openssl/nid.h>
+#include <boringssl/nid.h>
 
 #include "internal.h"
 
diff --git a/boringssl/crypto/cipher/e_rc2.c b/boringssl/crypto/cipher/e_rc2.c
index 67418d54..64a944b4 100644
--- a/boringssl/crypto/cipher/e_rc2.c
+++ b/boringssl/crypto/cipher/e_rc2.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,8 +55,8 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/cipher.h>
-#include <openssl/nid.h>
+#include <boringssl/cipher.h>
+#include <boringssl/nid.h>
 
 #include "internal.h"
 
diff --git a/boringssl/crypto/cipher/e_rc4.c b/boringssl/crypto/cipher/e_rc4.c
index e7c2ccaf..be0a7177 100644
--- a/boringssl/crypto/cipher/e_rc4.c
+++ b/boringssl/crypto/cipher/e_rc4.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -57,9 +58,9 @@
 #include <assert.h>
 #include <string.h>
 
-#include <openssl/cipher.h>
-#include <openssl/nid.h>
-#include <openssl/rc4.h>
+#include <boringssl/cipher.h>
+#include <boringssl/nid.h>
+#include <boringssl/rc4.h>
 
 
 static int rc4_init_key(EVP_CIPHER_CTX *ctx, const uint8_t *key,
diff --git a/boringssl/crypto/cipher/e_ssl3.c b/boringssl/crypto/cipher/e_ssl3.c
index 7dddf242..94779778 100644
--- a/boringssl/crypto/cipher/e_ssl3.c
+++ b/boringssl/crypto/cipher/e_ssl3.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -16,13 +17,13 @@
 #include <limits.h>
 #include <string.h>
 
-#include <openssl/aead.h>
-#include <openssl/cipher.h>
-#include <openssl/err.h>
-#include <openssl/hmac.h>
-#include <openssl/md5.h>
-#include <openssl/mem.h>
-#include <openssl/sha.h>
+#include <boringssl/aead.h>
+#include <boringssl/cipher.h>
+#include <boringssl/err.h>
+#include <boringssl/hmac.h>
+#include <boringssl/md5.h>
+#include <boringssl/mem.h>
+#include <boringssl/sha.h>
 
 #include "internal.h"
 
diff --git a/boringssl/crypto/cipher/e_tls.c b/boringssl/crypto/cipher/e_tls.c
index b87b0d6e..4737e027 100644
--- a/boringssl/crypto/cipher/e_tls.c
+++ b/boringssl/crypto/cipher/e_tls.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -16,14 +17,14 @@
 #include <limits.h>
 #include <string.h>
 
-#include <openssl/aead.h>
-#include <openssl/cipher.h>
-#include <openssl/err.h>
-#include <openssl/hmac.h>
-#include <openssl/md5.h>
-#include <openssl/mem.h>
-#include <openssl/sha.h>
-#include <openssl/type_check.h>
+#include <boringssl/aead.h>
+#include <boringssl/cipher.h>
+#include <boringssl/err.h>
+#include <boringssl/hmac.h>
+#include <boringssl/md5.h>
+#include <boringssl/mem.h>
+#include <boringssl/sha.h>
+#include <boringssl/type_check.h>
 
 #include "../crypto/internal.h"
 #include "internal.h"
diff --git a/boringssl/crypto/cipher/internal.h b/boringssl/crypto/cipher/internal.h
index 72ac1189..23456d8a 100644
--- a/boringssl/crypto/cipher/internal.h
+++ b/boringssl/crypto/cipher/internal.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -57,9 +58,9 @@
 #ifndef OPENSSL_HEADER_CIPHER_INTERNAL_H
 #define OPENSSL_HEADER_CIPHER_INTERNAL_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
-#include <openssl/aead.h>
+#include <boringssl/aead.h>
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/boringssl/crypto/cipher/tls_cbc.c b/boringssl/crypto/cipher/tls_cbc.c
index 510b4c73..0d94b4b5 100644
--- a/boringssl/crypto/cipher/tls_cbc.c
+++ b/boringssl/crypto/cipher/tls_cbc.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* ====================================================================
  * Copyright (c) 2012 The OpenSSL Project.  All rights reserved.
  *
@@ -53,9 +54,9 @@
 #include <assert.h>
 #include <string.h>
 
-#include <openssl/digest.h>
-#include <openssl/nid.h>
-#include <openssl/sha.h>
+#include <boringssl/digest.h>
+#include <boringssl/nid.h>
+#include <boringssl/sha.h>
 
 #include "../internal.h"
 #include "internal.h"
diff --git a/boringssl/crypto/cmac/CMakeLists.txt b/boringssl/crypto/cmac/CMakeLists.txt
index a346b248..27fd344a 100644
--- a/boringssl/crypto/cmac/CMakeLists.txt
+++ b/boringssl/crypto/cmac/CMakeLists.txt
@@ -16,5 +16,5 @@ add_executable(
   $<TARGET_OBJECTS:test_support>
 )
 
-target_link_libraries(cmac_test crypto)
+target_link_libraries(cmac_test bsslcrypto)
 add_dependencies(all_tests cmac_test)
diff --git a/boringssl/crypto/cmac/cmac.c b/boringssl/crypto/cmac/cmac.c
index fa4c3c49..8e85a20e 100644
--- a/boringssl/crypto/cmac/cmac.c
+++ b/boringssl/crypto/cmac/cmac.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* ====================================================================
  * Copyright (c) 2010 The OpenSSL Project.  All rights reserved.
  *
@@ -46,14 +47,14 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  * ==================================================================== */
 
-#include <openssl/cmac.h>
+#include <boringssl/cmac.h>
 
 #include <assert.h>
 #include <string.h>
 
-#include <openssl/aes.h>
-#include <openssl/cipher.h>
-#include <openssl/mem.h>
+#include <boringssl/aes.h>
+#include <boringssl/cipher.h>
+#include <boringssl/mem.h>
 
 
 struct cmac_ctx_st {
diff --git a/boringssl/crypto/cmac/cmac_test.cc b/boringssl/crypto/cmac/cmac_test.cc
index 2496f2a9..7109dc0f 100644
--- a/boringssl/crypto/cmac/cmac_test.cc
+++ b/boringssl/crypto/cmac/cmac_test.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2015, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -16,7 +17,7 @@
 
 #include <algorithm>
 
-#include <openssl/cmac.h>
+#include <boringssl/cmac.h>
 
 #include "../test/scoped_types.h"
 #include "../test/test_util.h"
diff --git a/boringssl/crypto/conf/conf.c b/boringssl/crypto/conf/conf.c
index e4fc428b..762bea09 100644
--- a/boringssl/crypto/conf/conf.c
+++ b/boringssl/crypto/conf/conf.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,15 +55,15 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/conf.h>
+#include <boringssl/conf.h>
 
 #include <string.h>
 #include <ctype.h>
 
-#include <openssl/bio.h>
-#include <openssl/buf.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
+#include <boringssl/bio.h>
+#include <boringssl/buf.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
 
 #include "conf_def.h"
 #include "internal.h"
diff --git a/boringssl/crypto/conf/conf_def.h b/boringssl/crypto/conf/conf_def.h
index b1e6ba63..ec678d69 100644
--- a/boringssl/crypto/conf/conf_def.h
+++ b/boringssl/crypto/conf/conf_def.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* crypto/conf/conf_def.h */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
diff --git a/boringssl/crypto/conf/internal.h b/boringssl/crypto/conf/internal.h
index 03d1a8f3..aed07a36 100644
--- a/boringssl/crypto/conf/internal.h
+++ b/boringssl/crypto/conf/internal.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2015, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/boringssl/crypto/constant_time_test.c b/boringssl/crypto/constant_time_test.c
index bc127c1c..6ea2bd52 100644
--- a/boringssl/crypto/constant_time_test.c
+++ b/boringssl/crypto/constant_time_test.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /*
  * Utilities for constant-time cryptography.
  *
diff --git a/boringssl/crypto/cpu-aarch64-linux.c b/boringssl/crypto/cpu-aarch64-linux.c
index 1b0f3955..df92075f 100644
--- a/boringssl/crypto/cpu-aarch64-linux.c
+++ b/boringssl/crypto/cpu-aarch64-linux.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2016, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -12,13 +13,13 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
 
-#include <openssl/cpu.h>
+#include <boringssl/cpu.h>
 
 #if defined(OPENSSL_AARCH64) && !defined(OPENSSL_STATIC_ARMCAP)
 
 #include <sys/auxv.h>
 
-#include <openssl/arm_arch.h>
+#include <boringssl/arm_arch.h>
 
 #include "internal.h"
 
diff --git a/boringssl/crypto/cpu-arm-linux.c b/boringssl/crypto/cpu-arm-linux.c
index 73c38ecc..8ce5a34b 100644
--- a/boringssl/crypto/cpu-arm-linux.c
+++ b/boringssl/crypto/cpu-arm-linux.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2016, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -12,7 +13,7 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
 
-#include <openssl/cpu.h>
+#include <boringssl/cpu.h>
 
 #if defined(OPENSSL_ARM) && !defined(OPENSSL_STATIC_ARMCAP)
 
@@ -22,9 +23,9 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <openssl/arm_arch.h>
-#include <openssl/buf.h>
-#include <openssl/mem.h>
+#include <boringssl/arm_arch.h>
+#include <boringssl/buf.h>
+#include <boringssl/mem.h>
 
 #include "internal.h"
 
diff --git a/boringssl/crypto/cpu-arm.c b/boringssl/crypto/cpu-arm.c
index ef395eae..ccd76d7a 100644
--- a/boringssl/crypto/cpu-arm.c
+++ b/boringssl/crypto/cpu-arm.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -12,12 +13,12 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
 
-#include <openssl/cpu.h>
+#include <boringssl/cpu.h>
 
 #if (defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64)) && \
     !defined(OPENSSL_STATIC_ARMCAP)
 
-#include <openssl/arm_arch.h>
+#include <boringssl/arm_arch.h>
 
 
 extern uint32_t OPENSSL_armcap_P;
diff --git a/boringssl/crypto/cpu-intel.c b/boringssl/crypto/cpu-intel.c
index 431e1e15..547995ec 100644
--- a/boringssl/crypto/cpu-intel.c
+++ b/boringssl/crypto/cpu-intel.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -58,7 +59,7 @@
 #define __STDC_FORMAT_MACROS
 #endif
 
-#include <openssl/cpu.h>
+#include <boringssl/cpu.h>
 
 
 #if !defined(OPENSSL_NO_ASM) && (defined(OPENSSL_X86) || defined(OPENSSL_X86_64))
diff --git a/boringssl/crypto/crypto.c b/boringssl/crypto/crypto.c
index 89b0bd14..31e9bdcb 100644
--- a/boringssl/crypto/crypto.c
+++ b/boringssl/crypto/crypto.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -12,9 +13,9 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
 
-#include <openssl/crypto.h>
+#include <boringssl/crypto.h>
 
-#include <openssl/cpu.h>
+#include <boringssl/cpu.h>
 
 #include "internal.h"
 
@@ -57,7 +58,7 @@
 uint32_t OPENSSL_ia32cap_P[4] = {0};
 #elif defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64)
 
-#include <openssl/arm_arch.h>
+#include <boringssl/arm_arch.h>
 
 #if defined(OPENSSL_STATIC_ARMCAP)
 
diff --git a/boringssl/crypto/curve25519/CMakeLists.txt b/boringssl/crypto/curve25519/CMakeLists.txt
index 195b1e6a..e100c5ee 100644
--- a/boringssl/crypto/curve25519/CMakeLists.txt
+++ b/boringssl/crypto/curve25519/CMakeLists.txt
@@ -35,7 +35,7 @@ add_executable(
   $<TARGET_OBJECTS:test_support>
 )
 
-target_link_libraries(ed25519_test crypto)
+target_link_libraries(ed25519_test bsslcrypto)
 add_dependencies(all_tests ed25519_test)
 
 add_executable(
@@ -44,7 +44,7 @@ add_executable(
   x25519_test.cc
 )
 
-target_link_libraries(x25519_test crypto)
+target_link_libraries(x25519_test bsslcrypto)
 add_dependencies(all_tests x25519_test)
 
 add_executable(
@@ -53,5 +53,5 @@ add_executable(
   spake25519_test.cc
 )
 
-target_link_libraries(spake25519_test crypto)
+target_link_libraries(spake25519_test bsslcrypto)
 add_dependencies(all_tests spake25519_test)
diff --git a/boringssl/crypto/curve25519/asm/x25519-asm-arm.S b/boringssl/crypto/curve25519/asm/x25519-asm-arm.S
index 3af1dba9..bb9d9581 100644
--- a/boringssl/crypto/curve25519/asm/x25519-asm-arm.S
+++ b/boringssl/crypto/curve25519/asm/x25519-asm-arm.S
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2015, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/boringssl/crypto/curve25519/asm/x25519-asm-x86_64.S b/boringssl/crypto/curve25519/asm/x25519-asm-x86_64.S
index 531ac163..533ee17d 100644
--- a/boringssl/crypto/curve25519/asm/x25519-asm-x86_64.S
+++ b/boringssl/crypto/curve25519/asm/x25519-asm-x86_64.S
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2015, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/boringssl/crypto/curve25519/curve25519.c b/boringssl/crypto/curve25519/curve25519.c
index 1dd1b3ed..b15634d5 100644
--- a/boringssl/crypto/curve25519/curve25519.c
+++ b/boringssl/crypto/curve25519/curve25519.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2015, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -19,14 +20,14 @@
  *
  * The field functions are shared by Ed25519 and X25519 where possible. */
 
-#include <openssl/curve25519.h>
+#include <boringssl/curve25519.h>
 
 #include <string.h>
 
-#include <openssl/cpu.h>
-#include <openssl/mem.h>
-#include <openssl/rand.h>
-#include <openssl/sha.h>
+#include <boringssl/cpu.h>
+#include <boringssl/mem.h>
+#include <boringssl/rand.h>
+#include <boringssl/sha.h>
 
 #include "internal.h"
 
diff --git a/boringssl/crypto/curve25519/ed25519_test.cc b/boringssl/crypto/curve25519/ed25519_test.cc
index 1b6a0b61..721b749c 100644
--- a/boringssl/crypto/curve25519/ed25519_test.cc
+++ b/boringssl/crypto/curve25519/ed25519_test.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2015, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +16,7 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <openssl/curve25519.h>
+#include <boringssl/curve25519.h>
 
 #include "../test/file_test.h"
 
diff --git a/boringssl/crypto/curve25519/internal.h b/boringssl/crypto/curve25519/internal.h
index ea206a3e..f2839e01 100644
--- a/boringssl/crypto/curve25519/internal.h
+++ b/boringssl/crypto/curve25519/internal.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2015, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/boringssl/crypto/curve25519/spake25519.c b/boringssl/crypto/curve25519/spake25519.c
index 617418cf..6619a774 100644
--- a/boringssl/crypto/curve25519/spake25519.c
+++ b/boringssl/crypto/curve25519/spake25519.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2016, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -12,14 +13,14 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
 
-#include <openssl/curve25519.h>
+#include <boringssl/curve25519.h>
 
 #include <string.h>
 
-#include <openssl/bytestring.h>
-#include <openssl/mem.h>
-#include <openssl/rand.h>
-#include <openssl/sha.h>
+#include <boringssl/bytestring.h>
+#include <boringssl/mem.h>
+#include <boringssl/rand.h>
+#include <boringssl/sha.h>
 
 #include "internal.h"
 
diff --git a/boringssl/crypto/curve25519/spake25519_test.cc b/boringssl/crypto/curve25519/spake25519_test.cc
index d97a8602..84822fab 100644
--- a/boringssl/crypto/curve25519/spake25519_test.cc
+++ b/boringssl/crypto/curve25519/spake25519_test.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2016, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -18,7 +19,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <openssl/curve25519.h>
+#include <boringssl/curve25519.h>
 #include "../test/scoped_types.h"
 
 
diff --git a/boringssl/crypto/curve25519/x25519-x86_64.c b/boringssl/crypto/curve25519/x25519-x86_64.c
index 9776c755..0be28a71 100644
--- a/boringssl/crypto/curve25519/x25519-x86_64.c
+++ b/boringssl/crypto/curve25519/x25519-x86_64.c
@@ -1,4 +1,5 @@
-#include <openssl/curve25519.h>
+#include <boringssl/bssl.h>
+#include <boringssl/curve25519.h>
 
 #include <string.h>
 
diff --git a/boringssl/crypto/curve25519/x25519_test.cc b/boringssl/crypto/curve25519/x25519_test.cc
index 24dfa650..58d607e5 100644
--- a/boringssl/crypto/curve25519/x25519_test.cc
+++ b/boringssl/crypto/curve25519/x25519_test.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2015, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -16,7 +17,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <openssl/curve25519.h>
+#include <boringssl/curve25519.h>
 
 
 static bool TestX25519() {
diff --git a/boringssl/crypto/des/des.c b/boringssl/crypto/des/des.c
index 1d27ebe4..ebbab34d 100644
--- a/boringssl/crypto/des/des.c
+++ b/boringssl/crypto/des/des.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,7 +55,7 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/des.h>
+#include <boringssl/des.h>
 
 #include <stdlib.h>
 
diff --git a/boringssl/crypto/des/internal.h b/boringssl/crypto/des/internal.h
index 00b45586..ac262f8e 100644
--- a/boringssl/crypto/des/internal.h
+++ b/boringssl/crypto/des/internal.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -57,7 +58,7 @@
 #ifndef OPENSSL_HEADER_DES_INTERNAL_H
 #define OPENSSL_HEADER_DES_INTERNAL_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/boringssl/crypto/dh/CMakeLists.txt b/boringssl/crypto/dh/CMakeLists.txt
index f1e86162..f9dd34a2 100644
--- a/boringssl/crypto/dh/CMakeLists.txt
+++ b/boringssl/crypto/dh/CMakeLists.txt
@@ -19,5 +19,5 @@ add_executable(
   $<TARGET_OBJECTS:test_support>
 )
 
-target_link_libraries(dh_test crypto)
+target_link_libraries(dh_test bsslcrypto)
 add_dependencies(all_tests dh_test)
diff --git a/boringssl/crypto/dh/check.c b/boringssl/crypto/dh/check.c
index d27fdf15..06221f50 100644
--- a/boringssl/crypto/dh/check.c
+++ b/boringssl/crypto/dh/check.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,9 +55,9 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/dh.h>
+#include <boringssl/dh.h>
 
-#include <openssl/bn.h>
+#include <boringssl/bn.h>
 
 #include "internal.h"
 
diff --git a/boringssl/crypto/dh/dh.c b/boringssl/crypto/dh/dh.c
index a5cf94d9..f0c9714c 100644
--- a/boringssl/crypto/dh/dh.c
+++ b/boringssl/crypto/dh/dh.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,16 +55,16 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/dh.h>
+#include <boringssl/dh.h>
 
 #include <string.h>
 
-#include <openssl/bn.h>
-#include <openssl/buf.h>
-#include <openssl/err.h>
-#include <openssl/ex_data.h>
-#include <openssl/mem.h>
-#include <openssl/thread.h>
+#include <boringssl/bn.h>
+#include <boringssl/buf.h>
+#include <boringssl/err.h>
+#include <boringssl/ex_data.h>
+#include <boringssl/mem.h>
+#include <boringssl/thread.h>
 
 #include "internal.h"
 #include "../internal.h"
diff --git a/boringssl/crypto/dh/dh_asn1.c b/boringssl/crypto/dh/dh_asn1.c
index 73cd4df7..7aa84cce 100644
--- a/boringssl/crypto/dh/dh_asn1.c
+++ b/boringssl/crypto/dh/dh_asn1.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2000.
  */
@@ -53,10 +54,10 @@
  * (eay@cryptsoft.com).  This product includes software written by Tim
  * Hudson (tjh@cryptsoft.com). */
 
-#include <openssl/dh.h>
+#include <boringssl/dh.h>
 
-#include <openssl/asn1.h>
-#include <openssl/asn1t.h>
+#include <boringssl/asn1.h>
+#include <boringssl/asn1t.h>
 
 #include "internal.h"
 
diff --git a/boringssl/crypto/dh/dh_test.cc b/boringssl/crypto/dh/dh_test.cc
index 885bd32b..36c29639 100644
--- a/boringssl/crypto/dh/dh_test.cc
+++ b/boringssl/crypto/dh/dh_test.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,17 +55,17 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/dh.h>
+#include <boringssl/dh.h>
 
 #include <stdio.h>
 #include <string.h>
 
 #include <vector>
 
-#include <openssl/bn.h>
-#include <openssl/crypto.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
+#include <boringssl/bn.h>
+#include <boringssl/crypto.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
 
 #include "internal.h"
 #include "../test/scoped_types.h"
diff --git a/boringssl/crypto/dh/internal.h b/boringssl/crypto/dh/internal.h
index 81b9c902..e63b3e14 100644
--- a/boringssl/crypto/dh/internal.h
+++ b/boringssl/crypto/dh/internal.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -57,10 +58,10 @@
 #ifndef OPENSSL_HEADER_DH_INTERNAL_H
 #define OPENSSL_HEADER_DH_INTERNAL_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
-#include <openssl/bn.h>
-#include <openssl/ex_data.h>
+#include <boringssl/bn.h>
+#include <boringssl/ex_data.h>
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/boringssl/crypto/dh/params.c b/boringssl/crypto/dh/params.c
index 7e8102a0..ba45869b 100644
--- a/boringssl/crypto/dh/params.c
+++ b/boringssl/crypto/dh/params.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* ====================================================================
  * Copyright (c) 2011 The OpenSSL Project.  All rights reserved.
  *
@@ -50,9 +51,9 @@
  * (eay@cryptsoft.com).  This product includes software written by Tim
  * Hudson (tjh@cryptsoft.com). */
 
-#include <openssl/dh.h>
+#include <boringssl/dh.h>
 
-#include <openssl/bn.h>
+#include <boringssl/bn.h>
 
 #include "internal.h"
 #include "../bn/internal.h"
diff --git a/boringssl/crypto/digest/CMakeLists.txt b/boringssl/crypto/digest/CMakeLists.txt
index 7a68f6fe..b0a78e2d 100644
--- a/boringssl/crypto/digest/CMakeLists.txt
+++ b/boringssl/crypto/digest/CMakeLists.txt
@@ -17,5 +17,5 @@ add_executable(
   $<TARGET_OBJECTS:test_support>
 )
 
-target_link_libraries(digest_test crypto)
+target_link_libraries(digest_test bsslcrypto)
 add_dependencies(all_tests digest_test)
diff --git a/boringssl/crypto/digest/digest.c b/boringssl/crypto/digest/digest.c
index fdd9fe55..54d5adbd 100644
--- a/boringssl/crypto/digest/digest.c
+++ b/boringssl/crypto/digest/digest.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,13 +55,13 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/digest.h>
+#include <boringssl/digest.h>
 
 #include <assert.h>
 #include <string.h>
 
-#include <openssl/err.h>
-#include <openssl/mem.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
 
 #include "internal.h"
 
diff --git a/boringssl/crypto/digest/digest_test.cc b/boringssl/crypto/digest/digest_test.cc
index 39ceaffc..ada2e35d 100644
--- a/boringssl/crypto/digest/digest_test.cc
+++ b/boringssl/crypto/digest/digest_test.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -16,12 +17,12 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <openssl/crypto.h>
-#include <openssl/digest.h>
-#include <openssl/err.h>
-#include <openssl/md4.h>
-#include <openssl/md5.h>
-#include <openssl/sha.h>
+#include <boringssl/crypto.h>
+#include <boringssl/digest.h>
+#include <boringssl/err.h>
+#include <boringssl/md4.h>
+#include <boringssl/md5.h>
+#include <boringssl/sha.h>
 
 #include "../test/scoped_types.h"
 
diff --git a/boringssl/crypto/digest/digests.c b/boringssl/crypto/digest/digests.c
index 3307f265..53f898dc 100644
--- a/boringssl/crypto/digest/digests.c
+++ b/boringssl/crypto/digest/digests.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,15 +55,15 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/digest.h>
+#include <boringssl/digest.h>
 
 #include <assert.h>
 #include <string.h>
 
-#include <openssl/md4.h>
-#include <openssl/md5.h>
-#include <openssl/obj.h>
-#include <openssl/sha.h>
+#include <boringssl/md4.h>
+#include <boringssl/md5.h>
+#include <boringssl/obj.h>
+#include <boringssl/sha.h>
 
 #include "internal.h"
 
diff --git a/boringssl/crypto/digest/internal.h b/boringssl/crypto/digest/internal.h
index e3d812ad..c4562ca4 100644
--- a/boringssl/crypto/digest/internal.h
+++ b/boringssl/crypto/digest/internal.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -57,7 +58,7 @@
 #ifndef OPENSSL_HEADER_DIGEST_INTERNAL_H
 #define OPENSSL_HEADER_DIGEST_INTERNAL_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/boringssl/crypto/digest/md32_common.h b/boringssl/crypto/digest/md32_common.h
index 4cf050ca..abe2b132 100644
--- a/boringssl/crypto/digest/md32_common.h
+++ b/boringssl/crypto/digest/md32_common.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* ====================================================================
  * Copyright (c) 1999-2007 The OpenSSL Project.  All rights reserved.
  *
@@ -49,7 +50,7 @@
 #ifndef OPENSSL_HEADER_MD32_COMMON_H
 #define OPENSSL_HEADER_MD32_COMMON_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #include <assert.h>
 
diff --git a/boringssl/crypto/dsa/CMakeLists.txt b/boringssl/crypto/dsa/CMakeLists.txt
index de365656..a56316fe 100644
--- a/boringssl/crypto/dsa/CMakeLists.txt
+++ b/boringssl/crypto/dsa/CMakeLists.txt
@@ -17,5 +17,5 @@ add_executable(
   $<TARGET_OBJECTS:test_support>
 )
 
-target_link_libraries(dsa_test crypto)
+target_link_libraries(dsa_test bsslcrypto)
 add_dependencies(all_tests dsa_test)
diff --git a/boringssl/crypto/dsa/dsa.c b/boringssl/crypto/dsa/dsa.c
index fe29aa0e..549f763c 100644
--- a/boringssl/crypto/dsa/dsa.c
+++ b/boringssl/crypto/dsa/dsa.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -57,20 +58,20 @@
  * The DSS routines are based on patches supplied by
  * Steven Schoch <schoch@sheba.arc.nasa.gov>. */
 
-#include <openssl/dsa.h>
+#include <boringssl/dsa.h>
 
 #include <string.h>
 
-#include <openssl/bn.h>
-#include <openssl/dh.h>
-#include <openssl/digest.h>
-#include <openssl/engine.h>
-#include <openssl/err.h>
-#include <openssl/ex_data.h>
-#include <openssl/mem.h>
-#include <openssl/rand.h>
-#include <openssl/sha.h>
-#include <openssl/thread.h>
+#include <boringssl/bn.h>
+#include <boringssl/dh.h>
+#include <boringssl/digest.h>
+#include <boringssl/engine.h>
+#include <boringssl/err.h>
+#include <boringssl/ex_data.h>
+#include <boringssl/mem.h>
+#include <boringssl/rand.h>
+#include <boringssl/sha.h>
+#include <boringssl/thread.h>
 
 #include "../internal.h"
 
diff --git a/boringssl/crypto/dsa/dsa_asn1.c b/boringssl/crypto/dsa/dsa_asn1.c
index ff5ee003..aee128a8 100644
--- a/boringssl/crypto/dsa/dsa_asn1.c
+++ b/boringssl/crypto/dsa/dsa_asn1.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2000. */
 /* ====================================================================
@@ -52,14 +53,14 @@
  * (eay@cryptsoft.com).  This product includes software written by Tim
  * Hudson (tjh@cryptsoft.com). */
 
-#include <openssl/dsa.h>
+#include <boringssl/dsa.h>
 
 #include <assert.h>
 
-#include <openssl/bn.h>
-#include <openssl/bytestring.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
+#include <boringssl/bn.h>
+#include <boringssl/bytestring.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
 
 #include "../bytestring/internal.h"
 
diff --git a/boringssl/crypto/dsa/dsa_test.c b/boringssl/crypto/dsa/dsa_test.c
index 6296c8f0..80ad9090 100644
--- a/boringssl/crypto/dsa/dsa_test.c
+++ b/boringssl/crypto/dsa/dsa_test.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -57,13 +58,13 @@
  * The DSS routines are based on patches supplied by
  * Steven Schoch <schoch@sheba.arc.nasa.gov>. */
 
-#include <openssl/dsa.h>
+#include <boringssl/dsa.h>
 
 #include <string.h>
 
-#include <openssl/bn.h>
-#include <openssl/crypto.h>
-#include <openssl/err.h>
+#include <boringssl/bn.h>
+#include <boringssl/crypto.h>
+#include <boringssl/err.h>
 
 
 static int dsa_cb(int p, int n, BN_GENCB *arg);
diff --git a/boringssl/crypto/ec/CMakeLists.txt b/boringssl/crypto/ec/CMakeLists.txt
index 4749484e..1593383e 100644
--- a/boringssl/crypto/ec/CMakeLists.txt
+++ b/boringssl/crypto/ec/CMakeLists.txt
@@ -46,6 +46,6 @@ add_executable(
   $<TARGET_OBJECTS:test_support>
 )
 
-target_link_libraries(example_mul crypto)
-target_link_libraries(ec_test crypto)
+target_link_libraries(example_mul bsslcrypto)
+target_link_libraries(ec_test bsslcrypto)
 add_dependencies(all_tests example_mul ec_test)
diff --git a/boringssl/crypto/ec/asm/p256-x86_64-asm.pl b/boringssl/crypto/ec/asm/p256-x86_64-asm.pl
index 50a5fe6e..fa927669 100755
--- a/boringssl/crypto/ec/asm/p256-x86_64-asm.pl
+++ b/boringssl/crypto/ec/asm/p256-x86_64-asm.pl
@@ -60,6 +60,7 @@
 
 $code.=<<___;
 .text
+#include <boringssl/bssl.h>
 .extern	OPENSSL_ia32cap_P
 
 # The polynomial
diff --git a/boringssl/crypto/ec/ec.c b/boringssl/crypto/ec/ec.c
index 8f3fa6e1..323ef03c 100644
--- a/boringssl/crypto/ec/ec.c
+++ b/boringssl/crypto/ec/ec.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Originally written by Bodo Moeller for the OpenSSL project.
  * ====================================================================
  * Copyright (c) 1998-2005 The OpenSSL Project.  All rights reserved.
@@ -65,15 +66,15 @@
  * Sheueling Chang Shantz and Douglas Stebila of Sun Microsystems
  * Laboratories. */
 
-#include <openssl/ec.h>
+#include <boringssl/ec.h>
 
 #include <assert.h>
 #include <string.h>
 
-#include <openssl/bn.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/nid.h>
+#include <boringssl/bn.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/nid.h>
 
 #include "internal.h"
 #include "../internal.h"
diff --git a/boringssl/crypto/ec/ec_asn1.c b/boringssl/crypto/ec/ec_asn1.c
index f31e1587..c1e8b561 100644
--- a/boringssl/crypto/ec/ec_asn1.c
+++ b/boringssl/crypto/ec/ec_asn1.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Written by Nils Larsch for the OpenSSL project. */
 /* ====================================================================
  * Copyright (c) 2000-2003 The OpenSSL Project.  All rights reserved.
@@ -51,16 +52,16 @@
  * (eay@cryptsoft.com).  This product includes software written by Tim
  * Hudson (tjh@cryptsoft.com). */
 
-#include <openssl/ec.h>
+#include <boringssl/ec.h>
 
 #include <limits.h>
 #include <string.h>
 
-#include <openssl/bytestring.h>
-#include <openssl/bn.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/nid.h>
+#include <boringssl/bytestring.h>
+#include <boringssl/bn.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/nid.h>
 
 #include "internal.h"
 #include "../bytestring/internal.h"
diff --git a/boringssl/crypto/ec/ec_key.c b/boringssl/crypto/ec/ec_key.c
index fee71fed..e36878f0 100644
--- a/boringssl/crypto/ec/ec_key.c
+++ b/boringssl/crypto/ec/ec_key.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Originally written by Bodo Moeller for the OpenSSL project.
  * ====================================================================
  * Copyright (c) 1998-2005 The OpenSSL Project.  All rights reserved.
@@ -65,16 +66,16 @@
  * Sheueling Chang Shantz and Douglas Stebila of Sun Microsystems
  * Laboratories. */
 
-#include <openssl/ec_key.h>
+#include <boringssl/ec_key.h>
 
 #include <string.h>
 
-#include <openssl/ec.h>
-#include <openssl/engine.h>
-#include <openssl/err.h>
-#include <openssl/ex_data.h>
-#include <openssl/mem.h>
-#include <openssl/thread.h>
+#include <boringssl/ec.h>
+#include <boringssl/engine.h>
+#include <boringssl/err.h>
+#include <boringssl/ex_data.h>
+#include <boringssl/mem.h>
+#include <boringssl/thread.h>
 
 #include "internal.h"
 #include "../internal.h"
diff --git a/boringssl/crypto/ec/ec_montgomery.c b/boringssl/crypto/ec/ec_montgomery.c
index 35df3651..b758058c 100644
--- a/boringssl/crypto/ec/ec_montgomery.c
+++ b/boringssl/crypto/ec/ec_montgomery.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Originally written by Bodo Moeller and Nils Larsch for the OpenSSL project.
  * ====================================================================
  * Copyright (c) 1998-2005 The OpenSSL Project.  All rights reserved.
@@ -65,11 +66,11 @@
  * Sheueling Chang Shantz and Douglas Stebila of Sun Microsystems
  * Laboratories. */
 
-#include <openssl/ec.h>
+#include <boringssl/ec.h>
 
-#include <openssl/bn.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
+#include <boringssl/bn.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
 
 #include "internal.h"
 
diff --git a/boringssl/crypto/ec/ec_test.cc b/boringssl/crypto/ec/ec_test.cc
index ce9d99f3..245b0078 100644
--- a/boringssl/crypto/ec/ec_test.cc
+++ b/boringssl/crypto/ec/ec_test.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -17,11 +18,11 @@
 
 #include <vector>
 
-#include <openssl/bytestring.h>
-#include <openssl/crypto.h>
-#include <openssl/ec_key.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
+#include <boringssl/bytestring.h>
+#include <boringssl/crypto.h>
+#include <boringssl/ec_key.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
 
 #include "../test/scoped_types.h"
 
diff --git a/boringssl/crypto/ec/example_mul.c b/boringssl/crypto/ec/example_mul.c
index a2bdd527..53989d6b 100644
--- a/boringssl/crypto/ec/example_mul.c
+++ b/boringssl/crypto/ec/example_mul.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Originally written by Bodo Moeller for the OpenSSL project.
  * ====================================================================
  * Copyright (c) 1998-2005 The OpenSSL Project.  All rights reserved.
@@ -67,10 +68,10 @@
 
 #include <stdio.h>
 
-#include <openssl/bn.h>
-#include <openssl/crypto.h>
-#include <openssl/ec.h>
-#include <openssl/nid.h>
+#include <boringssl/bn.h>
+#include <boringssl/crypto.h>
+#include <boringssl/ec.h>
+#include <boringssl/nid.h>
 
 
 static int example_EC_POINT_mul(void) {
diff --git a/boringssl/crypto/ec/internal.h b/boringssl/crypto/ec/internal.h
index f2cbb961..74b6fcdc 100644
--- a/boringssl/crypto/ec/internal.h
+++ b/boringssl/crypto/ec/internal.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Originally written by Bodo Moeller for the OpenSSL project.
  * ====================================================================
  * Copyright (c) 1998-2005 The OpenSSL Project.  All rights reserved.
@@ -68,11 +69,11 @@
 #ifndef OPENSSL_HEADER_EC_INTERNAL_H
 #define OPENSSL_HEADER_EC_INTERNAL_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
-#include <openssl/bn.h>
-#include <openssl/ex_data.h>
-#include <openssl/thread.h>
+#include <boringssl/bn.h>
+#include <boringssl/ex_data.h>
+#include <boringssl/thread.h>
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/boringssl/crypto/ec/oct.c b/boringssl/crypto/ec/oct.c
index bf1957ca..7b8a1b8c 100644
--- a/boringssl/crypto/ec/oct.c
+++ b/boringssl/crypto/ec/oct.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Originally written by Bodo Moeller for the OpenSSL project.
  * ====================================================================
  * Copyright (c) 1998-2005 The OpenSSL Project.  All rights reserved.
@@ -65,11 +66,11 @@
  * Sheueling Chang Shantz and Douglas Stebila of Sun Microsystems
  * Laboratories. */
 
-#include <openssl/ec.h>
+#include <boringssl/ec.h>
 
-#include <openssl/bn.h>
-#include <openssl/bytestring.h>
-#include <openssl/err.h>
+#include <boringssl/bn.h>
+#include <boringssl/bytestring.h>
+#include <boringssl/err.h>
 
 #include "internal.h"
 
diff --git a/boringssl/crypto/ec/p224-64.c b/boringssl/crypto/ec/p224-64.c
index 7bf889c9..afe6d636 100644
--- a/boringssl/crypto/ec/p224-64.c
+++ b/boringssl/crypto/ec/p224-64.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2015, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -17,15 +18,15 @@
  * Inspired by Daniel J. Bernstein's public domain nistp224 implementation
  * and Adam Langley's public domain 64-bit C implementation of curve25519. */
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #if defined(OPENSSL_64_BIT) && !defined(OPENSSL_WINDOWS) && \
     !defined(OPENSSL_SMALL)
 
-#include <openssl/bn.h>
-#include <openssl/ec.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
+#include <boringssl/bn.h>
+#include <boringssl/ec.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
 
 #include <string.h>
 
diff --git a/boringssl/crypto/ec/p256-64.c b/boringssl/crypto/ec/p256-64.c
index c4259b62..d160c979 100644
--- a/boringssl/crypto/ec/p256-64.c
+++ b/boringssl/crypto/ec/p256-64.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2015, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -19,14 +20,14 @@
  * Otherwise based on Emilia's P224 work, which was inspired by my curve25519
  * work which got its smarts from Daniel J. Bernstein's work on the same. */
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #if defined(OPENSSL_64_BIT) && !defined(OPENSSL_WINDOWS)
 
-#include <openssl/bn.h>
-#include <openssl/ec.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
+#include <boringssl/bn.h>
+#include <boringssl/ec.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
 
 #include <string.h>
 
diff --git a/boringssl/crypto/ec/p256-x86_64-table.h b/boringssl/crypto/ec/p256-x86_64-table.h
index e4705f8e..7efa6218 100644
--- a/boringssl/crypto/ec/p256-x86_64-table.h
+++ b/boringssl/crypto/ec/p256-x86_64-table.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2015, Intel Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/boringssl/crypto/ec/p256-x86_64.c b/boringssl/crypto/ec/p256-x86_64.c
index e1afec48..b582ee1b 100644
--- a/boringssl/crypto/ec/p256-x86_64.c
+++ b/boringssl/crypto/ec/p256-x86_64.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Intel Corporation.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -20,15 +21,15 @@
  * S.Gueron and V.Krasnov, "Fast Prime Field Elliptic Curve Cryptography with
  *                          256 Bit Primes" */
 
-#include <openssl/ec.h>
+#include <boringssl/ec.h>
 
 #include <assert.h>
 #include <stdint.h>
 #include <string.h>
 
-#include <openssl/bn.h>
-#include <openssl/crypto.h>
-#include <openssl/err.h>
+#include <boringssl/bn.h>
+#include <boringssl/crypto.h>
+#include <boringssl/err.h>
 
 #include "../bn/internal.h"
 #include "../ec/internal.h"
diff --git a/boringssl/crypto/ec/simple.c b/boringssl/crypto/ec/simple.c
index 4508d83f..8dd3d409 100644
--- a/boringssl/crypto/ec/simple.c
+++ b/boringssl/crypto/ec/simple.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Originally written by Bodo Moeller for the OpenSSL project.
  * ====================================================================
  * Copyright (c) 1998-2005 The OpenSSL Project.  All rights reserved.
@@ -65,13 +66,13 @@
  * Sheueling Chang Shantz and Douglas Stebila of Sun Microsystems
  * Laboratories. */
 
-#include <openssl/ec.h>
+#include <boringssl/ec.h>
 
 #include <string.h>
 
-#include <openssl/bn.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
+#include <boringssl/bn.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
 
 #include "internal.h"
 
diff --git a/boringssl/crypto/ec/util-64.c b/boringssl/crypto/ec/util-64.c
index 40062712..716cf68c 100644
--- a/boringssl/crypto/ec/util-64.c
+++ b/boringssl/crypto/ec/util-64.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2015, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -12,12 +13,12 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 
 #if defined(OPENSSL_64_BIT) && !defined(OPENSSL_WINDOWS)
 
-#include <openssl/ec.h>
+#include <boringssl/ec.h>
 
 #include "internal.h"
 
diff --git a/boringssl/crypto/ec/wnaf.c b/boringssl/crypto/ec/wnaf.c
index ba2257c4..3ab6b3b4 100644
--- a/boringssl/crypto/ec/wnaf.c
+++ b/boringssl/crypto/ec/wnaf.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Originally written by Bodo Moeller for the OpenSSL project.
  * ====================================================================
  * Copyright (c) 1998-2005 The OpenSSL Project.  All rights reserved.
@@ -65,14 +66,14 @@
  * Sheueling Chang Shantz and Douglas Stebila of Sun Microsystems
  * Laboratories. */
 
-#include <openssl/ec.h>
+#include <boringssl/ec.h>
 
 #include <string.h>
 
-#include <openssl/bn.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/thread.h>
+#include <boringssl/bn.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/thread.h>
 
 #include "internal.h"
 #include "../internal.h"
diff --git a/boringssl/crypto/ecdh/ecdh.c b/boringssl/crypto/ecdh/ecdh.c
index 4a1964a0..e28812c1 100644
--- a/boringssl/crypto/ecdh/ecdh.c
+++ b/boringssl/crypto/ecdh/ecdh.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* ====================================================================
  * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
  *
@@ -64,14 +65,14 @@
  * (eay@cryptsoft.com).  This product includes software written by Tim
  * Hudson (tjh@cryptsoft.com). */
 
-#include <openssl/ecdh.h>
+#include <boringssl/ecdh.h>
 
 #include <string.h>
 
-#include <openssl/bn.h>
-#include <openssl/digest.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
+#include <boringssl/bn.h>
+#include <boringssl/digest.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
 
 
 int ECDH_compute_key(void *out, size_t outlen, const EC_POINT *pub_key,
diff --git a/boringssl/crypto/ecdsa/CMakeLists.txt b/boringssl/crypto/ecdsa/CMakeLists.txt
index 0cc672e8..1cec6a74 100644
--- a/boringssl/crypto/ecdsa/CMakeLists.txt
+++ b/boringssl/crypto/ecdsa/CMakeLists.txt
@@ -18,5 +18,5 @@ add_executable(
   $<TARGET_OBJECTS:test_support>
 )
 
-target_link_libraries(ecdsa_test crypto)
+target_link_libraries(ecdsa_test bsslcrypto)
 add_dependencies(all_tests ecdsa_test)
diff --git a/boringssl/crypto/ecdsa/ecdsa.c b/boringssl/crypto/ecdsa/ecdsa.c
index 70cb1189..6d906936 100644
--- a/boringssl/crypto/ecdsa/ecdsa.c
+++ b/boringssl/crypto/ecdsa/ecdsa.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* ====================================================================
  * Copyright (c) 1998-2005 The OpenSSL Project.  All rights reserved.
  *
@@ -50,15 +51,15 @@
  * (eay@cryptsoft.com).  This product includes software written by Tim
  * Hudson (tjh@cryptsoft.com). */
 
-#include <openssl/ecdsa.h>
+#include <boringssl/ecdsa.h>
 
 #include <assert.h>
 #include <string.h>
 
-#include <openssl/bn.h>
-#include <openssl/bytestring.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
+#include <boringssl/bn.h>
+#include <boringssl/bytestring.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
 
 #include "../ec/internal.h"
 
diff --git a/boringssl/crypto/ecdsa/ecdsa_asn1.c b/boringssl/crypto/ecdsa/ecdsa_asn1.c
index d41a5366..90ae877e 100644
--- a/boringssl/crypto/ecdsa/ecdsa_asn1.c
+++ b/boringssl/crypto/ecdsa/ecdsa_asn1.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* ====================================================================
  * Copyright (c) 1998-2005 The OpenSSL Project.  All rights reserved.
  *
@@ -50,16 +51,16 @@
  * (eay@cryptsoft.com).  This product includes software written by Tim
  * Hudson (tjh@cryptsoft.com). */
 
-#include <openssl/ecdsa.h>
+#include <boringssl/ecdsa.h>
 
 #include <limits.h>
 #include <string.h>
 
-#include <openssl/bn.h>
-#include <openssl/bytestring.h>
-#include <openssl/err.h>
-#include <openssl/ec_key.h>
-#include <openssl/mem.h>
+#include <boringssl/bn.h>
+#include <boringssl/bytestring.h>
+#include <boringssl/err.h>
+#include <boringssl/ec_key.h>
+#include <boringssl/mem.h>
 
 #include "../bytestring/internal.h"
 #include "../ec/internal.h"
diff --git a/boringssl/crypto/ecdsa/ecdsa_test.cc b/boringssl/crypto/ecdsa/ecdsa_test.cc
index 8d7827df..07aaa1bd 100644
--- a/boringssl/crypto/ecdsa/ecdsa_test.cc
+++ b/boringssl/crypto/ecdsa/ecdsa_test.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* ====================================================================
  * Copyright (c) 1998-2005 The OpenSSL Project.  All rights reserved.
  *
@@ -50,17 +51,17 @@
  * (eay@cryptsoft.com).  This product includes software written by Tim
  * Hudson (tjh@cryptsoft.com). */
 
-#include <openssl/ecdsa.h>
+#include <boringssl/ecdsa.h>
 
 #include <vector>
 
-#include <openssl/bn.h>
-#include <openssl/crypto.h>
-#include <openssl/ec.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/nid.h>
-#include <openssl/rand.h>
+#include <boringssl/bn.h>
+#include <boringssl/crypto.h>
+#include <boringssl/ec.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/nid.h>
+#include <boringssl/rand.h>
 
 #include "../test/scoped_types.h"
 
diff --git a/boringssl/crypto/engine/engine.c b/boringssl/crypto/engine/engine.c
index 25ea98de..d11213e2 100644
--- a/boringssl/crypto/engine/engine.c
+++ b/boringssl/crypto/engine/engine.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -12,16 +13,16 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
 
-#include <openssl/engine.h>
+#include <boringssl/engine.h>
 
 #include <string.h>
 #include <assert.h>
 
-#include <openssl/ec_key.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/rsa.h>
-#include <openssl/thread.h>
+#include <boringssl/ec_key.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/rsa.h>
+#include <boringssl/thread.h>
 
 
 struct engine_st {
diff --git a/boringssl/crypto/err/CMakeLists.txt b/boringssl/crypto/err/CMakeLists.txt
index a095b542..d6b48f80 100644
--- a/boringssl/crypto/err/CMakeLists.txt
+++ b/boringssl/crypto/err/CMakeLists.txt
@@ -46,5 +46,5 @@ add_executable(
   $<TARGET_OBJECTS:test_support>
 )
 
-target_link_libraries(err_test crypto)
+target_link_libraries(err_test bsslcrypto)
 add_dependencies(all_tests err_test)
diff --git a/boringssl/crypto/err/err.c b/boringssl/crypto/err/err.c
index 9221bf17..28c2beb3 100644
--- a/boringssl/crypto/err/err.c
+++ b/boringssl/crypto/err/err.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -106,7 +107,7 @@
  * (eay@cryptsoft.com).  This product includes software written by Tim
  * Hudson (tjh@cryptsoft.com). */
 
-#include <openssl/err.h>
+#include <boringssl/err.h>
 
 #include <assert.h>
 #include <errno.h>
@@ -119,8 +120,8 @@
 #pragma warning(pop)
 #endif
 
-#include <openssl/mem.h>
-#include <openssl/thread.h>
+#include <boringssl/mem.h>
+#include <boringssl/thread.h>
 
 #include "../internal.h"
 
diff --git a/boringssl/crypto/err/err_data_generate.go b/boringssl/crypto/err/err_data_generate.go
index 893ebffe..1f65b7f9 100644
--- a/boringssl/crypto/err/err_data_generate.go
+++ b/boringssl/crypto/err/err_data_generate.go
@@ -267,9 +267,9 @@ func main() {
 
  /* This file was generated by err_data_generate.go. */
 
-#include <openssl/base.h>
-#include <openssl/err.h>
-#include <openssl/type_check.h>
+#include <boringssl/base.h>
+#include <boringssl/err.h>
+#include <boringssl/type_check.h>
 
 
 `)
diff --git a/boringssl/crypto/err/err_test.cc b/boringssl/crypto/err/err_test.cc
index d6913558..53561af2 100644
--- a/boringssl/crypto/err/err_test.cc
+++ b/boringssl/crypto/err/err_test.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,9 +16,9 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <openssl/crypto.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
+#include <boringssl/crypto.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
 
 
 static bool TestOverflow() {
diff --git a/boringssl/crypto/evp/CMakeLists.txt b/boringssl/crypto/evp/CMakeLists.txt
index ca1b5112..ce7e3ebb 100644
--- a/boringssl/crypto/evp/CMakeLists.txt
+++ b/boringssl/crypto/evp/CMakeLists.txt
@@ -44,7 +44,7 @@ add_executable(
   $<TARGET_OBJECTS:test_support>
 )
 
-target_link_libraries(evp_extra_test crypto)
-target_link_libraries(evp_test crypto)
-target_link_libraries(pbkdf_test crypto)
+target_link_libraries(evp_extra_test bsslcrypto)
+target_link_libraries(evp_test bsslcrypto)
+target_link_libraries(pbkdf_test bsslcrypto)
 add_dependencies(all_tests evp_extra_test evp_test pbkdf_test)
diff --git a/boringssl/crypto/evp/digestsign.c b/boringssl/crypto/evp/digestsign.c
index 69c483ad..c1d16bf3 100644
--- a/boringssl/crypto/evp/digestsign.c
+++ b/boringssl/crypto/evp/digestsign.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006.
  */
@@ -53,9 +54,9 @@
  * (eay@cryptsoft.com).  This product includes software written by Tim
  * Hudson (tjh@cryptsoft.com). */
 
-#include <openssl/evp.h>
+#include <boringssl/evp.h>
 
-#include <openssl/err.h>
+#include <boringssl/err.h>
 
 #include "internal.h"
 #include "../digest/internal.h"
diff --git a/boringssl/crypto/evp/evp.c b/boringssl/crypto/evp/evp.c
index 79993aab..dd1a082c 100644
--- a/boringssl/crypto/evp/evp.c
+++ b/boringssl/crypto/evp/evp.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,18 +55,18 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/evp.h>
+#include <boringssl/evp.h>
 
 #include <assert.h>
 #include <string.h>
 
-#include <openssl/dsa.h>
-#include <openssl/ec.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/nid.h>
-#include <openssl/rsa.h>
-#include <openssl/thread.h>
+#include <boringssl/dsa.h>
+#include <boringssl/ec.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/nid.h>
+#include <boringssl/rsa.h>
+#include <boringssl/thread.h>
 
 #include "internal.h"
 #include "../internal.h"
diff --git a/boringssl/crypto/evp/evp_asn1.c b/boringssl/crypto/evp/evp_asn1.c
index 3681d4fc..3703a5ee 100644
--- a/boringssl/crypto/evp/evp_asn1.c
+++ b/boringssl/crypto/evp/evp_asn1.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,15 +55,15 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/evp.h>
+#include <boringssl/evp.h>
 
 #include <string.h>
 
-#include <openssl/bytestring.h>
-#include <openssl/dsa.h>
-#include <openssl/ec_key.h>
-#include <openssl/err.h>
-#include <openssl/rsa.h>
+#include <boringssl/bytestring.h>
+#include <boringssl/dsa.h>
+#include <boringssl/ec_key.h>
+#include <boringssl/err.h>
+#include <boringssl/rsa.h>
 
 #include "internal.h"
 
diff --git a/boringssl/crypto/evp/evp_ctx.c b/boringssl/crypto/evp/evp_ctx.c
index f510f6c7..6d768ad6 100644
--- a/boringssl/crypto/evp/evp_ctx.c
+++ b/boringssl/crypto/evp/evp_ctx.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,12 +55,12 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/evp.h>
+#include <boringssl/evp.h>
 
 #include <string.h>
 
-#include <openssl/err.h>
-#include <openssl/mem.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
 
 #include "internal.h"
 
diff --git a/boringssl/crypto/evp/evp_extra_test.cc b/boringssl/crypto/evp/evp_extra_test.cc
index 9bc36ad8..3946d430 100644
--- a/boringssl/crypto/evp/evp_extra_test.cc
+++ b/boringssl/crypto/evp/evp_extra_test.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -20,12 +21,12 @@
 #include <utility>
 #include <vector>
 
-#include <openssl/bytestring.h>
-#include <openssl/crypto.h>
-#include <openssl/digest.h>
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/rsa.h>
+#include <boringssl/bytestring.h>
+#include <boringssl/crypto.h>
+#include <boringssl/digest.h>
+#include <boringssl/err.h>
+#include <boringssl/evp.h>
+#include <boringssl/rsa.h>
 
 #include "../test/scoped_types.h"
 
diff --git a/boringssl/crypto/evp/evp_test.cc b/boringssl/crypto/evp/evp_test.cc
index a7dac2bf..5750a094 100644
--- a/boringssl/crypto/evp/evp_test.cc
+++ b/boringssl/crypto/evp/evp_test.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
@@ -70,11 +71,11 @@
 #pragma warning(pop)
 #endif
 
-#include <openssl/bytestring.h>
-#include <openssl/crypto.h>
-#include <openssl/digest.h>
-#include <openssl/err.h>
-#include <openssl/evp.h>
+#include <boringssl/bytestring.h>
+#include <boringssl/crypto.h>
+#include <boringssl/digest.h>
+#include <boringssl/err.h>
+#include <boringssl/evp.h>
 
 #include "../test/file_test.h"
 #include "../test/scoped_types.h"
diff --git a/boringssl/crypto/evp/internal.h b/boringssl/crypto/evp/internal.h
index 0783143d..f01dfdd5 100644
--- a/boringssl/crypto/evp/internal.h
+++ b/boringssl/crypto/evp/internal.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -57,9 +58,9 @@
 #ifndef OPENSSL_HEADER_EVP_INTERNAL_H
 #define OPENSSL_HEADER_EVP_INTERNAL_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
-#include <openssl/rsa.h>
+#include <boringssl/rsa.h>
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/boringssl/crypto/evp/p_dsa_asn1.c b/boringssl/crypto/evp/p_dsa_asn1.c
index 1f022f1a..e9040125 100644
--- a/boringssl/crypto/evp/p_dsa_asn1.c
+++ b/boringssl/crypto/evp/p_dsa_asn1.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
  * 2006.
  */
@@ -53,13 +54,13 @@
  * (eay@cryptsoft.com).  This product includes software written by Tim
  * Hudson (tjh@cryptsoft.com). */
 
-#include <openssl/evp.h>
+#include <boringssl/evp.h>
 
-#include <openssl/digest.h>
-#include <openssl/bn.h>
-#include <openssl/bytestring.h>
-#include <openssl/dsa.h>
-#include <openssl/err.h>
+#include <boringssl/digest.h>
+#include <boringssl/bn.h>
+#include <boringssl/bytestring.h>
+#include <boringssl/dsa.h>
+#include <boringssl/err.h>
 
 #include "internal.h"
 
diff --git a/boringssl/crypto/evp/p_ec.c b/boringssl/crypto/evp/p_ec.c
index f92c87cf..f1bd9bbe 100644
--- a/boringssl/crypto/evp/p_ec.c
+++ b/boringssl/crypto/evp/p_ec.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006.
  */
@@ -53,20 +54,20 @@
  * (eay@cryptsoft.com).  This product includes software written by Tim
  * Hudson (tjh@cryptsoft.com). */
 
-#include <openssl/evp.h>
+#include <boringssl/evp.h>
 
 #include <string.h>
 
-#include <openssl/bn.h>
-#include <openssl/buf.h>
-#include <openssl/digest.h>
-#include <openssl/ec.h>
-#include <openssl/ec_key.h>
-#include <openssl/ecdh.h>
-#include <openssl/ecdsa.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/nid.h>
+#include <boringssl/bn.h>
+#include <boringssl/buf.h>
+#include <boringssl/digest.h>
+#include <boringssl/ec.h>
+#include <boringssl/ec_key.h>
+#include <boringssl/ecdh.h>
+#include <boringssl/ecdsa.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/nid.h>
 
 #include "internal.h"
 #include "../ec/internal.h"
diff --git a/boringssl/crypto/evp/p_ec_asn1.c b/boringssl/crypto/evp/p_ec_asn1.c
index 8d44dcdc..f5934439 100644
--- a/boringssl/crypto/evp/p_ec_asn1.c
+++ b/boringssl/crypto/evp/p_ec_asn1.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006.
  */
@@ -53,14 +54,14 @@
  * (eay@cryptsoft.com).  This product includes software written by Tim
  * Hudson (tjh@cryptsoft.com). */
 
-#include <openssl/evp.h>
+#include <boringssl/evp.h>
 
-#include <openssl/bn.h>
-#include <openssl/bytestring.h>
-#include <openssl/ec.h>
-#include <openssl/ec_key.h>
-#include <openssl/ecdsa.h>
-#include <openssl/err.h>
+#include <boringssl/bn.h>
+#include <boringssl/bytestring.h>
+#include <boringssl/ec.h>
+#include <boringssl/ec_key.h>
+#include <boringssl/ecdsa.h>
+#include <boringssl/err.h>
 
 #include "internal.h"
 
diff --git a/boringssl/crypto/evp/p_rsa.c b/boringssl/crypto/evp/p_rsa.c
index a2106572..122ddb70 100644
--- a/boringssl/crypto/evp/p_rsa.c
+++ b/boringssl/crypto/evp/p_rsa.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006.
  */
@@ -53,19 +54,19 @@
  * (eay@cryptsoft.com).  This product includes software written by Tim
  * Hudson (tjh@cryptsoft.com). */
 
-#include <openssl/evp.h>
+#include <boringssl/evp.h>
 
 #include <limits.h>
 #include <string.h>
 
-#include <openssl/bn.h>
-#include <openssl/buf.h>
-#include <openssl/bytestring.h>
-#include <openssl/digest.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/nid.h>
-#include <openssl/rsa.h>
+#include <boringssl/bn.h>
+#include <boringssl/buf.h>
+#include <boringssl/bytestring.h>
+#include <boringssl/digest.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/nid.h>
+#include <boringssl/rsa.h>
 
 #include "../rsa/internal.h"
 #include "internal.h"
diff --git a/boringssl/crypto/evp/p_rsa_asn1.c b/boringssl/crypto/evp/p_rsa_asn1.c
index 2c4b266d..0e4aaeec 100644
--- a/boringssl/crypto/evp/p_rsa_asn1.c
+++ b/boringssl/crypto/evp/p_rsa_asn1.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006.
  */
@@ -53,14 +54,14 @@
  * (eay@cryptsoft.com).  This product includes software written by Tim
  * Hudson (tjh@cryptsoft.com). */
 
-#include <openssl/evp.h>
+#include <boringssl/evp.h>
 
-#include <openssl/bn.h>
-#include <openssl/bytestring.h>
-#include <openssl/digest.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/rsa.h>
+#include <boringssl/bn.h>
+#include <boringssl/bytestring.h>
+#include <boringssl/digest.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/rsa.h>
 
 #include "../rsa/internal.h"
 #include "internal.h"
diff --git a/boringssl/crypto/evp/pbkdf.c b/boringssl/crypto/evp/pbkdf.c
index b06b922b..6f3ccc9d 100644
--- a/boringssl/crypto/evp/pbkdf.c
+++ b/boringssl/crypto/evp/pbkdf.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -53,11 +54,11 @@
  * (eay@cryptsoft.com).  This product includes software written by Tim
  * Hudson (tjh@cryptsoft.com). */
 
-#include <openssl/evp.h>
+#include <boringssl/evp.h>
 
 #include <string.h>
 
-#include <openssl/hmac.h>
+#include <boringssl/hmac.h>
 
 
 int PKCS5_PBKDF2_HMAC(const char *password, size_t password_len,
diff --git a/boringssl/crypto/evp/pbkdf_test.cc b/boringssl/crypto/evp/pbkdf_test.cc
index 438ab644..47c144c8 100644
--- a/boringssl/crypto/evp/pbkdf_test.cc
+++ b/boringssl/crypto/evp/pbkdf_test.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2015, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,10 +16,10 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <openssl/crypto.h>
-#include <openssl/digest.h>
-#include <openssl/err.h>
-#include <openssl/evp.h>
+#include <boringssl/crypto.h>
+#include <boringssl/digest.h>
+#include <boringssl/err.h>
+#include <boringssl/evp.h>
 
 
 // Prints out the data buffer as a sequence of hex bytes.
diff --git a/boringssl/crypto/evp/print.c b/boringssl/crypto/evp/print.c
index 56521ec5..ffbf7787 100644
--- a/boringssl/crypto/evp/print.c
+++ b/boringssl/crypto/evp/print.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* ====================================================================
  * Copyright (c) 2006 The OpenSSL Project.  All rights reserved.
  *
@@ -50,15 +51,15 @@
  * (eay@cryptsoft.com).  This product includes software written by Tim
  * Hudson (tjh@cryptsoft.com). */
 
-#include <openssl/evp.h>
+#include <boringssl/evp.h>
 
-#include <openssl/bio.h>
-#include <openssl/bn.h>
-#include <openssl/dsa.h>
-#include <openssl/ec.h>
-#include <openssl/ec_key.h>
-#include <openssl/mem.h>
-#include <openssl/rsa.h>
+#include <boringssl/bio.h>
+#include <boringssl/bn.h>
+#include <boringssl/dsa.h>
+#include <boringssl/ec.h>
+#include <boringssl/ec_key.h>
+#include <boringssl/mem.h>
+#include <boringssl/rsa.h>
 
 #include "../rsa/internal.h"
 
diff --git a/boringssl/crypto/evp/sign.c b/boringssl/crypto/evp/sign.c
index ced86bdf..6d88014c 100644
--- a/boringssl/crypto/evp/sign.c
+++ b/boringssl/crypto/evp/sign.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,10 +55,10 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/evp.h>
+#include <boringssl/evp.h>
 
-#include <openssl/digest.h>
-#include <openssl/err.h>
+#include <boringssl/digest.h>
+#include <boringssl/err.h>
 
 #include "internal.h"
 
diff --git a/boringssl/crypto/ex_data.c b/boringssl/crypto/ex_data.c
index 8fa12402..c1620588 100644
--- a/boringssl/crypto/ex_data.c
+++ b/boringssl/crypto/ex_data.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -106,17 +107,17 @@
  * (eay@cryptsoft.com).  This product includes software written by Tim
  * Hudson (tjh@cryptsoft.com). */
 
-#include <openssl/ex_data.h>
+#include <boringssl/ex_data.h>
 
 #include <assert.h>
 #include <string.h>
 
-#include <openssl/crypto.h>
-#include <openssl/err.h>
-#include <openssl/lhash.h>
-#include <openssl/mem.h>
-#include <openssl/stack.h>
-#include <openssl/thread.h>
+#include <boringssl/crypto.h>
+#include <boringssl/err.h>
+#include <boringssl/lhash.h>
+#include <boringssl/mem.h>
+#include <boringssl/stack.h>
+#include <boringssl/thread.h>
 
 #include "internal.h"
 
diff --git a/boringssl/crypto/hkdf/CMakeLists.txt b/boringssl/crypto/hkdf/CMakeLists.txt
index d9db933e..ce699faf 100644
--- a/boringssl/crypto/hkdf/CMakeLists.txt
+++ b/boringssl/crypto/hkdf/CMakeLists.txt
@@ -16,5 +16,5 @@ add_executable(
   $<TARGET_OBJECTS:test_support>
 )
 
-target_link_libraries(hkdf_test crypto)
+target_link_libraries(hkdf_test bsslcrypto)
 add_dependencies(all_tests hkdf_test)
diff --git a/boringssl/crypto/hkdf/hkdf.c b/boringssl/crypto/hkdf/hkdf.c
index f9cdcb0b..1bf4e5b8 100644
--- a/boringssl/crypto/hkdf/hkdf.c
+++ b/boringssl/crypto/hkdf/hkdf.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -12,13 +13,13 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
 
-#include <openssl/hkdf.h>
+#include <boringssl/hkdf.h>
 
 #include <assert.h>
 #include <string.h>
 
-#include <openssl/err.h>
-#include <openssl/hmac.h>
+#include <boringssl/err.h>
+#include <boringssl/hmac.h>
 
 
 int HKDF(uint8_t *out_key, size_t out_len,
diff --git a/boringssl/crypto/hkdf/hkdf_test.c b/boringssl/crypto/hkdf/hkdf_test.c
index b11061ae..250ce076 100644
--- a/boringssl/crypto/hkdf/hkdf_test.c
+++ b/boringssl/crypto/hkdf/hkdf_test.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,10 +16,10 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <openssl/crypto.h>
-#include <openssl/digest.h>
-#include <openssl/err.h>
-#include <openssl/hkdf.h>
+#include <boringssl/crypto.h>
+#include <boringssl/digest.h>
+#include <boringssl/err.h>
+#include <boringssl/hkdf.h>
 
 #include "../test/test_util.h"
 
diff --git a/boringssl/crypto/hmac/CMakeLists.txt b/boringssl/crypto/hmac/CMakeLists.txt
index 179a53b0..fe658424 100644
--- a/boringssl/crypto/hmac/CMakeLists.txt
+++ b/boringssl/crypto/hmac/CMakeLists.txt
@@ -17,5 +17,5 @@ add_executable(
   $<TARGET_OBJECTS:test_support>
 )
 
-target_link_libraries(hmac_test crypto)
+target_link_libraries(hmac_test bsslcrypto)
 add_dependencies(all_tests hmac_test)
diff --git a/boringssl/crypto/hmac/hmac.c b/boringssl/crypto/hmac/hmac.c
index bccc5c02..a9a2ddff 100644
--- a/boringssl/crypto/hmac/hmac.c
+++ b/boringssl/crypto/hmac/hmac.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,13 +55,13 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/hmac.h>
+#include <boringssl/hmac.h>
 
 #include <assert.h>
 #include <string.h>
 
-#include <openssl/digest.h>
-#include <openssl/mem.h>
+#include <boringssl/digest.h>
+#include <boringssl/mem.h>
 
 
 uint8_t *HMAC(const EVP_MD *evp_md, const void *key, size_t key_len,
diff --git a/boringssl/crypto/hmac/hmac_test.cc b/boringssl/crypto/hmac/hmac_test.cc
index da390ef8..8a613503 100644
--- a/boringssl/crypto/hmac/hmac_test.cc
+++ b/boringssl/crypto/hmac/hmac_test.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -60,9 +61,9 @@
 #include <string>
 #include <vector>
 
-#include <openssl/crypto.h>
-#include <openssl/digest.h>
-#include <openssl/hmac.h>
+#include <boringssl/crypto.h>
+#include <boringssl/digest.h>
+#include <boringssl/hmac.h>
 
 #include "../test/file_test.h"
 #include "../test/scoped_types.h"
diff --git a/boringssl/crypto/internal.h b/boringssl/crypto/internal.h
index a3f32306..9a0d4323 100644
--- a/boringssl/crypto/internal.h
+++ b/boringssl/crypto/internal.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -109,8 +110,8 @@
 #ifndef OPENSSL_HEADER_CRYPTO_INTERNAL_H
 #define OPENSSL_HEADER_CRYPTO_INTERNAL_H
 
-#include <openssl/ex_data.h>
-#include <openssl/thread.h>
+#include <boringssl/ex_data.h>
+#include <boringssl/thread.h>
 
 #if defined(_MSC_VER)
 #if !defined(__cplusplus) || _MSC_VER < 1900
diff --git a/boringssl/crypto/lhash/CMakeLists.txt b/boringssl/crypto/lhash/CMakeLists.txt
index 4f4dea7c..da82c6c4 100644
--- a/boringssl/crypto/lhash/CMakeLists.txt
+++ b/boringssl/crypto/lhash/CMakeLists.txt
@@ -16,5 +16,5 @@ add_executable(
   $<TARGET_OBJECTS:test_support>
 )
 
-target_link_libraries(lhash_test crypto)
+target_link_libraries(lhash_test bsslcrypto)
 add_dependencies(all_tests lhash_test)
diff --git a/boringssl/crypto/lhash/lhash.c b/boringssl/crypto/lhash/lhash.c
index 257900ea..ed910e07 100644
--- a/boringssl/crypto/lhash/lhash.c
+++ b/boringssl/crypto/lhash/lhash.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,13 +55,13 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/lhash.h>
+#include <boringssl/lhash.h>
 
 #include <assert.h>
 #include <limits.h>
 #include <string.h>
 
-#include <openssl/mem.h>
+#include <boringssl/mem.h>
 
 /* kMinNumBuckets is the minimum size of the buckets array in an |_LHASH|. */
 static const size_t kMinNumBuckets = 16;
diff --git a/boringssl/crypto/lhash/lhash_test.c b/boringssl/crypto/lhash/lhash_test.c
index 63748e73..94cd9782 100644
--- a/boringssl/crypto/lhash/lhash_test.c
+++ b/boringssl/crypto/lhash/lhash_test.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -16,8 +17,8 @@
 #define _POSIX_C_SOURCE 201410L
 #endif
 
-#include <openssl/crypto.h>
-#include <openssl/lhash.h>
+#include <boringssl/crypto.h>
+#include <boringssl/lhash.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/boringssl/crypto/md4/md4.c b/boringssl/crypto/md4/md4.c
index f79da9fd..064f0630 100644
--- a/boringssl/crypto/md4/md4.c
+++ b/boringssl/crypto/md4/md4.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,7 +55,7 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/md4.h>
+#include <boringssl/md4.h>
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/boringssl/crypto/md5/asm/md5-x86_64.pl b/boringssl/crypto/md5/asm/md5-x86_64.pl
index 77a6e01d..9fa59323 100644
--- a/boringssl/crypto/md5/asm/md5-x86_64.pl
+++ b/boringssl/crypto/md5/asm/md5-x86_64.pl
@@ -125,6 +125,7 @@ sub round4_step
 
 $code .= <<EOF;
 .text
+#include <boringssl/bssl.h>
 .align 16
 
 .globl md5_block_asm_data_order
diff --git a/boringssl/crypto/md5/md5.c b/boringssl/crypto/md5/md5.c
index 66483b84..be8f127c 100644
--- a/boringssl/crypto/md5/md5.c
+++ b/boringssl/crypto/md5/md5.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,11 +55,11 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/md5.h>
+#include <boringssl/md5.h>
 
 #include <string.h>
 
-#include <openssl/mem.h>
+#include <boringssl/mem.h>
 
 
 uint8_t *MD5(const uint8_t *data, size_t len, uint8_t *out) {
diff --git a/boringssl/crypto/mem.c b/boringssl/crypto/mem.c
index df8e0e33..401812d5 100644
--- a/boringssl/crypto/mem.c
+++ b/boringssl/crypto/mem.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -58,7 +59,7 @@
 #define _POSIX_C_SOURCE 201410L  /* needed for strdup, snprintf, vprintf etc */
 #endif
 
-#include <openssl/mem.h>
+#include <boringssl/mem.h>
 
 #include <assert.h>
 #include <stdarg.h>
diff --git a/boringssl/crypto/modes/CMakeLists.txt b/boringssl/crypto/modes/CMakeLists.txt
index 41f71d7e..944ec484 100644
--- a/boringssl/crypto/modes/CMakeLists.txt
+++ b/boringssl/crypto/modes/CMakeLists.txt
@@ -62,5 +62,5 @@ add_executable(
   $<TARGET_OBJECTS:test_support>
 )
 
-target_link_libraries(gcm_test crypto)
+target_link_libraries(gcm_test bsslcrypto)
 add_dependencies(all_tests gcm_test)
diff --git a/boringssl/crypto/modes/asm/aesni-gcm-x86_64.pl b/boringssl/crypto/modes/asm/aesni-gcm-x86_64.pl
index 5d58bbbb..e678cafd 100644
--- a/boringssl/crypto/modes/asm/aesni-gcm-x86_64.pl
+++ b/boringssl/crypto/modes/asm/aesni-gcm-x86_64.pl
@@ -65,6 +65,7 @@
 
 $code=<<___;
 .text
+#include <boringssl/bssl.h>
 
 .type	_aesni_ctr32_ghash_6x,\@abi-omnipotent
 .align	32
@@ -1063,6 +1064,7 @@
 }}} else {{{
 $code=<<___;	# assembler is too old
 .text
+#include <boringssl/bssl.h>
 
 .globl	aesni_gcm_encrypt
 .type	aesni_gcm_encrypt,\@abi-omnipotent
diff --git a/boringssl/crypto/modes/asm/ghash-armv4.pl b/boringssl/crypto/modes/asm/ghash-armv4.pl
index bb0dba5f..adf65316 100644
--- a/boringssl/crypto/modes/asm/ghash-armv4.pl
+++ b/boringssl/crypto/modes/asm/ghash-armv4.pl
@@ -138,6 +138,7 @@ ()
 .syntax unified
 
 .text
+#include <boringssl/bssl.h>
 .code	32
 
 #ifdef  __clang__
diff --git a/boringssl/crypto/modes/asm/ghash-x86_64.pl b/boringssl/crypto/modes/asm/ghash-x86_64.pl
index 5a11fb94..fb3b2a62 100644
--- a/boringssl/crypto/modes/asm/ghash-x86_64.pl
+++ b/boringssl/crypto/modes/asm/ghash-x86_64.pl
@@ -210,6 +210,7 @@ ()
 
 $code=<<___;
 .text
+#include <boringssl/bssl.h>
 .extern	OPENSSL_ia32cap_P
 
 .globl	gcm_gmult_4bit
diff --git a/boringssl/crypto/modes/asm/ghashv8-armx.pl b/boringssl/crypto/modes/asm/ghashv8-armx.pl
index 3a7b8d8b..93d51d86 100644
--- a/boringssl/crypto/modes/asm/ghashv8-armx.pl
+++ b/boringssl/crypto/modes/asm/ghashv8-armx.pl
@@ -57,6 +57,7 @@
 #include <openssl/arm_arch.h>
 
 .text
+#include <boringssl/bssl.h>
 ___
 $code.=<<___ if ($flavour =~ /64/);
 #if !defined(__clang__)
diff --git a/boringssl/crypto/modes/cbc.c b/boringssl/crypto/modes/cbc.c
index e41f2b49..28801c85 100644
--- a/boringssl/crypto/modes/cbc.c
+++ b/boringssl/crypto/modes/cbc.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* ====================================================================
  * Copyright (c) 2008 The OpenSSL Project.  All rights reserved.
  *
diff --git a/boringssl/crypto/modes/cfb.c b/boringssl/crypto/modes/cfb.c
index 51b883e8..207ebae0 100644
--- a/boringssl/crypto/modes/cfb.c
+++ b/boringssl/crypto/modes/cfb.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* ====================================================================
  * Copyright (c) 2008 The OpenSSL Project.  All rights reserved.
  *
@@ -46,7 +47,7 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  * ==================================================================== */
 
-#include <openssl/type_check.h>
+#include <boringssl/type_check.h>
 
 #include <assert.h>
 #include <string.h>
diff --git a/boringssl/crypto/modes/ctr.c b/boringssl/crypto/modes/ctr.c
index b84e72c5..3aa94887 100644
--- a/boringssl/crypto/modes/ctr.c
+++ b/boringssl/crypto/modes/ctr.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* ====================================================================
  * Copyright (c) 2008 The OpenSSL Project.  All rights reserved.
  *
@@ -46,7 +47,7 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  * ==================================================================== */
 
-#include <openssl/type_check.h>
+#include <boringssl/type_check.h>
 
 #include <assert.h>
 #include <string.h>
diff --git a/boringssl/crypto/modes/gcm.c b/boringssl/crypto/modes/gcm.c
index b8571313..3c9e38ff 100644
--- a/boringssl/crypto/modes/gcm.c
+++ b/boringssl/crypto/modes/gcm.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* ====================================================================
  * Copyright (c) 2008 The OpenSSL Project.  All rights reserved.
  *
@@ -46,13 +47,13 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  * ==================================================================== */
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #include <assert.h>
 #include <string.h>
 
-#include <openssl/mem.h>
-#include <openssl/cpu.h>
+#include <boringssl/mem.h>
+#include <boringssl/cpu.h>
 
 #include "internal.h"
 #include "../internal.h"
@@ -363,7 +364,7 @@ void gcm_ghash_4bit_x86(uint64_t Xi[2], const u128 Htable[16], const uint8_t *in
                         size_t len);
 #endif
 #elif defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64)
-#include <openssl/arm_arch.h>
+#include <boringssl/arm_arch.h>
 #if __ARM_ARCH__ >= 7
 #define GHASH_ASM_ARM
 #define GCM_FUNCREF_4BIT
diff --git a/boringssl/crypto/modes/gcm_test.c b/boringssl/crypto/modes/gcm_test.c
index 56639e6e..3bd3901a 100644
--- a/boringssl/crypto/modes/gcm_test.c
+++ b/boringssl/crypto/modes/gcm_test.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* ====================================================================
  * Copyright (c) 2008 The OpenSSL Project.  All rights reserved.
  *
@@ -49,9 +50,9 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <openssl/aes.h>
-#include <openssl/crypto.h>
-#include <openssl/mem.h>
+#include <boringssl/aes.h>
+#include <boringssl/crypto.h>
+#include <boringssl/mem.h>
 
 #include "internal.h"
 #include "../test/test_util.h"
diff --git a/boringssl/crypto/modes/internal.h b/boringssl/crypto/modes/internal.h
index b46e8369..0edb4c9b 100644
--- a/boringssl/crypto/modes/internal.h
+++ b/boringssl/crypto/modes/internal.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* ====================================================================
  * Copyright (c) 2008 The OpenSSL Project.  All rights reserved.
  *
@@ -49,7 +50,7 @@
 #ifndef OPENSSL_HEADER_MODES_INTERNAL_H
 #define OPENSSL_HEADER_MODES_INTERNAL_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/boringssl/crypto/modes/ofb.c b/boringssl/crypto/modes/ofb.c
index 2c5bdc9a..37e56186 100644
--- a/boringssl/crypto/modes/ofb.c
+++ b/boringssl/crypto/modes/ofb.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* ====================================================================
  * Copyright (c) 2008 The OpenSSL Project.  All rights reserved.
  *
@@ -46,7 +47,7 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  * ==================================================================== */
 
-#include <openssl/type_check.h>
+#include <boringssl/type_check.h>
 
 #include <assert.h>
 
diff --git a/boringssl/crypto/newhope/CMakeLists.txt b/boringssl/crypto/newhope/CMakeLists.txt
index 385cd6a7..45f8765d 100644
--- a/boringssl/crypto/newhope/CMakeLists.txt
+++ b/boringssl/crypto/newhope/CMakeLists.txt
@@ -18,5 +18,5 @@ add_executable(
   $<TARGET_OBJECTS:test_support>
 )
 
-target_link_libraries(newhope_test crypto)
+target_link_libraries(newhope_test bsslcrypto)
 add_dependencies(all_tests newhope_test)
diff --git a/boringssl/crypto/newhope/error_correction.c b/boringssl/crypto/newhope/error_correction.c
index e4ac1c26..9e49c920 100644
--- a/boringssl/crypto/newhope/error_correction.c
+++ b/boringssl/crypto/newhope/error_correction.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2016, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -14,8 +15,8 @@
 
 #include <string.h>
 
-#include <openssl/base.h>
-#include <openssl/rand.h>
+#include <boringssl/base.h>
+#include <boringssl/rand.h>
 
 #include "internal.h"
 
diff --git a/boringssl/crypto/newhope/internal.h b/boringssl/crypto/newhope/internal.h
index a5473d8e..49e285f0 100644
--- a/boringssl/crypto/newhope/internal.h
+++ b/boringssl/crypto/newhope/internal.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2016, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,8 +16,8 @@
 #ifndef OPENSSL_HEADER_NEWHOPE_INTERNAL_H
 #define OPENSSL_HEADER_NEWHOPE_INTERNAL_H
 
-#include <openssl/newhope.h>
-#include <openssl/sha.h>
+#include <boringssl/newhope.h>
+#include <boringssl/sha.h>
 
 #include "../internal.h"
 
diff --git a/boringssl/crypto/newhope/newhope.c b/boringssl/crypto/newhope/newhope.c
index 29e189f0..420a5066 100644
--- a/boringssl/crypto/newhope/newhope.c
+++ b/boringssl/crypto/newhope/newhope.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2016, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -14,8 +15,8 @@
 
 #include <string.h>
 
-#include <openssl/mem.h>
-#include <openssl/rand.h>
+#include <boringssl/mem.h>
+#include <boringssl/rand.h>
 
 #include "internal.h"
 
diff --git a/boringssl/crypto/newhope/newhope_test.c b/boringssl/crypto/newhope/newhope_test.c
index 5d960072..afce91d7 100644
--- a/boringssl/crypto/newhope/newhope_test.c
+++ b/boringssl/crypto/newhope/newhope_test.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2016, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -16,8 +17,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <openssl/crypto.h>
-#include <openssl/rand.h>
+#include <boringssl/crypto.h>
+#include <boringssl/rand.h>
 
 #include "internal.h"
 
diff --git a/boringssl/crypto/newhope/ntt.c b/boringssl/crypto/newhope/ntt.c
index 163a9d1a..1d96afac 100644
--- a/boringssl/crypto/newhope/ntt.c
+++ b/boringssl/crypto/newhope/ntt.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2016, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/boringssl/crypto/newhope/poly.c b/boringssl/crypto/newhope/poly.c
index a9839faf..cccc376f 100644
--- a/boringssl/crypto/newhope/poly.c
+++ b/boringssl/crypto/newhope/poly.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2016, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,8 +16,8 @@
 #include <assert.h>
 #include <string.h>
 
-#include <openssl/aes.h>
-#include <openssl/rand.h>
+#include <boringssl/aes.h>
+#include <boringssl/rand.h>
 
 #include "internal.h"
 
diff --git a/boringssl/crypto/newhope/precomp.c b/boringssl/crypto/newhope/precomp.c
index d0c478ee..41e2cd40 100644
--- a/boringssl/crypto/newhope/precomp.c
+++ b/boringssl/crypto/newhope/precomp.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2016, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/boringssl/crypto/newhope/reduce.c b/boringssl/crypto/newhope/reduce.c
index e7f13649..201c71fd 100644
--- a/boringssl/crypto/newhope/reduce.c
+++ b/boringssl/crypto/newhope/reduce.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2016, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/boringssl/crypto/obj/CMakeLists.txt b/boringssl/crypto/obj/CMakeLists.txt
index f49d499d..0e32ed09 100644
--- a/boringssl/crypto/obj/CMakeLists.txt
+++ b/boringssl/crypto/obj/CMakeLists.txt
@@ -17,5 +17,5 @@ add_executable(
   $<TARGET_OBJECTS:test_support>
 )
 
-target_link_libraries(obj_test crypto)
+target_link_libraries(obj_test bsslcrypto)
 add_dependencies(all_tests obj_test)
diff --git a/boringssl/crypto/obj/obj.c b/boringssl/crypto/obj/obj.c
index 94f739ce..36e13234 100644
--- a/boringssl/crypto/obj/obj.c
+++ b/boringssl/crypto/obj/obj.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,18 +55,18 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/obj.h>
+#include <boringssl/obj.h>
 
 #include <limits.h>
 #include <string.h>
 
-#include <openssl/asn1.h>
-#include <openssl/buf.h>
-#include <openssl/bytestring.h>
-#include <openssl/err.h>
-#include <openssl/lhash.h>
-#include <openssl/mem.h>
-#include <openssl/thread.h>
+#include <boringssl/asn1.h>
+#include <boringssl/buf.h>
+#include <boringssl/bytestring.h>
+#include <boringssl/err.h>
+#include <boringssl/lhash.h>
+#include <boringssl/mem.h>
+#include <boringssl/thread.h>
 
 #include "obj_dat.h"
 #include "../internal.h"
diff --git a/boringssl/crypto/obj/obj_dat.h b/boringssl/crypto/obj/obj_dat.h
index 1d779de6..692782ca 100644
--- a/boringssl/crypto/obj/obj_dat.h
+++ b/boringssl/crypto/obj/obj_dat.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* THIS FILE IS GENERATED FROM objects.h by obj_dat.pl via the
  * following command:
  * perl obj_dat.pl ../../include/openssl/nid.h obj_dat.h */
diff --git a/boringssl/crypto/obj/obj_test.cc b/boringssl/crypto/obj/obj_test.cc
index 2948941a..de366058 100644
--- a/boringssl/crypto/obj/obj_test.cc
+++ b/boringssl/crypto/obj/obj_test.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2016, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,9 +16,9 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <openssl/bytestring.h>
-#include <openssl/crypto.h>
-#include <openssl/obj.h>
+#include <boringssl/bytestring.h>
+#include <boringssl/crypto.h>
+#include <boringssl/obj.h>
 
 
 static bool TestBasic() {
diff --git a/boringssl/crypto/obj/obj_xref.c b/boringssl/crypto/obj/obj_xref.c
index 70babea8..8ddc5f3e 100644
--- a/boringssl/crypto/obj/obj_xref.c
+++ b/boringssl/crypto/obj/obj_xref.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,7 +55,7 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/obj.h>
+#include <boringssl/obj.h>
 
 #include <stdlib.h>
 
diff --git a/boringssl/crypto/obj/obj_xref.h b/boringssl/crypto/obj/obj_xref.h
index b2082f55..9e1a2d09 100644
--- a/boringssl/crypto/obj/obj_xref.h
+++ b/boringssl/crypto/obj/obj_xref.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* THIS FILE IS GENERATED FROM obj_xref.txt by obj_xref.pl via the
  * following command:
  * perl obj_xref.pl obj_mac.num obj_xref.txt > obj_xref.h */
diff --git a/boringssl/crypto/pem/pem_all.c b/boringssl/crypto/pem/pem_all.c
index e94ff265..99d19fad 100644
--- a/boringssl/crypto/pem/pem_all.c
+++ b/boringssl/crypto/pem/pem_all.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -108,16 +109,16 @@
 
 #include <stdio.h>
 
-#include <openssl/bio.h>
-#include <openssl/dh.h>
-#include <openssl/dsa.h>
-#include <openssl/evp.h>
-#include <openssl/pem.h>
+#include <boringssl/bio.h>
+#include <boringssl/dh.h>
+#include <boringssl/dsa.h>
+#include <boringssl/evp.h>
+#include <boringssl/pem.h>
 /*
- * #include <openssl/pkcs7.h>
+ * #include <boringssl/pkcs7.h>
  */
-#include <openssl/rsa.h>
-#include <openssl/x509.h>
+#include <boringssl/rsa.h>
+#include <boringssl/x509.h>
 
 static RSA *pkey_get_rsa(EVP_PKEY *key, RSA **rsa);
 static DSA *pkey_get_dsa(EVP_PKEY *key, DSA **dsa);
diff --git a/boringssl/crypto/pem/pem_info.c b/boringssl/crypto/pem/pem_info.c
index 57c87d4f..e50196e8 100644
--- a/boringssl/crypto/pem/pem_info.c
+++ b/boringssl/crypto/pem/pem_info.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* crypto/pem/pem_info.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
@@ -56,20 +57,20 @@
  * [including the GNU Public Licence.]
  */
 
-#include <openssl/pem.h>
+#include <boringssl/pem.h>
 
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>
 
-#include <openssl/buf.h>
-#include <openssl/dsa.h>
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/mem.h>
-#include <openssl/obj.h>
-#include <openssl/rsa.h>
-#include <openssl/x509.h>
+#include <boringssl/buf.h>
+#include <boringssl/dsa.h>
+#include <boringssl/err.h>
+#include <boringssl/evp.h>
+#include <boringssl/mem.h>
+#include <boringssl/obj.h>
+#include <boringssl/rsa.h>
+#include <boringssl/x509.h>
 
 #ifndef OPENSSL_NO_FP_API
 STACK_OF(X509_INFO) *PEM_X509_INFO_read(FILE *fp, STACK_OF(X509_INFO) *sk,
diff --git a/boringssl/crypto/pem/pem_lib.c b/boringssl/crypto/pem/pem_lib.c
index 6e928a65..a8e754e5 100644
--- a/boringssl/crypto/pem/pem_lib.c
+++ b/boringssl/crypto/pem/pem_lib.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* crypto/pem/pem_lib.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
@@ -60,16 +61,16 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <openssl/base64.h>
-#include <openssl/buf.h>
-#include <openssl/des.h>
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/mem.h>
-#include <openssl/obj.h>
-#include <openssl/pem.h>
-#include <openssl/rand.h>
-#include <openssl/x509.h>
+#include <boringssl/base64.h>
+#include <boringssl/buf.h>
+#include <boringssl/des.h>
+#include <boringssl/err.h>
+#include <boringssl/evp.h>
+#include <boringssl/mem.h>
+#include <boringssl/obj.h>
+#include <boringssl/pem.h>
+#include <boringssl/rand.h>
+#include <boringssl/x509.h>
 
 #define MIN_LENGTH      4
 
diff --git a/boringssl/crypto/pem/pem_oth.c b/boringssl/crypto/pem/pem_oth.c
index 8530c567..94ad888a 100644
--- a/boringssl/crypto/pem/pem_oth.c
+++ b/boringssl/crypto/pem/pem_oth.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* crypto/pem/pem_oth.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
@@ -55,17 +56,17 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/pem.h>
+#include <boringssl/pem.h>
 
 #include <stdio.h>
 
-#include <openssl/buf.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/evp.h>
-#include <openssl/obj.h>
-#include <openssl/rand.h>
-#include <openssl/x509.h>
+#include <boringssl/buf.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/evp.h>
+#include <boringssl/obj.h>
+#include <boringssl/rand.h>
+#include <boringssl/x509.h>
 
 /* Handle 'other' PEMs: not private keys */
 
diff --git a/boringssl/crypto/pem/pem_pk8.c b/boringssl/crypto/pem/pem_pk8.c
index 550661d6..85e78afe 100644
--- a/boringssl/crypto/pem/pem_pk8.c
+++ b/boringssl/crypto/pem/pem_pk8.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,16 +55,16 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/pem.h>
+#include <boringssl/pem.h>
 
-#include <openssl/buf.h>
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/mem.h>
-#include <openssl/obj.h>
-#include <openssl/pkcs8.h>
-#include <openssl/rand.h>
-#include <openssl/x509.h>
+#include <boringssl/buf.h>
+#include <boringssl/err.h>
+#include <boringssl/evp.h>
+#include <boringssl/mem.h>
+#include <boringssl/obj.h>
+#include <boringssl/pkcs8.h>
+#include <boringssl/rand.h>
+#include <boringssl/x509.h>
 
 static int do_pk8pkey(BIO *bp, EVP_PKEY *x, int isder,
                       int nid, const EVP_CIPHER *enc,
diff --git a/boringssl/crypto/pem/pem_pkey.c b/boringssl/crypto/pem/pem_pkey.c
index 058c0311..c5aa3e1e 100644
--- a/boringssl/crypto/pem/pem_pkey.c
+++ b/boringssl/crypto/pem/pem_pkey.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,20 +55,20 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/pem.h>
+#include <boringssl/pem.h>
 
 #include <stdio.h>
 #include <string.h>
 
-#include <openssl/buf.h>
-#include <openssl/dh.h>
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/mem.h>
-#include <openssl/obj.h>
-#include <openssl/pkcs8.h>
-#include <openssl/rand.h>
-#include <openssl/x509.h>
+#include <boringssl/buf.h>
+#include <boringssl/dh.h>
+#include <boringssl/err.h>
+#include <boringssl/evp.h>
+#include <boringssl/mem.h>
+#include <boringssl/obj.h>
+#include <boringssl/pkcs8.h>
+#include <boringssl/rand.h>
+#include <boringssl/x509.h>
 
 EVP_PKEY *PEM_read_bio_PrivateKey(BIO *bp, EVP_PKEY **x, pem_password_cb *cb,
                                   void *u)
diff --git a/boringssl/crypto/pem/pem_x509.c b/boringssl/crypto/pem/pem_x509.c
index 97f814db..de525bc5 100644
--- a/boringssl/crypto/pem/pem_x509.c
+++ b/boringssl/crypto/pem/pem_x509.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* pem_x509.c */
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
@@ -57,9 +58,9 @@
 
 #include <stdio.h>
 
-#include <openssl/bio.h>
-#include <openssl/evp.h>
-#include <openssl/pem.h>
-#include <openssl/x509.h>
+#include <boringssl/bio.h>
+#include <boringssl/evp.h>
+#include <boringssl/pem.h>
+#include <boringssl/x509.h>
 
 IMPLEMENT_PEM_rw(X509, X509, PEM_STRING_X509, X509)
diff --git a/boringssl/crypto/pem/pem_xaux.c b/boringssl/crypto/pem/pem_xaux.c
index 386dd60d..487febd2 100644
--- a/boringssl/crypto/pem/pem_xaux.c
+++ b/boringssl/crypto/pem/pem_xaux.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* pem_xaux.c */
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
@@ -57,10 +58,10 @@
 
 #include <stdio.h>
 
-#include <openssl/bio.h>
-#include <openssl/evp.h>
-#include <openssl/pem.h>
-#include <openssl/x509.h>
+#include <boringssl/bio.h>
+#include <boringssl/evp.h>
+#include <boringssl/pem.h>
+#include <boringssl/x509.h>
 
 IMPLEMENT_PEM_rw(X509_AUX, X509, PEM_STRING_X509_TRUSTED, X509_AUX)
 IMPLEMENT_PEM_rw(X509_CERT_PAIR, X509_CERT_PAIR, PEM_STRING_X509_PAIR,
diff --git a/boringssl/crypto/perlasm/x86_64-xlate.pl b/boringssl/crypto/perlasm/x86_64-xlate.pl
index 4965985d..d74b5fc5 100755
--- a/boringssl/crypto/perlasm/x86_64-xlate.pl
+++ b/boringssl/crypto/perlasm/x86_64-xlate.pl
@@ -856,6 +856,7 @@ sub rxb {
 ___
 }
 
+print STDOUT "#include <boringssl/bssl.h>\n" if ($gas);
 print STDOUT "#if defined(__x86_64__)\n" if ($gas);
 
 while($line=<>) {
diff --git a/boringssl/crypto/pkcs8/CMakeLists.txt b/boringssl/crypto/pkcs8/CMakeLists.txt
index ffb38218..69faff1f 100644
--- a/boringssl/crypto/pkcs8/CMakeLists.txt
+++ b/boringssl/crypto/pkcs8/CMakeLists.txt
@@ -25,6 +25,6 @@ add_executable(
   pkcs8_test.cc
 )
 
-target_link_libraries(pkcs8_test crypto)
-target_link_libraries(pkcs12_test crypto)
+target_link_libraries(pkcs8_test bsslcrypto)
+target_link_libraries(pkcs12_test bsslcrypto)
 add_dependencies(all_tests pkcs8_test pkcs12_test)
diff --git a/boringssl/crypto/pkcs8/internal.h b/boringssl/crypto/pkcs8/internal.h
index 7995e787..3a941996 100644
--- a/boringssl/crypto/pkcs8/internal.h
+++ b/boringssl/crypto/pkcs8/internal.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -56,7 +57,7 @@
 #ifndef OPENSSL_HEADER_PKCS8_INTERNAL_H
 #define OPENSSL_HEADER_PKCS8_INTERNAL_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/boringssl/crypto/pkcs8/p5_pbe.c b/boringssl/crypto/pkcs8/p5_pbe.c
index 8e56d41b..8cd67534 100644
--- a/boringssl/crypto/pkcs8/p5_pbe.c
+++ b/boringssl/crypto/pkcs8/p5_pbe.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -55,12 +56,12 @@
 
 #include <string.h>
 
-#include <openssl/asn1t.h>
-#include <openssl/err.h>
-#include <openssl/obj.h>
-#include <openssl/pkcs8.h>
-#include <openssl/rand.h>
-#include <openssl/x509.h>
+#include <boringssl/asn1t.h>
+#include <boringssl/err.h>
+#include <boringssl/obj.h>
+#include <boringssl/pkcs8.h>
+#include <boringssl/rand.h>
+#include <boringssl/x509.h>
 
 #include "internal.h"
 
diff --git a/boringssl/crypto/pkcs8/p5_pbev2.c b/boringssl/crypto/pkcs8/p5_pbev2.c
index 3799b39b..f3dea69f 100644
--- a/boringssl/crypto/pkcs8/p5_pbev2.c
+++ b/boringssl/crypto/pkcs8/p5_pbev2.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999-2004.
  */
@@ -57,14 +58,14 @@
 #include <limits.h>
 #include <string.h>
 
-#include <openssl/asn1t.h>
-#include <openssl/cipher.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/obj.h>
-#include <openssl/pkcs8.h>
-#include <openssl/rand.h>
-#include <openssl/x509.h>
+#include <boringssl/asn1t.h>
+#include <boringssl/cipher.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/obj.h>
+#include <boringssl/pkcs8.h>
+#include <boringssl/rand.h>
+#include <boringssl/x509.h>
 
 #include "internal.h"
 
diff --git a/boringssl/crypto/pkcs8/p8_pkey.c b/boringssl/crypto/pkcs8/p8_pkey.c
index c69d0fac..2292fbd9 100644
--- a/boringssl/crypto/pkcs8/p8_pkey.c
+++ b/boringssl/crypto/pkcs8/p8_pkey.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -56,9 +57,9 @@
 
 #include <stdio.h>
 
-#include <openssl/asn1t.h>
-#include <openssl/mem.h>
-#include <openssl/x509.h>
+#include <boringssl/asn1t.h>
+#include <boringssl/mem.h>
+#include <boringssl/x509.h>
 
 /* Minor tweak to operation: zero private key data */
 static int pkey_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
diff --git a/boringssl/crypto/pkcs8/pkcs12_test.cc b/boringssl/crypto/pkcs8/pkcs12_test.cc
index 17bcd273..58aaa14b 100644
--- a/boringssl/crypto/pkcs8/pkcs12_test.cc
+++ b/boringssl/crypto/pkcs8/pkcs12_test.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -14,14 +15,14 @@
 
 #include <stdio.h>
 
-#include <openssl/bio.h>
-#include <openssl/bytestring.h>
-#include <openssl/crypto.h>
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/pkcs8.h>
-#include <openssl/stack.h>
-#include <openssl/x509.h>
+#include <boringssl/bio.h>
+#include <boringssl/bytestring.h>
+#include <boringssl/crypto.h>
+#include <boringssl/err.h>
+#include <boringssl/evp.h>
+#include <boringssl/pkcs8.h>
+#include <boringssl/stack.h>
+#include <boringssl/x509.h>
 
 #include "../test/scoped_types.h"
 
diff --git a/boringssl/crypto/pkcs8/pkcs8.c b/boringssl/crypto/pkcs8/pkcs8.c
index 4ecf17f8..9f8f5bfc 100644
--- a/boringssl/crypto/pkcs8/pkcs8.c
+++ b/boringssl/crypto/pkcs8/pkcs8.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -53,22 +54,22 @@
  * (eay@cryptsoft.com).  This product includes software written by Tim
  * Hudson (tjh@cryptsoft.com). */
 
-#include <openssl/pkcs8.h>
+#include <boringssl/pkcs8.h>
 
 #include <assert.h>
 #include <limits.h>
 #include <string.h>
 
-#include <openssl/asn1.h>
-#include <openssl/buf.h>
-#include <openssl/bytestring.h>
-#include <openssl/cipher.h>
-#include <openssl/digest.h>
-#include <openssl/err.h>
-#include <openssl/hmac.h>
-#include <openssl/mem.h>
-#include <openssl/obj.h>
-#include <openssl/x509.h>
+#include <boringssl/asn1.h>
+#include <boringssl/buf.h>
+#include <boringssl/bytestring.h>
+#include <boringssl/cipher.h>
+#include <boringssl/digest.h>
+#include <boringssl/err.h>
+#include <boringssl/hmac.h>
+#include <boringssl/mem.h>
+#include <boringssl/obj.h>
+#include <boringssl/x509.h>
 
 #include "internal.h"
 #include "../bytestring/internal.h"
diff --git a/boringssl/crypto/pkcs8/pkcs8_test.cc b/boringssl/crypto/pkcs8/pkcs8_test.cc
index 7a88ddf4..6d913331 100644
--- a/boringssl/crypto/pkcs8/pkcs8_test.cc
+++ b/boringssl/crypto/pkcs8/pkcs8_test.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2015, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -16,10 +17,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <openssl/crypto.h>
-#include <openssl/err.h>
-#include <openssl/pkcs8.h>
-#include <openssl/x509.h>
+#include <boringssl/crypto.h>
+#include <boringssl/err.h>
+#include <boringssl/pkcs8.h>
+#include <boringssl/x509.h>
 
 #include "../test/scoped_types.h"
 
diff --git a/boringssl/crypto/poly1305/CMakeLists.txt b/boringssl/crypto/poly1305/CMakeLists.txt
index 1b6a8049..913ece79 100644
--- a/boringssl/crypto/poly1305/CMakeLists.txt
+++ b/boringssl/crypto/poly1305/CMakeLists.txt
@@ -27,5 +27,5 @@ add_executable(
   $<TARGET_OBJECTS:test_support>
 )
 
-target_link_libraries(poly1305_test crypto)
+target_link_libraries(poly1305_test bsslcrypto)
 add_dependencies(all_tests poly1305_test)
diff --git a/boringssl/crypto/poly1305/asm/poly1305-armv4.pl b/boringssl/crypto/poly1305/asm/poly1305-armv4.pl
index 9b765cec..46e22d4d 100755
--- a/boringssl/crypto/poly1305/asm/poly1305-armv4.pl
+++ b/boringssl/crypto/poly1305/asm/poly1305-armv4.pl
@@ -42,6 +42,7 @@
 #include <openssl/arm_arch.h>
 
 .text
+#include <boringssl/bssl.h>
 #if defined(__thumb2__)
 .syntax	unified
 .thumb
diff --git a/boringssl/crypto/poly1305/asm/poly1305-armv8.pl b/boringssl/crypto/poly1305/asm/poly1305-armv8.pl
index 1d9a81b8..d325425e 100755
--- a/boringssl/crypto/poly1305/asm/poly1305-armv8.pl
+++ b/boringssl/crypto/poly1305/asm/poly1305-armv8.pl
@@ -45,6 +45,7 @@
 #include <openssl/arm_arch.h>
 
 .text
+#include <boringssl/bssl.h>
 
 // forward "declarations" are required for Apple
 .extern	OPENSSL_armcap_P
diff --git a/boringssl/crypto/poly1305/asm/poly1305-x86_64.pl b/boringssl/crypto/poly1305/asm/poly1305-x86_64.pl
index 3c810c5a..14f82760 100755
--- a/boringssl/crypto/poly1305/asm/poly1305-x86_64.pl
+++ b/boringssl/crypto/poly1305/asm/poly1305-x86_64.pl
@@ -108,6 +108,7 @@ sub poly1305_iteration {
 
 $code.=<<___;
 .text
+#include <boringssl/bssl.h>
 
 .extern	OPENSSL_ia32cap_P
 
diff --git a/boringssl/crypto/poly1305/internal.h b/boringssl/crypto/poly1305/internal.h
index df6769ea..3054ff3b 100644
--- a/boringssl/crypto/poly1305/internal.h
+++ b/boringssl/crypto/poly1305/internal.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2016, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,8 +16,8 @@
 #ifndef OPENSSL_HEADER_POLY1305_INTERNAL_H
 #define OPENSSL_HEADER_POLY1305_INTERNAL_H
 
-#include <openssl/base.h>
-#include <openssl/poly1305.h>
+#include <boringssl/base.h>
+#include <boringssl/poly1305.h>
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/boringssl/crypto/poly1305/poly1305.c b/boringssl/crypto/poly1305/poly1305.c
index dc2d6a68..5a9cc3f0 100644
--- a/boringssl/crypto/poly1305/poly1305.c
+++ b/boringssl/crypto/poly1305/poly1305.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -16,11 +17,11 @@
  * (https://github.com/floodyberry/poly1305-donna) and released as public
  * domain. */
 
-#include <openssl/poly1305.h>
+#include <boringssl/poly1305.h>
 
 #include <string.h>
 
-#include <openssl/cpu.h>
+#include <boringssl/cpu.h>
 
 #include "internal.h"
 
diff --git a/boringssl/crypto/poly1305/poly1305_arm.c b/boringssl/crypto/poly1305/poly1305_arm.c
index de31d6b2..29e768e1 100644
--- a/boringssl/crypto/poly1305/poly1305_arm.c
+++ b/boringssl/crypto/poly1305/poly1305_arm.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +16,7 @@
 /* This implementation was taken from the public domain, neon2 version in
  * SUPERCOP by D. J. Bernstein and Peter Schwabe. */
 
-#include <openssl/poly1305.h>
+#include <boringssl/poly1305.h>
 
 #if defined(OPENSSL_ARM) && !defined(OPENSSL_NO_ASM)
 
diff --git a/boringssl/crypto/poly1305/poly1305_arm_asm.S b/boringssl/crypto/poly1305/poly1305_arm_asm.S
index e16f83bd..f30b0695 100644
--- a/boringssl/crypto/poly1305/poly1305_arm_asm.S
+++ b/boringssl/crypto/poly1305/poly1305_arm_asm.S
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 #if defined(__arm__) && !defined(OPENSSL_NO_ASM)
 
 # This implementation was taken from the public domain, neon2 version in
diff --git a/boringssl/crypto/poly1305/poly1305_test.cc b/boringssl/crypto/poly1305/poly1305_test.cc
index 2c25e93b..58c19d18 100644
--- a/boringssl/crypto/poly1305/poly1305_test.cc
+++ b/boringssl/crypto/poly1305/poly1305_test.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2015, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -17,8 +18,8 @@
 
 #include <vector>
 
-#include <openssl/crypto.h>
-#include <openssl/poly1305.h>
+#include <boringssl/crypto.h>
+#include <boringssl/poly1305.h>
 
 #include "../internal.h"
 #include "../test/file_test.h"
diff --git a/boringssl/crypto/poly1305/poly1305_vec.c b/boringssl/crypto/poly1305/poly1305_vec.c
index 3045a2f1..5b8f2ed2 100644
--- a/boringssl/crypto/poly1305/poly1305_vec.c
+++ b/boringssl/crypto/poly1305/poly1305_vec.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -18,7 +19,7 @@
  * http://cr.yp.to/papers.html#neoncrypto. Unrolled to 2 powers, i.e. 64 byte
  * block size */
 
-#include <openssl/poly1305.h>
+#include <boringssl/poly1305.h>
 
 #include "../internal.h"
 
diff --git a/boringssl/crypto/rand/asm/rdrand-x86_64.pl b/boringssl/crypto/rand/asm/rdrand-x86_64.pl
index c32a55c4..c01b7070 100644
--- a/boringssl/crypto/rand/asm/rdrand-x86_64.pl
+++ b/boringssl/crypto/rand/asm/rdrand-x86_64.pl
@@ -27,6 +27,7 @@
 
 print<<___;
 .text
+#include <boringssl/bssl.h>
 
 # CRYPTO_rdrand writes eight bytes of random data from the hardware RNG to
 # |out|. It returns one on success or zero on hardware failure.
diff --git a/boringssl/crypto/rand/deterministic.c b/boringssl/crypto/rand/deterministic.c
index e6b7bb7e..9796e485 100644
--- a/boringssl/crypto/rand/deterministic.c
+++ b/boringssl/crypto/rand/deterministic.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2016, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -12,13 +13,13 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
 
-#include <openssl/rand.h>
+#include <boringssl/rand.h>
 
 #if defined(BORINGSSL_UNSAFE_FUZZER_MODE)
 
 #include <string.h>
 
-#include <openssl/chacha.h>
+#include <boringssl/chacha.h>
 
 #include "internal.h"
 
diff --git a/boringssl/crypto/rand/internal.h b/boringssl/crypto/rand/internal.h
index dcff3aa6..e1a230c0 100644
--- a/boringssl/crypto/rand/internal.h
+++ b/boringssl/crypto/rand/internal.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2015, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/boringssl/crypto/rand/rand.c b/boringssl/crypto/rand/rand.c
index 5a1bec2e..fffdd47c 100644
--- a/boringssl/crypto/rand/rand.c
+++ b/boringssl/crypto/rand/rand.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -12,15 +13,15 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
 
-#include <openssl/rand.h>
+#include <boringssl/rand.h>
 
 #include <assert.h>
 #include <limits.h>
 #include <string.h>
 
-#include <openssl/chacha.h>
-#include <openssl/cpu.h>
-#include <openssl/mem.h>
+#include <boringssl/chacha.h>
+#include <boringssl/cpu.h>
+#include <boringssl/mem.h>
 
 #include "internal.h"
 #include "../internal.h"
diff --git a/boringssl/crypto/rand/urandom.c b/boringssl/crypto/rand/urandom.c
index a519983c..0cd65317 100644
--- a/boringssl/crypto/rand/urandom.c
+++ b/boringssl/crypto/rand/urandom.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -12,7 +13,7 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
 
-#include <openssl/rand.h>
+#include <boringssl/rand.h>
 
 #if !defined(OPENSSL_WINDOWS) && !defined(BORINGSSL_UNSAFE_FUZZER_MODE)
 
@@ -22,8 +23,8 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <openssl/thread.h>
-#include <openssl/mem.h>
+#include <boringssl/thread.h>
+#include <boringssl/mem.h>
 
 #include "internal.h"
 #include "../internal.h"
diff --git a/boringssl/crypto/rand/windows.c b/boringssl/crypto/rand/windows.c
index 9d7dd782..08884652 100644
--- a/boringssl/crypto/rand/windows.c
+++ b/boringssl/crypto/rand/windows.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -12,7 +13,7 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
 
-#include <openssl/rand.h>
+#include <boringssl/rand.h>
 
 #if defined(OPENSSL_WINDOWS) && !defined(BORINGSSL_UNSAFE_FUZZER_MODE)
 
diff --git a/boringssl/crypto/rc4/asm/rc4-x86_64.pl b/boringssl/crypto/rc4/asm/rc4-x86_64.pl
index cef62689..707f4d7e 100644
--- a/boringssl/crypto/rc4/asm/rc4-x86_64.pl
+++ b/boringssl/crypto/rc4/asm/rc4-x86_64.pl
@@ -123,6 +123,7 @@
 {
 $code=<<___;
 .text
+#include <boringssl/bssl.h>
 .extern	OPENSSL_ia32cap_P
 
 .globl	asm_RC4
diff --git a/boringssl/crypto/rc4/rc4.c b/boringssl/crypto/rc4/rc4.c
index b8e1d9f0..47ae3f11 100644
--- a/boringssl/crypto/rc4/rc4.c
+++ b/boringssl/crypto/rc4/rc4.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,7 +55,7 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/rc4.h>
+#include <boringssl/rc4.h>
 
 #if defined(OPENSSL_NO_ASM) || \
     (!defined(OPENSSL_X86_64) && !defined(OPENSSL_X86))
diff --git a/boringssl/crypto/refcount_c11.c b/boringssl/crypto/refcount_c11.c
index fbc0343d..935e2752 100644
--- a/boringssl/crypto/refcount_c11.c
+++ b/boringssl/crypto/refcount_c11.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2015, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -22,7 +23,7 @@
 #include <stdatomic.h>
 #include <stdlib.h>
 
-#include <openssl/type_check.h>
+#include <boringssl/type_check.h>
 
 
 /* See comment above the typedef of CRYPTO_refcount_t about these tests. */
diff --git a/boringssl/crypto/refcount_lock.c b/boringssl/crypto/refcount_lock.c
index bb8ef86b..ff5d1dd1 100644
--- a/boringssl/crypto/refcount_lock.c
+++ b/boringssl/crypto/refcount_lock.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2015, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -16,7 +17,7 @@
 
 #include <stdlib.h>
 
-#include <openssl/type_check.h>
+#include <boringssl/type_check.h>
 
 
 #if !defined(OPENSSL_C11_ATOMIC)
diff --git a/boringssl/crypto/refcount_test.c b/boringssl/crypto/refcount_test.c
index 97bfbd6f..ba9d537a 100644
--- a/boringssl/crypto/refcount_test.c
+++ b/boringssl/crypto/refcount_test.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2015, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -16,7 +17,7 @@
 
 #include <stdio.h>
 
-#include <openssl/type_check.h>
+#include <boringssl/type_check.h>
 
 
 int main(int argc, char **argv) {
diff --git a/boringssl/crypto/rsa/CMakeLists.txt b/boringssl/crypto/rsa/CMakeLists.txt
index 969b753e..3a14d64c 100644
--- a/boringssl/crypto/rsa/CMakeLists.txt
+++ b/boringssl/crypto/rsa/CMakeLists.txt
@@ -20,5 +20,5 @@ add_executable(
   $<TARGET_OBJECTS:test_support>
 )
 
-target_link_libraries(rsa_test crypto)
+target_link_libraries(rsa_test bsslcrypto)
 add_dependencies(all_tests rsa_test)
\ No newline at end of file
diff --git a/boringssl/crypto/rsa/blinding.c b/boringssl/crypto/rsa/blinding.c
index d9d90c2b..75b57182 100644
--- a/boringssl/crypto/rsa/blinding.c
+++ b/boringssl/crypto/rsa/blinding.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* ====================================================================
  * Copyright (c) 1998-2006 The OpenSSL Project.  All rights reserved.
  *
@@ -106,13 +107,13 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/rsa.h>
+#include <boringssl/rsa.h>
 
 #include <string.h>
 
-#include <openssl/bn.h>
-#include <openssl/mem.h>
-#include <openssl/err.h>
+#include <boringssl/bn.h>
+#include <boringssl/mem.h>
+#include <boringssl/err.h>
 
 #include "internal.h"
 
diff --git a/boringssl/crypto/rsa/internal.h b/boringssl/crypto/rsa/internal.h
index c6ea97f0..dcd7c929 100644
--- a/boringssl/crypto/rsa/internal.h
+++ b/boringssl/crypto/rsa/internal.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -57,7 +58,7 @@
 #ifndef OPENSSL_HEADER_RSA_INTERNAL_H
 #define OPENSSL_HEADER_RSA_INTERNAL_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 
 #if defined(__cplusplus)
diff --git a/boringssl/crypto/rsa/padding.c b/boringssl/crypto/rsa/padding.c
index 12147ea4..4dc41666 100644
--- a/boringssl/crypto/rsa/padding.c
+++ b/boringssl/crypto/rsa/padding.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2005.
  */
@@ -53,18 +54,18 @@
  * (eay@cryptsoft.com).  This product includes software written by Tim
  * Hudson (tjh@cryptsoft.com). */
 
-#include <openssl/rsa.h>
+#include <boringssl/rsa.h>
 
 #include <assert.h>
 #include <limits.h>
 #include <string.h>
 
-#include <openssl/bn.h>
-#include <openssl/digest.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/rand.h>
-#include <openssl/sha.h>
+#include <boringssl/bn.h>
+#include <boringssl/digest.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/rand.h>
+#include <boringssl/sha.h>
 
 #include "internal.h"
 #include "../internal.h"
diff --git a/boringssl/crypto/rsa/rsa.c b/boringssl/crypto/rsa/rsa.c
index e5f98916..dbbb9286 100644
--- a/boringssl/crypto/rsa/rsa.c
+++ b/boringssl/crypto/rsa/rsa.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,18 +55,18 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/rsa.h>
+#include <boringssl/rsa.h>
 
 #include <limits.h>
 #include <string.h>
 
-#include <openssl/bn.h>
-#include <openssl/engine.h>
-#include <openssl/err.h>
-#include <openssl/ex_data.h>
-#include <openssl/mem.h>
-#include <openssl/nid.h>
-#include <openssl/thread.h>
+#include <boringssl/bn.h>
+#include <boringssl/engine.h>
+#include <boringssl/err.h>
+#include <boringssl/ex_data.h>
+#include <boringssl/mem.h>
+#include <boringssl/nid.h>
+#include <boringssl/thread.h>
 
 #include "internal.h"
 #include "../internal.h"
diff --git a/boringssl/crypto/rsa/rsa_asn1.c b/boringssl/crypto/rsa/rsa_asn1.c
index d14ecaee..3ecb2b72 100644
--- a/boringssl/crypto/rsa/rsa_asn1.c
+++ b/boringssl/crypto/rsa/rsa_asn1.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2000.
  */
@@ -53,16 +54,16 @@
  * (eay@cryptsoft.com).  This product includes software written by Tim
  * Hudson (tjh@cryptsoft.com). */
 
-#include <openssl/rsa.h>
+#include <boringssl/rsa.h>
 
 #include <assert.h>
 #include <limits.h>
 #include <string.h>
 
-#include <openssl/bn.h>
-#include <openssl/bytestring.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
+#include <boringssl/bn.h>
+#include <boringssl/bytestring.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
 
 #include "internal.h"
 #include "../bytestring/internal.h"
diff --git a/boringssl/crypto/rsa/rsa_impl.c b/boringssl/crypto/rsa/rsa_impl.c
index 3e30d898..d85c1d6a 100644
--- a/boringssl/crypto/rsa/rsa_impl.c
+++ b/boringssl/crypto/rsa/rsa_impl.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,15 +55,15 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/rsa.h>
+#include <boringssl/rsa.h>
 
 #include <assert.h>
 #include <string.h>
 
-#include <openssl/bn.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/thread.h>
+#include <boringssl/bn.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/thread.h>
 
 #include "internal.h"
 #include "../internal.h"
diff --git a/boringssl/crypto/rsa/rsa_test.cc b/boringssl/crypto/rsa/rsa_test.cc
index 62177a4c..85b5e012 100644
--- a/boringssl/crypto/rsa/rsa_test.cc
+++ b/boringssl/crypto/rsa/rsa_test.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,16 +55,16 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/rsa.h>
+#include <boringssl/rsa.h>
 
 #include <stdlib.h>
 #include <string.h>
 
-#include <openssl/bn.h>
-#include <openssl/bytestring.h>
-#include <openssl/crypto.h>
-#include <openssl/err.h>
-#include <openssl/nid.h>
+#include <boringssl/bn.h>
+#include <boringssl/bytestring.h>
+#include <boringssl/crypto.h>
+#include <boringssl/err.h>
+#include <boringssl/nid.h>
 
 #include "../test/scoped_types.h"
 
diff --git a/boringssl/crypto/sha/asm/sha1-armv4-large.pl b/boringssl/crypto/sha/asm/sha1-armv4-large.pl
index 64e2ed61..f42b79f5 100644
--- a/boringssl/crypto/sha/asm/sha1-armv4-large.pl
+++ b/boringssl/crypto/sha/asm/sha1-armv4-large.pl
@@ -181,6 +181,7 @@ sub BODY_40_59 {
 #include <openssl/arm_arch.h>
 
 .text
+#include <boringssl/bssl.h>
 .code	32
 
 .global	sha1_block_data_order
diff --git a/boringssl/crypto/sha/asm/sha1-armv8.pl b/boringssl/crypto/sha/asm/sha1-armv8.pl
index 1c4fe4a2..4804bde7 100644
--- a/boringssl/crypto/sha/asm/sha1-armv8.pl
+++ b/boringssl/crypto/sha/asm/sha1-armv8.pl
@@ -165,6 +165,7 @@ sub BODY_20_39 {
 #include <openssl/arm_arch.h>
 
 .text
+#include <boringssl/bssl.h>
 
 .extern	OPENSSL_armcap_P
 .globl	sha1_block_data_order
diff --git a/boringssl/crypto/sha/asm/sha1-x86_64.pl b/boringssl/crypto/sha/asm/sha1-x86_64.pl
index 4895f922..c7e8c2a6 100644
--- a/boringssl/crypto/sha/asm/sha1-x86_64.pl
+++ b/boringssl/crypto/sha/asm/sha1-x86_64.pl
@@ -233,6 +233,7 @@ sub BODY_40_59 {
 
 $code.=<<___;
 .text
+#include <boringssl/bssl.h>
 .extern	OPENSSL_ia32cap_P
 
 .globl	sha1_block_data_order
diff --git a/boringssl/crypto/sha/asm/sha256-armv4.pl b/boringssl/crypto/sha/asm/sha256-armv4.pl
index 7e071474..2b87deb7 100644
--- a/boringssl/crypto/sha/asm/sha256-armv4.pl
+++ b/boringssl/crypto/sha/asm/sha256-armv4.pl
@@ -175,6 +175,7 @@ sub BODY_16_XX {
 #endif
 
 .text
+#include <boringssl/bssl.h>
 #if __ARM_ARCH__<7
 .code	32
 #else
diff --git a/boringssl/crypto/sha/asm/sha512-armv4.pl b/boringssl/crypto/sha/asm/sha512-armv4.pl
index 15d50f28..f3201204 100644
--- a/boringssl/crypto/sha/asm/sha512-armv4.pl
+++ b/boringssl/crypto/sha/asm/sha512-armv4.pl
@@ -212,6 +212,7 @@ ()
 #endif
 
 .text
+#include <boringssl/bssl.h>
 #if __ARM_ARCH__<7 || defined(__APPLE__)
 .code	32
 #else
diff --git a/boringssl/crypto/sha/asm/sha512-armv8.pl b/boringssl/crypto/sha/asm/sha512-armv8.pl
index 40eb17a7..03197fa0 100644
--- a/boringssl/crypto/sha/asm/sha512-armv8.pl
+++ b/boringssl/crypto/sha/asm/sha512-armv8.pl
@@ -167,6 +167,7 @@ sub BODY_00_xx {
 #include <openssl/arm_arch.h>
 
 .text
+#include <boringssl/bssl.h>
 
 .extern	OPENSSL_armcap_P
 .globl	$func
diff --git a/boringssl/crypto/sha/asm/sha512-x86_64.pl b/boringssl/crypto/sha/asm/sha512-x86_64.pl
index 2bc33c65..5eb91136 100644
--- a/boringssl/crypto/sha/asm/sha512-x86_64.pl
+++ b/boringssl/crypto/sha/asm/sha512-x86_64.pl
@@ -246,6 +246,7 @@ ()
 
 $code=<<___;
 .text
+#include <boringssl/bssl.h>
 
 .extern	OPENSSL_ia32cap_P
 .globl	$func
diff --git a/boringssl/crypto/sha/sha1.c b/boringssl/crypto/sha/sha1.c
index 74e841ca..1c68f6d0 100644
--- a/boringssl/crypto/sha/sha1.c
+++ b/boringssl/crypto/sha/sha1.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,11 +55,11 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/sha.h>
+#include <boringssl/sha.h>
 
 #include <string.h>
 
-#include <openssl/mem.h>
+#include <boringssl/mem.h>
 
 
 #if !defined(OPENSSL_NO_ASM) &&                         \
diff --git a/boringssl/crypto/sha/sha256.c b/boringssl/crypto/sha/sha256.c
index 58f7c42c..b44456db 100644
--- a/boringssl/crypto/sha/sha256.c
+++ b/boringssl/crypto/sha/sha256.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,11 +55,11 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/sha.h>
+#include <boringssl/sha.h>
 
 #include <string.h>
 
-#include <openssl/mem.h>
+#include <boringssl/mem.h>
 
 
 #if !defined(OPENSSL_NO_ASM) &&                         \
diff --git a/boringssl/crypto/sha/sha512.c b/boringssl/crypto/sha/sha512.c
index f4730463..c64ff971 100644
--- a/boringssl/crypto/sha/sha512.c
+++ b/boringssl/crypto/sha/sha512.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,11 +55,11 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/sha.h>
+#include <boringssl/sha.h>
 
 #include <string.h>
 
-#include <openssl/mem.h>
+#include <boringssl/mem.h>
 
 
 /* IMPLEMENTATION NOTES.
diff --git a/boringssl/crypto/stack/stack.c b/boringssl/crypto/stack/stack.c
index e8932217..bf6e6a82 100644
--- a/boringssl/crypto/stack/stack.c
+++ b/boringssl/crypto/stack/stack.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,11 +55,11 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/stack.h>
+#include <boringssl/stack.h>
 
 #include <string.h>
 
-#include <openssl/mem.h>
+#include <boringssl/mem.h>
 
 /* kMinSize is the number of pointers that will be initially allocated in a new
  * stack. */
diff --git a/boringssl/crypto/test/file_test.cc b/boringssl/crypto/test/file_test.cc
index d684aa09..9d26d048 100644
--- a/boringssl/crypto/test/file_test.cc
+++ b/boringssl/crypto/test/file_test.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2015, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -22,7 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <openssl/err.h>
+#include <boringssl/err.h>
 
 
 FileTest::FileTest(const char *path) {
diff --git a/boringssl/crypto/test/file_test.h b/boringssl/crypto/test/file_test.h
index e90cc86a..9da3df4c 100644
--- a/boringssl/crypto/test/file_test.h
+++ b/boringssl/crypto/test/file_test.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2015, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +16,7 @@
 #ifndef OPENSSL_HEADER_CRYPTO_TEST_FILE_TEST_H
 #define OPENSSL_HEADER_CRYPTO_TEST_FILE_TEST_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #include <stdint.h>
 #include <stdio.h>
diff --git a/boringssl/crypto/test/malloc.cc b/boringssl/crypto/test/malloc.cc
index 898f2a7c..6e3151ea 100644
--- a/boringssl/crypto/test/malloc.cc
+++ b/boringssl/crypto/test/malloc.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -12,7 +13,7 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #if defined(__has_feature)
 #if __has_feature(address_sanitizer) || __has_feature(memory_sanitizer)
diff --git a/boringssl/crypto/test/scoped_types.h b/boringssl/crypto/test/scoped_types.h
index 5c49a7ee..a9bb44f9 100644
--- a/boringssl/crypto/test/scoped_types.h
+++ b/boringssl/crypto/test/scoped_types.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2015, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -20,24 +21,24 @@
 
 #include <memory>
 
-#include <openssl/aead.h>
-#include <openssl/asn1.h>
-#include <openssl/bio.h>
-#include <openssl/bn.h>
-#include <openssl/bytestring.h>
-#include <openssl/cmac.h>
-#include <openssl/curve25519.h>
-#include <openssl/dh.h>
-#include <openssl/ecdsa.h>
-#include <openssl/ec.h>
-#include <openssl/ec_key.h>
-#include <openssl/evp.h>
-#include <openssl/hmac.h>
-#include <openssl/mem.h>
-#include <openssl/pkcs8.h>
-#include <openssl/rsa.h>
-#include <openssl/stack.h>
-#include <openssl/x509.h>
+#include <boringssl/aead.h>
+#include <boringssl/asn1.h>
+#include <boringssl/bio.h>
+#include <boringssl/bn.h>
+#include <boringssl/bytestring.h>
+#include <boringssl/cmac.h>
+#include <boringssl/curve25519.h>
+#include <boringssl/dh.h>
+#include <boringssl/ecdsa.h>
+#include <boringssl/ec.h>
+#include <boringssl/ec_key.h>
+#include <boringssl/evp.h>
+#include <boringssl/hmac.h>
+#include <boringssl/mem.h>
+#include <boringssl/pkcs8.h>
+#include <boringssl/rsa.h>
+#include <boringssl/stack.h>
+#include <boringssl/x509.h>
 
 
 template<typename T, void (*func)(T*)>
diff --git a/boringssl/crypto/test/test_util.cc b/boringssl/crypto/test/test_util.cc
index 8021aaa8..fef282d9 100644
--- a/boringssl/crypto/test/test_util.cc
+++ b/boringssl/crypto/test/test_util.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2015, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/boringssl/crypto/test/test_util.h b/boringssl/crypto/test/test_util.h
index 89e70c6d..048bb83c 100644
--- a/boringssl/crypto/test/test_util.h
+++ b/boringssl/crypto/test/test_util.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2015, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/boringssl/crypto/thread.c b/boringssl/crypto/thread.c
index 88371159..5d536d7f 100644
--- a/boringssl/crypto/thread.c
+++ b/boringssl/crypto/thread.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,7 +55,7 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/thread.h>
+#include <boringssl/thread.h>
 
 #include <string.h>
 
@@ -66,7 +67,7 @@
 #pragma warning(pop)
 #endif
 
-#include <openssl/mem.h>
+#include <boringssl/mem.h>
 
 
 int CRYPTO_num_locks(void) { return 1; }
diff --git a/boringssl/crypto/thread_none.c b/boringssl/crypto/thread_none.c
index cf4e85a7..0e99ffa7 100644
--- a/boringssl/crypto/thread_none.c
+++ b/boringssl/crypto/thread_none.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2015, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/boringssl/crypto/thread_pthread.c b/boringssl/crypto/thread_pthread.c
index 2a1c9f8a..1ea91ea2 100644
--- a/boringssl/crypto/thread_pthread.c
+++ b/boringssl/crypto/thread_pthread.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2015, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -20,8 +21,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <openssl/mem.h>
-#include <openssl/type_check.h>
+#include <boringssl/mem.h>
+#include <boringssl/type_check.h>
 
 
 OPENSSL_COMPILE_ASSERT(sizeof(CRYPTO_MUTEX) >= sizeof(pthread_rwlock_t),
diff --git a/boringssl/crypto/thread_test.c b/boringssl/crypto/thread_test.c
index 92a5373b..8e0364f6 100644
--- a/boringssl/crypto/thread_test.c
+++ b/boringssl/crypto/thread_test.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2015, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/boringssl/crypto/thread_win.c b/boringssl/crypto/thread_win.c
index 26325656..227b0460 100644
--- a/boringssl/crypto/thread_win.c
+++ b/boringssl/crypto/thread_win.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2015, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -23,8 +24,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <openssl/mem.h>
-#include <openssl/type_check.h>
+#include <boringssl/mem.h>
+#include <boringssl/type_check.h>
 
 
 OPENSSL_COMPILE_ASSERT(sizeof(CRYPTO_MUTEX) >= sizeof(CRITICAL_SECTION),
diff --git a/boringssl/crypto/time_support.c b/boringssl/crypto/time_support.c
index ae0f4963..5a498859 100644
--- a/boringssl/crypto/time_support.c
+++ b/boringssl/crypto/time_support.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Written by Richard Levitte (richard@levitte.org) for the OpenSSL
  * project 2001.
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
@@ -59,7 +60,7 @@
 #define _POSIX_C_SOURCE 201410L  /* for gmtime_r */
 #endif
 
-#include <openssl/time_support.h>
+#include <boringssl/time_support.h>
 
 #include <time.h>
 
diff --git a/boringssl/crypto/x509/CMakeLists.txt b/boringssl/crypto/x509/CMakeLists.txt
index 5d82e0a9..959da371 100644
--- a/boringssl/crypto/x509/CMakeLists.txt
+++ b/boringssl/crypto/x509/CMakeLists.txt
@@ -74,6 +74,6 @@ add_executable(
   $<TARGET_OBJECTS:test_support>
 )
 
-target_link_libraries(pkcs7_test crypto)
-target_link_libraries(x509_test crypto)
+target_link_libraries(pkcs7_test bsslcrypto)
+target_link_libraries(x509_test bsslcrypto)
 add_dependencies(all_tests pkcs7_test x509_test)
diff --git a/boringssl/crypto/x509/a_digest.c b/boringssl/crypto/x509/a_digest.c
index b88d6ac7..946e2e59 100644
--- a/boringssl/crypto/x509/a_digest.c
+++ b/boringssl/crypto/x509/a_digest.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,12 +55,12 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/x509.h>
+#include <boringssl/x509.h>
 
-#include <openssl/asn1.h>
-#include <openssl/digest.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
+#include <boringssl/asn1.h>
+#include <boringssl/digest.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
 
 int ASN1_digest(i2d_of_void *i2d, const EVP_MD *type, char *data,
                 unsigned char *md, unsigned int *len)
diff --git a/boringssl/crypto/x509/a_sign.c b/boringssl/crypto/x509/a_sign.c
index 13a3ac25..5a4b38e5 100644
--- a/boringssl/crypto/x509/a_sign.c
+++ b/boringssl/crypto/x509/a_sign.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,13 +55,13 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/asn1.h>
-#include <openssl/digest.h>
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/mem.h>
-#include <openssl/obj.h>
-#include <openssl/x509.h>
+#include <boringssl/asn1.h>
+#include <boringssl/digest.h>
+#include <boringssl/err.h>
+#include <boringssl/evp.h>
+#include <boringssl/mem.h>
+#include <boringssl/obj.h>
+#include <boringssl/x509.h>
 
 #include "internal.h"
 
diff --git a/boringssl/crypto/x509/a_strex.c b/boringssl/crypto/x509/a_strex.c
index aa2501a4..19221ae9 100644
--- a/boringssl/crypto/x509/a_strex.c
+++ b/boringssl/crypto/x509/a_strex.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,13 +55,13 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/x509.h>
+#include <boringssl/x509.h>
 
 #include <string.h>
 
-#include <openssl/asn1.h>
-#include <openssl/mem.h>
-#include <openssl/obj.h>
+#include <boringssl/asn1.h>
+#include <boringssl/mem.h>
+#include <boringssl/obj.h>
 
 #include "charmap.h"
 
diff --git a/boringssl/crypto/x509/a_verify.c b/boringssl/crypto/x509/a_verify.c
index 5a9adb65..1ee9619e 100644
--- a/boringssl/crypto/x509/a_verify.c
+++ b/boringssl/crypto/x509/a_verify.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,19 +55,19 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/x509.h>
+#include <boringssl/x509.h>
 
 #include <stdio.h>
 #include <time.h>
 #include <sys/types.h>
 
-#include <openssl/bn.h>
-#include <openssl/buf.h>
-#include <openssl/digest.h>
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/mem.h>
-#include <openssl/obj.h>
+#include <boringssl/bn.h>
+#include <boringssl/buf.h>
+#include <boringssl/digest.h>
+#include <boringssl/err.h>
+#include <boringssl/evp.h>
+#include <boringssl/mem.h>
+#include <boringssl/obj.h>
 
 #include "internal.h"
 
diff --git a/boringssl/crypto/x509/algorithm.c b/boringssl/crypto/x509/algorithm.c
index 78ae882b..4756fcdd 100644
--- a/boringssl/crypto/x509/algorithm.c
+++ b/boringssl/crypto/x509/algorithm.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,13 +55,13 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/x509.h>
+#include <boringssl/x509.h>
 
-#include <openssl/asn1.h>
-#include <openssl/digest.h>
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/obj.h>
+#include <boringssl/asn1.h>
+#include <boringssl/digest.h>
+#include <boringssl/err.h>
+#include <boringssl/evp.h>
+#include <boringssl/obj.h>
 
 #include "internal.h"
 
diff --git a/boringssl/crypto/x509/asn1_gen.c b/boringssl/crypto/x509/asn1_gen.c
index 03a0ab9f..8f7f8a00 100644
--- a/boringssl/crypto/x509/asn1_gen.c
+++ b/boringssl/crypto/x509/asn1_gen.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,15 +55,15 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/x509.h>
+#include <boringssl/x509.h>
 
 #include <string.h>
 
-#include <openssl/asn1.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/obj.h>
-#include <openssl/x509v3.h>
+#include <boringssl/asn1.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/obj.h>
+#include <boringssl/x509v3.h>
 
 #include "../internal.h"
 
diff --git a/boringssl/crypto/x509/by_dir.c b/boringssl/crypto/x509/by_dir.c
index 4f0a49e2..0426583e 100644
--- a/boringssl/crypto/x509/by_dir.c
+++ b/boringssl/crypto/x509/by_dir.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* crypto/x509/by_dir.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
@@ -59,12 +60,12 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include <openssl/buf.h>
-#include <openssl/err.h>
-#include <openssl/lhash.h>
-#include <openssl/mem.h>
-#include <openssl/thread.h>
-#include <openssl/x509.h>
+#include <boringssl/buf.h>
+#include <boringssl/err.h>
+#include <boringssl/lhash.h>
+#include <boringssl/mem.h>
+#include <boringssl/thread.h>
+#include <boringssl/x509.h>
 
 #include "../internal.h"
 
diff --git a/boringssl/crypto/x509/by_file.c b/boringssl/crypto/x509/by_file.c
index ebeb72e5..d822ae32 100644
--- a/boringssl/crypto/x509/by_file.c
+++ b/boringssl/crypto/x509/by_file.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* crypto/x509/by_file.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
@@ -57,11 +58,11 @@
 
 #include <stdlib.h>
 
-#include <openssl/buf.h>
-#include <openssl/err.h>
-#include <openssl/lhash.h>
-#include <openssl/pem.h>
-#include <openssl/thread.h>
+#include <boringssl/buf.h>
+#include <boringssl/err.h>
+#include <boringssl/lhash.h>
+#include <boringssl/pem.h>
+#include <boringssl/thread.h>
 
 #ifndef OPENSSL_NO_STDIO
 
diff --git a/boringssl/crypto/x509/charmap.h b/boringssl/crypto/x509/charmap.h
index 3305ad14..bba7560d 100644
--- a/boringssl/crypto/x509/charmap.h
+++ b/boringssl/crypto/x509/charmap.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /*
  * Auto generated with chartype.pl script. Mask of various character
  * properties
diff --git a/boringssl/crypto/x509/i2d_pr.c b/boringssl/crypto/x509/i2d_pr.c
index c3fb8a8a..cd18eb7f 100644
--- a/boringssl/crypto/x509/i2d_pr.c
+++ b/boringssl/crypto/x509/i2d_pr.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* crypto/asn1/i2d_pr.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
@@ -55,12 +56,12 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/asn1.h>
-#include <openssl/ec_key.h>
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/rsa.h>
-#include <openssl/dsa.h>
+#include <boringssl/asn1.h>
+#include <boringssl/ec_key.h>
+#include <boringssl/err.h>
+#include <boringssl/evp.h>
+#include <boringssl/rsa.h>
+#include <boringssl/dsa.h>
 
 
 int i2d_PrivateKey(const EVP_PKEY *a, uint8_t **pp)
diff --git a/boringssl/crypto/x509/internal.h b/boringssl/crypto/x509/internal.h
index 4957c1e1..4680d153 100644
--- a/boringssl/crypto/x509/internal.h
+++ b/boringssl/crypto/x509/internal.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2016, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,9 +16,9 @@
 #ifndef OPENSSL_HEADER_X509_INTERNAL_H
 #define OPENSSL_HEADER_X509_INTERNAL_H
 
-#include <openssl/base.h>
-#include <openssl/evp.h>
-#include <openssl/x509.h>
+#include <boringssl/base.h>
+#include <boringssl/evp.h>
+#include <boringssl/x509.h>
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/boringssl/crypto/x509/pkcs7.c b/boringssl/crypto/x509/pkcs7.c
index 9e6a52f2..cfa547a4 100644
--- a/boringssl/crypto/x509/pkcs7.c
+++ b/boringssl/crypto/x509/pkcs7.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -12,17 +13,17 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
 
-#include <openssl/x509.h>
+#include <boringssl/x509.h>
 
 #include <assert.h>
 #include <limits.h>
 
-#include <openssl/bytestring.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/obj.h>
-#include <openssl/pem.h>
-#include <openssl/stack.h>
+#include <boringssl/bytestring.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/obj.h>
+#include <boringssl/pem.h>
+#include <boringssl/stack.h>
 
 #include "../bytestring/internal.h"
 
diff --git a/boringssl/crypto/x509/pkcs7_test.c b/boringssl/crypto/x509/pkcs7_test.c
index 2dfeb5ed..8d8b958b 100644
--- a/boringssl/crypto/x509/pkcs7_test.c
+++ b/boringssl/crypto/x509/pkcs7_test.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -16,11 +17,11 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <openssl/bytestring.h>
-#include <openssl/crypto.h>
-#include <openssl/mem.h>
-#include <openssl/stack.h>
-#include <openssl/x509.h>
+#include <boringssl/bytestring.h>
+#include <boringssl/crypto.h>
+#include <boringssl/mem.h>
+#include <boringssl/stack.h>
+#include <boringssl/x509.h>
 
 #include "../test/test_util.h"
 
diff --git a/boringssl/crypto/x509/rsa_pss.c b/boringssl/crypto/x509/rsa_pss.c
index 1ae01a3d..111ecb5e 100644
--- a/boringssl/crypto/x509/rsa_pss.c
+++ b/boringssl/crypto/x509/rsa_pss.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006.
  */
@@ -53,16 +54,16 @@
  * (eay@cryptsoft.com).  This product includes software written by Tim
  * Hudson (tjh@cryptsoft.com). */
 
-#include <openssl/x509.h>
+#include <boringssl/x509.h>
 
 #include <assert.h>
 
-#include <openssl/asn1.h>
-#include <openssl/asn1t.h>
-#include <openssl/bio.h>
-#include <openssl/evp.h>
-#include <openssl/err.h>
-#include <openssl/obj.h>
+#include <boringssl/asn1.h>
+#include <boringssl/asn1t.h>
+#include <boringssl/bio.h>
+#include <boringssl/evp.h>
+#include <boringssl/err.h>
+#include <boringssl/obj.h>
 
 #include "internal.h"
 
diff --git a/boringssl/crypto/x509/t_crl.c b/boringssl/crypto/x509/t_crl.c
index 6c347cb8..69c2b229 100644
--- a/boringssl/crypto/x509/t_crl.c
+++ b/boringssl/crypto/x509/t_crl.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,12 +55,12 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/asn1.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/obj.h>
-#include <openssl/x509.h>
-#include <openssl/x509v3.h>
+#include <boringssl/asn1.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/obj.h>
+#include <boringssl/x509.h>
+#include <boringssl/x509v3.h>
 
 #ifndef OPENSSL_NO_FP_API
 int X509_CRL_print_fp(FILE *fp, X509_CRL *x)
diff --git a/boringssl/crypto/x509/t_req.c b/boringssl/crypto/x509/t_req.c
index 39c836cc..2f927355 100644
--- a/boringssl/crypto/x509/t_req.c
+++ b/boringssl/crypto/x509/t_req.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -56,12 +57,12 @@
 
 #include <stdio.h>
 
-#include <openssl/bn.h>
-#include <openssl/buffer.h>
-#include <openssl/err.h>
-#include <openssl/objects.h>
-#include <openssl/x509.h>
-#include <openssl/x509v3.h>
+#include <boringssl/bn.h>
+#include <boringssl/buffer.h>
+#include <boringssl/err.h>
+#include <boringssl/objects.h>
+#include <boringssl/x509.h>
+#include <boringssl/x509v3.h>
 
 
 int X509_REQ_print_fp(FILE *fp, X509_REQ *x) {
diff --git a/boringssl/crypto/x509/t_x509.c b/boringssl/crypto/x509/t_x509.c
index 1fba9b43..ec14ba97 100644
--- a/boringssl/crypto/x509/t_x509.c
+++ b/boringssl/crypto/x509/t_x509.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,15 +55,15 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/asn1.h>
-#include <openssl/bio.h>
-#include <openssl/digest.h>
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/mem.h>
-#include <openssl/obj.h>
-#include <openssl/x509.h>
-#include <openssl/x509v3.h>
+#include <boringssl/asn1.h>
+#include <boringssl/bio.h>
+#include <boringssl/digest.h>
+#include <boringssl/err.h>
+#include <boringssl/evp.h>
+#include <boringssl/mem.h>
+#include <boringssl/obj.h>
+#include <boringssl/x509.h>
+#include <boringssl/x509v3.h>
 
 #include "internal.h"
 
diff --git a/boringssl/crypto/x509/t_x509a.c b/boringssl/crypto/x509/t_x509a.c
index 54368286..3602866a 100644
--- a/boringssl/crypto/x509/t_x509a.c
+++ b/boringssl/crypto/x509/t_x509a.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,11 +55,11 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/asn1.h>
-#include <openssl/bio.h>
-#include <openssl/mem.h>
-#include <openssl/obj.h>
-#include <openssl/x509.h>
+#include <boringssl/asn1.h>
+#include <boringssl/bio.h>
+#include <boringssl/mem.h>
+#include <boringssl/obj.h>
+#include <boringssl/x509.h>
 
 /* X509_CERT_AUX and string set routines */
 
diff --git a/boringssl/crypto/x509/vpm_int.h b/boringssl/crypto/x509/vpm_int.h
index 9c55defc..440c2f35 100644
--- a/boringssl/crypto/x509/vpm_int.h
+++ b/boringssl/crypto/x509/vpm_int.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* vpm_int.h */
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
diff --git a/boringssl/crypto/x509/x509.c b/boringssl/crypto/x509/x509.c
index 188fd496..bee8c46a 100644
--- a/boringssl/crypto/x509/x509.c
+++ b/boringssl/crypto/x509/x509.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,11 +55,11 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/x509.h>
+#include <boringssl/x509.h>
 
-#include <openssl/bio.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
+#include <boringssl/bio.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
 
 
 /* |X509_R_UNSUPPORTED_ALGORITHM| is no longer emitted, but continue to define
diff --git a/boringssl/crypto/x509/x509_att.c b/boringssl/crypto/x509/x509_att.c
index b83d32f9..eb2a8e06 100644
--- a/boringssl/crypto/x509/x509_att.c
+++ b/boringssl/crypto/x509/x509_att.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* crypto/x509/x509_att.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
@@ -55,12 +56,12 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/asn1.h>
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/obj.h>
-#include <openssl/stack.h>
-#include <openssl/x509.h>
+#include <boringssl/asn1.h>
+#include <boringssl/err.h>
+#include <boringssl/evp.h>
+#include <boringssl/obj.h>
+#include <boringssl/stack.h>
+#include <boringssl/x509.h>
 
 int X509at_get_attr_count(const STACK_OF(X509_ATTRIBUTE) *x)
 {
diff --git a/boringssl/crypto/x509/x509_cmp.c b/boringssl/crypto/x509/x509_cmp.c
index 32862ebc..d7c17f35 100644
--- a/boringssl/crypto/x509/x509_cmp.c
+++ b/boringssl/crypto/x509/x509_cmp.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* crypto/x509/x509_cmp.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
@@ -57,15 +58,15 @@
 
 #include <string.h>
 
-#include <openssl/asn1.h>
-#include <openssl/buf.h>
-#include <openssl/digest.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/obj.h>
-#include <openssl/stack.h>
-#include <openssl/x509.h>
-#include <openssl/x509v3.h>
+#include <boringssl/asn1.h>
+#include <boringssl/buf.h>
+#include <boringssl/digest.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/obj.h>
+#include <boringssl/stack.h>
+#include <boringssl/x509.h>
+#include <boringssl/x509v3.h>
 
 int X509_issuer_and_serial_cmp(const X509 *a, const X509 *b)
 {
diff --git a/boringssl/crypto/x509/x509_d2.c b/boringssl/crypto/x509/x509_d2.c
index 69ae54ed..67404c27 100644
--- a/boringssl/crypto/x509/x509_d2.c
+++ b/boringssl/crypto/x509/x509_d2.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* crypto/x509/x509_d2.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
@@ -55,8 +56,8 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/err.h>
-#include <openssl/x509.h>
+#include <boringssl/err.h>
+#include <boringssl/x509.h>
 
 #ifndef OPENSSL_NO_STDIO
 int X509_STORE_set_default_paths(X509_STORE *ctx)
diff --git a/boringssl/crypto/x509/x509_def.c b/boringssl/crypto/x509/x509_def.c
index 2bf2240c..bc655cde 100644
--- a/boringssl/crypto/x509/x509_def.c
+++ b/boringssl/crypto/x509/x509_def.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* crypto/x509/x509_def.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
@@ -55,7 +56,7 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/x509.h>
+#include <boringssl/x509.h>
 
 /* TODO(fork): cleanup */
 
diff --git a/boringssl/crypto/x509/x509_ext.c b/boringssl/crypto/x509/x509_ext.c
index a329f6fa..8d9e0450 100644
--- a/boringssl/crypto/x509/x509_ext.c
+++ b/boringssl/crypto/x509/x509_ext.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* crypto/x509/x509_ext.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
@@ -55,12 +56,12 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/asn1.h>
-#include <openssl/evp.h>
-#include <openssl/obj.h>
-#include <openssl/stack.h>
-#include <openssl/x509.h>
-#include <openssl/x509v3.h>
+#include <boringssl/asn1.h>
+#include <boringssl/evp.h>
+#include <boringssl/obj.h>
+#include <boringssl/stack.h>
+#include <boringssl/x509.h>
+#include <boringssl/x509v3.h>
 
 int X509_CRL_get_ext_count(X509_CRL *x)
 {
diff --git a/boringssl/crypto/x509/x509_lu.c b/boringssl/crypto/x509/x509_lu.c
index ec3f300b..a65ea506 100644
--- a/boringssl/crypto/x509/x509_lu.c
+++ b/boringssl/crypto/x509/x509_lu.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* crypto/x509/x509_lu.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
@@ -57,12 +58,12 @@
 
 #include <string.h>
 
-#include <openssl/err.h>
-#include <openssl/lhash.h>
-#include <openssl/mem.h>
-#include <openssl/thread.h>
-#include <openssl/x509.h>
-#include <openssl/x509v3.h>
+#include <boringssl/err.h>
+#include <boringssl/lhash.h>
+#include <boringssl/mem.h>
+#include <boringssl/thread.h>
+#include <boringssl/x509.h>
+#include <boringssl/x509v3.h>
 
 #include "../internal.h"
 
diff --git a/boringssl/crypto/x509/x509_obj.c b/boringssl/crypto/x509/x509_obj.c
index 641e308d..b57d6688 100644
--- a/boringssl/crypto/x509/x509_obj.c
+++ b/boringssl/crypto/x509/x509_obj.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* crypto/x509/x509_obj.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
@@ -57,12 +58,12 @@
 
 #include <string.h>
 
-#include <openssl/buf.h>
-#include <openssl/err.h>
-#include <openssl/lhash.h>
-#include <openssl/mem.h>
-#include <openssl/obj.h>
-#include <openssl/x509.h>
+#include <boringssl/buf.h>
+#include <boringssl/err.h>
+#include <boringssl/lhash.h>
+#include <boringssl/mem.h>
+#include <boringssl/obj.h>
+#include <boringssl/x509.h>
 
 char *X509_NAME_oneline(X509_NAME *a, char *buf, int len)
 {
diff --git a/boringssl/crypto/x509/x509_r2x.c b/boringssl/crypto/x509/x509_r2x.c
index 83951a2e..ef17f019 100644
--- a/boringssl/crypto/x509/x509_r2x.c
+++ b/boringssl/crypto/x509/x509_r2x.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,14 +55,14 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/asn1.h>
-#include <openssl/bn.h>
-#include <openssl/buf.h>
-#include <openssl/digest.h>
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/obj.h>
-#include <openssl/x509.h>
+#include <boringssl/asn1.h>
+#include <boringssl/bn.h>
+#include <boringssl/buf.h>
+#include <boringssl/digest.h>
+#include <boringssl/err.h>
+#include <boringssl/evp.h>
+#include <boringssl/obj.h>
+#include <boringssl/x509.h>
 
 X509 *X509_REQ_to_X509(X509_REQ *r, int days, EVP_PKEY *pkey)
 {
diff --git a/boringssl/crypto/x509/x509_req.c b/boringssl/crypto/x509/x509_req.c
index 69bc6f11..b8100382 100644
--- a/boringssl/crypto/x509/x509_req.c
+++ b/boringssl/crypto/x509/x509_req.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* crypto/x509/x509_req.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
@@ -55,16 +56,16 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/asn1.h>
-#include <openssl/asn1t.h>
-#include <openssl/bn.h>
-#include <openssl/buf.h>
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/mem.h>
-#include <openssl/obj.h>
-#include <openssl/pem.h>
-#include <openssl/x509.h>
+#include <boringssl/asn1.h>
+#include <boringssl/asn1t.h>
+#include <boringssl/bn.h>
+#include <boringssl/buf.h>
+#include <boringssl/err.h>
+#include <boringssl/evp.h>
+#include <boringssl/mem.h>
+#include <boringssl/obj.h>
+#include <boringssl/pem.h>
+#include <boringssl/x509.h>
 
 X509_REQ *X509_to_X509_REQ(X509 *x, EVP_PKEY *pkey, const EVP_MD *md)
 {
diff --git a/boringssl/crypto/x509/x509_set.c b/boringssl/crypto/x509/x509_set.c
index 42e9cf0f..b41754a4 100644
--- a/boringssl/crypto/x509/x509_set.c
+++ b/boringssl/crypto/x509/x509_set.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,11 +55,11 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/asn1.h>
-#include <openssl/cipher.h>
-#include <openssl/evp.h>
-#include <openssl/obj.h>
-#include <openssl/x509.h>
+#include <boringssl/asn1.h>
+#include <boringssl/cipher.h>
+#include <boringssl/evp.h>
+#include <boringssl/obj.h>
+#include <boringssl/x509.h>
 
 int X509_set_version(X509 *x, long version)
 {
diff --git a/boringssl/crypto/x509/x509_test.cc b/boringssl/crypto/x509/x509_test.cc
index 650163a8..5956aa7d 100644
--- a/boringssl/crypto/x509/x509_test.cc
+++ b/boringssl/crypto/x509/x509_test.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2016, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -17,12 +18,12 @@
 #include <assert.h>
 #include <string.h>
 
-#include <openssl/crypto.h>
-#include <openssl/digest.h>
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/pem.h>
-#include <openssl/x509.h>
+#include <boringssl/crypto.h>
+#include <boringssl/digest.h>
+#include <boringssl/err.h>
+#include <boringssl/evp.h>
+#include <boringssl/pem.h>
+#include <boringssl/x509.h>
 
 #include "../test/scoped_types.h"
 
diff --git a/boringssl/crypto/x509/x509_trs.c b/boringssl/crypto/x509/x509_trs.c
index c7dfcad6..aa4f6fa9 100644
--- a/boringssl/crypto/x509/x509_trs.c
+++ b/boringssl/crypto/x509/x509_trs.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
  * 1999.
@@ -54,11 +55,11 @@
  * (eay@cryptsoft.com).  This product includes software written by Tim
  * Hudson (tjh@cryptsoft.com). */
 
-#include <openssl/buf.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/obj.h>
-#include <openssl/x509v3.h>
+#include <boringssl/buf.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/obj.h>
+#include <boringssl/x509v3.h>
 
 static int tr_cmp(const X509_TRUST **a, const X509_TRUST **b);
 static void trtable_free(X509_TRUST *p);
diff --git a/boringssl/crypto/x509/x509_txt.c b/boringssl/crypto/x509/x509_txt.c
index 86af3fec..f70e5cdd 100644
--- a/boringssl/crypto/x509/x509_txt.c
+++ b/boringssl/crypto/x509/x509_txt.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,14 +55,14 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/asn1.h>
-#include <openssl/buf.h>
-#include <openssl/cipher.h>
-#include <openssl/evp.h>
-#include <openssl/lhash.h>
-#include <openssl/mem.h>
-#include <openssl/obj.h>
-#include <openssl/x509.h>
+#include <boringssl/asn1.h>
+#include <boringssl/buf.h>
+#include <boringssl/cipher.h>
+#include <boringssl/evp.h>
+#include <boringssl/lhash.h>
+#include <boringssl/mem.h>
+#include <boringssl/obj.h>
+#include <boringssl/x509.h>
 
 const char *X509_verify_cert_error_string(long n)
 {
diff --git a/boringssl/crypto/x509/x509_v3.c b/boringssl/crypto/x509/x509_v3.c
index ecbc0ddc..896c7c7f 100644
--- a/boringssl/crypto/x509/x509_v3.c
+++ b/boringssl/crypto/x509/x509_v3.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,13 +55,13 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/asn1.h>
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/obj.h>
-#include <openssl/stack.h>
-#include <openssl/x509.h>
-#include <openssl/x509v3.h>
+#include <boringssl/asn1.h>
+#include <boringssl/err.h>
+#include <boringssl/evp.h>
+#include <boringssl/obj.h>
+#include <boringssl/stack.h>
+#include <boringssl/x509.h>
+#include <boringssl/x509v3.h>
 
 int X509v3_get_ext_count(const STACK_OF(X509_EXTENSION) *x)
 {
diff --git a/boringssl/crypto/x509/x509_vfy.c b/boringssl/crypto/x509/x509_vfy.c
index 2ed2f03e..a5541bc6 100644
--- a/boringssl/crypto/x509/x509_vfy.c
+++ b/boringssl/crypto/x509/x509_vfy.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -57,16 +58,16 @@
 #include <string.h>
 #include <time.h>
 
-#include <openssl/asn1.h>
-#include <openssl/buf.h>
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/lhash.h>
-#include <openssl/mem.h>
-#include <openssl/obj.h>
-#include <openssl/thread.h>
-#include <openssl/x509.h>
-#include <openssl/x509v3.h>
+#include <boringssl/asn1.h>
+#include <boringssl/buf.h>
+#include <boringssl/err.h>
+#include <boringssl/evp.h>
+#include <boringssl/lhash.h>
+#include <boringssl/mem.h>
+#include <boringssl/obj.h>
+#include <boringssl/thread.h>
+#include <boringssl/x509.h>
+#include <boringssl/x509v3.h>
 
 #include "vpm_int.h"
 #include "../internal.h"
diff --git a/boringssl/crypto/x509/x509_vpm.c b/boringssl/crypto/x509/x509_vpm.c
index b51bc176..f57cd5d9 100644
--- a/boringssl/crypto/x509/x509_vpm.c
+++ b/boringssl/crypto/x509/x509_vpm.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
  * 2004.
@@ -56,13 +57,13 @@
 
 #include <string.h>
 
-#include <openssl/buf.h>
-#include <openssl/lhash.h>
-#include <openssl/mem.h>
-#include <openssl/obj.h>
-#include <openssl/stack.h>
-#include <openssl/x509.h>
-#include <openssl/x509v3.h>
+#include <boringssl/buf.h>
+#include <boringssl/lhash.h>
+#include <boringssl/mem.h>
+#include <boringssl/obj.h>
+#include <boringssl/stack.h>
+#include <boringssl/x509.h>
+#include <boringssl/x509v3.h>
 
 #include "vpm_int.h"
 
diff --git a/boringssl/crypto/x509/x509cset.c b/boringssl/crypto/x509/x509cset.c
index a292710e..f12090d2 100644
--- a/boringssl/crypto/x509/x509cset.c
+++ b/boringssl/crypto/x509/x509cset.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
  * 2001.
@@ -54,10 +55,10 @@
  * (eay@cryptsoft.com).  This product includes software written by Tim
  * Hudson (tjh@cryptsoft.com). */
 
-#include <openssl/asn1.h>
-#include <openssl/evp.h>
-#include <openssl/obj.h>
-#include <openssl/x509.h>
+#include <boringssl/asn1.h>
+#include <boringssl/evp.h>
+#include <boringssl/obj.h>
+#include <boringssl/x509.h>
 
 #include "../internal.h"
 
diff --git a/boringssl/crypto/x509/x509name.c b/boringssl/crypto/x509/x509name.c
index 050e16a8..05891423 100644
--- a/boringssl/crypto/x509/x509name.c
+++ b/boringssl/crypto/x509/x509name.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -56,12 +57,12 @@
 
 #include <string.h>
 
-#include <openssl/asn1.h>
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/obj.h>
-#include <openssl/stack.h>
-#include <openssl/x509.h>
+#include <boringssl/asn1.h>
+#include <boringssl/err.h>
+#include <boringssl/evp.h>
+#include <boringssl/obj.h>
+#include <boringssl/stack.h>
+#include <boringssl/x509.h>
 
 int X509_NAME_get_text_by_NID(X509_NAME *name, int nid, char *buf, int len)
 {
diff --git a/boringssl/crypto/x509/x509rset.c b/boringssl/crypto/x509/x509rset.c
index c4e6683d..b1256ab8 100644
--- a/boringssl/crypto/x509/x509rset.c
+++ b/boringssl/crypto/x509/x509rset.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,10 +55,10 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/asn1.h>
-#include <openssl/evp.h>
-#include <openssl/obj.h>
-#include <openssl/x509.h>
+#include <boringssl/asn1.h>
+#include <boringssl/evp.h>
+#include <boringssl/obj.h>
+#include <boringssl/x509.h>
 
 int X509_REQ_set_version(X509_REQ *x, long version)
 {
diff --git a/boringssl/crypto/x509/x509spki.c b/boringssl/crypto/x509/x509spki.c
index 4a9b95e7..6589f64a 100644
--- a/boringssl/crypto/x509/x509spki.c
+++ b/boringssl/crypto/x509/x509spki.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
  * 1999.
@@ -56,10 +57,10 @@
 
 #include <string.h>
 
-#include <openssl/base64.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/x509.h>
+#include <boringssl/base64.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/x509.h>
 
 int NETSCAPE_SPKI_set_pubkey(NETSCAPE_SPKI *x, EVP_PKEY *pkey)
 {
diff --git a/boringssl/crypto/x509/x509type.c b/boringssl/crypto/x509/x509type.c
index d4f5a4dc..249e68cc 100644
--- a/boringssl/crypto/x509/x509type.c
+++ b/boringssl/crypto/x509/x509type.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,9 +55,9 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/evp.h>
-#include <openssl/obj.h>
-#include <openssl/x509.h>
+#include <boringssl/evp.h>
+#include <boringssl/obj.h>
+#include <boringssl/x509.h>
 
 int X509_certificate_type(X509 *x, EVP_PKEY *pkey)
 {
diff --git a/boringssl/crypto/x509/x_algor.c b/boringssl/crypto/x509/x_algor.c
index abacd061..11741170 100644
--- a/boringssl/crypto/x509/x_algor.c
+++ b/boringssl/crypto/x509/x_algor.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
  * 2000.
@@ -54,12 +55,12 @@
  * (eay@cryptsoft.com).  This product includes software written by Tim
  * Hudson (tjh@cryptsoft.com). */
 
-#include <openssl/x509.h>
+#include <boringssl/x509.h>
 
-#include <openssl/asn1.h>
-#include <openssl/asn1t.h>
-#include <openssl/digest.h>
-#include <openssl/obj.h>
+#include <boringssl/asn1.h>
+#include <boringssl/asn1t.h>
+#include <boringssl/digest.h>
+#include <boringssl/obj.h>
 
 
 ASN1_SEQUENCE(X509_ALGOR) = {
diff --git a/boringssl/crypto/x509/x_all.c b/boringssl/crypto/x509/x_all.c
index c430a7d3..2e3ee958 100644
--- a/boringssl/crypto/x509/x_all.c
+++ b/boringssl/crypto/x509/x_all.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,14 +55,14 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/asn1.h>
-#include <openssl/buf.h>
-#include <openssl/digest.h>
-#include <openssl/dsa.h>
-#include <openssl/evp.h>
-#include <openssl/rsa.h>
-#include <openssl/stack.h>
-#include <openssl/x509.h>
+#include <boringssl/asn1.h>
+#include <boringssl/buf.h>
+#include <boringssl/digest.h>
+#include <boringssl/dsa.h>
+#include <boringssl/evp.h>
+#include <boringssl/rsa.h>
+#include <boringssl/stack.h>
+#include <boringssl/x509.h>
 
 int X509_verify(X509 *a, EVP_PKEY *r)
 {
diff --git a/boringssl/crypto/x509/x_attrib.c b/boringssl/crypto/x509/x_attrib.c
index de8c95cc..26c6218d 100644
--- a/boringssl/crypto/x509/x_attrib.c
+++ b/boringssl/crypto/x509/x_attrib.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,10 +55,10 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/asn1.h>
-#include <openssl/asn1t.h>
-#include <openssl/x509.h>
-#include <openssl/obj.h>
+#include <boringssl/asn1.h>
+#include <boringssl/asn1t.h>
+#include <boringssl/x509.h>
+#include <boringssl/obj.h>
 
 /*
  * X509_ATTRIBUTE: this has the following form: typedef struct
diff --git a/boringssl/crypto/x509/x_crl.c b/boringssl/crypto/x509/x_crl.c
index cd648901..5361ff01 100644
--- a/boringssl/crypto/x509/x_crl.c
+++ b/boringssl/crypto/x509/x_crl.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,16 +55,16 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/asn1.h>
-#include <openssl/asn1t.h>
-#include <openssl/digest.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/obj.h>
-#include <openssl/stack.h>
-#include <openssl/thread.h>
-#include <openssl/x509.h>
-#include <openssl/x509v3.h>
+#include <boringssl/asn1.h>
+#include <boringssl/asn1t.h>
+#include <boringssl/digest.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/obj.h>
+#include <boringssl/stack.h>
+#include <boringssl/thread.h>
+#include <boringssl/x509.h>
+#include <boringssl/x509v3.h>
 
 #include "../internal.h"
 
diff --git a/boringssl/crypto/x509/x_exten.c b/boringssl/crypto/x509/x_exten.c
index 36403e48..fb31d5dd 100644
--- a/boringssl/crypto/x509/x_exten.c
+++ b/boringssl/crypto/x509/x_exten.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,10 +55,10 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/asn1.h>
-#include <openssl/asn1t.h>
-#include <openssl/cipher.h>
-#include <openssl/x509.h>
+#include <boringssl/asn1.h>
+#include <boringssl/asn1t.h>
+#include <boringssl/cipher.h>
+#include <boringssl/x509.h>
 
 
 ASN1_SEQUENCE(X509_EXTENSION) = {
diff --git a/boringssl/crypto/x509/x_info.c b/boringssl/crypto/x509/x_info.c
index 177cd0eb..13ff8138 100644
--- a/boringssl/crypto/x509/x_info.c
+++ b/boringssl/crypto/x509/x_info.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,12 +55,12 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/x509.h>
+#include <boringssl/x509.h>
 
-#include <openssl/asn1.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/thread.h>
+#include <boringssl/asn1.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/thread.h>
 
 X509_INFO *X509_INFO_new(void)
 {
diff --git a/boringssl/crypto/x509/x_name.c b/boringssl/crypto/x509/x_name.c
index 226e76dc..eaf88b09 100644
--- a/boringssl/crypto/x509/x_name.c
+++ b/boringssl/crypto/x509/x_name.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -57,14 +58,14 @@
 #include <ctype.h>
 #include <string.h>
 
-#include <openssl/asn1.h>
-#include <openssl/asn1t.h>
-#include <openssl/buf.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/obj.h>
-#include <openssl/stack.h>
-#include <openssl/x509.h>
+#include <boringssl/asn1.h>
+#include <boringssl/asn1t.h>
+#include <boringssl/buf.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/obj.h>
+#include <boringssl/stack.h>
+#include <boringssl/x509.h>
 
 #include "../asn1/asn1_locl.h"
 
diff --git a/boringssl/crypto/x509/x_pkey.c b/boringssl/crypto/x509/x_pkey.c
index fc445954..7d68456a 100644
--- a/boringssl/crypto/x509/x_pkey.c
+++ b/boringssl/crypto/x509/x_pkey.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,14 +55,14 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/x509.h>
+#include <boringssl/x509.h>
 
 #include <string.h>
 
-#include <openssl/asn1.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/thread.h>
+#include <boringssl/asn1.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/thread.h>
 
 X509_PKEY *X509_PKEY_new(void)
 {
diff --git a/boringssl/crypto/x509/x_pubkey.c b/boringssl/crypto/x509/x_pubkey.c
index 1549195e..510e1a71 100644
--- a/boringssl/crypto/x509/x_pubkey.c
+++ b/boringssl/crypto/x509/x_pubkey.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,18 +55,18 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/x509.h>
+#include <boringssl/x509.h>
 
 #include <limits.h>
 
-#include <openssl/asn1.h>
-#include <openssl/asn1t.h>
-#include <openssl/bytestring.h>
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/mem.h>
-#include <openssl/obj.h>
-#include <openssl/thread.h>
+#include <boringssl/asn1.h>
+#include <boringssl/asn1t.h>
+#include <boringssl/bytestring.h>
+#include <boringssl/err.h>
+#include <boringssl/evp.h>
+#include <boringssl/mem.h>
+#include <boringssl/obj.h>
+#include <boringssl/thread.h>
 
 #include "../internal.h"
 
diff --git a/boringssl/crypto/x509/x_req.c b/boringssl/crypto/x509/x_req.c
index 5dfe19e5..743f96c3 100644
--- a/boringssl/crypto/x509/x_req.c
+++ b/boringssl/crypto/x509/x_req.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -56,9 +57,9 @@
 
 #include <stdio.h>
 
-#include <openssl/asn1t.h>
-#include <openssl/thread.h>
-#include <openssl/x509.h>
+#include <boringssl/asn1t.h>
+#include <boringssl/thread.h>
+#include <boringssl/x509.h>
 
 /*
  * X509_REQ_INFO is handled in an unusual way to get round invalid encodings.
diff --git a/boringssl/crypto/x509/x_sig.c b/boringssl/crypto/x509/x_sig.c
index e18024a7..02cb91b2 100644
--- a/boringssl/crypto/x509/x_sig.c
+++ b/boringssl/crypto/x509/x_sig.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* crypto/asn1/x_sig.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
@@ -57,8 +58,8 @@
 
 #include <stdio.h>
 
-#include <openssl/asn1t.h>
-#include <openssl/x509.h>
+#include <boringssl/asn1t.h>
+#include <boringssl/x509.h>
 
 
 ASN1_SEQUENCE(X509_SIG) = {
diff --git a/boringssl/crypto/x509/x_spki.c b/boringssl/crypto/x509/x_spki.c
index 86da6ddf..d8a1c558 100644
--- a/boringssl/crypto/x509/x_spki.c
+++ b/boringssl/crypto/x509/x_spki.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* crypto/asn1/x_spki.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
@@ -60,8 +61,8 @@
   * It is under my Copyright with his permission.
   */
 
-#include <openssl/x509.h>
-#include <openssl/asn1t.h>
+#include <boringssl/x509.h>
+#include <boringssl/asn1t.h>
 
 
 ASN1_SEQUENCE(NETSCAPE_SPKAC) = {
diff --git a/boringssl/crypto/x509/x_val.c b/boringssl/crypto/x509/x_val.c
index ad4f7e14..78313f30 100644
--- a/boringssl/crypto/x509/x_val.c
+++ b/boringssl/crypto/x509/x_val.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* crypto/asn1/x_val.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
@@ -57,8 +58,8 @@
 
 #include <stdio.h>
 
-#include <openssl/asn1t.h>
-#include <openssl/x509.h>
+#include <boringssl/asn1t.h>
+#include <boringssl/x509.h>
 
 
 ASN1_SEQUENCE(X509_VAL) = {
diff --git a/boringssl/crypto/x509/x_x509.c b/boringssl/crypto/x509/x_x509.c
index 9d242348..b00f633b 100644
--- a/boringssl/crypto/x509/x_x509.c
+++ b/boringssl/crypto/x509/x_x509.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* crypto/asn1/x_x509.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
@@ -57,13 +58,13 @@
 
 #include <stdio.h>
 
-#include <openssl/asn1t.h>
-#include <openssl/evp.h>
-#include <openssl/mem.h>
-#include <openssl/obj.h>
-#include <openssl/thread.h>
-#include <openssl/x509.h>
-#include <openssl/x509v3.h>
+#include <boringssl/asn1t.h>
+#include <boringssl/evp.h>
+#include <boringssl/mem.h>
+#include <boringssl/obj.h>
+#include <boringssl/thread.h>
+#include <boringssl/x509.h>
+#include <boringssl/x509v3.h>
 
 #include "../internal.h"
 
diff --git a/boringssl/crypto/x509/x_x509a.c b/boringssl/crypto/x509/x_x509a.c
index a63ee422..9d303238 100644
--- a/boringssl/crypto/x509/x_x509a.c
+++ b/boringssl/crypto/x509/x_x509a.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
  * 1999.
@@ -56,10 +57,10 @@
 
 #include <stdio.h>
 
-#include <openssl/asn1t.h>
-#include <openssl/evp.h>
-#include <openssl/obj.h>
-#include <openssl/x509.h>
+#include <boringssl/asn1t.h>
+#include <boringssl/evp.h>
+#include <boringssl/obj.h>
+#include <boringssl/x509.h>
 
 /*
  * X509_CERT_AUX routines. These are used to encode additional user
diff --git a/boringssl/crypto/x509v3/CMakeLists.txt b/boringssl/crypto/x509v3/CMakeLists.txt
index cf2474a4..c7ad032a 100644
--- a/boringssl/crypto/x509v3/CMakeLists.txt
+++ b/boringssl/crypto/x509v3/CMakeLists.txt
@@ -51,7 +51,7 @@ add_executable(
   $<TARGET_OBJECTS:test_support>
 )
 
-target_link_libraries(v3name_test crypto)
+target_link_libraries(v3name_test bsslcrypto)
 add_dependencies(all_tests v3name_test)
 
 add_executable(
@@ -62,5 +62,5 @@ add_executable(
   $<TARGET_OBJECTS:test_support>
 )
 
-target_link_libraries(tab_test crypto)
+target_link_libraries(tab_test bsslcrypto)
 add_dependencies(all_tests tab_test)
diff --git a/boringssl/crypto/x509v3/ext_dat.h b/boringssl/crypto/x509v3/ext_dat.h
index 9ece19c5..fc013247 100644
--- a/boringssl/crypto/x509v3/ext_dat.h
+++ b/boringssl/crypto/x509v3/ext_dat.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
  * 1999.
diff --git a/boringssl/crypto/x509v3/pcy_cache.c b/boringssl/crypto/x509v3/pcy_cache.c
index f1e512ea..d2e4a558 100644
--- a/boringssl/crypto/x509v3/pcy_cache.c
+++ b/boringssl/crypto/x509v3/pcy_cache.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
  * 2004.
@@ -54,11 +55,11 @@
  * (eay@cryptsoft.com).  This product includes software written by Tim
  * Hudson (tjh@cryptsoft.com). */
 
-#include <openssl/mem.h>
-#include <openssl/obj.h>
-#include <openssl/thread.h>
-#include <openssl/x509.h>
-#include <openssl/x509v3.h>
+#include <boringssl/mem.h>
+#include <boringssl/obj.h>
+#include <boringssl/thread.h>
+#include <boringssl/x509.h>
+#include <boringssl/x509v3.h>
 
 #include "pcy_int.h"
 #include "../internal.h"
diff --git a/boringssl/crypto/x509v3/pcy_data.c b/boringssl/crypto/x509v3/pcy_data.c
index 498de4dd..ab4ada08 100644
--- a/boringssl/crypto/x509v3/pcy_data.c
+++ b/boringssl/crypto/x509v3/pcy_data.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* pcy_data.c */
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
@@ -57,10 +58,10 @@
  *
  */
 
-#include <openssl/mem.h>
-#include <openssl/obj.h>
-#include <openssl/x509.h>
-#include <openssl/x509v3.h>
+#include <boringssl/mem.h>
+#include <boringssl/obj.h>
+#include <boringssl/x509.h>
+#include <boringssl/x509v3.h>
 
 #include "pcy_int.h"
 
diff --git a/boringssl/crypto/x509v3/pcy_int.h b/boringssl/crypto/x509v3/pcy_int.h
index b5075f9e..5fe81944 100644
--- a/boringssl/crypto/x509v3/pcy_int.h
+++ b/boringssl/crypto/x509v3/pcy_int.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* pcy_int.h */
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
diff --git a/boringssl/crypto/x509v3/pcy_lib.c b/boringssl/crypto/x509v3/pcy_lib.c
index 764f38f9..d65a7f5b 100644
--- a/boringssl/crypto/x509v3/pcy_lib.c
+++ b/boringssl/crypto/x509v3/pcy_lib.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* pcy_lib.c */
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
@@ -55,8 +56,8 @@
  * (eay@cryptsoft.com).  This product includes software written by Tim
  * Hudson (tjh@cryptsoft.com). */
 
-#include <openssl/x509.h>
-#include <openssl/x509v3.h>
+#include <boringssl/x509.h>
+#include <boringssl/x509v3.h>
 
 #include "pcy_int.h"
 
diff --git a/boringssl/crypto/x509v3/pcy_map.c b/boringssl/crypto/x509v3/pcy_map.c
index 7263c692..aabd8c3b 100644
--- a/boringssl/crypto/x509v3/pcy_map.c
+++ b/boringssl/crypto/x509v3/pcy_map.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* pcy_map.c */
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
@@ -57,9 +58,9 @@
  *
  */
 
-#include <openssl/obj.h>
-#include <openssl/x509.h>
-#include <openssl/x509v3.h>
+#include <boringssl/obj.h>
+#include <boringssl/x509.h>
+#include <boringssl/x509v3.h>
 
 #include "pcy_int.h"
 
diff --git a/boringssl/crypto/x509v3/pcy_node.c b/boringssl/crypto/x509v3/pcy_node.c
index cf4e79d8..a526d8ed 100644
--- a/boringssl/crypto/x509v3/pcy_node.c
+++ b/boringssl/crypto/x509v3/pcy_node.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* pcy_node.c */
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
@@ -55,11 +56,11 @@
  * (eay@cryptsoft.com).  This product includes software written by Tim
  * Hudson (tjh@cryptsoft.com). */
 
-#include <openssl/asn1.h>
-#include <openssl/mem.h>
-#include <openssl/obj.h>
-#include <openssl/x509.h>
-#include <openssl/x509v3.h>
+#include <boringssl/asn1.h>
+#include <boringssl/mem.h>
+#include <boringssl/obj.h>
+#include <boringssl/x509.h>
+#include <boringssl/x509v3.h>
 
 #include "pcy_int.h"
 
diff --git a/boringssl/crypto/x509v3/pcy_tree.c b/boringssl/crypto/x509v3/pcy_tree.c
index e7484e52..ed6181b2 100644
--- a/boringssl/crypto/x509v3/pcy_tree.c
+++ b/boringssl/crypto/x509v3/pcy_tree.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
  * 2004.
@@ -58,12 +59,12 @@
 
 #include <string.h>
 
-#include <openssl/mem.h>
-#include <openssl/obj.h>
-#include <openssl/stack.h>
-#include <openssl/thread.h>
-#include <openssl/x509.h>
-#include <openssl/x509v3.h>
+#include <boringssl/mem.h>
+#include <boringssl/obj.h>
+#include <boringssl/stack.h>
+#include <boringssl/thread.h>
+#include <boringssl/x509.h>
+#include <boringssl/x509v3.h>
 
 #include "pcy_int.h"
 
diff --git a/boringssl/crypto/x509v3/tab_test.c b/boringssl/crypto/x509v3/tab_test.c
index 19005474..0aa15936 100644
--- a/boringssl/crypto/x509v3/tab_test.c
+++ b/boringssl/crypto/x509v3/tab_test.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* tabtest.c */
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
@@ -64,10 +65,10 @@
 
 #include <stdio.h>
 
-#include <openssl/base.h>
-#include <openssl/crypto.h>
-#include <openssl/obj.h>
-#include <openssl/x509v3.h>
+#include <boringssl/base.h>
+#include <boringssl/crypto.h>
+#include <boringssl/obj.h>
+#include <boringssl/x509v3.h>
 
 #if !defined(BORINGSSL_SHARED_LIBRARY)
 # include "ext_dat.h"
diff --git a/boringssl/crypto/x509v3/v3_akey.c b/boringssl/crypto/x509v3/v3_akey.c
index 4503e615..1a7c8bc5 100644
--- a/boringssl/crypto/x509v3/v3_akey.c
+++ b/boringssl/crypto/x509v3/v3_akey.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* v3_akey.c */
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
@@ -58,13 +59,13 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <openssl/asn1.h>
-#include <openssl/asn1t.h>
-#include <openssl/conf.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/obj.h>
-#include <openssl/x509v3.h>
+#include <boringssl/asn1.h>
+#include <boringssl/asn1t.h>
+#include <boringssl/conf.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/obj.h>
+#include <boringssl/x509v3.h>
 
 static STACK_OF(CONF_VALUE) *i2v_AUTHORITY_KEYID(X509V3_EXT_METHOD *method,
                                                  AUTHORITY_KEYID *akeyid,
diff --git a/boringssl/crypto/x509v3/v3_akeya.c b/boringssl/crypto/x509v3/v3_akeya.c
index 844dee52..1448c857 100644
--- a/boringssl/crypto/x509v3/v3_akeya.c
+++ b/boringssl/crypto/x509v3/v3_akeya.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* v3_akey_asn1.c */
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
@@ -57,10 +58,10 @@
 
 #include <stdio.h>
 
-#include <openssl/asn1.h>
-#include <openssl/asn1t.h>
-#include <openssl/conf.h>
-#include <openssl/x509v3.h>
+#include <boringssl/asn1.h>
+#include <boringssl/asn1t.h>
+#include <boringssl/conf.h>
+#include <boringssl/x509v3.h>
 
 
 ASN1_SEQUENCE(AUTHORITY_KEYID) = {
diff --git a/boringssl/crypto/x509v3/v3_alt.c b/boringssl/crypto/x509v3/v3_alt.c
index 152bd79f..8db39615 100644
--- a/boringssl/crypto/x509v3/v3_alt.c
+++ b/boringssl/crypto/x509v3/v3_alt.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* v3_alt.c */
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
@@ -58,11 +59,11 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <openssl/conf.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/obj.h>
-#include <openssl/x509v3.h>
+#include <boringssl/conf.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/obj.h>
+#include <boringssl/x509v3.h>
 
 static GENERAL_NAMES *v2i_subject_alt(X509V3_EXT_METHOD *method,
                                       X509V3_CTX *ctx,
diff --git a/boringssl/crypto/x509v3/v3_bcons.c b/boringssl/crypto/x509v3/v3_bcons.c
index aefefdff..f815a228 100644
--- a/boringssl/crypto/x509v3/v3_bcons.c
+++ b/boringssl/crypto/x509v3/v3_bcons.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* v3_bcons.c */
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
@@ -58,12 +59,12 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <openssl/asn1.h>
-#include <openssl/asn1t.h>
-#include <openssl/conf.h>
-#include <openssl/err.h>
-#include <openssl/obj.h>
-#include <openssl/x509v3.h>
+#include <boringssl/asn1.h>
+#include <boringssl/asn1t.h>
+#include <boringssl/conf.h>
+#include <boringssl/err.h>
+#include <boringssl/obj.h>
+#include <boringssl/x509v3.h>
 
 static STACK_OF(CONF_VALUE) *i2v_BASIC_CONSTRAINTS(X509V3_EXT_METHOD *method,
                                                    BASIC_CONSTRAINTS *bcons,
diff --git a/boringssl/crypto/x509v3/v3_bitst.c b/boringssl/crypto/x509v3/v3_bitst.c
index 86a8c361..ebd0d5f6 100644
--- a/boringssl/crypto/x509v3/v3_bitst.c
+++ b/boringssl/crypto/x509v3/v3_bitst.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* v3_bitst.c */
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
@@ -58,10 +59,10 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <openssl/conf.h>
-#include <openssl/err.h>
-#include <openssl/obj.h>
-#include <openssl/x509v3.h>
+#include <boringssl/conf.h>
+#include <boringssl/err.h>
+#include <boringssl/obj.h>
+#include <boringssl/x509v3.h>
 
 static const BIT_STRING_BITNAME ns_cert_type_table[] = {
     {0, "SSL Client", "client"},
diff --git a/boringssl/crypto/x509v3/v3_conf.c b/boringssl/crypto/x509v3/v3_conf.c
index 66abca4e..f336e001 100644
--- a/boringssl/crypto/x509v3/v3_conf.c
+++ b/boringssl/crypto/x509v3/v3_conf.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* v3_conf.c */
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
@@ -61,12 +62,12 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <openssl/conf.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/obj.h>
-#include <openssl/x509.h>
-#include <openssl/x509v3.h>
+#include <boringssl/conf.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/obj.h>
+#include <boringssl/x509.h>
+#include <boringssl/x509v3.h>
 
 #include "../internal.h"
 
diff --git a/boringssl/crypto/x509v3/v3_cpols.c b/boringssl/crypto/x509v3/v3_cpols.c
index 4d086ab5..d84b3f9b 100644
--- a/boringssl/crypto/x509v3/v3_cpols.c
+++ b/boringssl/crypto/x509v3/v3_cpols.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* v3_cpols.c */
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
@@ -60,14 +61,14 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <openssl/asn1.h>
-#include <openssl/asn1t.h>
-#include <openssl/conf.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/obj.h>
-#include <openssl/stack.h>
-#include <openssl/x509v3.h>
+#include <boringssl/asn1.h>
+#include <boringssl/asn1t.h>
+#include <boringssl/conf.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/obj.h>
+#include <boringssl/stack.h>
+#include <boringssl/x509v3.h>
 
 #include "pcy_int.h"
 
diff --git a/boringssl/crypto/x509v3/v3_crld.c b/boringssl/crypto/x509v3/v3_crld.c
index c93c4495..eb4af3e1 100644
--- a/boringssl/crypto/x509v3/v3_crld.c
+++ b/boringssl/crypto/x509v3/v3_crld.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* v3_crld.c */
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
@@ -58,13 +59,13 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <openssl/asn1.h>
-#include <openssl/asn1t.h>
-#include <openssl/conf.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/obj.h>
-#include <openssl/x509v3.h>
+#include <boringssl/asn1.h>
+#include <boringssl/asn1t.h>
+#include <boringssl/conf.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/obj.h>
+#include <boringssl/x509v3.h>
 
 static void *v2i_crld(const X509V3_EXT_METHOD *method,
                       X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval);
diff --git a/boringssl/crypto/x509v3/v3_enum.c b/boringssl/crypto/x509v3/v3_enum.c
index 6bfb232c..751b2a3c 100644
--- a/boringssl/crypto/x509v3/v3_enum.c
+++ b/boringssl/crypto/x509v3/v3_enum.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* v3_enum.c */
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
@@ -57,9 +58,9 @@
 
 #include <stdio.h>
 
-#include <openssl/buf.h>
-#include <openssl/obj.h>
-#include <openssl/x509v3.h>
+#include <boringssl/buf.h>
+#include <boringssl/obj.h>
+#include <boringssl/x509v3.h>
 
 static const ENUMERATED_NAMES crl_reasons[] = {
     {CRL_REASON_UNSPECIFIED, "Unspecified", "unspecified"},
diff --git a/boringssl/crypto/x509v3/v3_extku.c b/boringssl/crypto/x509v3/v3_extku.c
index 952e032c..9c54747c 100644
--- a/boringssl/crypto/x509v3/v3_extku.c
+++ b/boringssl/crypto/x509v3/v3_extku.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* v3_extku.c */
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
@@ -57,11 +58,11 @@
 
 #include <stdio.h>
 
-#include <openssl/asn1t.h>
-#include <openssl/conf.h>
-#include <openssl/err.h>
-#include <openssl/obj.h>
-#include <openssl/x509v3.h>
+#include <boringssl/asn1t.h>
+#include <boringssl/conf.h>
+#include <boringssl/err.h>
+#include <boringssl/obj.h>
+#include <boringssl/x509v3.h>
 
 static void *v2i_EXTENDED_KEY_USAGE(const X509V3_EXT_METHOD *method,
                                     X509V3_CTX *ctx,
diff --git a/boringssl/crypto/x509v3/v3_genn.c b/boringssl/crypto/x509v3/v3_genn.c
index 2331cd49..c990b20f 100644
--- a/boringssl/crypto/x509v3/v3_genn.c
+++ b/boringssl/crypto/x509v3/v3_genn.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* v3_genn.c */
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
@@ -57,10 +58,10 @@
 
 #include <stdio.h>
 
-#include <openssl/asn1t.h>
-#include <openssl/conf.h>
-#include <openssl/obj.h>
-#include <openssl/x509v3.h>
+#include <boringssl/asn1t.h>
+#include <boringssl/conf.h>
+#include <boringssl/obj.h>
+#include <boringssl/x509v3.h>
 
 
 ASN1_SEQUENCE(OTHERNAME) = {
diff --git a/boringssl/crypto/x509v3/v3_ia5.c b/boringssl/crypto/x509v3/v3_ia5.c
index 6fc6b59b..81d655e8 100644
--- a/boringssl/crypto/x509v3/v3_ia5.c
+++ b/boringssl/crypto/x509v3/v3_ia5.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* v3_ia5.c */
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
@@ -60,12 +61,12 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <openssl/asn1.h>
-#include <openssl/conf.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/obj.h>
-#include <openssl/x509v3.h>
+#include <boringssl/asn1.h>
+#include <boringssl/conf.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/obj.h>
+#include <boringssl/x509v3.h>
 
 static char *i2s_ASN1_IA5STRING(X509V3_EXT_METHOD *method,
                                 ASN1_IA5STRING *ia5);
diff --git a/boringssl/crypto/x509v3/v3_info.c b/boringssl/crypto/x509v3/v3_info.c
index 482208d7..2dfc2ea6 100644
--- a/boringssl/crypto/x509v3/v3_info.c
+++ b/boringssl/crypto/x509v3/v3_info.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* v3_info.c */
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
@@ -60,14 +61,14 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <openssl/asn1.h>
-#include <openssl/asn1t.h>
-#include <openssl/buf.h>
-#include <openssl/conf.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/obj.h>
-#include <openssl/x509v3.h>
+#include <boringssl/asn1.h>
+#include <boringssl/asn1t.h>
+#include <boringssl/buf.h>
+#include <boringssl/conf.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/obj.h>
+#include <boringssl/x509v3.h>
 
 static STACK_OF(CONF_VALUE) *i2v_AUTHORITY_INFO_ACCESS(X509V3_EXT_METHOD
                                                        *method, AUTHORITY_INFO_ACCESS
diff --git a/boringssl/crypto/x509v3/v3_int.c b/boringssl/crypto/x509v3/v3_int.c
index 7bde446c..daa5950c 100644
--- a/boringssl/crypto/x509v3/v3_int.c
+++ b/boringssl/crypto/x509v3/v3_int.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* v3_int.c */
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
@@ -57,8 +58,8 @@
 
 #include <stdio.h>
 
-#include <openssl/obj.h>
-#include <openssl/x509v3.h>
+#include <boringssl/obj.h>
+#include <boringssl/x509v3.h>
 
 const X509V3_EXT_METHOD v3_crl_num = {
     NID_crl_number, 0, ASN1_ITEM_ref(ASN1_INTEGER),
diff --git a/boringssl/crypto/x509v3/v3_lib.c b/boringssl/crypto/x509v3/v3_lib.c
index c4718e33..d8aea40c 100644
--- a/boringssl/crypto/x509v3/v3_lib.c
+++ b/boringssl/crypto/x509v3/v3_lib.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* v3_lib.c */
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
@@ -60,11 +61,11 @@
 
 #include <stdio.h>
 
-#include <openssl/conf.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/obj.h>
-#include <openssl/x509v3.h>
+#include <boringssl/conf.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/obj.h>
+#include <boringssl/x509v3.h>
 
 #include "ext_dat.h"
 static STACK_OF(X509V3_EXT_METHOD) *ext_list = NULL;
diff --git a/boringssl/crypto/x509v3/v3_ncons.c b/boringssl/crypto/x509v3/v3_ncons.c
index 368ad272..bcfd147f 100644
--- a/boringssl/crypto/x509v3/v3_ncons.c
+++ b/boringssl/crypto/x509v3/v3_ncons.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* v3_ncons.c */
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
@@ -58,12 +59,12 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <openssl/asn1t.h>
-#include <openssl/conf.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/obj.h>
-#include <openssl/x509v3.h>
+#include <boringssl/asn1t.h>
+#include <boringssl/conf.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/obj.h>
+#include <boringssl/x509v3.h>
 
 static void *v2i_NAME_CONSTRAINTS(const X509V3_EXT_METHOD *method,
                                   X509V3_CTX *ctx,
diff --git a/boringssl/crypto/x509v3/v3_pci.c b/boringssl/crypto/x509v3/v3_pci.c
index 220f65e1..5076e524 100644
--- a/boringssl/crypto/x509v3/v3_pci.c
+++ b/boringssl/crypto/x509v3/v3_pci.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* v3_pci.c -*- mode:C; c-file-style: "eay" -*- */
 /*
  * Contributed to the OpenSSL Project 2004 by Richard Levitte
@@ -38,11 +39,11 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <openssl/conf.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/obj.h>
-#include <openssl/x509v3.h>
+#include <boringssl/conf.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/obj.h>
+#include <boringssl/x509v3.h>
 
 static int i2r_pci(X509V3_EXT_METHOD *method, PROXY_CERT_INFO_EXTENSION *ext,
                    BIO *out, int indent);
diff --git a/boringssl/crypto/x509v3/v3_pcia.c b/boringssl/crypto/x509v3/v3_pcia.c
index 3f285f30..93579a81 100644
--- a/boringssl/crypto/x509v3/v3_pcia.c
+++ b/boringssl/crypto/x509v3/v3_pcia.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* v3_pcia.c -*- mode:C; c-file-style: "eay" -*- */
 /*
  * Contributed to the OpenSSL Project 2004 by Richard Levitte
@@ -35,9 +36,9 @@
  * SUCH DAMAGE.
  */
 
-#include <openssl/asn1.h>
-#include <openssl/asn1t.h>
-#include <openssl/x509v3.h>
+#include <boringssl/asn1.h>
+#include <boringssl/asn1t.h>
+#include <boringssl/x509v3.h>
 
 
 ASN1_SEQUENCE(PROXY_POLICY) =
diff --git a/boringssl/crypto/x509v3/v3_pcons.c b/boringssl/crypto/x509v3/v3_pcons.c
index 1a463143..afa1f803 100644
--- a/boringssl/crypto/x509v3/v3_pcons.c
+++ b/boringssl/crypto/x509v3/v3_pcons.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* v3_pcons.c */
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
@@ -58,12 +59,12 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <openssl/asn1.h>
-#include <openssl/asn1t.h>
-#include <openssl/conf.h>
-#include <openssl/err.h>
-#include <openssl/obj.h>
-#include <openssl/x509v3.h>
+#include <boringssl/asn1.h>
+#include <boringssl/asn1t.h>
+#include <boringssl/conf.h>
+#include <boringssl/err.h>
+#include <boringssl/obj.h>
+#include <boringssl/x509v3.h>
 
 static STACK_OF(CONF_VALUE) *i2v_POLICY_CONSTRAINTS(const X509V3_EXT_METHOD
                                                     *method, void *bcons, STACK_OF(CONF_VALUE)
diff --git a/boringssl/crypto/x509v3/v3_pku.c b/boringssl/crypto/x509v3/v3_pku.c
index e4868b47..ecb9bf1e 100644
--- a/boringssl/crypto/x509v3/v3_pku.c
+++ b/boringssl/crypto/x509v3/v3_pku.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* v3_pku.c */
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
@@ -57,11 +58,11 @@
 
 #include <stdio.h>
 
-#include <openssl/asn1.h>
-#include <openssl/asn1t.h>
-#include <openssl/mem.h>
-#include <openssl/obj.h>
-#include <openssl/x509v3.h>
+#include <boringssl/asn1.h>
+#include <boringssl/asn1t.h>
+#include <boringssl/mem.h>
+#include <boringssl/obj.h>
+#include <boringssl/x509v3.h>
 
 static int i2r_PKEY_USAGE_PERIOD(X509V3_EXT_METHOD *method,
                                  PKEY_USAGE_PERIOD *usage, BIO *out,
diff --git a/boringssl/crypto/x509v3/v3_pmaps.c b/boringssl/crypto/x509v3/v3_pmaps.c
index caacdb27..4639e865 100644
--- a/boringssl/crypto/x509v3/v3_pmaps.c
+++ b/boringssl/crypto/x509v3/v3_pmaps.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* v3_pmaps.c */
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
@@ -57,11 +58,11 @@
 
 #include <stdio.h>
 
-#include <openssl/asn1t.h>
-#include <openssl/conf.h>
-#include <openssl/err.h>
-#include <openssl/obj.h>
-#include <openssl/x509v3.h>
+#include <boringssl/asn1t.h>
+#include <boringssl/conf.h>
+#include <boringssl/err.h>
+#include <boringssl/obj.h>
+#include <boringssl/x509v3.h>
 
 static void *v2i_POLICY_MAPPINGS(const X509V3_EXT_METHOD *method,
                                  X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval);
diff --git a/boringssl/crypto/x509v3/v3_prn.c b/boringssl/crypto/x509v3/v3_prn.c
index 5015efcc..8ebf8c03 100644
--- a/boringssl/crypto/x509v3/v3_prn.c
+++ b/boringssl/crypto/x509v3/v3_prn.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* v3_prn.c */
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
@@ -59,10 +60,10 @@
 
 #include <stdio.h>
 
-#include <openssl/bio.h>
-#include <openssl/conf.h>
-#include <openssl/mem.h>
-#include <openssl/x509v3.h>
+#include <boringssl/bio.h>
+#include <boringssl/conf.h>
+#include <boringssl/mem.h>
+#include <boringssl/x509v3.h>
 
 /* Extension printing routines */
 
diff --git a/boringssl/crypto/x509v3/v3_purp.c b/boringssl/crypto/x509v3/v3_purp.c
index 85bc15b7..3ab19e7f 100644
--- a/boringssl/crypto/x509v3/v3_purp.c
+++ b/boringssl/crypto/x509v3/v3_purp.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* v3_purp.c */
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
@@ -59,14 +60,14 @@
 
 #include <string.h>
 
-#include <openssl/buf.h>
-#include <openssl/err.h>
-#include <openssl/digest.h>
-#include <openssl/mem.h>
-#include <openssl/obj.h>
-#include <openssl/thread.h>
-#include <openssl/x509_vfy.h>
-#include <openssl/x509v3.h>
+#include <boringssl/buf.h>
+#include <boringssl/err.h>
+#include <boringssl/digest.h>
+#include <boringssl/mem.h>
+#include <boringssl/obj.h>
+#include <boringssl/thread.h>
+#include <boringssl/x509_vfy.h>
+#include <boringssl/x509v3.h>
 
 #include "../internal.h"
 
diff --git a/boringssl/crypto/x509v3/v3_skey.c b/boringssl/crypto/x509v3/v3_skey.c
index 65f8287c..505ab669 100644
--- a/boringssl/crypto/x509v3/v3_skey.c
+++ b/boringssl/crypto/x509v3/v3_skey.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* v3_skey.c */
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
@@ -58,10 +59,10 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <openssl/digest.h>
-#include <openssl/err.h>
-#include <openssl/obj.h>
-#include <openssl/x509v3.h>
+#include <boringssl/digest.h>
+#include <boringssl/err.h>
+#include <boringssl/obj.h>
+#include <boringssl/x509v3.h>
 
 static ASN1_OCTET_STRING *s2i_skey_id(X509V3_EXT_METHOD *method,
                                       X509V3_CTX *ctx, char *str);
diff --git a/boringssl/crypto/x509v3/v3_sxnet.c b/boringssl/crypto/x509v3/v3_sxnet.c
index 51c5a676..c83aa817 100644
--- a/boringssl/crypto/x509v3/v3_sxnet.c
+++ b/boringssl/crypto/x509v3/v3_sxnet.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* v3_sxnet.c */
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
@@ -60,13 +61,13 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <openssl/asn1.h>
-#include <openssl/asn1t.h>
-#include <openssl/conf.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/obj.h>
-#include <openssl/x509v3.h>
+#include <boringssl/asn1.h>
+#include <boringssl/asn1t.h>
+#include <boringssl/conf.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/obj.h>
+#include <boringssl/x509v3.h>
 
 /* Support for Thawte strong extranet extension */
 
diff --git a/boringssl/crypto/x509v3/v3_utl.c b/boringssl/crypto/x509v3/v3_utl.c
index a238a20e..6e49e79c 100644
--- a/boringssl/crypto/x509v3/v3_utl.c
+++ b/boringssl/crypto/x509v3/v3_utl.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* v3_utl.c */
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
@@ -62,13 +63,13 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <openssl/bn.h>
-#include <openssl/buf.h>
-#include <openssl/conf.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/obj.h>
-#include <openssl/x509v3.h>
+#include <boringssl/bn.h>
+#include <boringssl/buf.h>
+#include <boringssl/conf.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/obj.h>
+#include <boringssl/x509v3.h>
 
 #include "../conf/internal.h"
 
diff --git a/boringssl/crypto/x509v3/v3name_test.c b/boringssl/crypto/x509v3/v3name_test.c
index dadf488f..8b6dfbf1 100644
--- a/boringssl/crypto/x509v3/v3name_test.c
+++ b/boringssl/crypto/x509v3/v3name_test.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
  * 1999.
@@ -57,10 +58,10 @@
 #include <stdarg.h>
 #include <string.h>
 
-#include <openssl/crypto.h>
-#include <openssl/mem.h>
-#include <openssl/x509.h>
-#include <openssl/x509v3.h>
+#include <boringssl/crypto.h>
+#include <boringssl/mem.h>
+#include <boringssl/x509.h>
+#include <boringssl/x509v3.h>
 
 static const char *const names[] = {
     "a", "b", ".", "*", "@",
diff --git a/boringssl/decrepit/CMakeLists.txt b/boringssl/decrepit/CMakeLists.txt
index 6a5462c2..16b23afe 100644
--- a/boringssl/decrepit/CMakeLists.txt
+++ b/boringssl/decrepit/CMakeLists.txt
@@ -32,4 +32,4 @@ add_library(
   $<TARGET_OBJECTS:xts>
 )
 
-target_link_libraries(decrepit crypto ssl)
+target_link_libraries(decrepit bsslcrypto bssl)
diff --git a/boringssl/decrepit/bio/base64_bio.c b/boringssl/decrepit/bio/base64_bio.c
index 2056138f..c3f1cd02 100644
--- a/boringssl/decrepit/bio/base64_bio.c
+++ b/boringssl/decrepit/bio/base64_bio.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -59,11 +60,11 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <openssl/base64.h>
-#include <openssl/bio.h>
-#include <openssl/buffer.h>
-#include <openssl/evp.h>
-#include <openssl/mem.h>
+#include <boringssl/base64.h>
+#include <boringssl/bio.h>
+#include <boringssl/buffer.h>
+#include <boringssl/evp.h>
+#include <boringssl/mem.h>
 
 
 #define B64_BLOCK_SIZE 1024
diff --git a/boringssl/decrepit/blowfish/blowfish.c b/boringssl/decrepit/blowfish/blowfish.c
index e277f344..535e702a 100644
--- a/boringssl/decrepit/blowfish/blowfish.c
+++ b/boringssl/decrepit/blowfish/blowfish.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,7 +55,7 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/blowfish.h>
+#include <boringssl/blowfish.h>
 
 #include <string.h>
 
diff --git a/boringssl/decrepit/cast/cast.c b/boringssl/decrepit/cast/cast.c
index 94b07106..3eeb7eda 100644
--- a/boringssl/decrepit/cast/cast.c
+++ b/boringssl/decrepit/cast/cast.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,7 +55,7 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]. */
 
-#include <openssl/cast.h>
+#include <boringssl/cast.h>
 
 #if defined(OPENSSL_WINDOWS)
 #pragma warning(push, 3)
diff --git a/boringssl/decrepit/cast/cast_tables.c b/boringssl/decrepit/cast/cast_tables.c
index 6808aa89..a96cfe53 100644
--- a/boringssl/decrepit/cast/cast_tables.c
+++ b/boringssl/decrepit/cast/cast_tables.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,7 +55,7 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #include "internal.h"
 
diff --git a/boringssl/decrepit/cast/internal.h b/boringssl/decrepit/cast/internal.h
index 15e22226..2ff7998f 100644
--- a/boringssl/decrepit/cast/internal.h
+++ b/boringssl/decrepit/cast/internal.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -57,7 +58,7 @@
 #ifndef OPENSSL_HEADER_CAST_INTERNAL_H
 #define OPENSSL_HEADER_CAST_INTERNAL_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/boringssl/decrepit/des/cfb64ede.c b/boringssl/decrepit/des/cfb64ede.c
index f7e81d45..0ba95a78 100644
--- a/boringssl/decrepit/des/cfb64ede.c
+++ b/boringssl/decrepit/des/cfb64ede.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -56,7 +57,7 @@
 
 #include <string.h>
 
-#include <openssl/des.h>
+#include <boringssl/des.h>
 
 #include "../crypto/des/internal.h"
 
diff --git a/boringssl/decrepit/dh/dh_decrepit.c b/boringssl/decrepit/dh/dh_decrepit.c
index 1d38c12e..0f6f8862 100644
--- a/boringssl/decrepit/dh/dh_decrepit.c
+++ b/boringssl/decrepit/dh/dh_decrepit.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* ====================================================================
  * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
  *
@@ -50,8 +51,8 @@
  * (eay@cryptsoft.com).  This product includes software written by Tim
  * Hudson (tjh@cryptsoft.com). */
 
-#include <openssl/bn.h>
-#include <openssl/dh.h>
+#include <boringssl/bn.h>
+#include <boringssl/dh.h>
 
 
 struct wrapped_callback {
diff --git a/boringssl/decrepit/dsa/dsa_decrepit.c b/boringssl/decrepit/dsa/dsa_decrepit.c
index aef8056b..d3fc7f18 100644
--- a/boringssl/decrepit/dsa/dsa_decrepit.c
+++ b/boringssl/decrepit/dsa/dsa_decrepit.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* ====================================================================
  * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
  *
@@ -50,8 +51,8 @@
  * (eay@cryptsoft.com).  This product includes software written by Tim
  * Hudson (tjh@cryptsoft.com). */
 
-#include <openssl/bn.h>
-#include <openssl/dsa.h>
+#include <boringssl/bn.h>
+#include <boringssl/dsa.h>
 
 
 struct wrapped_callback {
diff --git a/boringssl/decrepit/evp/evp_do_all.c b/boringssl/decrepit/evp/evp_do_all.c
index 621c0b11..3f2ba71c 100644
--- a/boringssl/decrepit/evp/evp_do_all.c
+++ b/boringssl/decrepit/evp/evp_do_all.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2016, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -12,7 +13,7 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
 
-#include <openssl/evp.h>
+#include <boringssl/evp.h>
 
 
 void EVP_CIPHER_do_all_sorted(void (*callback)(const EVP_CIPHER *cipher,
diff --git a/boringssl/decrepit/macros.h b/boringssl/decrepit/macros.h
index 228183a3..2ac5704c 100644
--- a/boringssl/decrepit/macros.h
+++ b/boringssl/decrepit/macros.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
diff --git a/boringssl/decrepit/obj/obj_decrepit.c b/boringssl/decrepit/obj/obj_decrepit.c
index 06051f11..b91ce67e 100644
--- a/boringssl/decrepit/obj/obj_decrepit.c
+++ b/boringssl/decrepit/obj/obj_decrepit.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2016, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -12,12 +13,12 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
 
-#include <openssl/obj.h>
+#include <boringssl/obj.h>
 
 #include <assert.h>
 #include <string.h>
 
-#include <openssl/evp.h>
+#include <boringssl/evp.h>
 
 
 struct wrapped_callback {
diff --git a/boringssl/decrepit/rc4/rc4_decrepit.c b/boringssl/decrepit/rc4/rc4_decrepit.c
index 140e15d6..775a69d8 100644
--- a/boringssl/decrepit/rc4/rc4_decrepit.c
+++ b/boringssl/decrepit/rc4/rc4_decrepit.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,7 +55,7 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/rc4.h>
+#include <boringssl/rc4.h>
 
 
 const char *RC4_options(void) {
diff --git a/boringssl/decrepit/ripemd/CMakeLists.txt b/boringssl/decrepit/ripemd/CMakeLists.txt
index 0714a8f0..090351cd 100644
--- a/boringssl/decrepit/ripemd/CMakeLists.txt
+++ b/boringssl/decrepit/ripemd/CMakeLists.txt
@@ -16,6 +16,6 @@ add_executable(
   $<TARGET_OBJECTS:test_support>
 )
 
-target_link_libraries(ripemd_test crypto)
+target_link_libraries(ripemd_test bsslcrypto)
 target_link_libraries(ripemd_test decrepit)
 add_dependencies(all_tests ripemd_test)
diff --git a/boringssl/decrepit/ripemd/internal.h b/boringssl/decrepit/ripemd/internal.h
index c4db4b23..252d0501 100644
--- a/boringssl/decrepit/ripemd/internal.h
+++ b/boringssl/decrepit/ripemd/internal.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -57,7 +58,7 @@
 #ifndef OPENSSL_HEADER_BN_INTERNAL_H
 #define OPENSSL_HEADER_BN_INTERNAL_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/boringssl/decrepit/ripemd/ripemd.c b/boringssl/decrepit/ripemd/ripemd.c
index 6ed7816c..6502f885 100644
--- a/boringssl/decrepit/ripemd/ripemd.c
+++ b/boringssl/decrepit/ripemd/ripemd.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,7 +55,7 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/ripemd.h>
+#include <boringssl/ripemd.h>
 
 #include <string.h>
 
diff --git a/boringssl/decrepit/ripemd/ripemd_test.cc b/boringssl/decrepit/ripemd/ripemd_test.cc
index ebcabdfb..6817ca59 100644
--- a/boringssl/decrepit/ripemd/ripemd_test.cc
+++ b/boringssl/decrepit/ripemd/ripemd_test.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2016, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -12,7 +13,7 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
 
-#include <openssl/ripemd.h>
+#include <boringssl/ripemd.h>
 
 #include <memory>
 
diff --git a/boringssl/decrepit/rsa/rsa_decrepit.c b/boringssl/decrepit/rsa/rsa_decrepit.c
index 0d7c5f66..f62ac86b 100644
--- a/boringssl/decrepit/rsa/rsa_decrepit.c
+++ b/boringssl/decrepit/rsa/rsa_decrepit.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,11 +55,11 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/rsa.h>
+#include <boringssl/rsa.h>
 
 #include <assert.h>
 
-#include <openssl/bn.h>
+#include <boringssl/bn.h>
 
 
 RSA *RSA_generate_key(int bits, unsigned long e_value, void *callback,
diff --git a/boringssl/decrepit/ssl/ssl_decrepit.c b/boringssl/decrepit/ssl/ssl_decrepit.c
index e25cbf31..8c8ed5bb 100644
--- a/boringssl/decrepit/ssl/ssl_decrepit.c
+++ b/boringssl/decrepit/ssl/ssl_decrepit.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -108,7 +109,7 @@
  *
  */
 
-#include <openssl/ssl.h>
+#include <boringssl/ssl.h>
 
 #if !defined(OPENSSL_WINDOWS) && !defined(OPENSSL_PNACL)
 
@@ -117,8 +118,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <openssl/err.h>
-#include <openssl/mem.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
 
 
 typedef struct {
diff --git a/boringssl/decrepit/x509/x509_decrepit.c b/boringssl/decrepit/x509/x509_decrepit.c
index 5714b40a..1c94e60d 100644
--- a/boringssl/decrepit/x509/x509_decrepit.c
+++ b/boringssl/decrepit/x509/x509_decrepit.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2016, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -12,8 +13,8 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
 
-#include <openssl/conf.h>
-#include <openssl/x509v3.h>
+#include <boringssl/conf.h>
+#include <boringssl/x509v3.h>
 
 
 X509_EXTENSION *X509V3_EXT_conf_nid(LHASH_OF(CONF_VALUE) *conf,
diff --git a/boringssl/decrepit/xts/xts.c b/boringssl/decrepit/xts/xts.c
index 10a696de..f59e0f73 100644
--- a/boringssl/decrepit/xts/xts.c
+++ b/boringssl/decrepit/xts/xts.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* ====================================================================
  * Copyright (c) 2011 The OpenSSL Project.  All rights reserved.
  *
@@ -46,12 +47,12 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  * ==================================================================== */
 
-#include <openssl/evp.h>
+#include <boringssl/evp.h>
 
 #include <string.h>
 
-#include <openssl/aes.h>
-#include <openssl/cipher.h>
+#include <boringssl/aes.h>
+#include <boringssl/cipher.h>
 
 #include "../crypto/modes/internal.h"
 
diff --git a/boringssl/fuzz/CMakeLists.txt b/boringssl/fuzz/CMakeLists.txt
index f315347e..eee2be0a 100644
--- a/boringssl/fuzz/CMakeLists.txt
+++ b/boringssl/fuzz/CMakeLists.txt
@@ -7,7 +7,7 @@ add_executable(
 )
 
 target_link_libraries(privkey Fuzzer)
-target_link_libraries(privkey crypto)
+target_link_libraries(privkey bsslcrypto)
 
 add_executable(
   cert
@@ -16,7 +16,7 @@ add_executable(
 )
 
 target_link_libraries(cert Fuzzer)
-target_link_libraries(cert crypto)
+target_link_libraries(cert bsslcrypto)
 
 add_executable(
   spki
@@ -25,7 +25,7 @@ add_executable(
 )
 
 target_link_libraries(spki Fuzzer)
-target_link_libraries(spki crypto)
+target_link_libraries(spki bsslcrypto)
 
 add_executable(
   pkcs8
@@ -34,7 +34,7 @@ add_executable(
 )
 
 target_link_libraries(pkcs8 Fuzzer)
-target_link_libraries(pkcs8 crypto)
+target_link_libraries(pkcs8 bsslcrypto)
 
 add_executable(
   server
@@ -43,8 +43,8 @@ add_executable(
 )
 
 target_link_libraries(server Fuzzer)
-target_link_libraries(server crypto)
-target_link_libraries(server ssl)
+target_link_libraries(server bsslcrypto)
+target_link_libraries(server bssl)
 
 add_executable(
   client
@@ -53,5 +53,5 @@ add_executable(
 )
 
 target_link_libraries(client Fuzzer)
-target_link_libraries(client crypto)
-target_link_libraries(client ssl)
+target_link_libraries(client bsslcrypto)
+target_link_libraries(client bssl)
diff --git a/boringssl/fuzz/cert.cc b/boringssl/fuzz/cert.cc
index b8815a5a..764cc755 100644
--- a/boringssl/fuzz/cert.cc
+++ b/boringssl/fuzz/cert.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2016, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -12,8 +13,8 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
 
-#include <openssl/mem.h>
-#include <openssl/x509.h>
+#include <boringssl/mem.h>
+#include <boringssl/x509.h>
 
 extern "C" int LLVMFuzzerTestOneInput(uint8_t *buf, size_t len) {
   const uint8_t *bufp = buf;
diff --git a/boringssl/fuzz/client.cc b/boringssl/fuzz/client.cc
index a90a8960..6d189ff3 100644
--- a/boringssl/fuzz/client.cc
+++ b/boringssl/fuzz/client.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2016, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -14,8 +15,8 @@
 
 #include <assert.h>
 
-#include <openssl/rand.h>
-#include <openssl/ssl.h>
+#include <boringssl/rand.h>
+#include <boringssl/ssl.h>
 
 struct GlobalState {
   GlobalState() : ctx(SSL_CTX_new(SSLv23_method())) {}
diff --git a/boringssl/fuzz/pkcs8.cc b/boringssl/fuzz/pkcs8.cc
index 55d38930..c24d124a 100644
--- a/boringssl/fuzz/pkcs8.cc
+++ b/boringssl/fuzz/pkcs8.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2016, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -12,9 +13,9 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
 
-#include <openssl/bytestring.h>
-#include <openssl/evp.h>
-#include <openssl/mem.h>
+#include <boringssl/bytestring.h>
+#include <boringssl/evp.h>
+#include <boringssl/mem.h>
 
 extern "C" int LLVMFuzzerTestOneInput(uint8_t *buf, size_t len) {
   CBS cbs;
diff --git a/boringssl/fuzz/privkey.cc b/boringssl/fuzz/privkey.cc
index a7cd1b7b..d2730057 100644
--- a/boringssl/fuzz/privkey.cc
+++ b/boringssl/fuzz/privkey.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2016, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -12,7 +13,7 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
 
-#include <openssl/evp.h>
+#include <boringssl/evp.h>
 
 extern "C" int LLVMFuzzerTestOneInput(uint8_t *buf, size_t len) {
   const uint8_t *bufp = buf;
diff --git a/boringssl/fuzz/server.cc b/boringssl/fuzz/server.cc
index 75522bac..f30aaeed 100644
--- a/boringssl/fuzz/server.cc
+++ b/boringssl/fuzz/server.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2016, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -14,8 +15,8 @@
 
 #include <assert.h>
 
-#include <openssl/rand.h>
-#include <openssl/ssl.h>
+#include <boringssl/rand.h>
+#include <boringssl/ssl.h>
 
 static const uint8_t kCertificateDER[] = {
     0x30, 0x82, 0x02, 0xff, 0x30, 0x82, 0x01, 0xe7, 0xa0, 0x03, 0x02, 0x01,
diff --git a/boringssl/fuzz/spki.cc b/boringssl/fuzz/spki.cc
index 939d7196..32d305d7 100644
--- a/boringssl/fuzz/spki.cc
+++ b/boringssl/fuzz/spki.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2016, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -12,9 +13,9 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
 
-#include <openssl/bytestring.h>
-#include <openssl/evp.h>
-#include <openssl/mem.h>
+#include <boringssl/bytestring.h>
+#include <boringssl/evp.h>
+#include <boringssl/mem.h>
 
 extern "C" int LLVMFuzzerTestOneInput(uint8_t *buf, size_t len) {
   CBS cbs;
diff --git a/boringssl/include/openssl/aead.h b/boringssl/include/boringssl/aead.h
similarity index 99%
rename from boringssl/include/openssl/aead.h
rename to boringssl/include/boringssl/aead.h
index d9a640c3..d9d4b92f 100644
--- a/boringssl/include/openssl/aead.h
+++ b/boringssl/include/boringssl/aead.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +16,7 @@
 #ifndef OPENSSL_HEADER_AEAD_H
 #define OPENSSL_HEADER_AEAD_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/boringssl/include/openssl/aes.h b/boringssl/include/boringssl/aes.h
similarity index 99%
rename from boringssl/include/openssl/aes.h
rename to boringssl/include/boringssl/aes.h
index ed060ff6..9adb4867 100644
--- a/boringssl/include/openssl/aes.h
+++ b/boringssl/include/boringssl/aes.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* ====================================================================
  * Copyright (c) 2002-2006 The OpenSSL Project.  All rights reserved.
  *
@@ -49,7 +50,7 @@
 #ifndef OPENSSL_HEADER_AES_H
 #define OPENSSL_HEADER_AES_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/boringssl/include/openssl/arm_arch.h b/boringssl/include/boringssl/arm_arch.h
similarity index 99%
rename from boringssl/include/openssl/arm_arch.h
rename to boringssl/include/boringssl/arm_arch.h
index e7010f40..cac4a9d9 100644
--- a/boringssl/include/openssl/arm_arch.h
+++ b/boringssl/include/boringssl/arm_arch.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* ====================================================================
  * Copyright (c) 1998-2011 The OpenSSL Project.  All rights reserved.
  *
diff --git a/boringssl/include/openssl/asn1.h b/boringssl/include/boringssl/asn1.h
similarity index 99%
rename from boringssl/include/openssl/asn1.h
rename to boringssl/include/boringssl/asn1.h
index 22b62820..9798c764 100644
--- a/boringssl/include/openssl/asn1.h
+++ b/boringssl/include/boringssl/asn1.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -58,14 +59,14 @@
 #ifndef HEADER_ASN1_H
 #define HEADER_ASN1_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #include <time.h>
 
-#include <openssl/bio.h>
-#include <openssl/stack.h>
+#include <boringssl/bio.h>
+#include <boringssl/stack.h>
 
-#include <openssl/bn.h>
+#include <boringssl/bn.h>
 
 #ifdef  __cplusplus
 extern "C" {
diff --git a/boringssl/include/openssl/asn1_mac.h b/boringssl/include/boringssl/asn1_mac.h
similarity index 98%
rename from boringssl/include/openssl/asn1_mac.h
rename to boringssl/include/boringssl/asn1_mac.h
index f319beec..af2aaf64 100644
--- a/boringssl/include/openssl/asn1_mac.h
+++ b/boringssl/include/boringssl/asn1_mac.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -58,7 +59,7 @@
 #ifndef HEADER_ASN1_MAC_H
 #define HEADER_ASN1_MAC_H
 
-#include <openssl/asn1.h>
+#include <boringssl/asn1.h>
 
 #ifdef  __cplusplus
 extern "C" {
diff --git a/boringssl/include/openssl/asn1t.h b/boringssl/include/boringssl/asn1t.h
similarity index 99%
rename from boringssl/include/openssl/asn1t.h
rename to boringssl/include/boringssl/asn1t.h
index b43c3328..b55bc08c 100644
--- a/boringssl/include/openssl/asn1t.h
+++ b/boringssl/include/boringssl/asn1t.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2000.
  */
@@ -57,8 +58,8 @@
 #ifndef HEADER_ASN1T_H
 #define HEADER_ASN1T_H
 
-#include <openssl/base.h>
-#include <openssl/asn1.h>
+#include <boringssl/base.h>
+#include <boringssl/asn1.h>
 
 #ifdef OPENSSL_BUILD_SHLIBCRYPTO
 # undef OPENSSL_EXTERN
diff --git a/boringssl/include/openssl/base.h b/boringssl/include/boringssl/base.h
similarity index 99%
rename from boringssl/include/openssl/base.h
rename to boringssl/include/boringssl/base.h
index 22119205..fd090c03 100644
--- a/boringssl/include/openssl/base.h
+++ b/boringssl/include/boringssl/base.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* ====================================================================
  * Copyright (c) 1998-2001 The OpenSSL Project.  All rights reserved.
  *
@@ -60,7 +61,7 @@
 #include <stdint.h>
 #include <sys/types.h>
 
-#include <openssl/opensslconf.h>
+#include <boringssl/opensslconf.h>
 
 #if defined(BORINGSSL_PREFIX)
 #include <boringssl_prefix_symbols.h>
diff --git a/boringssl/include/openssl/base64.h b/boringssl/include/boringssl/base64.h
similarity index 99%
rename from boringssl/include/openssl/base64.h
rename to boringssl/include/boringssl/base64.h
index f28e7ddb..62eb4b34 100644
--- a/boringssl/include/openssl/base64.h
+++ b/boringssl/include/boringssl/base64.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -57,7 +58,7 @@
 #ifndef OPENSSL_HEADER_BASE64_H
 #define OPENSSL_HEADER_BASE64_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/boringssl/include/openssl/bio.h b/boringssl/include/boringssl/bio.h
similarity index 99%
rename from boringssl/include/openssl/bio.h
rename to boringssl/include/boringssl/bio.h
index a7fe2617..233ff96e 100644
--- a/boringssl/include/openssl/bio.h
+++ b/boringssl/include/boringssl/bio.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -57,15 +58,15 @@
 #ifndef OPENSSL_HEADER_BIO_H
 #define OPENSSL_HEADER_BIO_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #include <stdio.h>  /* For FILE */
 
-#include <openssl/buffer.h>
-#include <openssl/err.h> /* for ERR_print_errors_fp */
-#include <openssl/ex_data.h>
-#include <openssl/stack.h>
-#include <openssl/thread.h>
+#include <boringssl/buffer.h>
+#include <boringssl/err.h> /* for ERR_print_errors_fp */
+#include <boringssl/ex_data.h>
+#include <boringssl/stack.h>
+#include <boringssl/thread.h>
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/boringssl/include/openssl/blowfish.h b/boringssl/include/boringssl/blowfish.h
similarity index 98%
rename from boringssl/include/openssl/blowfish.h
rename to boringssl/include/boringssl/blowfish.h
index fa60d533..2e46b3a9 100644
--- a/boringssl/include/openssl/blowfish.h
+++ b/boringssl/include/boringssl/blowfish.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -57,7 +58,7 @@
 #ifndef OPENSSL_HEADER_BLOWFISH_H
 #define OPENSSL_HEADER_BLOWFISH_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #ifdef  __cplusplus
 extern "C" {
diff --git a/boringssl/include/openssl/bn.h b/boringssl/include/boringssl/bn.h
similarity index 99%
rename from boringssl/include/openssl/bn.h
rename to boringssl/include/boringssl/bn.h
index 1dea3c5d..c6e0859f 100644
--- a/boringssl/include/openssl/bn.h
+++ b/boringssl/include/boringssl/bn.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -123,8 +124,8 @@
 #ifndef OPENSSL_HEADER_BN_H
 #define OPENSSL_HEADER_BN_H
 
-#include <openssl/base.h>
-#include <openssl/thread.h>
+#include <boringssl/base.h>
+#include <boringssl/thread.h>
 
 #include <inttypes.h>  /* for PRIu64 and friends */
 #include <stdio.h>  /* for FILE* */
diff --git a/boringssl/include/boringssl/bssl.h b/boringssl/include/boringssl/bssl.h
new file mode 100644
index 00000000..8c5be2e9
--- /dev/null
+++ b/boringssl/include/boringssl/bssl.h
@@ -0,0 +1,3046 @@
+#ifndef _BSSL_H
+#define _BSSL_H
+#define a2d_ASN1_OBJECT bssl_a2d_ASN1_OBJECT
+#define a2i_ASN1_ENUMERATED bssl_a2i_ASN1_ENUMERATED
+#define a2i_ASN1_INTEGER bssl_a2i_ASN1_INTEGER
+#define a2i_ASN1_STRING bssl_a2i_ASN1_STRING
+#define a2i_GENERAL_NAME bssl_a2i_GENERAL_NAME
+#define a2i_ipadd bssl_a2i_ipadd
+#define a2i_IPADDRESS bssl_a2i_IPADDRESS
+#define a2i_IPADDRESS_NC bssl_a2i_IPADDRESS_NC
+#define ACCESS_DESCRIPTION_free bssl_ACCESS_DESCRIPTION_free
+#define ACCESS_DESCRIPTION_it bssl_ACCESS_DESCRIPTION_it
+#define ACCESS_DESCRIPTION_new bssl_ACCESS_DESCRIPTION_new
+#define AES_cbc_encrypt bssl_AES_cbc_encrypt
+#define AES_cfb128_encrypt bssl_AES_cfb128_encrypt
+#define AES_CMAC bssl_AES_CMAC
+#define AES_ctr128_encrypt bssl_AES_ctr128_encrypt
+#define AES_decrypt bssl_AES_decrypt
+#define AES_ecb_encrypt bssl_AES_ecb_encrypt
+#define AES_encrypt bssl_AES_encrypt
+#define aesni_cbc_encrypt bssl_aesni_cbc_encrypt
+#define aesni_ccm64_decrypt_blocks bssl_aesni_ccm64_decrypt_blocks
+#define aesni_ccm64_encrypt_blocks bssl_aesni_ccm64_encrypt_blocks
+#define aesni_ctr32_encrypt_blocks bssl_aesni_ctr32_encrypt_blocks
+#define aesni_decrypt bssl_aesni_decrypt
+#define aesni_ecb_encrypt bssl_aesni_ecb_encrypt
+#define aesni_encrypt bssl_aesni_encrypt
+#define aesni_gcm_decrypt bssl_aesni_gcm_decrypt
+#define aesni_gcm_encrypt bssl_aesni_gcm_encrypt
+#define aesni_set_decrypt_key bssl_aesni_set_decrypt_key
+#define aesni_set_encrypt_key bssl_aesni_set_encrypt_key
+#define aesni_xts_decrypt bssl_aesni_xts_decrypt
+#define aesni_xts_encrypt bssl_aesni_xts_encrypt
+#define AES_ofb128_encrypt bssl_AES_ofb128_encrypt
+#define AES_set_decrypt_key bssl_AES_set_decrypt_key
+#define AES_set_encrypt_key bssl_AES_set_encrypt_key
+#define asm_AES_cbc_encrypt bssl_asm_AES_cbc_encrypt
+#define asm_AES_decrypt bssl_asm_AES_decrypt
+#define asm_AES_encrypt bssl_asm_AES_encrypt
+#define asm_AES_set_decrypt_key bssl_asm_AES_set_decrypt_key
+#define asm_AES_set_encrypt_key bssl_asm_AES_set_encrypt_key
+#define asm_RC4 bssl_asm_RC4
+#define asm_RC4_set_key bssl_asm_RC4_set_key
+#define ASN1_ANY_it bssl_ASN1_ANY_it
+#define ASN1_BIT_STRING_check bssl_ASN1_BIT_STRING_check
+#define ASN1_BIT_STRING_free bssl_ASN1_BIT_STRING_free
+#define ASN1_BIT_STRING_get_bit bssl_ASN1_BIT_STRING_get_bit
+#define ASN1_BIT_STRING_it bssl_ASN1_BIT_STRING_it
+#define ASN1_BIT_STRING_name_print bssl_ASN1_BIT_STRING_name_print
+#define ASN1_BIT_STRING_new bssl_ASN1_BIT_STRING_new
+#define ASN1_BIT_STRING_num_asc bssl_ASN1_BIT_STRING_num_asc
+#define ASN1_BIT_STRING_set bssl_ASN1_BIT_STRING_set
+#define ASN1_BIT_STRING_set_asc bssl_ASN1_BIT_STRING_set_asc
+#define ASN1_BIT_STRING_set_bit bssl_ASN1_BIT_STRING_set_bit
+#define ASN1_BMPSTRING_free bssl_ASN1_BMPSTRING_free
+#define ASN1_BMPSTRING_it bssl_ASN1_BMPSTRING_it
+#define ASN1_BMPSTRING_new bssl_ASN1_BMPSTRING_new
+#define ASN1_BOOLEAN_it bssl_ASN1_BOOLEAN_it
+#define ASN1_check_infinite_end bssl_ASN1_check_infinite_end
+#define ASN1_const_check_infinite_end bssl_ASN1_const_check_infinite_end
+#define asn1_const_Finish bssl_asn1_const_Finish
+#define ASN1_d2i_bio bssl_ASN1_d2i_bio
+#define ASN1_d2i_fp bssl_ASN1_d2i_fp
+#define ASN1_digest bssl_ASN1_digest
+#define asn1_do_adb bssl_asn1_do_adb
+#define ASN1_dup bssl_ASN1_dup
+#define asn1_enc_free bssl_asn1_enc_free
+#define asn1_enc_init bssl_asn1_enc_init
+#define asn1_enc_restore bssl_asn1_enc_restore
+#define asn1_enc_save bssl_asn1_enc_save
+#define ASN1_ENUMERATED_free bssl_ASN1_ENUMERATED_free
+#define ASN1_ENUMERATED_get bssl_ASN1_ENUMERATED_get
+#define ASN1_ENUMERATED_it bssl_ASN1_ENUMERATED_it
+#define ASN1_ENUMERATED_new bssl_ASN1_ENUMERATED_new
+#define ASN1_ENUMERATED_set bssl_ASN1_ENUMERATED_set
+#define ASN1_ENUMERATED_to_BN bssl_ASN1_ENUMERATED_to_BN
+#define asn1_ex_c2i bssl_asn1_ex_c2i
+#define asn1_ex_i2c bssl_asn1_ex_i2c
+#define ASN1_FBOOLEAN_it bssl_ASN1_FBOOLEAN_it
+#define asn1_Finish bssl_asn1_Finish
+#define ASN1_GENERALIZEDTIME_adj bssl_ASN1_GENERALIZEDTIME_adj
+#define ASN1_GENERALIZEDTIME_check bssl_ASN1_GENERALIZEDTIME_check
+#define ASN1_GENERALIZEDTIME_free bssl_ASN1_GENERALIZEDTIME_free
+#define ASN1_GENERALIZEDTIME_it bssl_ASN1_GENERALIZEDTIME_it
+#define ASN1_GENERALIZEDTIME_new bssl_ASN1_GENERALIZEDTIME_new
+#define ASN1_GENERALIZEDTIME_print bssl_ASN1_GENERALIZEDTIME_print
+#define ASN1_GENERALIZEDTIME_set bssl_ASN1_GENERALIZEDTIME_set
+#define ASN1_GENERALIZEDTIME_set_string bssl_ASN1_GENERALIZEDTIME_set_string
+#define asn1_generalizedtime_to_tm bssl_asn1_generalizedtime_to_tm
+#define ASN1_GENERALSTRING_free bssl_ASN1_GENERALSTRING_free
+#define ASN1_GENERALSTRING_it bssl_ASN1_GENERALSTRING_it
+#define ASN1_GENERALSTRING_new bssl_ASN1_GENERALSTRING_new
+#define ASN1_generate_nconf bssl_ASN1_generate_nconf
+#define ASN1_generate_v3 bssl_ASN1_generate_v3
+#define asn1_get_choice_selector bssl_asn1_get_choice_selector
+#define asn1_get_field_ptr bssl_asn1_get_field_ptr
+#define ASN1_get_object bssl_ASN1_get_object
+#define asn1_GetSequence bssl_asn1_GetSequence
+#define ASN1_i2d_bio bssl_ASN1_i2d_bio
+#define ASN1_i2d_fp bssl_ASN1_i2d_fp
+#define ASN1_IA5STRING_free bssl_ASN1_IA5STRING_free
+#define ASN1_IA5STRING_it bssl_ASN1_IA5STRING_it
+#define ASN1_IA5STRING_new bssl_ASN1_IA5STRING_new
+#define ASN1_INTEGER_cmp bssl_ASN1_INTEGER_cmp
+#define ASN1_INTEGER_dup bssl_ASN1_INTEGER_dup
+#define ASN1_INTEGER_free bssl_ASN1_INTEGER_free
+#define ASN1_INTEGER_get bssl_ASN1_INTEGER_get
+#define ASN1_INTEGER_it bssl_ASN1_INTEGER_it
+#define ASN1_INTEGER_new bssl_ASN1_INTEGER_new
+#define ASN1_INTEGER_set bssl_ASN1_INTEGER_set
+#define ASN1_INTEGER_to_BN bssl_ASN1_INTEGER_to_BN
+#define ASN1_item_d2i bssl_ASN1_item_d2i
+#define ASN1_item_d2i_bio bssl_ASN1_item_d2i_bio
+#define ASN1_item_d2i_fp bssl_ASN1_item_d2i_fp
+#define ASN1_item_digest bssl_ASN1_item_digest
+#define ASN1_item_dup bssl_ASN1_item_dup
+#define ASN1_item_ex_d2i bssl_ASN1_item_ex_d2i
+#define ASN1_item_ex_free bssl_ASN1_item_ex_free
+#define ASN1_item_ex_i2d bssl_ASN1_item_ex_i2d
+#define ASN1_item_ex_new bssl_ASN1_item_ex_new
+#define ASN1_item_free bssl_ASN1_item_free
+#define ASN1_item_i2d bssl_ASN1_item_i2d
+#define ASN1_item_i2d_bio bssl_ASN1_item_i2d_bio
+#define ASN1_item_i2d_fp bssl_ASN1_item_i2d_fp
+#define ASN1_item_ndef_i2d bssl_ASN1_item_ndef_i2d
+#define ASN1_item_new bssl_ASN1_item_new
+#define ASN1_item_pack bssl_ASN1_item_pack
+#define ASN1_item_print bssl_ASN1_item_print
+#define ASN1_item_sign bssl_ASN1_item_sign
+#define ASN1_item_sign_ctx bssl_ASN1_item_sign_ctx
+#define ASN1_item_unpack bssl_ASN1_item_unpack
+#define ASN1_item_verify bssl_ASN1_item_verify
+#define ASN1_mbstring_copy bssl_ASN1_mbstring_copy
+#define ASN1_mbstring_ncopy bssl_ASN1_mbstring_ncopy
+#define ASN1_NULL_free bssl_ASN1_NULL_free
+#define ASN1_NULL_it bssl_ASN1_NULL_it
+#define ASN1_NULL_new bssl_ASN1_NULL_new
+#define ASN1_OBJECT_create bssl_ASN1_OBJECT_create
+#define ASN1_OBJECT_free bssl_ASN1_OBJECT_free
+#define ASN1_OBJECT_it bssl_ASN1_OBJECT_it
+#define ASN1_OBJECT_new bssl_ASN1_OBJECT_new
+#define ASN1_object_size bssl_ASN1_object_size
+#define ASN1_OCTET_STRING_cmp bssl_ASN1_OCTET_STRING_cmp
+#define ASN1_OCTET_STRING_dup bssl_ASN1_OCTET_STRING_dup
+#define ASN1_OCTET_STRING_free bssl_ASN1_OCTET_STRING_free
+#define ASN1_OCTET_STRING_it bssl_ASN1_OCTET_STRING_it
+#define ASN1_OCTET_STRING_NDEF_it bssl_ASN1_OCTET_STRING_NDEF_it
+#define ASN1_OCTET_STRING_new bssl_ASN1_OCTET_STRING_new
+#define ASN1_OCTET_STRING_set bssl_ASN1_OCTET_STRING_set
+#define ASN1_parse bssl_ASN1_parse
+#define ASN1_parse_dump bssl_ASN1_parse_dump
+#define ASN1_PCTX_free bssl_ASN1_PCTX_free
+#define ASN1_PCTX_get_cert_flags bssl_ASN1_PCTX_get_cert_flags
+#define ASN1_PCTX_get_flags bssl_ASN1_PCTX_get_flags
+#define ASN1_PCTX_get_nm_flags bssl_ASN1_PCTX_get_nm_flags
+#define ASN1_PCTX_get_oid_flags bssl_ASN1_PCTX_get_oid_flags
+#define ASN1_PCTX_get_str_flags bssl_ASN1_PCTX_get_str_flags
+#define ASN1_PCTX_new bssl_ASN1_PCTX_new
+#define ASN1_PCTX_set_cert_flags bssl_ASN1_PCTX_set_cert_flags
+#define ASN1_PCTX_set_flags bssl_ASN1_PCTX_set_flags
+#define ASN1_PCTX_set_nm_flags bssl_ASN1_PCTX_set_nm_flags
+#define ASN1_PCTX_set_oid_flags bssl_ASN1_PCTX_set_oid_flags
+#define ASN1_PCTX_set_str_flags bssl_ASN1_PCTX_set_str_flags
+#define ASN1_primitive_free bssl_ASN1_primitive_free
+#define ASN1_primitive_new bssl_ASN1_primitive_new
+#define ASN1_PRINTABLE_free bssl_ASN1_PRINTABLE_free
+#define ASN1_PRINTABLE_it bssl_ASN1_PRINTABLE_it
+#define ASN1_PRINTABLE_new bssl_ASN1_PRINTABLE_new
+#define ASN1_PRINTABLESTRING_free bssl_ASN1_PRINTABLESTRING_free
+#define ASN1_PRINTABLESTRING_it bssl_ASN1_PRINTABLESTRING_it
+#define ASN1_PRINTABLESTRING_new bssl_ASN1_PRINTABLESTRING_new
+#define ASN1_PRINTABLE_type bssl_ASN1_PRINTABLE_type
+#define ASN1_put_eoc bssl_ASN1_put_eoc
+#define ASN1_put_object bssl_ASN1_put_object
+#define asn1_refcount_dec_and_test_zero bssl_asn1_refcount_dec_and_test_zero
+#define asn1_refcount_set_one bssl_asn1_refcount_set_one
+#define ASN1_SEQUENCE_ANY_it bssl_ASN1_SEQUENCE_ANY_it
+#define ASN1_SEQUENCE_it bssl_ASN1_SEQUENCE_it
+#define ASN1_SET_ANY_it bssl_ASN1_SET_ANY_it
+#define asn1_set_choice_selector bssl_asn1_set_choice_selector
+#define ASN1_STRING_cmp bssl_ASN1_STRING_cmp
+#define ASN1_STRING_copy bssl_ASN1_STRING_copy
+#define ASN1_STRING_data bssl_ASN1_STRING_data
+#define ASN1_STRING_dup bssl_ASN1_STRING_dup
+#define ASN1_STRING_free bssl_ASN1_STRING_free
+#define ASN1_STRING_get_default_mask bssl_ASN1_STRING_get_default_mask
+#define ASN1_STRING_length bssl_ASN1_STRING_length
+#define ASN1_STRING_length_set bssl_ASN1_STRING_length_set
+#define ASN1_STRING_new bssl_ASN1_STRING_new
+#define ASN1_STRING_print bssl_ASN1_STRING_print
+#define ASN1_STRING_print_ex bssl_ASN1_STRING_print_ex
+#define ASN1_STRING_print_ex_fp bssl_ASN1_STRING_print_ex_fp
+#define ASN1_STRING_set bssl_ASN1_STRING_set
+#define ASN1_STRING_set0 bssl_ASN1_STRING_set0
+#define ASN1_STRING_set_by_NID bssl_ASN1_STRING_set_by_NID
+#define ASN1_STRING_set_default_mask bssl_ASN1_STRING_set_default_mask
+#define ASN1_STRING_set_default_mask_asc bssl_ASN1_STRING_set_default_mask_asc
+#define ASN1_STRING_TABLE_add bssl_ASN1_STRING_TABLE_add
+#define ASN1_STRING_TABLE_cleanup bssl_ASN1_STRING_TABLE_cleanup
+#define ASN1_STRING_TABLE_get bssl_ASN1_STRING_TABLE_get
+#define ASN1_STRING_to_UTF8 bssl_ASN1_STRING_to_UTF8
+#define ASN1_STRING_type bssl_ASN1_STRING_type
+#define ASN1_STRING_type_new bssl_ASN1_STRING_type_new
+#define ASN1_T61STRING_free bssl_ASN1_T61STRING_free
+#define ASN1_T61STRING_it bssl_ASN1_T61STRING_it
+#define ASN1_T61STRING_new bssl_ASN1_T61STRING_new
+#define ASN1_tag2bit bssl_ASN1_tag2bit
+#define ASN1_tag2str bssl_ASN1_tag2str
+#define ASN1_TBOOLEAN_it bssl_ASN1_TBOOLEAN_it
+#define ASN1_template_d2i bssl_ASN1_template_d2i
+#define ASN1_template_free bssl_ASN1_template_free
+#define ASN1_template_i2d bssl_ASN1_template_i2d
+#define ASN1_template_new bssl_ASN1_template_new
+#define asn1_template_print_ctx bssl_asn1_template_print_ctx
+#define ASN1_TIME_adj bssl_ASN1_TIME_adj
+#define ASN1_TIME_check bssl_ASN1_TIME_check
+#define ASN1_TIME_diff bssl_ASN1_TIME_diff
+#define ASN1_TIME_free bssl_ASN1_TIME_free
+#define ASN1_TIME_it bssl_ASN1_TIME_it
+#define ASN1_TIME_new bssl_ASN1_TIME_new
+#define ASN1_TIME_print bssl_ASN1_TIME_print
+#define ASN1_TIME_set bssl_ASN1_TIME_set
+#define ASN1_TIME_set_string bssl_ASN1_TIME_set_string
+#define ASN1_TIME_to_generalizedtime bssl_ASN1_TIME_to_generalizedtime
+#define ASN1_TYPE_cmp bssl_ASN1_TYPE_cmp
+#define ASN1_TYPE_free bssl_ASN1_TYPE_free
+#define ASN1_TYPE_get bssl_ASN1_TYPE_get
+#define ASN1_TYPE_new bssl_ASN1_TYPE_new
+#define ASN1_TYPE_set bssl_ASN1_TYPE_set
+#define ASN1_TYPE_set1 bssl_ASN1_TYPE_set1
+#define ASN1_UNIVERSALSTRING_free bssl_ASN1_UNIVERSALSTRING_free
+#define ASN1_UNIVERSALSTRING_it bssl_ASN1_UNIVERSALSTRING_it
+#define ASN1_UNIVERSALSTRING_new bssl_ASN1_UNIVERSALSTRING_new
+#define ASN1_UNIVERSALSTRING_to_string bssl_ASN1_UNIVERSALSTRING_to_string
+#define ASN1_UTCTIME_adj bssl_ASN1_UTCTIME_adj
+#define ASN1_UTCTIME_check bssl_ASN1_UTCTIME_check
+#define ASN1_UTCTIME_cmp_time_t bssl_ASN1_UTCTIME_cmp_time_t
+#define ASN1_UTCTIME_free bssl_ASN1_UTCTIME_free
+#define ASN1_UTCTIME_it bssl_ASN1_UTCTIME_it
+#define ASN1_UTCTIME_new bssl_ASN1_UTCTIME_new
+#define ASN1_UTCTIME_print bssl_ASN1_UTCTIME_print
+#define ASN1_UTCTIME_set bssl_ASN1_UTCTIME_set
+#define ASN1_UTCTIME_set_string bssl_ASN1_UTCTIME_set_string
+#define asn1_utctime_to_tm bssl_asn1_utctime_to_tm
+#define ASN1_UTF8STRING_free bssl_ASN1_UTF8STRING_free
+#define ASN1_UTF8STRING_it bssl_ASN1_UTF8STRING_it
+#define ASN1_UTF8STRING_new bssl_ASN1_UTF8STRING_new
+#define ASN1_VISIBLESTRING_free bssl_ASN1_VISIBLESTRING_free
+#define ASN1_VISIBLESTRING_it bssl_ASN1_VISIBLESTRING_it
+#define ASN1_VISIBLESTRING_new bssl_ASN1_VISIBLESTRING_new
+#define AUTHORITY_INFO_ACCESS_free bssl_AUTHORITY_INFO_ACCESS_free
+#define AUTHORITY_INFO_ACCESS_it bssl_AUTHORITY_INFO_ACCESS_it
+#define AUTHORITY_INFO_ACCESS_new bssl_AUTHORITY_INFO_ACCESS_new
+#define AUTHORITY_KEYID_free bssl_AUTHORITY_KEYID_free
+#define AUTHORITY_KEYID_it bssl_AUTHORITY_KEYID_it
+#define AUTHORITY_KEYID_new bssl_AUTHORITY_KEYID_new
+#define BASIC_CONSTRAINTS_free bssl_BASIC_CONSTRAINTS_free
+#define BASIC_CONSTRAINTS_it bssl_BASIC_CONSTRAINTS_it
+#define BASIC_CONSTRAINTS_new bssl_BASIC_CONSTRAINTS_new
+#define BIGNUM_it bssl_BIGNUM_it
+#define BIO_append_filename bssl_BIO_append_filename
+#define BIO_asn1_get_prefix bssl_BIO_asn1_get_prefix
+#define BIO_asn1_get_suffix bssl_BIO_asn1_get_suffix
+#define BIO_asn1_set_prefix bssl_BIO_asn1_set_prefix
+#define BIO_asn1_set_suffix bssl_BIO_asn1_set_suffix
+#define BIO_callback_ctrl bssl_BIO_callback_ctrl
+#define BIO_clear_flags bssl_BIO_clear_flags
+#define BIO_clear_retry_flags bssl_BIO_clear_retry_flags
+#define bio_clear_socket_error bssl_bio_clear_socket_error
+#define BIO_copy_next_retry bssl_BIO_copy_next_retry
+#define BIO_ctrl bssl_BIO_ctrl
+#define BIO_ctrl_get_read_request bssl_BIO_ctrl_get_read_request
+#define BIO_ctrl_get_write_guarantee bssl_BIO_ctrl_get_write_guarantee
+#define BIO_ctrl_pending bssl_BIO_ctrl_pending
+#define BIO_do_connect bssl_BIO_do_connect
+#define BIO_f_asn1 bssl_BIO_f_asn1
+#define BIO_f_buffer bssl_BIO_f_buffer
+#define bio_fd_should_retry bssl_bio_fd_should_retry
+#define BIO_find_type bssl_BIO_find_type
+#define BIO_flush bssl_BIO_flush
+#define BIO_free bssl_BIO_free
+#define BIO_free_all bssl_BIO_free_all
+#define BIO_get_callback_arg bssl_BIO_get_callback_arg
+#define BIO_get_fd bssl_BIO_get_fd
+#define BIO_get_fp bssl_BIO_get_fp
+#define BIO_get_mem_data bssl_BIO_get_mem_data
+#define BIO_get_mem_ptr bssl_BIO_get_mem_ptr
+#define BIO_get_retry_flags bssl_BIO_get_retry_flags
+#define BIO_get_retry_reason bssl_BIO_get_retry_reason
+#define BIO_gets bssl_BIO_gets
+#define BIO_hexdump bssl_BIO_hexdump
+#define BIO_indent bssl_BIO_indent
+#define BIO_int_ctrl bssl_BIO_int_ctrl
+#define bio_ip_and_port_to_socket_and_addr bssl_bio_ip_and_port_to_socket_and_addr
+#define BIO_mem_contents bssl_BIO_mem_contents
+#define BIO_method_type bssl_BIO_method_type
+#define BIO_new bssl_BIO_new
+#define BIO_new_bio_pair bssl_BIO_new_bio_pair
+#define BIO_new_bio_pair_external_buf bssl_BIO_new_bio_pair_external_buf
+#define BIO_new_connect bssl_BIO_new_connect
+#define BIO_new_fd bssl_BIO_new_fd
+#define BIO_new_file bssl_BIO_new_file
+#define BIO_new_fp bssl_BIO_new_fp
+#define BIO_new_mem_buf bssl_BIO_new_mem_buf
+#define BIO_new_NDEF bssl_BIO_new_NDEF
+#define BIO_new_socket bssl_BIO_new_socket
+#define BIO_next bssl_BIO_next
+#define BIO_number_read bssl_BIO_number_read
+#define BIO_number_written bssl_BIO_number_written
+#define BIO_pending bssl_BIO_pending
+#define BIO_pop bssl_BIO_pop
+#define BIO_print_errors bssl_BIO_print_errors
+#define BIO_printf bssl_BIO_printf
+#define BIO_ptr_ctrl bssl_BIO_ptr_ctrl
+#define BIO_push bssl_BIO_push
+#define BIO_puts bssl_BIO_puts
+#define BIO_read bssl_BIO_read
+#define BIO_read_asn1 bssl_BIO_read_asn1
+#define BIO_read_filename bssl_BIO_read_filename
+#define BIO_reset bssl_BIO_reset
+#define BIO_rw_filename bssl_BIO_rw_filename
+#define BIO_s_connect bssl_BIO_s_connect
+#define BIO_set_callback bssl_BIO_set_callback
+#define BIO_set_callback_arg bssl_BIO_set_callback_arg
+#define BIO_set_close bssl_BIO_set_close
+#define BIO_set_conn_hostname bssl_BIO_set_conn_hostname
+#define BIO_set_conn_port bssl_BIO_set_conn_port
+#define BIO_set_fd bssl_BIO_set_fd
+#define BIO_set_flags bssl_BIO_set_flags
+#define BIO_set_fp bssl_BIO_set_fp
+#define BIO_set_mem_buf bssl_BIO_set_mem_buf
+#define BIO_set_mem_eof_return bssl_BIO_set_mem_eof_return
+#define BIO_set_nbio bssl_BIO_set_nbio
+#define BIO_set_read_buffer_size bssl_BIO_set_read_buffer_size
+#define BIO_set_retry_read bssl_BIO_set_retry_read
+#define BIO_set_retry_write bssl_BIO_set_retry_write
+#define BIO_set_write_buffer_size bssl_BIO_set_write_buffer_size
+#define BIO_s_fd bssl_BIO_s_fd
+#define BIO_s_file bssl_BIO_s_file
+#define BIO_should_io_special bssl_BIO_should_io_special
+#define BIO_should_read bssl_BIO_should_read
+#define BIO_should_retry bssl_BIO_should_retry
+#define BIO_should_write bssl_BIO_should_write
+#define BIO_shutdown_wr bssl_BIO_shutdown_wr
+#define BIO_s_mem bssl_BIO_s_mem
+#define BIO_snprintf bssl_BIO_snprintf
+#define bio_sock_error bssl_bio_sock_error
+#define bio_socket_nbio bssl_bio_socket_nbio
+#define BIO_s_socket bssl_BIO_s_socket
+#define BIO_test_flags bssl_BIO_test_flags
+#define BIO_up_ref bssl_BIO_up_ref
+#define BIO_vfree bssl_BIO_vfree
+#define BIO_vsnprintf bssl_BIO_vsnprintf
+#define BIO_wpending bssl_BIO_wpending
+#define BIO_write bssl_BIO_write
+#define BIO_write_filename bssl_BIO_write_filename
+#define BIO_zero_copy_get_read_buf bssl_BIO_zero_copy_get_read_buf
+#define BIO_zero_copy_get_read_buf_done bssl_BIO_zero_copy_get_read_buf_done
+#define BIO_zero_copy_get_write_buf bssl_BIO_zero_copy_get_write_buf
+#define BIO_zero_copy_get_write_buf_done bssl_BIO_zero_copy_get_write_buf_done
+#define BN_abs_is_word bssl_BN_abs_is_word
+#define BN_add bssl_BN_add
+#define BN_add_word bssl_BN_add_word
+#define bn_add_words bssl_bn_add_words
+#define BN_asc2bn bssl_BN_asc2bn
+#define BN_bin2bn bssl_BN_bin2bn
+#define BN_BLINDING_convert bssl_BN_BLINDING_convert
+#define BN_BLINDING_free bssl_BN_BLINDING_free
+#define BN_BLINDING_invert bssl_BN_BLINDING_invert
+#define BN_BLINDING_new bssl_BN_BLINDING_new
+#define BN_bn2bin bssl_BN_bn2bin
+#define BN_bn2bin_padded bssl_BN_bn2bin_padded
+#define BN_bn2cbb_padded bssl_BN_bn2cbb_padded
+#define BN_bn2dec bssl_BN_bn2dec
+#define BN_bn2hex bssl_BN_bn2hex
+#define BN_bn2mpi bssl_BN_bn2mpi
+#define BN_clear bssl_BN_clear
+#define BN_clear_bit bssl_BN_clear_bit
+#define BN_clear_free bssl_BN_clear_free
+#define BN_cmp bssl_BN_cmp
+#define bn_cmp_part_words bssl_bn_cmp_part_words
+#define bn_cmp_words bssl_bn_cmp_words
+#define BN_copy bssl_BN_copy
+#define bn_correct_top bssl_bn_correct_top
+#define BN_CTX_end bssl_BN_CTX_end
+#define BN_CTX_free bssl_BN_CTX_free
+#define BN_CTX_get bssl_BN_CTX_get
+#define BN_CTX_new bssl_BN_CTX_new
+#define BN_CTX_start bssl_BN_CTX_start
+#define BN_dec2bn bssl_BN_dec2bn
+#define BN_div bssl_BN_div
+#define BN_div_word bssl_BN_div_word
+#define BN_dup bssl_BN_dup
+#define BN_exp bssl_BN_exp
+#define bn_expand bssl_bn_expand
+#define BN_free bssl_BN_free
+#define bn_from_montgomery bssl_bn_from_montgomery
+#define BN_from_montgomery bssl_BN_from_montgomery
+#define bn_gather5 bssl_bn_gather5
+#define BN_gcd bssl_BN_gcd
+#define BN_GENCB_call bssl_BN_GENCB_call
+#define BN_GENCB_set bssl_BN_GENCB_set
+#define BN_generate_dsa_nonce bssl_BN_generate_dsa_nonce
+#define BN_generate_prime_ex bssl_BN_generate_prime_ex
+#define BN_get_flags bssl_BN_get_flags
+#define BN_get_word bssl_BN_get_word
+#define BN_hex2bn bssl_BN_hex2bn
+#define BN_init bssl_BN_init
+#define BN_is_bit_set bssl_BN_is_bit_set
+#define BN_is_negative bssl_BN_is_negative
+#define BN_is_odd bssl_BN_is_odd
+#define BN_is_one bssl_BN_is_one
+#define BN_is_prime_ex bssl_BN_is_prime_ex
+#define BN_is_prime_fasttest_ex bssl_BN_is_prime_fasttest_ex
+#define BN_is_word bssl_BN_is_word
+#define BN_is_zero bssl_BN_is_zero
+#define BN_kronecker bssl_BN_kronecker
+#define BN_lshift bssl_BN_lshift
+#define BN_lshift1 bssl_BN_lshift1
+#define BN_marshal_asn1 bssl_BN_marshal_asn1
+#define BN_mask_bits bssl_BN_mask_bits
+#define BN_mod_add bssl_BN_mod_add
+#define BN_mod_add_quick bssl_BN_mod_add_quick
+#define BN_mod_exp bssl_BN_mod_exp
+#define BN_mod_exp2_mont bssl_BN_mod_exp2_mont
+#define BN_mod_exp_mont bssl_BN_mod_exp_mont
+#define BN_mod_exp_mont_consttime bssl_BN_mod_exp_mont_consttime
+#define BN_mod_exp_mont_word bssl_BN_mod_exp_mont_word
+#define BN_mod_inverse bssl_BN_mod_inverse
+#define BN_mod_inverse_ex bssl_BN_mod_inverse_ex
+#define BN_mod_lshift bssl_BN_mod_lshift
+#define BN_mod_lshift1 bssl_BN_mod_lshift1
+#define BN_mod_lshift1_quick bssl_BN_mod_lshift1_quick
+#define BN_mod_lshift_quick bssl_BN_mod_lshift_quick
+#define BN_mod_mul bssl_BN_mod_mul
+#define BN_mod_mul_montgomery bssl_BN_mod_mul_montgomery
+#define BN_mod_sqr bssl_BN_mod_sqr
+#define BN_mod_sqrt bssl_BN_mod_sqrt
+#define BN_mod_sub bssl_BN_mod_sub
+#define BN_mod_sub_quick bssl_BN_mod_sub_quick
+#define BN_mod_word bssl_BN_mod_word
+#define BN_MONT_CTX_copy bssl_BN_MONT_CTX_copy
+#define BN_MONT_CTX_free bssl_BN_MONT_CTX_free
+#define BN_MONT_CTX_new bssl_BN_MONT_CTX_new
+#define BN_MONT_CTX_set bssl_BN_MONT_CTX_set
+#define BN_MONT_CTX_set_locked bssl_BN_MONT_CTX_set_locked
+#define BN_mpi2bn bssl_BN_mpi2bn
+#define BN_mul bssl_BN_mul
+#define bn_mul_add_words bssl_bn_mul_add_words
+#define bn_mul_comba4 bssl_bn_mul_comba4
+#define bn_mul_comba8 bssl_bn_mul_comba8
+#define bn_mul_mont bssl_bn_mul_mont
+#define bn_mul_mont_gather5 bssl_bn_mul_mont_gather5
+#define BN_mul_word bssl_BN_mul_word
+#define bn_mul_words bssl_bn_mul_words
+#define BN_new bssl_BN_new
+#define BN_nnmod bssl_BN_nnmod
+#define BN_num_bits bssl_BN_num_bits
+#define BN_num_bits_word bssl_BN_num_bits_word
+#define BN_num_bytes bssl_BN_num_bytes
+#define BN_one bssl_BN_one
+#define BN_parse_asn1_unsigned bssl_BN_parse_asn1_unsigned
+#define BN_parse_asn1_unsigned_buggy bssl_BN_parse_asn1_unsigned_buggy
+#define bn_power5 bssl_bn_power5
+#define BN_primality_test bssl_BN_primality_test
+#define BN_print bssl_BN_print
+#define BN_print_fp bssl_BN_print_fp
+#define BN_pseudo_rand bssl_BN_pseudo_rand
+#define BN_pseudo_rand_range bssl_BN_pseudo_rand_range
+#define BN_rand bssl_BN_rand
+#define BN_rand_range bssl_BN_rand_range
+#define BN_rshift bssl_BN_rshift
+#define BN_rshift1 bssl_BN_rshift1
+#define bn_scatter5 bssl_bn_scatter5
+#define BN_set_bit bssl_BN_set_bit
+#define BN_set_flags bssl_BN_set_flags
+#define BN_set_negative bssl_BN_set_negative
+#define BN_set_word bssl_BN_set_word
+#define bn_set_words bssl_bn_set_words
+#define BN_sqr bssl_BN_sqr
+#define bn_sqr8x_internal bssl_bn_sqr8x_internal
+#define bn_sqr_comba4 bssl_bn_sqr_comba4
+#define bn_sqr_comba8 bssl_bn_sqr_comba8
+#define BN_sqrt bssl_BN_sqrt
+#define bn_sqr_words bssl_bn_sqr_words
+#define BN_sub bssl_BN_sub
+#define BN_sub_word bssl_BN_sub_word
+#define bn_sub_words bssl_bn_sub_words
+#define BN_to_ASN1_ENUMERATED bssl_BN_to_ASN1_ENUMERATED
+#define BN_to_ASN1_INTEGER bssl_BN_to_ASN1_INTEGER
+#define BN_to_montgomery bssl_BN_to_montgomery
+#define BN_uadd bssl_BN_uadd
+#define BN_ucmp bssl_BN_ucmp
+#define BN_usub bssl_BN_usub
+#define BN_value_one bssl_BN_value_one
+#define bn_wexpand bssl_bn_wexpand
+#define BN_with_flags bssl_BN_with_flags
+#define BN_zero bssl_BN_zero
+#define bsaes_cbc_encrypt bssl_bsaes_cbc_encrypt
+#define bsaes_ctr32_encrypt_blocks bssl_bsaes_ctr32_encrypt_blocks
+#define bsaes_xts_decrypt bssl_bsaes_xts_decrypt
+#define bsaes_xts_encrypt bssl_bsaes_xts_encrypt
+#define BUF_memdup bssl_BUF_memdup
+#define BUF_MEM_free bssl_BUF_MEM_free
+#define BUF_MEM_grow bssl_BUF_MEM_grow
+#define BUF_MEM_grow_clean bssl_BUF_MEM_grow_clean
+#define BUF_MEM_new bssl_BUF_MEM_new
+#define BUF_strdup bssl_BUF_strdup
+#define BUF_strlcat bssl_BUF_strlcat
+#define BUF_strlcpy bssl_BUF_strlcpy
+#define BUF_strndup bssl_BUF_strndup
+#define BUF_strnlen bssl_BUF_strnlen
+#define c2i_ASN1_BIT_STRING bssl_c2i_ASN1_BIT_STRING
+#define c2i_ASN1_INTEGER bssl_c2i_ASN1_INTEGER
+#define c2i_ASN1_OBJECT bssl_c2i_ASN1_OBJECT
+#define CBB_add_asn1 bssl_CBB_add_asn1
+#define CBB_add_asn1_uint64 bssl_CBB_add_asn1_uint64
+#define CBB_add_bytes bssl_CBB_add_bytes
+#define CBB_add_space bssl_CBB_add_space
+#define CBB_add_u16 bssl_CBB_add_u16
+#define CBB_add_u16_length_prefixed bssl_CBB_add_u16_length_prefixed
+#define CBB_add_u24 bssl_CBB_add_u24
+#define CBB_add_u24_length_prefixed bssl_CBB_add_u24_length_prefixed
+#define CBB_add_u8 bssl_CBB_add_u8
+#define CBB_add_u8_length_prefixed bssl_CBB_add_u8_length_prefixed
+#define CBB_cleanup bssl_CBB_cleanup
+#define CBB_data bssl_CBB_data
+#define CBB_did_write bssl_CBB_did_write
+#define CBB_discard_child bssl_CBB_discard_child
+#define CBB_finish bssl_CBB_finish
+#define CBB_finish_i2d bssl_CBB_finish_i2d
+#define CBB_flush bssl_CBB_flush
+#define CBB_init bssl_CBB_init
+#define CBB_init_fixed bssl_CBB_init_fixed
+#define CBB_len bssl_CBB_len
+#define CBB_reserve bssl_CBB_reserve
+#define CBB_zero bssl_CBB_zero
+#define CBIGNUM_it bssl_CBIGNUM_it
+#define CBS_asn1_ber_to_der bssl_CBS_asn1_ber_to_der
+#define CBS_contains_zero_byte bssl_CBS_contains_zero_byte
+#define CBS_copy_bytes bssl_CBS_copy_bytes
+#define CBS_data bssl_CBS_data
+#define CBS_get_any_asn1_element bssl_CBS_get_any_asn1_element
+#define CBS_get_any_ber_asn1_element bssl_CBS_get_any_ber_asn1_element
+#define CBS_get_asn1 bssl_CBS_get_asn1
+#define CBS_get_asn1_element bssl_CBS_get_asn1_element
+#define CBS_get_asn1_implicit_string bssl_CBS_get_asn1_implicit_string
+#define CBS_get_asn1_uint64 bssl_CBS_get_asn1_uint64
+#define CBS_get_bytes bssl_CBS_get_bytes
+#define CBS_get_optional_asn1 bssl_CBS_get_optional_asn1
+#define CBS_get_optional_asn1_bool bssl_CBS_get_optional_asn1_bool
+#define CBS_get_optional_asn1_octet_string bssl_CBS_get_optional_asn1_octet_string
+#define CBS_get_optional_asn1_uint64 bssl_CBS_get_optional_asn1_uint64
+#define CBS_get_u16 bssl_CBS_get_u16
+#define CBS_get_u16_length_prefixed bssl_CBS_get_u16_length_prefixed
+#define CBS_get_u24 bssl_CBS_get_u24
+#define CBS_get_u24_length_prefixed bssl_CBS_get_u24_length_prefixed
+#define CBS_get_u32 bssl_CBS_get_u32
+#define CBS_get_u8 bssl_CBS_get_u8
+#define CBS_get_u8_length_prefixed bssl_CBS_get_u8_length_prefixed
+#define CBS_init bssl_CBS_init
+#define CBS_len bssl_CBS_len
+#define CBS_mem_equal bssl_CBS_mem_equal
+#define CBS_peek_asn1_tag bssl_CBS_peek_asn1_tag
+#define CBS_skip bssl_CBS_skip
+#define CBS_stow bssl_CBS_stow
+#define CBS_strdup bssl_CBS_strdup
+#define CERTIFICATEPOLICIES_free bssl_CERTIFICATEPOLICIES_free
+#define CERTIFICATEPOLICIES_it bssl_CERTIFICATEPOLICIES_it
+#define CERTIFICATEPOLICIES_new bssl_CERTIFICATEPOLICIES_new
+#define ChaCha20_ctr32 bssl_ChaCha20_ctr32
+#define CMAC_CTX_free bssl_CMAC_CTX_free
+#define CMAC_CTX_new bssl_CMAC_CTX_new
+#define CMAC_Final bssl_CMAC_Final
+#define CMAC_Init bssl_CMAC_Init
+#define CMAC_Reset bssl_CMAC_Reset
+#define CMAC_Update bssl_CMAC_Update
+#define CONF_modules_free bssl_CONF_modules_free
+#define CONF_modules_load_file bssl_CONF_modules_load_file
+#define CONF_parse_list bssl_CONF_parse_list
+#define CONF_VALUE_new bssl_CONF_VALUE_new
+#define CRL_DIST_POINTS_free bssl_CRL_DIST_POINTS_free
+#define CRL_DIST_POINTS_it bssl_CRL_DIST_POINTS_it
+#define CRL_DIST_POINTS_new bssl_CRL_DIST_POINTS_new
+#define CRYPTO_cbc128_decrypt bssl_CRYPTO_cbc128_decrypt
+#define CRYPTO_cbc128_encrypt bssl_CRYPTO_cbc128_encrypt
+#define CRYPTO_cfb128_1_encrypt bssl_CRYPTO_cfb128_1_encrypt
+#define CRYPTO_cfb128_8_encrypt bssl_CRYPTO_cfb128_8_encrypt
+#define CRYPTO_cfb128_encrypt bssl_CRYPTO_cfb128_encrypt
+#define CRYPTO_chacha_20 bssl_CRYPTO_chacha_20
+#define CRYPTO_cleanup_all_ex_data bssl_CRYPTO_cleanup_all_ex_data
+#define CRYPTO_ctr128_encrypt bssl_CRYPTO_ctr128_encrypt
+#define CRYPTO_ctr128_encrypt_ctr32 bssl_CRYPTO_ctr128_encrypt_ctr32
+#define CRYPTO_dup_ex_data bssl_CRYPTO_dup_ex_data
+#define CRYPTO_free_ex_data bssl_CRYPTO_free_ex_data
+#define CRYPTO_gcm128_aad bssl_CRYPTO_gcm128_aad
+#define CRYPTO_gcm128_decrypt bssl_CRYPTO_gcm128_decrypt
+#define CRYPTO_gcm128_decrypt_ctr32 bssl_CRYPTO_gcm128_decrypt_ctr32
+#define CRYPTO_gcm128_encrypt bssl_CRYPTO_gcm128_encrypt
+#define CRYPTO_gcm128_encrypt_ctr32 bssl_CRYPTO_gcm128_encrypt_ctr32
+#define CRYPTO_gcm128_finish bssl_CRYPTO_gcm128_finish
+#define CRYPTO_gcm128_init bssl_CRYPTO_gcm128_init
+#define CRYPTO_gcm128_setiv bssl_CRYPTO_gcm128_setiv
+#define CRYPTO_gcm128_tag bssl_CRYPTO_gcm128_tag
+#define crypto_gcm_clmul_enabled bssl_crypto_gcm_clmul_enabled
+#define CRYPTO_get_ex_data bssl_CRYPTO_get_ex_data
+#define CRYPTO_get_ex_new_index bssl_CRYPTO_get_ex_new_index
+#define CRYPTO_get_lock_name bssl_CRYPTO_get_lock_name
+#define CRYPTO_get_thread_local bssl_CRYPTO_get_thread_local
+#define CRYPTO_library_init bssl_CRYPTO_library_init
+#define CRYPTO_malloc_init bssl_CRYPTO_malloc_init
+#define CRYPTO_memcmp bssl_CRYPTO_memcmp
+#define CRYPTO_MUTEX_cleanup bssl_CRYPTO_MUTEX_cleanup
+#define CRYPTO_MUTEX_init bssl_CRYPTO_MUTEX_init
+#define CRYPTO_MUTEX_lock_read bssl_CRYPTO_MUTEX_lock_read
+#define CRYPTO_MUTEX_lock_write bssl_CRYPTO_MUTEX_lock_write
+#define CRYPTO_MUTEX_unlock bssl_CRYPTO_MUTEX_unlock
+#define CRYPTO_new_ex_data bssl_CRYPTO_new_ex_data
+#define CRYPTO_num_locks bssl_CRYPTO_num_locks
+#define CRYPTO_ofb128_encrypt bssl_CRYPTO_ofb128_encrypt
+#define CRYPTO_once bssl_CRYPTO_once
+#define CRYPTO_poly1305_finish bssl_CRYPTO_poly1305_finish
+#define CRYPTO_poly1305_init bssl_CRYPTO_poly1305_init
+#define CRYPTO_poly1305_update bssl_CRYPTO_poly1305_update
+#define CRYPTO_rdrand bssl_CRYPTO_rdrand
+#define CRYPTO_rdrand_multiple8_buf bssl_CRYPTO_rdrand_multiple8_buf
+#define CRYPTO_refcount_dec_and_test_zero bssl_CRYPTO_refcount_dec_and_test_zero
+#define CRYPTO_refcount_inc bssl_CRYPTO_refcount_inc
+#define CRYPTO_set_add_lock_callback bssl_CRYPTO_set_add_lock_callback
+#define CRYPTO_set_dynlock_create_callback bssl_CRYPTO_set_dynlock_create_callback
+#define CRYPTO_set_dynlock_destroy_callback bssl_CRYPTO_set_dynlock_destroy_callback
+#define CRYPTO_set_dynlock_lock_callback bssl_CRYPTO_set_dynlock_lock_callback
+#define CRYPTO_set_ex_data bssl_CRYPTO_set_ex_data
+#define CRYPTO_set_id_callback bssl_CRYPTO_set_id_callback
+#define CRYPTO_set_locking_callback bssl_CRYPTO_set_locking_callback
+#define CRYPTO_set_thread_local bssl_CRYPTO_set_thread_local
+#define CRYPTO_STATIC_MUTEX_lock_read bssl_CRYPTO_STATIC_MUTEX_lock_read
+#define CRYPTO_STATIC_MUTEX_lock_write bssl_CRYPTO_STATIC_MUTEX_lock_write
+#define CRYPTO_STATIC_MUTEX_unlock bssl_CRYPTO_STATIC_MUTEX_unlock
+#define CRYPTO_sysrand bssl_CRYPTO_sysrand
+#define CRYPTO_THREADID_current bssl_CRYPTO_THREADID_current
+#define CRYPTO_THREADID_set_callback bssl_CRYPTO_THREADID_set_callback
+#define CRYPTO_THREADID_set_numeric bssl_CRYPTO_THREADID_set_numeric
+#define CRYPTO_THREADID_set_pointer bssl_CRYPTO_THREADID_set_pointer
+#define custom_ext_add_clienthello bssl_custom_ext_add_clienthello
+#define custom_ext_add_serverhello bssl_custom_ext_add_serverhello
+#define custom_ext_parse_clienthello bssl_custom_ext_parse_clienthello
+#define custom_ext_parse_serverhello bssl_custom_ext_parse_serverhello
+#define d2i_ACCESS_DESCRIPTION bssl_d2i_ACCESS_DESCRIPTION
+#define d2i_ASN1_BIT_STRING bssl_d2i_ASN1_BIT_STRING
+#define d2i_ASN1_BMPSTRING bssl_d2i_ASN1_BMPSTRING
+#define d2i_ASN1_BOOLEAN bssl_d2i_ASN1_BOOLEAN
+#define d2i_ASN1_bytes bssl_d2i_ASN1_bytes
+#define d2i_ASN1_ENUMERATED bssl_d2i_ASN1_ENUMERATED
+#define d2i_ASN1_GENERALIZEDTIME bssl_d2i_ASN1_GENERALIZEDTIME
+#define d2i_ASN1_GENERALSTRING bssl_d2i_ASN1_GENERALSTRING
+#define d2i_ASN1_IA5STRING bssl_d2i_ASN1_IA5STRING
+#define d2i_ASN1_INTEGER bssl_d2i_ASN1_INTEGER
+#define d2i_ASN1_NULL bssl_d2i_ASN1_NULL
+#define d2i_ASN1_OBJECT bssl_d2i_ASN1_OBJECT
+#define d2i_ASN1_OCTET_STRING bssl_d2i_ASN1_OCTET_STRING
+#define d2i_ASN1_PRINTABLE bssl_d2i_ASN1_PRINTABLE
+#define d2i_ASN1_PRINTABLESTRING bssl_d2i_ASN1_PRINTABLESTRING
+#define d2i_ASN1_SEQUENCE_ANY bssl_d2i_ASN1_SEQUENCE_ANY
+#define d2i_ASN1_SET_ANY bssl_d2i_ASN1_SET_ANY
+#define d2i_ASN1_T61STRING bssl_d2i_ASN1_T61STRING
+#define d2i_ASN1_TIME bssl_d2i_ASN1_TIME
+#define d2i_ASN1_TYPE bssl_d2i_ASN1_TYPE
+#define d2i_ASN1_type_bytes bssl_d2i_ASN1_type_bytes
+#define d2i_ASN1_UINTEGER bssl_d2i_ASN1_UINTEGER
+#define d2i_ASN1_UNIVERSALSTRING bssl_d2i_ASN1_UNIVERSALSTRING
+#define d2i_ASN1_UTCTIME bssl_d2i_ASN1_UTCTIME
+#define d2i_ASN1_UTF8STRING bssl_d2i_ASN1_UTF8STRING
+#define d2i_ASN1_VISIBLESTRING bssl_d2i_ASN1_VISIBLESTRING
+#define d2i_AUTHORITY_INFO_ACCESS bssl_d2i_AUTHORITY_INFO_ACCESS
+#define d2i_AUTHORITY_KEYID bssl_d2i_AUTHORITY_KEYID
+#define d2i_AutoPrivateKey bssl_d2i_AutoPrivateKey
+#define d2i_BASIC_CONSTRAINTS bssl_d2i_BASIC_CONSTRAINTS
+#define d2i_CERTIFICATEPOLICIES bssl_d2i_CERTIFICATEPOLICIES
+#define d2i_CRL_DIST_POINTS bssl_d2i_CRL_DIST_POINTS
+#define d2i_DHparams bssl_d2i_DHparams
+#define d2i_DIRECTORYSTRING bssl_d2i_DIRECTORYSTRING
+#define d2i_DISPLAYTEXT bssl_d2i_DISPLAYTEXT
+#define d2i_DIST_POINT bssl_d2i_DIST_POINT
+#define d2i_DIST_POINT_NAME bssl_d2i_DIST_POINT_NAME
+#define d2i_DSAparams bssl_d2i_DSAparams
+#define d2i_DSAPrivateKey bssl_d2i_DSAPrivateKey
+#define d2i_DSAPrivateKey_bio bssl_d2i_DSAPrivateKey_bio
+#define d2i_DSAPrivateKey_fp bssl_d2i_DSAPrivateKey_fp
+#define d2i_DSA_PUBKEY bssl_d2i_DSA_PUBKEY
+#define d2i_DSA_PUBKEY_bio bssl_d2i_DSA_PUBKEY_bio
+#define d2i_DSA_PUBKEY_fp bssl_d2i_DSA_PUBKEY_fp
+#define d2i_DSAPublicKey bssl_d2i_DSAPublicKey
+#define d2i_DSA_SIG bssl_d2i_DSA_SIG
+#define d2i_ECDSA_SIG bssl_d2i_ECDSA_SIG
+#define d2i_ECParameters bssl_d2i_ECParameters
+#define d2i_ECPrivateKey bssl_d2i_ECPrivateKey
+#define d2i_ECPrivateKey_bio bssl_d2i_ECPrivateKey_bio
+#define d2i_ECPrivateKey_fp bssl_d2i_ECPrivateKey_fp
+#define d2i_EC_PUBKEY bssl_d2i_EC_PUBKEY
+#define d2i_EC_PUBKEY_bio bssl_d2i_EC_PUBKEY_bio
+#define d2i_EC_PUBKEY_fp bssl_d2i_EC_PUBKEY_fp
+#define d2i_EDIPARTYNAME bssl_d2i_EDIPARTYNAME
+#define d2i_EXTENDED_KEY_USAGE bssl_d2i_EXTENDED_KEY_USAGE
+#define d2i_GENERAL_NAME bssl_d2i_GENERAL_NAME
+#define d2i_GENERAL_NAMES bssl_d2i_GENERAL_NAMES
+#define d2i_ISSUING_DIST_POINT bssl_d2i_ISSUING_DIST_POINT
+#define d2i_NETSCAPE_SPKAC bssl_d2i_NETSCAPE_SPKAC
+#define d2i_NETSCAPE_SPKI bssl_d2i_NETSCAPE_SPKI
+#define d2i_NOTICEREF bssl_d2i_NOTICEREF
+#define d2i_OTHERNAME bssl_d2i_OTHERNAME
+#define d2i_PBE2PARAM bssl_d2i_PBE2PARAM
+#define d2i_PBEPARAM bssl_d2i_PBEPARAM
+#define d2i_PBKDF2PARAM bssl_d2i_PBKDF2PARAM
+#define d2i_PKCS12 bssl_d2i_PKCS12
+#define d2i_PKCS12_bio bssl_d2i_PKCS12_bio
+#define d2i_PKCS12_fp bssl_d2i_PKCS12_fp
+#define d2i_PKCS8_bio bssl_d2i_PKCS8_bio
+#define d2i_PKCS8_fp bssl_d2i_PKCS8_fp
+#define d2i_PKCS8PrivateKey_bio bssl_d2i_PKCS8PrivateKey_bio
+#define d2i_PKCS8PrivateKey_fp bssl_d2i_PKCS8PrivateKey_fp
+#define d2i_PKCS8_PRIV_KEY_INFO bssl_d2i_PKCS8_PRIV_KEY_INFO
+#define d2i_PKCS8_PRIV_KEY_INFO_bio bssl_d2i_PKCS8_PRIV_KEY_INFO_bio
+#define d2i_PKCS8_PRIV_KEY_INFO_fp bssl_d2i_PKCS8_PRIV_KEY_INFO_fp
+#define d2i_PKEY_USAGE_PERIOD bssl_d2i_PKEY_USAGE_PERIOD
+#define d2i_POLICYINFO bssl_d2i_POLICYINFO
+#define d2i_POLICYQUALINFO bssl_d2i_POLICYQUALINFO
+#define d2i_PrivateKey bssl_d2i_PrivateKey
+#define d2i_PrivateKey_bio bssl_d2i_PrivateKey_bio
+#define d2i_PrivateKey_fp bssl_d2i_PrivateKey_fp
+#define d2i_PROXY_CERT_INFO_EXTENSION bssl_d2i_PROXY_CERT_INFO_EXTENSION
+#define d2i_PROXY_POLICY bssl_d2i_PROXY_POLICY
+#define d2i_PUBKEY bssl_d2i_PUBKEY
+#define d2i_PUBKEY_bio bssl_d2i_PUBKEY_bio
+#define d2i_PUBKEY_fp bssl_d2i_PUBKEY_fp
+#define d2i_RSAPrivateKey bssl_d2i_RSAPrivateKey
+#define d2i_RSAPrivateKey_bio bssl_d2i_RSAPrivateKey_bio
+#define d2i_RSAPrivateKey_fp bssl_d2i_RSAPrivateKey_fp
+#define d2i_RSA_PSS_PARAMS bssl_d2i_RSA_PSS_PARAMS
+#define d2i_RSA_PUBKEY bssl_d2i_RSA_PUBKEY
+#define d2i_RSA_PUBKEY_bio bssl_d2i_RSA_PUBKEY_bio
+#define d2i_RSA_PUBKEY_fp bssl_d2i_RSA_PUBKEY_fp
+#define d2i_RSAPublicKey bssl_d2i_RSAPublicKey
+#define d2i_RSAPublicKey_bio bssl_d2i_RSAPublicKey_bio
+#define d2i_RSAPublicKey_fp bssl_d2i_RSAPublicKey_fp
+#define d2i_SSL_SESSION bssl_d2i_SSL_SESSION
+#define d2i_SSL_SESSION_bio bssl_d2i_SSL_SESSION_bio
+#define d2i_SXNET bssl_d2i_SXNET
+#define d2i_SXNETID bssl_d2i_SXNETID
+#define d2i_USERNOTICE bssl_d2i_USERNOTICE
+#define d2i_X509 bssl_d2i_X509
+#define d2i_X509_ALGOR bssl_d2i_X509_ALGOR
+#define d2i_X509_ALGORS bssl_d2i_X509_ALGORS
+#define d2i_X509_ATTRIBUTE bssl_d2i_X509_ATTRIBUTE
+#define d2i_X509_AUX bssl_d2i_X509_AUX
+#define d2i_X509_bio bssl_d2i_X509_bio
+#define d2i_X509_CERT_AUX bssl_d2i_X509_CERT_AUX
+#define d2i_X509_CERT_PAIR bssl_d2i_X509_CERT_PAIR
+#define d2i_X509_CINF bssl_d2i_X509_CINF
+#define d2i_X509_CRL bssl_d2i_X509_CRL
+#define d2i_X509_CRL_bio bssl_d2i_X509_CRL_bio
+#define d2i_X509_CRL_fp bssl_d2i_X509_CRL_fp
+#define d2i_X509_CRL_INFO bssl_d2i_X509_CRL_INFO
+#define d2i_X509_EXTENSION bssl_d2i_X509_EXTENSION
+#define d2i_X509_EXTENSIONS bssl_d2i_X509_EXTENSIONS
+#define d2i_X509_fp bssl_d2i_X509_fp
+#define d2i_X509_NAME bssl_d2i_X509_NAME
+#define d2i_X509_NAME_ENTRY bssl_d2i_X509_NAME_ENTRY
+#define d2i_X509_PUBKEY bssl_d2i_X509_PUBKEY
+#define d2i_X509_REQ bssl_d2i_X509_REQ
+#define d2i_X509_REQ_bio bssl_d2i_X509_REQ_bio
+#define d2i_X509_REQ_fp bssl_d2i_X509_REQ_fp
+#define d2i_X509_REQ_INFO bssl_d2i_X509_REQ_INFO
+#define d2i_X509_REVOKED bssl_d2i_X509_REVOKED
+#define d2i_X509_SIG bssl_d2i_X509_SIG
+#define d2i_X509_VAL bssl_d2i_X509_VAL
+#define DES_decrypt3 bssl_DES_decrypt3
+#define DES_ecb3_encrypt bssl_DES_ecb3_encrypt
+#define DES_ecb_encrypt bssl_DES_ecb_encrypt
+#define DES_ede2_cbc_encrypt bssl_DES_ede2_cbc_encrypt
+#define DES_ede3_cbc_encrypt bssl_DES_ede3_cbc_encrypt
+#define DES_encrypt3 bssl_DES_encrypt3
+#define DES_ncbc_encrypt bssl_DES_ncbc_encrypt
+#define DES_set_key bssl_DES_set_key
+#define DES_set_key_unchecked bssl_DES_set_key_unchecked
+#define DES_set_odd_parity bssl_DES_set_odd_parity
+#define DH_check bssl_DH_check
+#define DH_check_pub_key bssl_DH_check_pub_key
+#define DH_check_standard_parameters bssl_DH_check_standard_parameters
+#define DH_compute_key bssl_DH_compute_key
+#define DH_free bssl_DH_free
+#define DH_generate_key bssl_DH_generate_key
+#define DH_generate_parameters_ex bssl_DH_generate_parameters_ex
+#define DH_get_1024_160 bssl_DH_get_1024_160
+#define DH_get_2048_224 bssl_DH_get_2048_224
+#define DH_get_2048_256 bssl_DH_get_2048_256
+#define DH_get_ex_data bssl_DH_get_ex_data
+#define DH_get_ex_new_index bssl_DH_get_ex_new_index
+#define DH_new bssl_DH_new
+#define DH_num_bits bssl_DH_num_bits
+#define DHparams_dup bssl_DHparams_dup
+#define DHparams_it bssl_DHparams_it
+#define DH_set_ex_data bssl_DH_set_ex_data
+#define DH_size bssl_DH_size
+#define DH_up_ref bssl_DH_up_ref
+#define DIRECTORYSTRING_free bssl_DIRECTORYSTRING_free
+#define DIRECTORYSTRING_it bssl_DIRECTORYSTRING_it
+#define DIRECTORYSTRING_new bssl_DIRECTORYSTRING_new
+#define DISPLAYTEXT_free bssl_DISPLAYTEXT_free
+#define DISPLAYTEXT_it bssl_DISPLAYTEXT_it
+#define DISPLAYTEXT_new bssl_DISPLAYTEXT_new
+#define DIST_POINT_free bssl_DIST_POINT_free
+#define DIST_POINT_it bssl_DIST_POINT_it
+#define DIST_POINT_NAME_free bssl_DIST_POINT_NAME_free
+#define DIST_POINT_NAME_it bssl_DIST_POINT_NAME_it
+#define DIST_POINT_NAME_new bssl_DIST_POINT_NAME_new
+#define DIST_POINT_new bssl_DIST_POINT_new
+#define DIST_POINT_set_dpname bssl_DIST_POINT_set_dpname
+#define dsa_asn1_meth bssl_dsa_asn1_meth
+#define DSA_check_signature bssl_DSA_check_signature
+#define DSA_do_check_signature bssl_DSA_do_check_signature
+#define DSA_do_sign bssl_DSA_do_sign
+#define DSA_do_verify bssl_DSA_do_verify
+#define DSA_dup_DH bssl_DSA_dup_DH
+#define DSA_free bssl_DSA_free
+#define DSA_generate_key bssl_DSA_generate_key
+#define DSA_generate_parameters_ex bssl_DSA_generate_parameters_ex
+#define DSA_get_ex_data bssl_DSA_get_ex_data
+#define DSA_get_ex_new_index bssl_DSA_get_ex_new_index
+#define DSA_marshal_parameters bssl_DSA_marshal_parameters
+#define DSA_marshal_private_key bssl_DSA_marshal_private_key
+#define DSA_marshal_public_key bssl_DSA_marshal_public_key
+#define DSA_new bssl_DSA_new
+#define DSAparams_dup bssl_DSAparams_dup
+#define DSA_parse_parameters bssl_DSA_parse_parameters
+#define DSA_parse_private_key bssl_DSA_parse_private_key
+#define DSA_parse_public_key bssl_DSA_parse_public_key
+#define DSA_set_ex_data bssl_DSA_set_ex_data
+#define DSA_SIG_free bssl_DSA_SIG_free
+#define DSA_SIG_marshal bssl_DSA_SIG_marshal
+#define DSA_sign bssl_DSA_sign
+#define DSA_SIG_new bssl_DSA_SIG_new
+#define DSA_sign_setup bssl_DSA_sign_setup
+#define DSA_SIG_parse bssl_DSA_SIG_parse
+#define DSA_size bssl_DSA_size
+#define DSA_up_ref bssl_DSA_up_ref
+#define DSA_verify bssl_DSA_verify
+#define dtls1_accept bssl_dtls1_accept
+#define dtls1_buffer_message bssl_dtls1_buffer_message
+#define dtls1_check_timeout_num bssl_dtls1_check_timeout_num
+#define dtls1_clear_record_buffer bssl_dtls1_clear_record_buffer
+#define dtls1_connect bssl_dtls1_connect
+#define dtls1_dispatch_alert bssl_dtls1_dispatch_alert
+#define dtls1_do_handshake_write bssl_dtls1_do_handshake_write
+#define dtls1_double_timeout bssl_dtls1_double_timeout
+#define dtls1_free bssl_dtls1_free
+#define dtls1_get_message bssl_dtls1_get_message
+#define dtls1_get_message_header bssl_dtls1_get_message_header
+#define dtls1_handshake_write bssl_dtls1_handshake_write
+#define dtls1_hm_fragment_free bssl_dtls1_hm_fragment_free
+#define dtls1_is_timer_expired bssl_dtls1_is_timer_expired
+#define dtls1_min_mtu bssl_dtls1_min_mtu
+#define dtls1_new bssl_dtls1_new
+#define dtls1_read_app_data bssl_dtls1_read_app_data
+#define dtls1_read_bytes bssl_dtls1_read_bytes
+#define dtls1_read_change_cipher_spec bssl_dtls1_read_change_cipher_spec
+#define dtls1_read_close_notify bssl_dtls1_read_close_notify
+#define dtls1_read_failed bssl_dtls1_read_failed
+#define dtls1_retransmit_buffered_messages bssl_dtls1_retransmit_buffered_messages
+#define dtls1_send_change_cipher_spec bssl_dtls1_send_change_cipher_spec
+#define dtls1_set_handshake_header bssl_dtls1_set_handshake_header
+#define dtls1_set_message_header bssl_dtls1_set_message_header
+#define dtls1_start_timer bssl_dtls1_start_timer
+#define dtls1_stop_timer bssl_dtls1_stop_timer
+#define dtls1_supports_cipher bssl_dtls1_supports_cipher
+#define dtls1_write_app_data bssl_dtls1_write_app_data
+#define dtls1_write_bytes bssl_dtls1_write_bytes
+#define DTLS_client_method bssl_DTLS_client_method
+#define DTLS_method bssl_DTLS_method
+#define dtls_open_record bssl_dtls_open_record
+#define dtls_seal_record bssl_dtls_seal_record
+#define DTLS_server_method bssl_DTLS_server_method
+#define DTLSv1_2_client_method bssl_DTLSv1_2_client_method
+#define DTLSv1_2_method bssl_DTLSv1_2_method
+#define DTLSv1_2_server_method bssl_DTLSv1_2_server_method
+#define DTLSv1_client_method bssl_DTLSv1_client_method
+#define DTLSv1_get_timeout bssl_DTLSv1_get_timeout
+#define DTLSv1_handle_timeout bssl_DTLSv1_handle_timeout
+#define DTLSv1_method bssl_DTLSv1_method
+#define DTLSv1_server_method bssl_DTLSv1_server_method
+#define ec_asn1_meth bssl_ec_asn1_meth
+#define ECDH_compute_key bssl_ECDH_compute_key
+#define ECDSA_do_sign bssl_ECDSA_do_sign
+#define ECDSA_do_sign_ex bssl_ECDSA_do_sign_ex
+#define ECDSA_do_verify bssl_ECDSA_do_verify
+#define ECDSA_SIG_free bssl_ECDSA_SIG_free
+#define ECDSA_SIG_from_bytes bssl_ECDSA_SIG_from_bytes
+#define ECDSA_SIG_marshal bssl_ECDSA_SIG_marshal
+#define ECDSA_SIG_max_len bssl_ECDSA_SIG_max_len
+#define ECDSA_sign bssl_ECDSA_sign
+#define ECDSA_SIG_new bssl_ECDSA_SIG_new
+#define ECDSA_sign_ex bssl_ECDSA_sign_ex
+#define ECDSA_sign_setup bssl_ECDSA_sign_setup
+#define ECDSA_SIG_parse bssl_ECDSA_SIG_parse
+#define ECDSA_SIG_to_bytes bssl_ECDSA_SIG_to_bytes
+#define ECDSA_size bssl_ECDSA_size
+#define ECDSA_verify bssl_ECDSA_verify
+#define EC_get_builtin_curves bssl_EC_get_builtin_curves
+#define ec_GFp_mont_field_decode bssl_ec_GFp_mont_field_decode
+#define ec_GFp_mont_field_encode bssl_ec_GFp_mont_field_encode
+#define ec_GFp_mont_field_mul bssl_ec_GFp_mont_field_mul
+#define ec_GFp_mont_field_sqr bssl_ec_GFp_mont_field_sqr
+#define ec_GFp_mont_group_copy bssl_ec_GFp_mont_group_copy
+#define ec_GFp_mont_group_finish bssl_ec_GFp_mont_group_finish
+#define ec_GFp_mont_group_init bssl_ec_GFp_mont_group_init
+#define ec_GFp_mont_group_set_curve bssl_ec_GFp_mont_group_set_curve
+#define EC_GFp_mont_method bssl_EC_GFp_mont_method
+#define EC_GFp_nistp224_method bssl_EC_GFp_nistp224_method
+#define EC_GFp_nistp256_method bssl_EC_GFp_nistp256_method
+#define ec_GFp_nistp_recode_scalar_bits bssl_ec_GFp_nistp_recode_scalar_bits
+#define EC_GFp_nistz256_method bssl_EC_GFp_nistz256_method
+#define ec_GFp_simple_add bssl_ec_GFp_simple_add
+#define ec_GFp_simple_cmp bssl_ec_GFp_simple_cmp
+#define ec_GFp_simple_dbl bssl_ec_GFp_simple_dbl
+#define ec_GFp_simple_field_mul bssl_ec_GFp_simple_field_mul
+#define ec_GFp_simple_field_sqr bssl_ec_GFp_simple_field_sqr
+#define ec_GFp_simple_get_Jprojective_coordinates_GFp bssl_ec_GFp_simple_get_Jprojective_coordinates_GFp
+#define ec_GFp_simple_group_copy bssl_ec_GFp_simple_group_copy
+#define ec_GFp_simple_group_finish bssl_ec_GFp_simple_group_finish
+#define ec_GFp_simple_group_get_curve bssl_ec_GFp_simple_group_get_curve
+#define ec_GFp_simple_group_get_degree bssl_ec_GFp_simple_group_get_degree
+#define ec_GFp_simple_group_init bssl_ec_GFp_simple_group_init
+#define ec_GFp_simple_group_set_curve bssl_ec_GFp_simple_group_set_curve
+#define ec_GFp_simple_invert bssl_ec_GFp_simple_invert
+#define ec_GFp_simple_is_at_infinity bssl_ec_GFp_simple_is_at_infinity
+#define ec_GFp_simple_is_on_curve bssl_ec_GFp_simple_is_on_curve
+#define ec_GFp_simple_make_affine bssl_ec_GFp_simple_make_affine
+#define ec_GFp_simple_point_clear_finish bssl_ec_GFp_simple_point_clear_finish
+#define ec_GFp_simple_point_copy bssl_ec_GFp_simple_point_copy
+#define ec_GFp_simple_point_finish bssl_ec_GFp_simple_point_finish
+#define ec_GFp_simple_point_init bssl_ec_GFp_simple_point_init
+#define ec_GFp_simple_point_set_affine_coordinates bssl_ec_GFp_simple_point_set_affine_coordinates
+#define ec_GFp_simple_point_set_to_infinity bssl_ec_GFp_simple_point_set_to_infinity
+#define ec_GFp_simple_points_make_affine bssl_ec_GFp_simple_points_make_affine
+#define ec_GFp_simple_set_compressed_coordinates bssl_ec_GFp_simple_set_compressed_coordinates
+#define ec_GFp_simple_set_Jprojective_coordinates_GFp bssl_ec_GFp_simple_set_Jprojective_coordinates_GFp
+#define EC_GROUP_cmp bssl_EC_GROUP_cmp
+#define ec_group_copy bssl_ec_group_copy
+#define EC_GROUP_dup bssl_EC_GROUP_dup
+#define EC_GROUP_free bssl_EC_GROUP_free
+#define EC_GROUP_get0_generator bssl_EC_GROUP_get0_generator
+#define EC_GROUP_get0_order bssl_EC_GROUP_get0_order
+#define EC_GROUP_get_cofactor bssl_EC_GROUP_get_cofactor
+#define EC_GROUP_get_curve_GFp bssl_EC_GROUP_get_curve_GFp
+#define EC_GROUP_get_curve_name bssl_EC_GROUP_get_curve_name
+#define EC_GROUP_get_degree bssl_EC_GROUP_get_degree
+#define ec_group_get_mont_data bssl_ec_group_get_mont_data
+#define EC_GROUP_get_order bssl_EC_GROUP_get_order
+#define EC_GROUP_method_of bssl_EC_GROUP_method_of
+#define ec_group_new bssl_ec_group_new
+#define EC_GROUP_new_arbitrary bssl_EC_GROUP_new_arbitrary
+#define EC_GROUP_new_by_curve_name bssl_EC_GROUP_new_by_curve_name
+#define EC_GROUP_new_curve_GFp bssl_EC_GROUP_new_curve_GFp
+#define EC_GROUP_set_asn1_flag bssl_EC_GROUP_set_asn1_flag
+#define EC_GROUP_set_generator bssl_EC_GROUP_set_generator
+#define EC_GROUP_set_point_conversion_form bssl_EC_GROUP_set_point_conversion_form
+#define EC_KEY_check_key bssl_EC_KEY_check_key
+#define EC_KEY_copy bssl_EC_KEY_copy
+#define EC_KEY_dup bssl_EC_KEY_dup
+#define EC_KEY_free bssl_EC_KEY_free
+#define EC_KEY_generate_key bssl_EC_KEY_generate_key
+#define EC_KEY_get0_group bssl_EC_KEY_get0_group
+#define EC_KEY_get0_private_key bssl_EC_KEY_get0_private_key
+#define EC_KEY_get0_public_key bssl_EC_KEY_get0_public_key
+#define EC_KEY_get_conv_form bssl_EC_KEY_get_conv_form
+#define EC_KEY_get_enc_flags bssl_EC_KEY_get_enc_flags
+#define EC_KEY_get_ex_data bssl_EC_KEY_get_ex_data
+#define EC_KEY_get_ex_new_index bssl_EC_KEY_get_ex_new_index
+#define EC_KEY_is_opaque bssl_EC_KEY_is_opaque
+#define EC_KEY_marshal_curve_name bssl_EC_KEY_marshal_curve_name
+#define EC_KEY_marshal_private_key bssl_EC_KEY_marshal_private_key
+#define EC_KEY_new bssl_EC_KEY_new
+#define EC_KEY_new_by_curve_name bssl_EC_KEY_new_by_curve_name
+#define EC_KEY_new_method bssl_EC_KEY_new_method
+#define EC_KEY_parse_curve_name bssl_EC_KEY_parse_curve_name
+#define EC_KEY_parse_parameters bssl_EC_KEY_parse_parameters
+#define EC_KEY_parse_private_key bssl_EC_KEY_parse_private_key
+#define EC_KEY_set_asn1_flag bssl_EC_KEY_set_asn1_flag
+#define EC_KEY_set_conv_form bssl_EC_KEY_set_conv_form
+#define EC_KEY_set_enc_flags bssl_EC_KEY_set_enc_flags
+#define EC_KEY_set_ex_data bssl_EC_KEY_set_ex_data
+#define EC_KEY_set_group bssl_EC_KEY_set_group
+#define EC_KEY_set_private_key bssl_EC_KEY_set_private_key
+#define EC_KEY_set_public_key bssl_EC_KEY_set_public_key
+#define EC_KEY_set_public_key_affine_coordinates bssl_EC_KEY_set_public_key_affine_coordinates
+#define EC_KEY_up_ref bssl_EC_KEY_up_ref
+#define EC_METHOD_get_field_type bssl_EC_METHOD_get_field_type
+#define ec_pkey_meth bssl_ec_pkey_meth
+#define ecp_nistz256_avx2_select_w7 bssl_ecp_nistz256_avx2_select_w7
+#define ecp_nistz256_from_mont bssl_ecp_nistz256_from_mont
+#define ecp_nistz256_mul_mont bssl_ecp_nistz256_mul_mont
+#define ecp_nistz256_neg bssl_ecp_nistz256_neg
+#define ecp_nistz256_point_add bssl_ecp_nistz256_point_add
+#define ecp_nistz256_point_add_affine bssl_ecp_nistz256_point_add_affine
+#define ecp_nistz256_point_double bssl_ecp_nistz256_point_double
+#define ecp_nistz256_select_w5 bssl_ecp_nistz256_select_w5
+#define ecp_nistz256_select_w7 bssl_ecp_nistz256_select_w7
+#define ecp_nistz256_sqr_mont bssl_ecp_nistz256_sqr_mont
+#define EC_POINT_add bssl_EC_POINT_add
+#define EC_POINT_clear_free bssl_EC_POINT_clear_free
+#define EC_POINT_cmp bssl_EC_POINT_cmp
+#define EC_POINT_copy bssl_EC_POINT_copy
+#define EC_POINT_dbl bssl_EC_POINT_dbl
+#define EC_POINT_dup bssl_EC_POINT_dup
+#define EC_POINT_free bssl_EC_POINT_free
+#define EC_POINT_get_affine_coordinates_GFp bssl_EC_POINT_get_affine_coordinates_GFp
+#define EC_POINT_invert bssl_EC_POINT_invert
+#define EC_POINT_is_at_infinity bssl_EC_POINT_is_at_infinity
+#define EC_POINT_is_on_curve bssl_EC_POINT_is_on_curve
+#define EC_POINT_make_affine bssl_EC_POINT_make_affine
+#define EC_POINT_mul bssl_EC_POINT_mul
+#define EC_POINT_new bssl_EC_POINT_new
+#define EC_POINT_oct2point bssl_EC_POINT_oct2point
+#define EC_POINT_point2cbb bssl_EC_POINT_point2cbb
+#define EC_POINT_point2oct bssl_EC_POINT_point2oct
+#define EC_POINT_set_affine_coordinates_GFp bssl_EC_POINT_set_affine_coordinates_GFp
+#define EC_POINT_set_compressed_coordinates_GFp bssl_EC_POINT_set_compressed_coordinates_GFp
+#define ec_point_set_Jprojective_coordinates_GFp bssl_ec_point_set_Jprojective_coordinates_GFp
+#define EC_POINT_set_to_infinity bssl_EC_POINT_set_to_infinity
+#define EC_POINTs_make_affine bssl_EC_POINTs_make_affine
+#define ec_wNAF_mul bssl_ec_wNAF_mul
+#define ED25519_keypair bssl_ED25519_keypair
+#define ED25519_sign bssl_ED25519_sign
+#define ED25519_verify bssl_ED25519_verify
+#define EDIPARTYNAME_free bssl_EDIPARTYNAME_free
+#define EDIPARTYNAME_it bssl_EDIPARTYNAME_it
+#define EDIPARTYNAME_new bssl_EDIPARTYNAME_new
+#define ENGINE_free bssl_ENGINE_free
+#define ENGINE_get_ECDSA_method bssl_ENGINE_get_ECDSA_method
+#define ENGINE_get_RSA_method bssl_ENGINE_get_RSA_method
+#define ENGINE_load_builtin_engines bssl_ENGINE_load_builtin_engines
+#define ENGINE_new bssl_ENGINE_new
+#define ENGINE_set_ECDSA_method bssl_ENGINE_set_ECDSA_method
+#define ENGINE_set_RSA_method bssl_ENGINE_set_RSA_method
+#define ERR_add_error_data bssl_ERR_add_error_data
+#define ERR_add_error_dataf bssl_ERR_add_error_dataf
+#define ERR_clear_error bssl_ERR_clear_error
+#define ERR_clear_system_error bssl_ERR_clear_system_error
+#define ERR_error_string bssl_ERR_error_string
+#define ERR_error_string_n bssl_ERR_error_string_n
+#define ERR_free_strings bssl_ERR_free_strings
+#define ERR_func_error_string bssl_ERR_func_error_string
+#define ERR_get_error bssl_ERR_get_error
+#define ERR_get_error_line bssl_ERR_get_error_line
+#define ERR_get_error_line_data bssl_ERR_get_error_line_data
+#define ERR_get_next_error_library bssl_ERR_get_next_error_library
+#define ERR_lib_error_string bssl_ERR_lib_error_string
+#define ERR_load_BIO_strings bssl_ERR_load_BIO_strings
+#define ERR_load_crypto_strings bssl_ERR_load_crypto_strings
+#define ERR_load_ERR_strings bssl_ERR_load_ERR_strings
+#define ERR_load_SSL_strings bssl_ERR_load_SSL_strings
+#define ERR_peek_error bssl_ERR_peek_error
+#define ERR_peek_error_line bssl_ERR_peek_error_line
+#define ERR_peek_error_line_data bssl_ERR_peek_error_line_data
+#define ERR_peek_last_error bssl_ERR_peek_last_error
+#define ERR_peek_last_error_line bssl_ERR_peek_last_error_line
+#define ERR_peek_last_error_line_data bssl_ERR_peek_last_error_line_data
+#define ERR_pop_to_mark bssl_ERR_pop_to_mark
+#define ERR_print_errors bssl_ERR_print_errors
+#define ERR_print_errors_cb bssl_ERR_print_errors_cb
+#define ERR_print_errors_fp bssl_ERR_print_errors_fp
+#define ERR_put_error bssl_ERR_put_error
+#define ERR_reason_error_string bssl_ERR_reason_error_string
+#define ERR_remove_state bssl_ERR_remove_state
+#define ERR_remove_thread_state bssl_ERR_remove_thread_state
+#define ERR_set_mark bssl_ERR_set_mark
+#define EVP_add_cipher_alias bssl_EVP_add_cipher_alias
+#define EVP_add_digest bssl_EVP_add_digest
+#define EVP_aead_aes_128_cbc_sha1_ssl3 bssl_EVP_aead_aes_128_cbc_sha1_ssl3
+#define EVP_aead_aes_128_cbc_sha1_tls bssl_EVP_aead_aes_128_cbc_sha1_tls
+#define EVP_aead_aes_128_cbc_sha1_tls_implicit_iv bssl_EVP_aead_aes_128_cbc_sha1_tls_implicit_iv
+#define EVP_aead_aes_128_cbc_sha256_tls bssl_EVP_aead_aes_128_cbc_sha256_tls
+#define EVP_aead_aes_128_ctr_hmac_sha256 bssl_EVP_aead_aes_128_ctr_hmac_sha256
+#define EVP_aead_aes_128_gcm bssl_EVP_aead_aes_128_gcm
+#define EVP_aead_aes_128_key_wrap bssl_EVP_aead_aes_128_key_wrap
+#define EVP_aead_aes_256_cbc_sha1_ssl3 bssl_EVP_aead_aes_256_cbc_sha1_ssl3
+#define EVP_aead_aes_256_cbc_sha1_tls bssl_EVP_aead_aes_256_cbc_sha1_tls
+#define EVP_aead_aes_256_cbc_sha1_tls_implicit_iv bssl_EVP_aead_aes_256_cbc_sha1_tls_implicit_iv
+#define EVP_aead_aes_256_cbc_sha256_tls bssl_EVP_aead_aes_256_cbc_sha256_tls
+#define EVP_aead_aes_256_cbc_sha384_tls bssl_EVP_aead_aes_256_cbc_sha384_tls
+#define EVP_aead_aes_256_ctr_hmac_sha256 bssl_EVP_aead_aes_256_ctr_hmac_sha256
+#define EVP_aead_aes_256_gcm bssl_EVP_aead_aes_256_gcm
+#define EVP_aead_aes_256_key_wrap bssl_EVP_aead_aes_256_key_wrap
+#define EVP_aead_chacha20_poly1305 bssl_EVP_aead_chacha20_poly1305
+#define EVP_aead_chacha20_poly1305_old bssl_EVP_aead_chacha20_poly1305_old
+#define EVP_AEAD_CTX_cleanup bssl_EVP_AEAD_CTX_cleanup
+#define EVP_AEAD_CTX_get_iv bssl_EVP_AEAD_CTX_get_iv
+#define EVP_AEAD_CTX_get_rc4_state bssl_EVP_AEAD_CTX_get_rc4_state
+#define EVP_AEAD_CTX_init bssl_EVP_AEAD_CTX_init
+#define EVP_AEAD_CTX_init_with_direction bssl_EVP_AEAD_CTX_init_with_direction
+#define EVP_AEAD_CTX_open bssl_EVP_AEAD_CTX_open
+#define EVP_AEAD_CTX_seal bssl_EVP_AEAD_CTX_seal
+#define EVP_AEAD_CTX_zero bssl_EVP_AEAD_CTX_zero
+#define EVP_aead_des_ede3_cbc_sha1_ssl3 bssl_EVP_aead_des_ede3_cbc_sha1_ssl3
+#define EVP_aead_des_ede3_cbc_sha1_tls bssl_EVP_aead_des_ede3_cbc_sha1_tls
+#define EVP_aead_des_ede3_cbc_sha1_tls_implicit_iv bssl_EVP_aead_des_ede3_cbc_sha1_tls_implicit_iv
+#define EVP_AEAD_key_length bssl_EVP_AEAD_key_length
+#define EVP_AEAD_max_overhead bssl_EVP_AEAD_max_overhead
+#define EVP_AEAD_max_tag_len bssl_EVP_AEAD_max_tag_len
+#define EVP_AEAD_nonce_length bssl_EVP_AEAD_nonce_length
+#define EVP_aead_null_sha1_ssl3 bssl_EVP_aead_null_sha1_ssl3
+#define EVP_aead_null_sha1_tls bssl_EVP_aead_null_sha1_tls
+#define EVP_aead_rc4_md5_ssl3 bssl_EVP_aead_rc4_md5_ssl3
+#define EVP_aead_rc4_md5_tls bssl_EVP_aead_rc4_md5_tls
+#define EVP_aead_rc4_sha1_ssl3 bssl_EVP_aead_rc4_sha1_ssl3
+#define EVP_aead_rc4_sha1_tls bssl_EVP_aead_rc4_sha1_tls
+#define EVP_aes_128_cbc bssl_EVP_aes_128_cbc
+#define EVP_aes_128_ctr bssl_EVP_aes_128_ctr
+#define EVP_aes_128_ecb bssl_EVP_aes_128_ecb
+#define EVP_aes_128_gcm bssl_EVP_aes_128_gcm
+#define EVP_aes_128_ofb bssl_EVP_aes_128_ofb
+#define EVP_aes_192_cbc bssl_EVP_aes_192_cbc
+#define EVP_aes_192_ctr bssl_EVP_aes_192_ctr
+#define EVP_aes_192_ecb bssl_EVP_aes_192_ecb
+#define EVP_aes_192_gcm bssl_EVP_aes_192_gcm
+#define EVP_aes_256_cbc bssl_EVP_aes_256_cbc
+#define EVP_aes_256_ctr bssl_EVP_aes_256_ctr
+#define EVP_aes_256_ecb bssl_EVP_aes_256_ecb
+#define EVP_aes_256_gcm bssl_EVP_aes_256_gcm
+#define EVP_aes_256_ofb bssl_EVP_aes_256_ofb
+#define EVP_BytesToKey bssl_EVP_BytesToKey
+#define EVP_Cipher bssl_EVP_Cipher
+#define EVP_CIPHER_block_size bssl_EVP_CIPHER_block_size
+#define EVP_CIPHER_CTX_block_size bssl_EVP_CIPHER_CTX_block_size
+#define EVP_CIPHER_CTX_cipher bssl_EVP_CIPHER_CTX_cipher
+#define EVP_CIPHER_CTX_cleanup bssl_EVP_CIPHER_CTX_cleanup
+#define EVP_CIPHER_CTX_copy bssl_EVP_CIPHER_CTX_copy
+#define EVP_CIPHER_CTX_ctrl bssl_EVP_CIPHER_CTX_ctrl
+#define EVP_CIPHER_CTX_flags bssl_EVP_CIPHER_CTX_flags
+#define EVP_CIPHER_CTX_free bssl_EVP_CIPHER_CTX_free
+#define EVP_CIPHER_CTX_get_app_data bssl_EVP_CIPHER_CTX_get_app_data
+#define EVP_CIPHER_CTX_init bssl_EVP_CIPHER_CTX_init
+#define EVP_CIPHER_CTX_iv_length bssl_EVP_CIPHER_CTX_iv_length
+#define EVP_CIPHER_CTX_key_length bssl_EVP_CIPHER_CTX_key_length
+#define EVP_CIPHER_CTX_mode bssl_EVP_CIPHER_CTX_mode
+#define EVP_CIPHER_CTX_new bssl_EVP_CIPHER_CTX_new
+#define EVP_CIPHER_CTX_nid bssl_EVP_CIPHER_CTX_nid
+#define EVP_CIPHER_CTX_set_app_data bssl_EVP_CIPHER_CTX_set_app_data
+#define EVP_CIPHER_CTX_set_key_length bssl_EVP_CIPHER_CTX_set_key_length
+#define EVP_CIPHER_CTX_set_padding bssl_EVP_CIPHER_CTX_set_padding
+#define EVP_CipherFinal_ex bssl_EVP_CipherFinal_ex
+#define EVP_CIPHER_flags bssl_EVP_CIPHER_flags
+#define EVP_CipherInit bssl_EVP_CipherInit
+#define EVP_CipherInit_ex bssl_EVP_CipherInit_ex
+#define EVP_CIPHER_iv_length bssl_EVP_CIPHER_iv_length
+#define EVP_CIPHER_key_length bssl_EVP_CIPHER_key_length
+#define EVP_CIPHER_mode bssl_EVP_CIPHER_mode
+#define EVP_CIPHER_nid bssl_EVP_CIPHER_nid
+#define EVP_CipherUpdate bssl_EVP_CipherUpdate
+#define EVP_cleanup bssl_EVP_cleanup
+#define EVP_DecodeBase64 bssl_EVP_DecodeBase64
+#define EVP_DecodeBlock bssl_EVP_DecodeBlock
+#define EVP_DecodedLength bssl_EVP_DecodedLength
+#define EVP_DecodeFinal bssl_EVP_DecodeFinal
+#define EVP_DecodeInit bssl_EVP_DecodeInit
+#define EVP_DecodeUpdate bssl_EVP_DecodeUpdate
+#define EVP_DecryptFinal_ex bssl_EVP_DecryptFinal_ex
+#define EVP_DecryptInit bssl_EVP_DecryptInit
+#define EVP_DecryptInit_ex bssl_EVP_DecryptInit_ex
+#define EVP_DecryptUpdate bssl_EVP_DecryptUpdate
+#define EVP_des_cbc bssl_EVP_des_cbc
+#define EVP_des_ecb bssl_EVP_des_ecb
+#define EVP_des_ede bssl_EVP_des_ede
+#define EVP_des_ede3_cbc bssl_EVP_des_ede3_cbc
+#define EVP_des_ede_cbc bssl_EVP_des_ede_cbc
+#define EVP_Digest bssl_EVP_Digest
+#define EVP_DigestFinal bssl_EVP_DigestFinal
+#define EVP_DigestFinal_ex bssl_EVP_DigestFinal_ex
+#define EVP_DigestInit bssl_EVP_DigestInit
+#define EVP_DigestInit_ex bssl_EVP_DigestInit_ex
+#define EVP_DigestSignFinal bssl_EVP_DigestSignFinal
+#define EVP_DigestSignInit bssl_EVP_DigestSignInit
+#define EVP_DigestSignUpdate bssl_EVP_DigestSignUpdate
+#define EVP_DigestUpdate bssl_EVP_DigestUpdate
+#define EVP_DigestVerifyFinal bssl_EVP_DigestVerifyFinal
+#define EVP_DigestVerifyInit bssl_EVP_DigestVerifyInit
+#define EVP_DigestVerifyUpdate bssl_EVP_DigestVerifyUpdate
+#define EVP_enc_null bssl_EVP_enc_null
+#define EVP_EncodeBlock bssl_EVP_EncodeBlock
+#define EVP_EncodedLength bssl_EVP_EncodedLength
+#define EVP_EncodeFinal bssl_EVP_EncodeFinal
+#define EVP_EncodeInit bssl_EVP_EncodeInit
+#define EVP_EncodeUpdate bssl_EVP_EncodeUpdate
+#define EVP_EncryptFinal_ex bssl_EVP_EncryptFinal_ex
+#define EVP_EncryptInit bssl_EVP_EncryptInit
+#define EVP_EncryptInit_ex bssl_EVP_EncryptInit_ex
+#define EVP_EncryptUpdate bssl_EVP_EncryptUpdate
+#define EVP_get_cipherbyname bssl_EVP_get_cipherbyname
+#define EVP_get_cipherbynid bssl_EVP_get_cipherbynid
+#define EVP_get_digestbyname bssl_EVP_get_digestbyname
+#define EVP_get_digestbynid bssl_EVP_get_digestbynid
+#define EVP_get_digestbyobj bssl_EVP_get_digestbyobj
+#define EVP_has_aes_hardware bssl_EVP_has_aes_hardware
+#define EVP_marshal_private_key bssl_EVP_marshal_private_key
+#define EVP_marshal_public_key bssl_EVP_marshal_public_key
+#define EVP_md4 bssl_EVP_md4
+#define EVP_md5 bssl_EVP_md5
+#define EVP_md5_sha1 bssl_EVP_md5_sha1
+#define EVP_MD_block_size bssl_EVP_MD_block_size
+#define EVP_MD_CTX_block_size bssl_EVP_MD_CTX_block_size
+#define EVP_MD_CTX_cleanup bssl_EVP_MD_CTX_cleanup
+#define EVP_MD_CTX_copy bssl_EVP_MD_CTX_copy
+#define EVP_MD_CTX_copy_ex bssl_EVP_MD_CTX_copy_ex
+#define EVP_MD_CTX_create bssl_EVP_MD_CTX_create
+#define EVP_MD_CTX_destroy bssl_EVP_MD_CTX_destroy
+#define EVP_MD_CTX_init bssl_EVP_MD_CTX_init
+#define EVP_MD_CTX_md bssl_EVP_MD_CTX_md
+#define EVP_MD_CTX_size bssl_EVP_MD_CTX_size
+#define EVP_MD_CTX_type bssl_EVP_MD_CTX_type
+#define EVP_MD_flags bssl_EVP_MD_flags
+#define EVP_MD_size bssl_EVP_MD_size
+#define EVP_MD_type bssl_EVP_MD_type
+#define EVP_parse_private_key bssl_EVP_parse_private_key
+#define EVP_parse_public_key bssl_EVP_parse_public_key
+#define EVP_PKCS82PKEY bssl_EVP_PKCS82PKEY
+#define EVP_PKEY2PKCS8 bssl_EVP_PKEY2PKCS8
+#define EVP_PKEY_assign bssl_EVP_PKEY_assign
+#define EVP_PKEY_assign_DSA bssl_EVP_PKEY_assign_DSA
+#define EVP_PKEY_assign_EC_KEY bssl_EVP_PKEY_assign_EC_KEY
+#define EVP_PKEY_assign_RSA bssl_EVP_PKEY_assign_RSA
+#define EVP_PKEY_bits bssl_EVP_PKEY_bits
+#define EVP_PKEY_cmp bssl_EVP_PKEY_cmp
+#define EVP_PKEY_cmp_parameters bssl_EVP_PKEY_cmp_parameters
+#define EVP_PKEY_copy_parameters bssl_EVP_PKEY_copy_parameters
+#define EVP_PKEY_CTX_ctrl bssl_EVP_PKEY_CTX_ctrl
+#define EVP_PKEY_CTX_dup bssl_EVP_PKEY_CTX_dup
+#define EVP_PKEY_CTX_free bssl_EVP_PKEY_CTX_free
+#define EVP_PKEY_CTX_get0_pkey bssl_EVP_PKEY_CTX_get0_pkey
+#define EVP_PKEY_CTX_get0_rsa_oaep_label bssl_EVP_PKEY_CTX_get0_rsa_oaep_label
+#define EVP_PKEY_CTX_get_rsa_mgf1_md bssl_EVP_PKEY_CTX_get_rsa_mgf1_md
+#define EVP_PKEY_CTX_get_rsa_oaep_md bssl_EVP_PKEY_CTX_get_rsa_oaep_md
+#define EVP_PKEY_CTX_get_rsa_padding bssl_EVP_PKEY_CTX_get_rsa_padding
+#define EVP_PKEY_CTX_get_rsa_pss_saltlen bssl_EVP_PKEY_CTX_get_rsa_pss_saltlen
+#define EVP_PKEY_CTX_get_signature_md bssl_EVP_PKEY_CTX_get_signature_md
+#define EVP_PKEY_CTX_new bssl_EVP_PKEY_CTX_new
+#define EVP_PKEY_CTX_new_id bssl_EVP_PKEY_CTX_new_id
+#define EVP_PKEY_CTX_set0_rsa_oaep_label bssl_EVP_PKEY_CTX_set0_rsa_oaep_label
+#define EVP_PKEY_CTX_set_rsa_keygen_bits bssl_EVP_PKEY_CTX_set_rsa_keygen_bits
+#define EVP_PKEY_CTX_set_rsa_keygen_pubexp bssl_EVP_PKEY_CTX_set_rsa_keygen_pubexp
+#define EVP_PKEY_CTX_set_rsa_mgf1_md bssl_EVP_PKEY_CTX_set_rsa_mgf1_md
+#define EVP_PKEY_CTX_set_rsa_oaep_md bssl_EVP_PKEY_CTX_set_rsa_oaep_md
+#define EVP_PKEY_CTX_set_rsa_padding bssl_EVP_PKEY_CTX_set_rsa_padding
+#define EVP_PKEY_CTX_set_rsa_pss_saltlen bssl_EVP_PKEY_CTX_set_rsa_pss_saltlen
+#define EVP_PKEY_CTX_set_signature_md bssl_EVP_PKEY_CTX_set_signature_md
+#define EVP_PKEY_decrypt bssl_EVP_PKEY_decrypt
+#define EVP_PKEY_decrypt_init bssl_EVP_PKEY_decrypt_init
+#define EVP_PKEY_derive bssl_EVP_PKEY_derive
+#define EVP_PKEY_derive_init bssl_EVP_PKEY_derive_init
+#define EVP_PKEY_derive_set_peer bssl_EVP_PKEY_derive_set_peer
+#define EVP_PKEY_encrypt bssl_EVP_PKEY_encrypt
+#define EVP_PKEY_encrypt_init bssl_EVP_PKEY_encrypt_init
+#define EVP_PKEY_free bssl_EVP_PKEY_free
+#define EVP_PKEY_get0_DSA bssl_EVP_PKEY_get0_DSA
+#define EVP_PKEY_get0_EC_KEY bssl_EVP_PKEY_get0_EC_KEY
+#define EVP_PKEY_get0_RSA bssl_EVP_PKEY_get0_RSA
+#define EVP_PKEY_get1_DSA bssl_EVP_PKEY_get1_DSA
+#define EVP_PKEY_get1_EC_KEY bssl_EVP_PKEY_get1_EC_KEY
+#define EVP_PKEY_get1_RSA bssl_EVP_PKEY_get1_RSA
+#define EVP_PKEY_id bssl_EVP_PKEY_id
+#define EVP_PKEY_is_opaque bssl_EVP_PKEY_is_opaque
+#define EVP_PKEY_keygen bssl_EVP_PKEY_keygen
+#define EVP_PKEY_keygen_init bssl_EVP_PKEY_keygen_init
+#define EVP_PKEY_missing_parameters bssl_EVP_PKEY_missing_parameters
+#define EVP_PKEY_new bssl_EVP_PKEY_new
+#define EVP_PKEY_print_params bssl_EVP_PKEY_print_params
+#define EVP_PKEY_print_private bssl_EVP_PKEY_print_private
+#define EVP_PKEY_print_public bssl_EVP_PKEY_print_public
+#define EVP_PKEY_set1_DSA bssl_EVP_PKEY_set1_DSA
+#define EVP_PKEY_set1_EC_KEY bssl_EVP_PKEY_set1_EC_KEY
+#define EVP_PKEY_set1_RSA bssl_EVP_PKEY_set1_RSA
+#define EVP_PKEY_set_type bssl_EVP_PKEY_set_type
+#define EVP_PKEY_sign bssl_EVP_PKEY_sign
+#define EVP_PKEY_sign_init bssl_EVP_PKEY_sign_init
+#define EVP_PKEY_size bssl_EVP_PKEY_size
+#define EVP_PKEY_supports_digest bssl_EVP_PKEY_supports_digest
+#define EVP_PKEY_type bssl_EVP_PKEY_type
+#define EVP_PKEY_up_ref bssl_EVP_PKEY_up_ref
+#define EVP_PKEY_verify bssl_EVP_PKEY_verify
+#define EVP_PKEY_verify_init bssl_EVP_PKEY_verify_init
+#define EVP_PKEY_verify_recover bssl_EVP_PKEY_verify_recover
+#define EVP_PKEY_verify_recover_init bssl_EVP_PKEY_verify_recover_init
+#define EVP_rc2_40_cbc bssl_EVP_rc2_40_cbc
+#define EVP_rc2_cbc bssl_EVP_rc2_cbc
+#define EVP_rc4 bssl_EVP_rc4
+#define EVP_sha1 bssl_EVP_sha1
+#define EVP_sha224 bssl_EVP_sha224
+#define EVP_sha256 bssl_EVP_sha256
+#define EVP_sha384 bssl_EVP_sha384
+#define EVP_sha512 bssl_EVP_sha512
+#define EVP_SignFinal bssl_EVP_SignFinal
+#define EVP_SignInit bssl_EVP_SignInit
+#define EVP_SignInit_ex bssl_EVP_SignInit_ex
+#define EVP_SignUpdate bssl_EVP_SignUpdate
+#define EVP_tls_cbc_copy_mac bssl_EVP_tls_cbc_copy_mac
+#define EVP_tls_cbc_digest_record bssl_EVP_tls_cbc_digest_record
+#define EVP_tls_cbc_record_digest_supported bssl_EVP_tls_cbc_record_digest_supported
+#define EVP_tls_cbc_remove_padding bssl_EVP_tls_cbc_remove_padding
+#define EVP_VerifyFinal bssl_EVP_VerifyFinal
+#define EVP_VerifyInit bssl_EVP_VerifyInit
+#define EVP_VerifyInit_ex bssl_EVP_VerifyInit_ex
+#define EVP_VerifyUpdate bssl_EVP_VerifyUpdate
+#define EXTENDED_KEY_USAGE_free bssl_EXTENDED_KEY_USAGE_free
+#define EXTENDED_KEY_USAGE_it bssl_EXTENDED_KEY_USAGE_it
+#define EXTENDED_KEY_USAGE_new bssl_EXTENDED_KEY_USAGE_new
+#define FIPS_mode bssl_FIPS_mode
+#define gcm_ghash_4bit bssl_gcm_ghash_4bit
+#define gcm_ghash_avx bssl_gcm_ghash_avx
+#define gcm_ghash_clmul bssl_gcm_ghash_clmul
+#define gcm_gmult_4bit bssl_gcm_gmult_4bit
+#define gcm_gmult_avx bssl_gcm_gmult_avx
+#define gcm_gmult_clmul bssl_gcm_gmult_clmul
+#define gcm_init_avx bssl_gcm_init_avx
+#define gcm_init_clmul bssl_gcm_init_clmul
+#define GENERAL_NAME_cmp bssl_GENERAL_NAME_cmp
+#define GENERAL_NAME_dup bssl_GENERAL_NAME_dup
+#define GENERAL_NAME_free bssl_GENERAL_NAME_free
+#define GENERAL_NAME_get0_otherName bssl_GENERAL_NAME_get0_otherName
+#define GENERAL_NAME_get0_value bssl_GENERAL_NAME_get0_value
+#define GENERAL_NAME_it bssl_GENERAL_NAME_it
+#define GENERAL_NAME_new bssl_GENERAL_NAME_new
+#define GENERAL_NAME_print bssl_GENERAL_NAME_print
+#define GENERAL_NAME_set0_othername bssl_GENERAL_NAME_set0_othername
+#define GENERAL_NAME_set0_value bssl_GENERAL_NAME_set0_value
+#define GENERAL_NAMES_free bssl_GENERAL_NAMES_free
+#define GENERAL_NAMES_it bssl_GENERAL_NAMES_it
+#define GENERAL_NAMES_new bssl_GENERAL_NAMES_new
+#define GENERAL_SUBTREE_free bssl_GENERAL_SUBTREE_free
+#define GENERAL_SUBTREE_it bssl_GENERAL_SUBTREE_it
+#define GENERAL_SUBTREE_new bssl_GENERAL_SUBTREE_new
+#define hex_to_string bssl_hex_to_string
+#define HKDF bssl_HKDF
+#define HMAC bssl_HMAC
+#define HMAC_CTX_cleanup bssl_HMAC_CTX_cleanup
+#define HMAC_CTX_copy bssl_HMAC_CTX_copy
+#define HMAC_CTX_copy_ex bssl_HMAC_CTX_copy_ex
+#define HMAC_CTX_init bssl_HMAC_CTX_init
+#define HMAC_Final bssl_HMAC_Final
+#define HMAC_Init bssl_HMAC_Init
+#define HMAC_Init_ex bssl_HMAC_Init_ex
+#define HMAC_size bssl_HMAC_size
+#define HMAC_Update bssl_HMAC_Update
+#define i2a_ACCESS_DESCRIPTION bssl_i2a_ACCESS_DESCRIPTION
+#define i2a_ASN1_ENUMERATED bssl_i2a_ASN1_ENUMERATED
+#define i2a_ASN1_INTEGER bssl_i2a_ASN1_INTEGER
+#define i2a_ASN1_OBJECT bssl_i2a_ASN1_OBJECT
+#define i2a_ASN1_STRING bssl_i2a_ASN1_STRING
+#define i2c_ASN1_BIT_STRING bssl_i2c_ASN1_BIT_STRING
+#define i2c_ASN1_INTEGER bssl_i2c_ASN1_INTEGER
+#define i2d_ACCESS_DESCRIPTION bssl_i2d_ACCESS_DESCRIPTION
+#define i2d_ASN1_BIT_STRING bssl_i2d_ASN1_BIT_STRING
+#define i2d_ASN1_BMPSTRING bssl_i2d_ASN1_BMPSTRING
+#define i2d_ASN1_BOOLEAN bssl_i2d_ASN1_BOOLEAN
+#define i2d_ASN1_bytes bssl_i2d_ASN1_bytes
+#define i2d_ASN1_ENUMERATED bssl_i2d_ASN1_ENUMERATED
+#define i2d_ASN1_GENERALIZEDTIME bssl_i2d_ASN1_GENERALIZEDTIME
+#define i2d_ASN1_GENERALSTRING bssl_i2d_ASN1_GENERALSTRING
+#define i2d_ASN1_IA5STRING bssl_i2d_ASN1_IA5STRING
+#define i2d_ASN1_INTEGER bssl_i2d_ASN1_INTEGER
+#define i2d_ASN1_NULL bssl_i2d_ASN1_NULL
+#define i2d_ASN1_OBJECT bssl_i2d_ASN1_OBJECT
+#define i2d_ASN1_OCTET_STRING bssl_i2d_ASN1_OCTET_STRING
+#define i2d_ASN1_PRINTABLE bssl_i2d_ASN1_PRINTABLE
+#define i2d_ASN1_PRINTABLESTRING bssl_i2d_ASN1_PRINTABLESTRING
+#define i2d_ASN1_SEQUENCE_ANY bssl_i2d_ASN1_SEQUENCE_ANY
+#define i2d_ASN1_SET_ANY bssl_i2d_ASN1_SET_ANY
+#define i2d_ASN1_T61STRING bssl_i2d_ASN1_T61STRING
+#define i2d_ASN1_TIME bssl_i2d_ASN1_TIME
+#define i2d_ASN1_TYPE bssl_i2d_ASN1_TYPE
+#define i2d_ASN1_UNIVERSALSTRING bssl_i2d_ASN1_UNIVERSALSTRING
+#define i2d_ASN1_UTCTIME bssl_i2d_ASN1_UTCTIME
+#define i2d_ASN1_UTF8STRING bssl_i2d_ASN1_UTF8STRING
+#define i2d_ASN1_VISIBLESTRING bssl_i2d_ASN1_VISIBLESTRING
+#define i2d_AUTHORITY_INFO_ACCESS bssl_i2d_AUTHORITY_INFO_ACCESS
+#define i2d_AUTHORITY_KEYID bssl_i2d_AUTHORITY_KEYID
+#define i2d_BASIC_CONSTRAINTS bssl_i2d_BASIC_CONSTRAINTS
+#define i2d_CERTIFICATEPOLICIES bssl_i2d_CERTIFICATEPOLICIES
+#define i2d_CRL_DIST_POINTS bssl_i2d_CRL_DIST_POINTS
+#define i2d_DHparams bssl_i2d_DHparams
+#define i2d_DIRECTORYSTRING bssl_i2d_DIRECTORYSTRING
+#define i2d_DISPLAYTEXT bssl_i2d_DISPLAYTEXT
+#define i2d_DIST_POINT bssl_i2d_DIST_POINT
+#define i2d_DIST_POINT_NAME bssl_i2d_DIST_POINT_NAME
+#define i2d_DSAparams bssl_i2d_DSAparams
+#define i2d_DSAPrivateKey bssl_i2d_DSAPrivateKey
+#define i2d_DSAPrivateKey_bio bssl_i2d_DSAPrivateKey_bio
+#define i2d_DSAPrivateKey_fp bssl_i2d_DSAPrivateKey_fp
+#define i2d_DSA_PUBKEY bssl_i2d_DSA_PUBKEY
+#define i2d_DSA_PUBKEY_bio bssl_i2d_DSA_PUBKEY_bio
+#define i2d_DSA_PUBKEY_fp bssl_i2d_DSA_PUBKEY_fp
+#define i2d_DSAPublicKey bssl_i2d_DSAPublicKey
+#define i2d_DSA_SIG bssl_i2d_DSA_SIG
+#define i2d_ECDSA_SIG bssl_i2d_ECDSA_SIG
+#define i2d_ECParameters bssl_i2d_ECParameters
+#define i2d_ECPrivateKey bssl_i2d_ECPrivateKey
+#define i2d_ECPrivateKey_bio bssl_i2d_ECPrivateKey_bio
+#define i2d_ECPrivateKey_fp bssl_i2d_ECPrivateKey_fp
+#define i2d_EC_PUBKEY bssl_i2d_EC_PUBKEY
+#define i2d_EC_PUBKEY_bio bssl_i2d_EC_PUBKEY_bio
+#define i2d_EC_PUBKEY_fp bssl_i2d_EC_PUBKEY_fp
+#define i2d_EDIPARTYNAME bssl_i2d_EDIPARTYNAME
+#define i2d_EXTENDED_KEY_USAGE bssl_i2d_EXTENDED_KEY_USAGE
+#define i2d_GENERAL_NAME bssl_i2d_GENERAL_NAME
+#define i2d_GENERAL_NAMES bssl_i2d_GENERAL_NAMES
+#define i2d_ISSUING_DIST_POINT bssl_i2d_ISSUING_DIST_POINT
+#define i2d_NETSCAPE_SPKAC bssl_i2d_NETSCAPE_SPKAC
+#define i2d_NETSCAPE_SPKI bssl_i2d_NETSCAPE_SPKI
+#define i2d_NOTICEREF bssl_i2d_NOTICEREF
+#define i2d_OTHERNAME bssl_i2d_OTHERNAME
+#define i2d_PBE2PARAM bssl_i2d_PBE2PARAM
+#define i2d_PBEPARAM bssl_i2d_PBEPARAM
+#define i2d_PBKDF2PARAM bssl_i2d_PBKDF2PARAM
+#define i2d_PKCS8_bio bssl_i2d_PKCS8_bio
+#define i2d_PKCS8_fp bssl_i2d_PKCS8_fp
+#define i2d_PKCS8PrivateKey_bio bssl_i2d_PKCS8PrivateKey_bio
+#define i2d_PKCS8PrivateKey_fp bssl_i2d_PKCS8PrivateKey_fp
+#define i2d_PKCS8PrivateKeyInfo_bio bssl_i2d_PKCS8PrivateKeyInfo_bio
+#define i2d_PKCS8PrivateKeyInfo_fp bssl_i2d_PKCS8PrivateKeyInfo_fp
+#define i2d_PKCS8PrivateKey_nid_bio bssl_i2d_PKCS8PrivateKey_nid_bio
+#define i2d_PKCS8PrivateKey_nid_fp bssl_i2d_PKCS8PrivateKey_nid_fp
+#define i2d_PKCS8_PRIV_KEY_INFO bssl_i2d_PKCS8_PRIV_KEY_INFO
+#define i2d_PKCS8_PRIV_KEY_INFO_bio bssl_i2d_PKCS8_PRIV_KEY_INFO_bio
+#define i2d_PKCS8_PRIV_KEY_INFO_fp bssl_i2d_PKCS8_PRIV_KEY_INFO_fp
+#define i2d_PKEY_USAGE_PERIOD bssl_i2d_PKEY_USAGE_PERIOD
+#define i2d_POLICYINFO bssl_i2d_POLICYINFO
+#define i2d_POLICYQUALINFO bssl_i2d_POLICYQUALINFO
+#define i2d_PrivateKey bssl_i2d_PrivateKey
+#define i2d_PrivateKey_bio bssl_i2d_PrivateKey_bio
+#define i2d_PrivateKey_fp bssl_i2d_PrivateKey_fp
+#define i2d_PROXY_CERT_INFO_EXTENSION bssl_i2d_PROXY_CERT_INFO_EXTENSION
+#define i2d_PROXY_POLICY bssl_i2d_PROXY_POLICY
+#define i2d_PUBKEY bssl_i2d_PUBKEY
+#define i2d_PUBKEY_bio bssl_i2d_PUBKEY_bio
+#define i2d_PUBKEY_fp bssl_i2d_PUBKEY_fp
+#define i2d_PublicKey bssl_i2d_PublicKey
+#define i2d_RSAPrivateKey bssl_i2d_RSAPrivateKey
+#define i2d_RSAPrivateKey_bio bssl_i2d_RSAPrivateKey_bio
+#define i2d_RSAPrivateKey_fp bssl_i2d_RSAPrivateKey_fp
+#define i2d_RSA_PSS_PARAMS bssl_i2d_RSA_PSS_PARAMS
+#define i2d_RSA_PUBKEY bssl_i2d_RSA_PUBKEY
+#define i2d_RSA_PUBKEY_bio bssl_i2d_RSA_PUBKEY_bio
+#define i2d_RSA_PUBKEY_fp bssl_i2d_RSA_PUBKEY_fp
+#define i2d_RSAPublicKey bssl_i2d_RSAPublicKey
+#define i2d_RSAPublicKey_bio bssl_i2d_RSAPublicKey_bio
+#define i2d_RSAPublicKey_fp bssl_i2d_RSAPublicKey_fp
+#define i2d_SSL_SESSION bssl_i2d_SSL_SESSION
+#define i2d_SSL_SESSION_bio bssl_i2d_SSL_SESSION_bio
+#define i2d_SXNET bssl_i2d_SXNET
+#define i2d_SXNETID bssl_i2d_SXNETID
+#define i2d_USERNOTICE bssl_i2d_USERNOTICE
+#define i2d_X509 bssl_i2d_X509
+#define i2d_X509_ALGOR bssl_i2d_X509_ALGOR
+#define i2d_X509_ALGORS bssl_i2d_X509_ALGORS
+#define i2d_X509_ATTRIBUTE bssl_i2d_X509_ATTRIBUTE
+#define i2d_X509_AUX bssl_i2d_X509_AUX
+#define i2d_X509_bio bssl_i2d_X509_bio
+#define i2d_X509_CERT_AUX bssl_i2d_X509_CERT_AUX
+#define i2d_X509_CERT_PAIR bssl_i2d_X509_CERT_PAIR
+#define i2d_X509_CINF bssl_i2d_X509_CINF
+#define i2d_X509_CRL bssl_i2d_X509_CRL
+#define i2d_X509_CRL_bio bssl_i2d_X509_CRL_bio
+#define i2d_X509_CRL_fp bssl_i2d_X509_CRL_fp
+#define i2d_X509_CRL_INFO bssl_i2d_X509_CRL_INFO
+#define i2d_X509_EXTENSION bssl_i2d_X509_EXTENSION
+#define i2d_X509_EXTENSIONS bssl_i2d_X509_EXTENSIONS
+#define i2d_X509_fp bssl_i2d_X509_fp
+#define i2d_X509_NAME bssl_i2d_X509_NAME
+#define i2d_X509_NAME_ENTRY bssl_i2d_X509_NAME_ENTRY
+#define i2d_X509_PUBKEY bssl_i2d_X509_PUBKEY
+#define i2d_X509_REQ bssl_i2d_X509_REQ
+#define i2d_X509_REQ_bio bssl_i2d_X509_REQ_bio
+#define i2d_X509_REQ_fp bssl_i2d_X509_REQ_fp
+#define i2d_X509_REQ_INFO bssl_i2d_X509_REQ_INFO
+#define i2d_X509_REVOKED bssl_i2d_X509_REVOKED
+#define i2d_X509_SIG bssl_i2d_X509_SIG
+#define i2d_X509_VAL bssl_i2d_X509_VAL
+#define i2o_ECPublicKey bssl_i2o_ECPublicKey
+#define i2s_ASN1_ENUMERATED bssl_i2s_ASN1_ENUMERATED
+#define i2s_ASN1_ENUMERATED_TABLE bssl_i2s_ASN1_ENUMERATED_TABLE
+#define i2s_ASN1_INTEGER bssl_i2s_ASN1_INTEGER
+#define i2s_ASN1_OCTET_STRING bssl_i2s_ASN1_OCTET_STRING
+#define i2t_ASN1_OBJECT bssl_i2t_ASN1_OBJECT
+#define i2v_ASN1_BIT_STRING bssl_i2v_ASN1_BIT_STRING
+#define i2v_GENERAL_NAME bssl_i2v_GENERAL_NAME
+#define i2v_GENERAL_NAMES bssl_i2v_GENERAL_NAMES
+#define ISSUING_DIST_POINT_free bssl_ISSUING_DIST_POINT_free
+#define ISSUING_DIST_POINT_it bssl_ISSUING_DIST_POINT_it
+#define ISSUING_DIST_POINT_new bssl_ISSUING_DIST_POINT_new
+#define kOpenSSLReasonStringData bssl_kOpenSSLReasonStringData
+#define kOpenSSLReasonValues bssl_kOpenSSLReasonValues
+#define kOpenSSLReasonValuesLen bssl_kOpenSSLReasonValuesLen
+#define kSRTPProfiles bssl_kSRTPProfiles
+#define level_add_node bssl_level_add_node
+#define level_find_node bssl_level_find_node
+#define lh_delete bssl_lh_delete
+#define lh_doall bssl_lh_doall
+#define lh_doall_arg bssl_lh_doall_arg
+#define lh_free bssl_lh_free
+#define lh_insert bssl_lh_insert
+#define lh_new bssl_lh_new
+#define lh_num_items bssl_lh_num_items
+#define lh_retrieve bssl_lh_retrieve
+#define lh_strhash bssl_lh_strhash
+#define LONG_it bssl_LONG_it
+#define MD4 bssl_MD4
+#define md4_block_data_order bssl_md4_block_data_order
+#define MD4_Final bssl_MD4_Final
+#define MD4_Init bssl_MD4_Init
+#define MD4_Transform bssl_MD4_Transform
+#define MD4_Update bssl_MD4_Update
+#define MD5 bssl_MD5
+#define md5_block_asm_data_order bssl_md5_block_asm_data_order
+#define MD5_Final bssl_MD5_Final
+#define MD5_Init bssl_MD5_Init
+#define MD5_Transform bssl_MD5_Transform
+#define MD5_Update bssl_MD5_Update
+#define METHOD_ref bssl_METHOD_ref
+#define METHOD_unref bssl_METHOD_unref
+#define name_cmp bssl_name_cmp
+#define NAME_CONSTRAINTS_check bssl_NAME_CONSTRAINTS_check
+#define NAME_CONSTRAINTS_free bssl_NAME_CONSTRAINTS_free
+#define NAME_CONSTRAINTS_it bssl_NAME_CONSTRAINTS_it
+#define NAME_CONSTRAINTS_new bssl_NAME_CONSTRAINTS_new
+#define NCONF_free bssl_NCONF_free
+#define NCONF_get_section bssl_NCONF_get_section
+#define NCONF_get_string bssl_NCONF_get_string
+#define NCONF_load bssl_NCONF_load
+#define NCONF_load_bio bssl_NCONF_load_bio
+#define NCONF_new bssl_NCONF_new
+#define NETSCAPE_SPKAC_free bssl_NETSCAPE_SPKAC_free
+#define NETSCAPE_SPKAC_it bssl_NETSCAPE_SPKAC_it
+#define NETSCAPE_SPKAC_new bssl_NETSCAPE_SPKAC_new
+#define NETSCAPE_SPKI_b64_decode bssl_NETSCAPE_SPKI_b64_decode
+#define NETSCAPE_SPKI_b64_encode bssl_NETSCAPE_SPKI_b64_encode
+#define NETSCAPE_SPKI_free bssl_NETSCAPE_SPKI_free
+#define NETSCAPE_SPKI_get_pubkey bssl_NETSCAPE_SPKI_get_pubkey
+#define NETSCAPE_SPKI_it bssl_NETSCAPE_SPKI_it
+#define NETSCAPE_SPKI_new bssl_NETSCAPE_SPKI_new
+#define NETSCAPE_SPKI_set_pubkey bssl_NETSCAPE_SPKI_set_pubkey
+#define NETSCAPE_SPKI_sign bssl_NETSCAPE_SPKI_sign
+#define NETSCAPE_SPKI_verify bssl_NETSCAPE_SPKI_verify
+#define newhope_barrett_reduce bssl_newhope_barrett_reduce
+#define newhope_bitrev_vector bssl_newhope_bitrev_vector
+#define NEWHOPE_client_compute_key bssl_NEWHOPE_client_compute_key
+#define newhope_helprec bssl_newhope_helprec
+#define NEWHOPE_keygen bssl_NEWHOPE_keygen
+#define newhope_montgomery_reduce bssl_newhope_montgomery_reduce
+#define newhope_mul_coefficients bssl_newhope_mul_coefficients
+#define newhope_ntt bssl_newhope_ntt
+#define newhope_omegas_inv_montgomery bssl_newhope_omegas_inv_montgomery
+#define newhope_omegas_montgomery bssl_newhope_omegas_montgomery
+#define newhope_poly_add bssl_newhope_poly_add
+#define NEWHOPE_POLY_free bssl_NEWHOPE_POLY_free
+#define newhope_poly_frombytes bssl_newhope_poly_frombytes
+#define newhope_poly_getnoise bssl_newhope_poly_getnoise
+#define newhope_poly_invntt bssl_newhope_poly_invntt
+#define NEWHOPE_POLY_new bssl_NEWHOPE_POLY_new
+#define newhope_poly_ntt bssl_newhope_poly_ntt
+#define newhope_poly_pointwise bssl_newhope_poly_pointwise
+#define newhope_poly_tobytes bssl_newhope_poly_tobytes
+#define newhope_poly_uniform bssl_newhope_poly_uniform
+#define newhope_psis_bitrev_montgomery bssl_newhope_psis_bitrev_montgomery
+#define newhope_psis_inv_montgomery bssl_newhope_psis_inv_montgomery
+#define newhope_reconcile bssl_newhope_reconcile
+#define NEWHOPE_server_compute_key bssl_NEWHOPE_server_compute_key
+#define NOTICEREF_free bssl_NOTICEREF_free
+#define NOTICEREF_it bssl_NOTICEREF_it
+#define NOTICEREF_new bssl_NOTICEREF_new
+#define o2i_ECPublicKey bssl_o2i_ECPublicKey
+#define OBJ_cbs2nid bssl_OBJ_cbs2nid
+#define OBJ_cmp bssl_OBJ_cmp
+#define OBJ_create bssl_OBJ_create
+#define OBJ_dup bssl_OBJ_dup
+#define OBJ_find_sigid_algs bssl_OBJ_find_sigid_algs
+#define OBJ_find_sigid_by_algs bssl_OBJ_find_sigid_by_algs
+#define OBJ_ln2nid bssl_OBJ_ln2nid
+#define OBJ_nid2cbb bssl_OBJ_nid2cbb
+#define OBJ_nid2ln bssl_OBJ_nid2ln
+#define OBJ_nid2obj bssl_OBJ_nid2obj
+#define OBJ_nid2sn bssl_OBJ_nid2sn
+#define OBJ_obj2nid bssl_OBJ_obj2nid
+#define OBJ_obj2txt bssl_OBJ_obj2txt
+#define OBJ_sn2nid bssl_OBJ_sn2nid
+#define OBJ_txt2nid bssl_OBJ_txt2nid
+#define OBJ_txt2obj bssl_OBJ_txt2obj
+#define OpenSSL_add_all_algorithms bssl_OpenSSL_add_all_algorithms
+#define OpenSSL_add_all_ciphers bssl_OpenSSL_add_all_ciphers
+#define OpenSSL_add_all_digests bssl_OpenSSL_add_all_digests
+#define OPENSSL_built_in_curves bssl_OPENSSL_built_in_curves
+#define OPENSSL_cleanse bssl_OPENSSL_cleanse
+#define OPENSSL_config bssl_OPENSSL_config
+#define OPENSSL_cpuid_setup bssl_OPENSSL_cpuid_setup
+#define OPENSSL_gmtime bssl_OPENSSL_gmtime
+#define OPENSSL_gmtime_adj bssl_OPENSSL_gmtime_adj
+#define OPENSSL_gmtime_diff bssl_OPENSSL_gmtime_diff
+#define OPENSSL_hash32 bssl_OPENSSL_hash32
+#define OPENSSL_ia32cap_P bssl_OPENSSL_ia32cap_P
+#define OPENSSL_load_builtin_modules bssl_OPENSSL_load_builtin_modules
+#define OPENSSL_realloc_clean bssl_OPENSSL_realloc_clean
+#define OPENSSL_strcasecmp bssl_OPENSSL_strcasecmp
+#define OPENSSL_strdup bssl_OPENSSL_strdup
+#define OPENSSL_strncasecmp bssl_OPENSSL_strncasecmp
+#define OPENSSL_strnlen bssl_OPENSSL_strnlen
+#define OTHERNAME_cmp bssl_OTHERNAME_cmp
+#define OTHERNAME_free bssl_OTHERNAME_free
+#define OTHERNAME_it bssl_OTHERNAME_it
+#define OTHERNAME_new bssl_OTHERNAME_new
+#define PBE2PARAM_free bssl_PBE2PARAM_free
+#define PBE2PARAM_it bssl_PBE2PARAM_it
+#define PBE2PARAM_new bssl_PBE2PARAM_new
+#define PBEPARAM_free bssl_PBEPARAM_free
+#define PBEPARAM_it bssl_PBEPARAM_it
+#define PBEPARAM_new bssl_PBEPARAM_new
+#define PBKDF2PARAM_free bssl_PBKDF2PARAM_free
+#define PBKDF2PARAM_it bssl_PBKDF2PARAM_it
+#define PBKDF2PARAM_new bssl_PBKDF2PARAM_new
+#define PEM_ASN1_read bssl_PEM_ASN1_read
+#define PEM_ASN1_read_bio bssl_PEM_ASN1_read_bio
+#define PEM_ASN1_write bssl_PEM_ASN1_write
+#define PEM_ASN1_write_bio bssl_PEM_ASN1_write_bio
+#define PEM_bytes_read_bio bssl_PEM_bytes_read_bio
+#define PEM_def_callback bssl_PEM_def_callback
+#define PEM_dek_info bssl_PEM_dek_info
+#define PEM_do_header bssl_PEM_do_header
+#define PEM_get_EVP_CIPHER_INFO bssl_PEM_get_EVP_CIPHER_INFO
+#define PEM_proc_type bssl_PEM_proc_type
+#define PEM_read bssl_PEM_read
+#define PEM_read_bio bssl_PEM_read_bio
+#define PEM_read_bio_DHparams bssl_PEM_read_bio_DHparams
+#define PEM_read_bio_DSAparams bssl_PEM_read_bio_DSAparams
+#define PEM_read_bio_DSAPrivateKey bssl_PEM_read_bio_DSAPrivateKey
+#define PEM_read_bio_DSA_PUBKEY bssl_PEM_read_bio_DSA_PUBKEY
+#define PEM_read_bio_ECPrivateKey bssl_PEM_read_bio_ECPrivateKey
+#define PEM_read_bio_EC_PUBKEY bssl_PEM_read_bio_EC_PUBKEY
+#define PEM_read_bio_PKCS8 bssl_PEM_read_bio_PKCS8
+#define PEM_read_bio_PKCS8_PRIV_KEY_INFO bssl_PEM_read_bio_PKCS8_PRIV_KEY_INFO
+#define PEM_read_bio_PrivateKey bssl_PEM_read_bio_PrivateKey
+#define PEM_read_bio_PUBKEY bssl_PEM_read_bio_PUBKEY
+#define PEM_read_bio_RSAPrivateKey bssl_PEM_read_bio_RSAPrivateKey
+#define PEM_read_bio_RSA_PUBKEY bssl_PEM_read_bio_RSA_PUBKEY
+#define PEM_read_bio_RSAPublicKey bssl_PEM_read_bio_RSAPublicKey
+#define PEM_read_bio_SSL_SESSION bssl_PEM_read_bio_SSL_SESSION
+#define PEM_read_bio_X509 bssl_PEM_read_bio_X509
+#define PEM_read_bio_X509_AUX bssl_PEM_read_bio_X509_AUX
+#define PEM_read_bio_X509_CERT_PAIR bssl_PEM_read_bio_X509_CERT_PAIR
+#define PEM_read_bio_X509_CRL bssl_PEM_read_bio_X509_CRL
+#define PEM_read_bio_X509_REQ bssl_PEM_read_bio_X509_REQ
+#define PEM_read_DHparams bssl_PEM_read_DHparams
+#define PEM_read_DSAparams bssl_PEM_read_DSAparams
+#define PEM_read_DSAPrivateKey bssl_PEM_read_DSAPrivateKey
+#define PEM_read_DSA_PUBKEY bssl_PEM_read_DSA_PUBKEY
+#define PEM_read_ECPrivateKey bssl_PEM_read_ECPrivateKey
+#define PEM_read_EC_PUBKEY bssl_PEM_read_EC_PUBKEY
+#define PEM_read_PKCS8 bssl_PEM_read_PKCS8
+#define PEM_read_PKCS8_PRIV_KEY_INFO bssl_PEM_read_PKCS8_PRIV_KEY_INFO
+#define PEM_read_PrivateKey bssl_PEM_read_PrivateKey
+#define PEM_read_PUBKEY bssl_PEM_read_PUBKEY
+#define PEM_read_RSAPrivateKey bssl_PEM_read_RSAPrivateKey
+#define PEM_read_RSA_PUBKEY bssl_PEM_read_RSA_PUBKEY
+#define PEM_read_RSAPublicKey bssl_PEM_read_RSAPublicKey
+#define PEM_read_SSL_SESSION bssl_PEM_read_SSL_SESSION
+#define PEM_read_X509 bssl_PEM_read_X509
+#define PEM_read_X509_AUX bssl_PEM_read_X509_AUX
+#define PEM_read_X509_CERT_PAIR bssl_PEM_read_X509_CERT_PAIR
+#define PEM_read_X509_CRL bssl_PEM_read_X509_CRL
+#define PEM_read_X509_REQ bssl_PEM_read_X509_REQ
+#define PEM_write bssl_PEM_write
+#define PEM_write_bio bssl_PEM_write_bio
+#define PEM_write_bio_DHparams bssl_PEM_write_bio_DHparams
+#define PEM_write_bio_DSAparams bssl_PEM_write_bio_DSAparams
+#define PEM_write_bio_DSAPrivateKey bssl_PEM_write_bio_DSAPrivateKey
+#define PEM_write_bio_DSA_PUBKEY bssl_PEM_write_bio_DSA_PUBKEY
+#define PEM_write_bio_ECPrivateKey bssl_PEM_write_bio_ECPrivateKey
+#define PEM_write_bio_EC_PUBKEY bssl_PEM_write_bio_EC_PUBKEY
+#define PEM_write_bio_PKCS8 bssl_PEM_write_bio_PKCS8
+#define PEM_write_bio_PKCS8PrivateKey bssl_PEM_write_bio_PKCS8PrivateKey
+#define PEM_write_bio_PKCS8PrivateKey_nid bssl_PEM_write_bio_PKCS8PrivateKey_nid
+#define PEM_write_bio_PKCS8_PRIV_KEY_INFO bssl_PEM_write_bio_PKCS8_PRIV_KEY_INFO
+#define PEM_write_bio_PrivateKey bssl_PEM_write_bio_PrivateKey
+#define PEM_write_bio_PUBKEY bssl_PEM_write_bio_PUBKEY
+#define PEM_write_bio_RSAPrivateKey bssl_PEM_write_bio_RSAPrivateKey
+#define PEM_write_bio_RSA_PUBKEY bssl_PEM_write_bio_RSA_PUBKEY
+#define PEM_write_bio_RSAPublicKey bssl_PEM_write_bio_RSAPublicKey
+#define PEM_write_bio_SSL_SESSION bssl_PEM_write_bio_SSL_SESSION
+#define PEM_write_bio_X509 bssl_PEM_write_bio_X509
+#define PEM_write_bio_X509_AUX bssl_PEM_write_bio_X509_AUX
+#define PEM_write_bio_X509_CERT_PAIR bssl_PEM_write_bio_X509_CERT_PAIR
+#define PEM_write_bio_X509_CRL bssl_PEM_write_bio_X509_CRL
+#define PEM_write_bio_X509_REQ bssl_PEM_write_bio_X509_REQ
+#define PEM_write_bio_X509_REQ_NEW bssl_PEM_write_bio_X509_REQ_NEW
+#define PEM_write_DHparams bssl_PEM_write_DHparams
+#define PEM_write_DSAparams bssl_PEM_write_DSAparams
+#define PEM_write_DSAPrivateKey bssl_PEM_write_DSAPrivateKey
+#define PEM_write_DSA_PUBKEY bssl_PEM_write_DSA_PUBKEY
+#define PEM_write_ECPrivateKey bssl_PEM_write_ECPrivateKey
+#define PEM_write_EC_PUBKEY bssl_PEM_write_EC_PUBKEY
+#define PEM_write_PKCS8 bssl_PEM_write_PKCS8
+#define PEM_write_PKCS8PrivateKey bssl_PEM_write_PKCS8PrivateKey
+#define PEM_write_PKCS8PrivateKey_nid bssl_PEM_write_PKCS8PrivateKey_nid
+#define PEM_write_PKCS8_PRIV_KEY_INFO bssl_PEM_write_PKCS8_PRIV_KEY_INFO
+#define PEM_write_PrivateKey bssl_PEM_write_PrivateKey
+#define PEM_write_PUBKEY bssl_PEM_write_PUBKEY
+#define PEM_write_RSAPrivateKey bssl_PEM_write_RSAPrivateKey
+#define PEM_write_RSA_PUBKEY bssl_PEM_write_RSA_PUBKEY
+#define PEM_write_RSAPublicKey bssl_PEM_write_RSAPublicKey
+#define PEM_write_SSL_SESSION bssl_PEM_write_SSL_SESSION
+#define PEM_write_X509 bssl_PEM_write_X509
+#define PEM_write_X509_AUX bssl_PEM_write_X509_AUX
+#define PEM_write_X509_CERT_PAIR bssl_PEM_write_X509_CERT_PAIR
+#define PEM_write_X509_CRL bssl_PEM_write_X509_CRL
+#define PEM_write_X509_REQ bssl_PEM_write_X509_REQ
+#define PEM_write_X509_REQ_NEW bssl_PEM_write_X509_REQ_NEW
+#define PEM_X509_INFO_read bssl_PEM_X509_INFO_read
+#define PEM_X509_INFO_read_bio bssl_PEM_X509_INFO_read_bio
+#define PEM_X509_INFO_write_bio bssl_PEM_X509_INFO_write_bio
+#define pitem_free bssl_pitem_free
+#define pitem_new bssl_pitem_new
+#define PKCS12_free bssl_PKCS12_free
+#define PKCS12_get_key_and_certs bssl_PKCS12_get_key_and_certs
+#define PKCS12_parse bssl_PKCS12_parse
+#define PKCS12_PBE_add bssl_PKCS12_PBE_add
+#define PKCS12_verify_mac bssl_PKCS12_verify_mac
+#define PKCS5_pbe2_set bssl_PKCS5_pbe2_set
+#define PKCS5_pbe2_set_iv bssl_PKCS5_pbe2_set_iv
+#define PKCS5_pbe_set bssl_PKCS5_pbe_set
+#define PKCS5_pbe_set0_algor bssl_PKCS5_pbe_set0_algor
+#define PKCS5_PBKDF2_HMAC bssl_PKCS5_PBKDF2_HMAC
+#define PKCS5_PBKDF2_HMAC_SHA1 bssl_PKCS5_PBKDF2_HMAC_SHA1
+#define PKCS5_pbkdf2_set bssl_PKCS5_pbkdf2_set
+#define PKCS5_v2_PBE_keyivgen bssl_PKCS5_v2_PBE_keyivgen
+#define PKCS7_bundle_certificates bssl_PKCS7_bundle_certificates
+#define PKCS7_bundle_CRLs bssl_PKCS7_bundle_CRLs
+#define PKCS7_get_certificates bssl_PKCS7_get_certificates
+#define PKCS7_get_CRLs bssl_PKCS7_get_CRLs
+#define PKCS7_get_PEM_certificates bssl_PKCS7_get_PEM_certificates
+#define PKCS7_get_PEM_CRLs bssl_PKCS7_get_PEM_CRLs
+#define PKCS8_decrypt bssl_PKCS8_decrypt
+#define PKCS8_decrypt_pbe bssl_PKCS8_decrypt_pbe
+#define PKCS8_encrypt bssl_PKCS8_encrypt
+#define PKCS8_encrypt_pbe bssl_PKCS8_encrypt_pbe
+#define PKCS8_pkey_get0 bssl_PKCS8_pkey_get0
+#define PKCS8_pkey_set0 bssl_PKCS8_pkey_set0
+#define PKCS8_PRIV_KEY_INFO_free bssl_PKCS8_PRIV_KEY_INFO_free
+#define PKCS8_PRIV_KEY_INFO_it bssl_PKCS8_PRIV_KEY_INFO_it
+#define PKCS8_PRIV_KEY_INFO_new bssl_PKCS8_PRIV_KEY_INFO_new
+#define PKEY_USAGE_PERIOD_free bssl_PKEY_USAGE_PERIOD_free
+#define PKEY_USAGE_PERIOD_it bssl_PKEY_USAGE_PERIOD_it
+#define PKEY_USAGE_PERIOD_new bssl_PKEY_USAGE_PERIOD_new
+#define policy_cache_find_data bssl_policy_cache_find_data
+#define policy_cache_free bssl_policy_cache_free
+#define policy_cache_set bssl_policy_cache_set
+#define policy_cache_set_mapping bssl_policy_cache_set_mapping
+#define POLICY_CONSTRAINTS_free bssl_POLICY_CONSTRAINTS_free
+#define POLICY_CONSTRAINTS_it bssl_POLICY_CONSTRAINTS_it
+#define POLICY_CONSTRAINTS_new bssl_POLICY_CONSTRAINTS_new
+#define policy_data_free bssl_policy_data_free
+#define policy_data_new bssl_policy_data_new
+#define POLICYINFO_free bssl_POLICYINFO_free
+#define POLICYINFO_it bssl_POLICYINFO_it
+#define POLICYINFO_new bssl_POLICYINFO_new
+#define POLICY_MAPPING_free bssl_POLICY_MAPPING_free
+#define POLICY_MAPPING_it bssl_POLICY_MAPPING_it
+#define POLICY_MAPPING_new bssl_POLICY_MAPPING_new
+#define POLICY_MAPPINGS_it bssl_POLICY_MAPPINGS_it
+#define policy_node_cmp_new bssl_policy_node_cmp_new
+#define policy_node_free bssl_policy_node_free
+#define policy_node_match bssl_policy_node_match
+#define POLICYQUALINFO_free bssl_POLICYQUALINFO_free
+#define POLICYQUALINFO_it bssl_POLICYQUALINFO_it
+#define POLICYQUALINFO_new bssl_POLICYQUALINFO_new
+#define pqueue_find bssl_pqueue_find
+#define pqueue_free bssl_pqueue_free
+#define pqueue_insert bssl_pqueue_insert
+#define pqueue_iterator bssl_pqueue_iterator
+#define pqueue_new bssl_pqueue_new
+#define pqueue_next bssl_pqueue_next
+#define pqueue_peek bssl_pqueue_peek
+#define pqueue_pop bssl_pqueue_pop
+#define pqueue_size bssl_pqueue_size
+#define PROXY_CERT_INFO_EXTENSION_free bssl_PROXY_CERT_INFO_EXTENSION_free
+#define PROXY_CERT_INFO_EXTENSION_it bssl_PROXY_CERT_INFO_EXTENSION_it
+#define PROXY_CERT_INFO_EXTENSION_new bssl_PROXY_CERT_INFO_EXTENSION_new
+#define PROXY_POLICY_free bssl_PROXY_POLICY_free
+#define PROXY_POLICY_it bssl_PROXY_POLICY_it
+#define PROXY_POLICY_new bssl_PROXY_POLICY_new
+#define RAND_add bssl_RAND_add
+#define RAND_bytes bssl_RAND_bytes
+#define RAND_cleanup bssl_RAND_cleanup
+#define RAND_egd bssl_RAND_egd
+#define RAND_enable_fork_unsafe_buffering bssl_RAND_enable_fork_unsafe_buffering
+#define RAND_file_name bssl_RAND_file_name
+#define RAND_load_file bssl_RAND_load_file
+#define RAND_poll bssl_RAND_poll
+#define RAND_pseudo_bytes bssl_RAND_pseudo_bytes
+#define RAND_seed bssl_RAND_seed
+#define RAND_set_rand_method bssl_RAND_set_rand_method
+#define RAND_set_urandom_fd bssl_RAND_set_urandom_fd
+#define RAND_SSLeay bssl_RAND_SSLeay
+#define RAND_status bssl_RAND_status
+#define RC4 bssl_RC4
+#define RC4_set_key bssl_RC4_set_key
+#define RSA_additional_prime_free bssl_RSA_additional_prime_free
+#define RSA_add_pkcs1_prefix bssl_RSA_add_pkcs1_prefix
+#define rsa_asn1_meth bssl_rsa_asn1_meth
+#define RSA_blinding_on bssl_RSA_blinding_on
+#define RSA_check_key bssl_RSA_check_key
+#define RSA_decrypt bssl_RSA_decrypt
+#define rsa_default_decrypt bssl_rsa_default_decrypt
+#define rsa_default_encrypt bssl_rsa_default_encrypt
+#define rsa_default_keygen bssl_rsa_default_keygen
+#define RSA_default_method bssl_RSA_default_method
+#define rsa_default_multi_prime_keygen bssl_rsa_default_multi_prime_keygen
+#define rsa_default_private_transform bssl_rsa_default_private_transform
+#define rsa_default_sign_raw bssl_rsa_default_sign_raw
+#define rsa_default_size bssl_rsa_default_size
+#define RSA_encrypt bssl_RSA_encrypt
+#define RSA_free bssl_RSA_free
+#define RSA_generate_key_ex bssl_RSA_generate_key_ex
+#define RSA_generate_multi_prime_key bssl_RSA_generate_multi_prime_key
+#define RSA_get_ex_data bssl_RSA_get_ex_data
+#define RSA_get_ex_new_index bssl_RSA_get_ex_new_index
+#define RSA_is_opaque bssl_RSA_is_opaque
+#define RSA_marshal_private_key bssl_RSA_marshal_private_key
+#define RSA_marshal_public_key bssl_RSA_marshal_public_key
+#define RSA_new bssl_RSA_new
+#define RSA_new_method bssl_RSA_new_method
+#define RSA_padding_add_none bssl_RSA_padding_add_none
+#define RSA_padding_add_PKCS1_OAEP_mgf1 bssl_RSA_padding_add_PKCS1_OAEP_mgf1
+#define RSA_padding_add_PKCS1_PSS_mgf1 bssl_RSA_padding_add_PKCS1_PSS_mgf1
+#define RSA_padding_add_PKCS1_type_1 bssl_RSA_padding_add_PKCS1_type_1
+#define RSA_padding_add_PKCS1_type_2 bssl_RSA_padding_add_PKCS1_type_2
+#define RSA_padding_check_PKCS1_OAEP_mgf1 bssl_RSA_padding_check_PKCS1_OAEP_mgf1
+#define RSA_padding_check_PKCS1_type_1 bssl_RSA_padding_check_PKCS1_type_1
+#define RSA_padding_check_PKCS1_type_2 bssl_RSA_padding_check_PKCS1_type_2
+#define RSA_parse_private_key bssl_RSA_parse_private_key
+#define RSA_parse_public_key bssl_RSA_parse_public_key
+#define RSA_parse_public_key_buggy bssl_RSA_parse_public_key_buggy
+#define rsa_pkey_meth bssl_rsa_pkey_meth
+#define RSA_private_decrypt bssl_RSA_private_decrypt
+#define RSA_private_encrypt bssl_RSA_private_encrypt
+#define RSAPrivateKey_dup bssl_RSAPrivateKey_dup
+#define RSA_private_key_from_bytes bssl_RSA_private_key_from_bytes
+#define RSA_private_key_to_bytes bssl_RSA_private_key_to_bytes
+#define RSA_private_transform bssl_RSA_private_transform
+#define RSA_PSS_PARAMS_free bssl_RSA_PSS_PARAMS_free
+#define RSA_PSS_PARAMS_it bssl_RSA_PSS_PARAMS_it
+#define RSA_PSS_PARAMS_new bssl_RSA_PSS_PARAMS_new
+#define RSA_public_decrypt bssl_RSA_public_decrypt
+#define RSA_public_encrypt bssl_RSA_public_encrypt
+#define RSAPublicKey_dup bssl_RSAPublicKey_dup
+#define RSA_public_key_from_bytes bssl_RSA_public_key_from_bytes
+#define RSA_public_key_to_bytes bssl_RSA_public_key_to_bytes
+#define RSA_recover_crt_params bssl_RSA_recover_crt_params
+#define RSA_set_ex_data bssl_RSA_set_ex_data
+#define RSA_sign bssl_RSA_sign
+#define RSA_sign_raw bssl_RSA_sign_raw
+#define RSA_size bssl_RSA_size
+#define RSA_supports_digest bssl_RSA_supports_digest
+#define RSA_up_ref bssl_RSA_up_ref
+#define RSA_verify bssl_RSA_verify
+#define RSA_verify_PKCS1_PSS_mgf1 bssl_RSA_verify_PKCS1_PSS_mgf1
+#define RSA_verify_raw bssl_RSA_verify_raw
+#define rsaz_1024_gather5_avx2 bssl_rsaz_1024_gather5_avx2
+#define RSAZ_1024_mod_exp_avx2 bssl_RSAZ_1024_mod_exp_avx2
+#define rsaz_1024_mul_avx2 bssl_rsaz_1024_mul_avx2
+#define rsaz_1024_norm2red_avx2 bssl_rsaz_1024_norm2red_avx2
+#define rsaz_1024_red2norm_avx2 bssl_rsaz_1024_red2norm_avx2
+#define rsaz_1024_scatter5_avx2 bssl_rsaz_1024_scatter5_avx2
+#define rsaz_1024_sqr_avx2 bssl_rsaz_1024_sqr_avx2
+#define rsaz_512_gather4 bssl_rsaz_512_gather4
+#define RSAZ_512_mod_exp bssl_RSAZ_512_mod_exp
+#define rsaz_512_mul bssl_rsaz_512_mul
+#define rsaz_512_mul_by_one bssl_rsaz_512_mul_by_one
+#define rsaz_512_mul_gather4 bssl_rsaz_512_mul_gather4
+#define rsaz_512_mul_scatter4 bssl_rsaz_512_mul_scatter4
+#define rsaz_512_scatter4 bssl_rsaz_512_scatter4
+#define rsaz_512_sqr bssl_rsaz_512_sqr
+#define rsaz_avx2_eligible bssl_rsaz_avx2_eligible
+#define s2i_ASN1_INTEGER bssl_s2i_ASN1_INTEGER
+#define s2i_ASN1_OCTET_STRING bssl_s2i_ASN1_OCTET_STRING
+#define SHA1 bssl_SHA1
+#define sha1_block_data_order bssl_sha1_block_data_order
+#define SHA1_Final bssl_SHA1_Final
+#define SHA1_Init bssl_SHA1_Init
+#define SHA1_Transform bssl_SHA1_Transform
+#define SHA1_Update bssl_SHA1_Update
+#define SHA224 bssl_SHA224
+#define SHA224_Final bssl_SHA224_Final
+#define SHA224_Init bssl_SHA224_Init
+#define SHA224_Update bssl_SHA224_Update
+#define SHA256 bssl_SHA256
+#define sha256_block_data_order bssl_sha256_block_data_order
+#define SHA256_Final bssl_SHA256_Final
+#define SHA256_Init bssl_SHA256_Init
+#define SHA256_Transform bssl_SHA256_Transform
+#define SHA256_Update bssl_SHA256_Update
+#define SHA384 bssl_SHA384
+#define SHA384_Final bssl_SHA384_Final
+#define SHA384_Init bssl_SHA384_Init
+#define SHA384_Update bssl_SHA384_Update
+#define SHA512 bssl_SHA512
+#define sha512_block_data_order bssl_sha512_block_data_order
+#define SHA512_Final bssl_SHA512_Final
+#define SHA512_Init bssl_SHA512_Init
+#define SHA512_Transform bssl_SHA512_Transform
+#define SHA512_Update bssl_SHA512_Update
+#define sk_deep_copy bssl_sk_deep_copy
+#define sk_delete bssl_sk_delete
+#define sk_delete_ptr bssl_sk_delete_ptr
+#define sk_dup bssl_sk_dup
+#define sk_find bssl_sk_find
+#define sk_free bssl_sk_free
+#define sk_insert bssl_sk_insert
+#define sk_is_sorted bssl_sk_is_sorted
+#define sk_new bssl_sk_new
+#define sk_new_null bssl_sk_new_null
+#define sk_num bssl_sk_num
+#define sk_pop bssl_sk_pop
+#define sk_pop_free bssl_sk_pop_free
+#define sk_push bssl_sk_push
+#define sk_set bssl_sk_set
+#define sk_set_cmp_func bssl_sk_set_cmp_func
+#define sk_shift bssl_sk_shift
+#define sk_sort bssl_sk_sort
+#define sk_value bssl_sk_value
+#define sk_zero bssl_sk_zero
+#define SPAKE2_CTX_free bssl_SPAKE2_CTX_free
+#define SPAKE2_CTX_new bssl_SPAKE2_CTX_new
+#define SPAKE2_generate_msg bssl_SPAKE2_generate_msg
+#define SPAKE2_process_msg bssl_SPAKE2_process_msg
+#define ssl3_accept bssl_ssl3_accept
+#define ssl3_can_false_start bssl_ssl3_can_false_start
+#define ssl3_cert_verify_hash bssl_ssl3_cert_verify_hash
+#define ssl3_choose_cipher bssl_ssl3_choose_cipher
+#define ssl3_cleanup_key_block bssl_ssl3_cleanup_key_block
+#define ssl3_connect bssl_ssl3_connect
+#define ssl3_dispatch_alert bssl_ssl3_dispatch_alert
+#define ssl3_do_write bssl_ssl3_do_write
+#define ssl3_free bssl_ssl3_free
+#define ssl3_free_handshake_buffer bssl_ssl3_free_handshake_buffer
+#define ssl3_free_handshake_hash bssl_ssl3_free_handshake_hash
+#define ssl3_get_certificate_request bssl_ssl3_get_certificate_request
+#define ssl3_get_cert_status bssl_ssl3_get_cert_status
+#define ssl3_get_cert_verify bssl_ssl3_get_cert_verify
+#define ssl3_get_channel_id bssl_ssl3_get_channel_id
+#define ssl3_get_client_certificate bssl_ssl3_get_client_certificate
+#define ssl3_get_client_hello bssl_ssl3_get_client_hello
+#define ssl3_get_client_key_exchange bssl_ssl3_get_client_key_exchange
+#define ssl3_get_enc_method bssl_ssl3_get_enc_method
+#define ssl3_get_finished bssl_ssl3_get_finished
+#define ssl3_get_initial_bytes bssl_ssl3_get_initial_bytes
+#define ssl3_get_max_client_version bssl_ssl3_get_max_client_version
+#define ssl3_get_max_server_version bssl_ssl3_get_max_server_version
+#define ssl3_get_message bssl_ssl3_get_message
+#define ssl3_get_mutual_version bssl_ssl3_get_mutual_version
+#define ssl3_get_new_session_ticket bssl_ssl3_get_new_session_ticket
+#define ssl3_get_next_proto bssl_ssl3_get_next_proto
+#define ssl3_get_req_cert_type bssl_ssl3_get_req_cert_type
+#define ssl3_get_server_certificate bssl_ssl3_get_server_certificate
+#define ssl3_get_server_done bssl_ssl3_get_server_done
+#define ssl3_get_server_hello bssl_ssl3_get_server_hello
+#define ssl3_get_server_key_exchange bssl_ssl3_get_server_key_exchange
+#define ssl3_get_v2_client_hello bssl_ssl3_get_v2_client_hello
+#define ssl3_handshake_write bssl_ssl3_handshake_write
+#define ssl3_hash_current_message bssl_ssl3_hash_current_message
+#define ssl3_init_handshake_buffer bssl_ssl3_init_handshake_buffer
+#define ssl3_init_handshake_hash bssl_ssl3_init_handshake_hash
+#define ssl3_is_version_enabled bssl_ssl3_is_version_enabled
+#define ssl3_new bssl_ssl3_new
+#define ssl3_output_cert_chain bssl_ssl3_output_cert_chain
+#define ssl3_protocol_version bssl_ssl3_protocol_version
+#define ssl3_read_app_data bssl_ssl3_read_app_data
+#define ssl3_read_bytes bssl_ssl3_read_bytes
+#define ssl3_read_change_cipher_spec bssl_ssl3_read_change_cipher_spec
+#define ssl3_read_close_notify bssl_ssl3_read_close_notify
+#define ssl3_send_alert bssl_ssl3_send_alert
+#define ssl3_send_certificate_request bssl_ssl3_send_certificate_request
+#define ssl3_send_certificate_status bssl_ssl3_send_certificate_status
+#define ssl3_send_cert_verify bssl_ssl3_send_cert_verify
+#define ssl3_send_change_cipher_spec bssl_ssl3_send_change_cipher_spec
+#define ssl3_send_channel_id bssl_ssl3_send_channel_id
+#define ssl3_send_client_certificate bssl_ssl3_send_client_certificate
+#define ssl3_send_client_hello bssl_ssl3_send_client_hello
+#define ssl3_send_client_key_exchange bssl_ssl3_send_client_key_exchange
+#define ssl3_send_finished bssl_ssl3_send_finished
+#define ssl3_send_new_session_ticket bssl_ssl3_send_new_session_ticket
+#define ssl3_send_next_proto bssl_ssl3_send_next_proto
+#define ssl3_send_server_certificate bssl_ssl3_send_server_certificate
+#define ssl3_send_server_done bssl_ssl3_send_server_done
+#define ssl3_send_server_hello bssl_ssl3_send_server_hello
+#define ssl3_send_server_key_exchange bssl_ssl3_send_server_key_exchange
+#define ssl3_set_handshake_header bssl_ssl3_set_handshake_header
+#define ssl3_supports_cipher bssl_ssl3_supports_cipher
+#define ssl3_update_handshake_hash bssl_ssl3_update_handshake_hash
+#define ssl3_verify_server_cert bssl_ssl3_verify_server_cert
+#define ssl3_version_from_wire bssl_ssl3_version_from_wire
+#define ssl3_write_app_data bssl_ssl3_write_app_data
+#define ssl3_write_bytes bssl_ssl3_write_bytes
+#define SSL_accept bssl_SSL_accept
+#define SSL_add0_chain_cert bssl_SSL_add0_chain_cert
+#define SSL_add1_chain_cert bssl_SSL_add1_chain_cert
+#define ssl_add_cert_chain bssl_ssl_add_cert_chain
+#define SSL_add_client_CA bssl_SSL_add_client_CA
+#define ssl_add_clienthello_tlsext bssl_ssl_add_clienthello_tlsext
+#define SSL_add_file_cert_subjects_to_stack bssl_SSL_add_file_cert_subjects_to_stack
+#define ssl_add_serverhello_tlsext bssl_ssl_add_serverhello_tlsext
+#define SSL_AEAD_CTX_explicit_nonce_len bssl_SSL_AEAD_CTX_explicit_nonce_len
+#define SSL_AEAD_CTX_free bssl_SSL_AEAD_CTX_free
+#define SSL_AEAD_CTX_max_overhead bssl_SSL_AEAD_CTX_max_overhead
+#define SSL_AEAD_CTX_new bssl_SSL_AEAD_CTX_new
+#define SSL_AEAD_CTX_open bssl_SSL_AEAD_CTX_open
+#define SSL_AEAD_CTX_seal bssl_SSL_AEAD_CTX_seal
+#define SSL_alert_desc_string bssl_SSL_alert_desc_string
+#define SSL_alert_desc_string_long bssl_SSL_alert_desc_string_long
+#define SSL_alert_type_string bssl_SSL_alert_type_string
+#define SSL_alert_type_string_long bssl_SSL_alert_type_string_long
+#define ssl_bytes_to_cipher_list bssl_ssl_bytes_to_cipher_list
+#define SSL_cache_hit bssl_SSL_cache_hit
+#define ssl_cert_add0_chain_cert bssl_ssl_cert_add0_chain_cert
+#define ssl_cert_add1_chain_cert bssl_ssl_cert_add1_chain_cert
+#define ssl_cert_clear_certs bssl_ssl_cert_clear_certs
+#define ssl_cert_dup bssl_ssl_cert_dup
+#define ssl_cert_free bssl_ssl_cert_free
+#define ssl_cert_new bssl_ssl_cert_new
+#define SSL_certs_clear bssl_SSL_certs_clear
+#define ssl_cert_set0_chain bssl_ssl_cert_set0_chain
+#define ssl_cert_set1_chain bssl_ssl_cert_set1_chain
+#define ssl_cert_set_cert_cb bssl_ssl_cert_set_cert_cb
+#define SSL_check_private_key bssl_SSL_check_private_key
+#define SSL_CIPHER_description bssl_SSL_CIPHER_description
+#define SSL_CIPHER_get_bits bssl_SSL_CIPHER_get_bits
+#define ssl_cipher_get_evp_aead bssl_ssl_cipher_get_evp_aead
+#define SSL_CIPHER_get_id bssl_SSL_CIPHER_get_id
+#define ssl_cipher_get_key_type bssl_ssl_cipher_get_key_type
+#define SSL_CIPHER_get_kx_name bssl_SSL_CIPHER_get_kx_name
+#define SSL_CIPHER_get_min_version bssl_SSL_CIPHER_get_min_version
+#define SSL_CIPHER_get_name bssl_SSL_CIPHER_get_name
+#define ssl_cipher_get_record_split_len bssl_ssl_cipher_get_record_split_len
+#define SSL_CIPHER_get_rfc_name bssl_SSL_CIPHER_get_rfc_name
+#define ssl_cipher_get_value bssl_ssl_cipher_get_value
+#define SSL_CIPHER_get_version bssl_SSL_CIPHER_get_version
+#define SSL_CIPHER_has_MD5_HMAC bssl_SSL_CIPHER_has_MD5_HMAC
+#define ssl_cipher_has_server_public_key bssl_ssl_cipher_has_server_public_key
+#define SSL_CIPHER_has_SHA1_HMAC bssl_SSL_CIPHER_has_SHA1_HMAC
+#define SSL_CIPHER_has_SHA256_HMAC bssl_SSL_CIPHER_has_SHA256_HMAC
+#define SSL_CIPHER_is_AES bssl_SSL_CIPHER_is_AES
+#define SSL_CIPHER_is_AES128CBC bssl_SSL_CIPHER_is_AES128CBC
+#define SSL_CIPHER_is_AES128GCM bssl_SSL_CIPHER_is_AES128GCM
+#define SSL_CIPHER_is_AES256CBC bssl_SSL_CIPHER_is_AES256CBC
+#define SSL_CIPHER_is_AESGCM bssl_SSL_CIPHER_is_AESGCM
+#define SSL_CIPHER_is_block_cipher bssl_SSL_CIPHER_is_block_cipher
+#define SSL_CIPHER_is_CHACHA20POLY1305 bssl_SSL_CIPHER_is_CHACHA20POLY1305
+#define SSL_CIPHER_is_ECDHE bssl_SSL_CIPHER_is_ECDHE
+#define SSL_CIPHER_is_ECDSA bssl_SSL_CIPHER_is_ECDSA
+#define SSL_CIPHER_is_NULL bssl_SSL_CIPHER_is_NULL
+#define SSL_CIPHER_is_RC4 bssl_SSL_CIPHER_is_RC4
+#define ssl_cipher_preference_list_free bssl_ssl_cipher_preference_list_free
+#define ssl_cipher_requires_server_key_exchange bssl_ssl_cipher_requires_server_key_exchange
+#define SSL_clear bssl_SSL_clear
+#define ssl_clear_bad_session bssl_ssl_clear_bad_session
+#define SSL_clear_chain_certs bssl_SSL_clear_chain_certs
+#define SSL_clear_mode bssl_SSL_clear_mode
+#define SSL_clear_options bssl_SSL_clear_options
+#define SSL_COMP_add_compression_method bssl_SSL_COMP_add_compression_method
+#define SSL_COMP_get_compression_methods bssl_SSL_COMP_get_compression_methods
+#define SSL_COMP_get_name bssl_SSL_COMP_get_name
+#define SSL_connect bssl_SSL_connect
+#define ssl_create_cipher_list bssl_ssl_create_cipher_list
+#define SSL_CTX_add0_chain_cert bssl_SSL_CTX_add0_chain_cert
+#define SSL_CTX_add1_chain_cert bssl_SSL_CTX_add1_chain_cert
+#define SSL_CTX_add_client_CA bssl_SSL_CTX_add_client_CA
+#define SSL_CTX_add_client_custom_ext bssl_SSL_CTX_add_client_custom_ext
+#define SSL_CTX_add_extra_chain_cert bssl_SSL_CTX_add_extra_chain_cert
+#define SSL_CTX_add_server_custom_ext bssl_SSL_CTX_add_server_custom_ext
+#define SSL_CTX_add_session bssl_SSL_CTX_add_session
+#define SSL_CTX_check_private_key bssl_SSL_CTX_check_private_key
+#define SSL_CTX_clear_chain_certs bssl_SSL_CTX_clear_chain_certs
+#define SSL_CTX_clear_extra_chain_certs bssl_SSL_CTX_clear_extra_chain_certs
+#define SSL_CTX_clear_mode bssl_SSL_CTX_clear_mode
+#define SSL_CTX_clear_options bssl_SSL_CTX_clear_options
+#define SSL_CTX_enable_ocsp_stapling bssl_SSL_CTX_enable_ocsp_stapling
+#define SSL_CTX_enable_signed_cert_timestamps bssl_SSL_CTX_enable_signed_cert_timestamps
+#define SSL_CTX_enable_tls_channel_id bssl_SSL_CTX_enable_tls_channel_id
+#define SSL_CTX_flush_sessions bssl_SSL_CTX_flush_sessions
+#define SSL_CTX_free bssl_SSL_CTX_free
+#define SSL_CTX_get0_certificate bssl_SSL_CTX_get0_certificate
+#define SSL_CTX_get0_chain_certs bssl_SSL_CTX_get0_chain_certs
+#define SSL_CTX_get0_param bssl_SSL_CTX_get0_param
+#define SSL_CTX_get0_privatekey bssl_SSL_CTX_get0_privatekey
+#define SSL_CTX_get_cert_store bssl_SSL_CTX_get_cert_store
+#define SSL_CTX_get_channel_id_cb bssl_SSL_CTX_get_channel_id_cb
+#define SSL_CTX_get_client_CA_list bssl_SSL_CTX_get_client_CA_list
+#define SSL_CTX_get_client_cert_cb bssl_SSL_CTX_get_client_cert_cb
+#define SSL_CTX_get_ex_data bssl_SSL_CTX_get_ex_data
+#define SSL_CTX_get_ex_new_index bssl_SSL_CTX_get_ex_new_index
+#define SSL_CTX_get_extra_chain_certs bssl_SSL_CTX_get_extra_chain_certs
+#define SSL_CTX_get_info_callback bssl_SSL_CTX_get_info_callback
+#define SSL_CTX_get_max_cert_list bssl_SSL_CTX_get_max_cert_list
+#define SSL_CTX_get_mode bssl_SSL_CTX_get_mode
+#define SSL_CTX_get_options bssl_SSL_CTX_get_options
+#define SSL_CTX_get_quiet_shutdown bssl_SSL_CTX_get_quiet_shutdown
+#define SSL_CTX_get_read_ahead bssl_SSL_CTX_get_read_ahead
+#define SSL_CTX_get_session_cache_mode bssl_SSL_CTX_get_session_cache_mode
+#define SSL_CTX_get_timeout bssl_SSL_CTX_get_timeout
+#define SSL_CTX_get_tlsext_ticket_keys bssl_SSL_CTX_get_tlsext_ticket_keys
+#define SSL_CTX_get_verify_callback bssl_SSL_CTX_get_verify_callback
+#define SSL_CTX_get_verify_depth bssl_SSL_CTX_get_verify_depth
+#define SSL_CTX_get_verify_mode bssl_SSL_CTX_get_verify_mode
+#define SSL_CTX_load_verify_locations bssl_SSL_CTX_load_verify_locations
+#define SSL_CTX_need_tmp_RSA bssl_SSL_CTX_need_tmp_RSA
+#define SSL_CTX_new bssl_SSL_CTX_new
+#define SSL_CTX_remove_session bssl_SSL_CTX_remove_session
+#define SSL_CTX_sess_accept bssl_SSL_CTX_sess_accept
+#define SSL_CTX_sess_accept_good bssl_SSL_CTX_sess_accept_good
+#define SSL_CTX_sess_accept_renegotiate bssl_SSL_CTX_sess_accept_renegotiate
+#define SSL_CTX_sess_cache_full bssl_SSL_CTX_sess_cache_full
+#define SSL_CTX_sess_cb_hits bssl_SSL_CTX_sess_cb_hits
+#define SSL_CTX_sess_connect bssl_SSL_CTX_sess_connect
+#define SSL_CTX_sess_connect_good bssl_SSL_CTX_sess_connect_good
+#define SSL_CTX_sess_connect_renegotiate bssl_SSL_CTX_sess_connect_renegotiate
+#define SSL_CTX_sess_get_cache_size bssl_SSL_CTX_sess_get_cache_size
+#define SSL_CTX_sess_get_get_cb bssl_SSL_CTX_sess_get_get_cb
+#define SSL_CTX_sess_get_new_cb bssl_SSL_CTX_sess_get_new_cb
+#define SSL_CTX_sess_get_remove_cb bssl_SSL_CTX_sess_get_remove_cb
+#define SSL_CTX_sess_hits bssl_SSL_CTX_sess_hits
+#define SSL_CTX_sessions bssl_SSL_CTX_sessions
+#define SSL_CTX_sess_misses bssl_SSL_CTX_sess_misses
+#define SSL_CTX_sess_number bssl_SSL_CTX_sess_number
+#define SSL_CTX_sess_set_cache_size bssl_SSL_CTX_sess_set_cache_size
+#define SSL_CTX_sess_set_get_cb bssl_SSL_CTX_sess_set_get_cb
+#define SSL_CTX_sess_set_new_cb bssl_SSL_CTX_sess_set_new_cb
+#define SSL_CTX_sess_set_remove_cb bssl_SSL_CTX_sess_set_remove_cb
+#define SSL_CTX_sess_timeouts bssl_SSL_CTX_sess_timeouts
+#define SSL_CTX_set0_chain bssl_SSL_CTX_set0_chain
+#define SSL_CTX_set0_verify_cert_store bssl_SSL_CTX_set0_verify_cert_store
+#define SSL_CTX_set1_chain bssl_SSL_CTX_set1_chain
+#define SSL_CTX_set1_curves bssl_SSL_CTX_set1_curves
+#define SSL_CTX_set1_param bssl_SSL_CTX_set1_param
+#define SSL_CTX_set1_tls_channel_id bssl_SSL_CTX_set1_tls_channel_id
+#define SSL_CTX_set1_verify_cert_store bssl_SSL_CTX_set1_verify_cert_store
+#define SSL_CTX_set_alpn_protos bssl_SSL_CTX_set_alpn_protos
+#define SSL_CTX_set_alpn_select_cb bssl_SSL_CTX_set_alpn_select_cb
+#define SSL_CTX_set_cert_cb bssl_SSL_CTX_set_cert_cb
+#define SSL_CTX_set_cert_store bssl_SSL_CTX_set_cert_store
+#define SSL_CTX_set_cert_verify_callback bssl_SSL_CTX_set_cert_verify_callback
+#define SSL_CTX_set_channel_id_cb bssl_SSL_CTX_set_channel_id_cb
+#define SSL_CTX_set_cipher_list bssl_SSL_CTX_set_cipher_list
+#define SSL_CTX_set_cipher_list_tls10 bssl_SSL_CTX_set_cipher_list_tls10
+#define SSL_CTX_set_cipher_list_tls11 bssl_SSL_CTX_set_cipher_list_tls11
+#define SSL_CTX_set_client_CA_list bssl_SSL_CTX_set_client_CA_list
+#define SSL_CTX_set_client_cert_cb bssl_SSL_CTX_set_client_cert_cb
+#define SSL_CTX_set_default_passwd_cb bssl_SSL_CTX_set_default_passwd_cb
+#define SSL_CTX_set_default_passwd_cb_userdata bssl_SSL_CTX_set_default_passwd_cb_userdata
+#define SSL_CTX_set_default_verify_paths bssl_SSL_CTX_set_default_verify_paths
+#define SSL_CTX_set_dos_protection_cb bssl_SSL_CTX_set_dos_protection_cb
+#define SSL_CTX_set_ex_data bssl_SSL_CTX_set_ex_data
+#define SSL_CTX_set_info_callback bssl_SSL_CTX_set_info_callback
+#define SSL_CTX_set_keylog_callback bssl_SSL_CTX_set_keylog_callback
+#define SSL_CTX_set_max_cert_list bssl_SSL_CTX_set_max_cert_list
+#define SSL_CTX_set_max_send_fragment bssl_SSL_CTX_set_max_send_fragment
+#define SSL_CTX_set_max_version bssl_SSL_CTX_set_max_version
+#define SSL_CTX_set_min_version bssl_SSL_CTX_set_min_version
+#define SSL_CTX_set_mode bssl_SSL_CTX_set_mode
+#define SSL_CTX_set_msg_callback bssl_SSL_CTX_set_msg_callback
+#define SSL_CTX_set_msg_callback_arg bssl_SSL_CTX_set_msg_callback_arg
+#define SSL_CTX_set_next_protos_advertised_cb bssl_SSL_CTX_set_next_protos_advertised_cb
+#define SSL_CTX_set_next_proto_select_cb bssl_SSL_CTX_set_next_proto_select_cb
+#define SSL_CTX_set_ocsp_response bssl_SSL_CTX_set_ocsp_response
+#define SSL_CTX_set_options bssl_SSL_CTX_set_options
+#define SSL_CTX_set_private_key_method bssl_SSL_CTX_set_private_key_method
+#define SSL_CTX_set_psk_client_callback bssl_SSL_CTX_set_psk_client_callback
+#define SSL_CTX_set_psk_server_callback bssl_SSL_CTX_set_psk_server_callback
+#define SSL_CTX_set_purpose bssl_SSL_CTX_set_purpose
+#define SSL_CTX_set_quiet_shutdown bssl_SSL_CTX_set_quiet_shutdown
+#define SSL_CTX_set_read_ahead bssl_SSL_CTX_set_read_ahead
+#define SSL_CTX_set_retain_only_sha256_of_client_certs bssl_SSL_CTX_set_retain_only_sha256_of_client_certs
+#define SSL_CTX_set_select_certificate_cb bssl_SSL_CTX_set_select_certificate_cb
+#define SSL_CTX_set_session_cache_mode bssl_SSL_CTX_set_session_cache_mode
+#define SSL_CTX_set_session_id_context bssl_SSL_CTX_set_session_id_context
+#define SSL_CTX_set_signed_cert_timestamp_list bssl_SSL_CTX_set_signed_cert_timestamp_list
+#define SSL_CTX_set_srtp_profiles bssl_SSL_CTX_set_srtp_profiles
+#define SSL_CTX_set_timeout bssl_SSL_CTX_set_timeout
+#define SSL_CTX_set_tlsext_servername_arg bssl_SSL_CTX_set_tlsext_servername_arg
+#define SSL_CTX_set_tlsext_servername_callback bssl_SSL_CTX_set_tlsext_servername_callback
+#define SSL_CTX_set_tlsext_ticket_key_cb bssl_SSL_CTX_set_tlsext_ticket_key_cb
+#define SSL_CTX_set_tlsext_ticket_keys bssl_SSL_CTX_set_tlsext_ticket_keys
+#define SSL_CTX_set_tlsext_use_srtp bssl_SSL_CTX_set_tlsext_use_srtp
+#define SSL_CTX_set_tmp_dh bssl_SSL_CTX_set_tmp_dh
+#define SSL_CTX_set_tmp_dh_callback bssl_SSL_CTX_set_tmp_dh_callback
+#define SSL_CTX_set_tmp_ecdh bssl_SSL_CTX_set_tmp_ecdh
+#define SSL_CTX_set_tmp_rsa bssl_SSL_CTX_set_tmp_rsa
+#define SSL_CTX_set_tmp_rsa_callback bssl_SSL_CTX_set_tmp_rsa_callback
+#define SSL_CTX_set_trust bssl_SSL_CTX_set_trust
+#define SSL_CTX_set_verify bssl_SSL_CTX_set_verify
+#define SSL_CTX_set_verify_depth bssl_SSL_CTX_set_verify_depth
+#define SSL_CTX_use_certificate bssl_SSL_CTX_use_certificate
+#define SSL_CTX_use_certificate_ASN1 bssl_SSL_CTX_use_certificate_ASN1
+#define SSL_CTX_use_certificate_chain_file bssl_SSL_CTX_use_certificate_chain_file
+#define SSL_CTX_use_certificate_file bssl_SSL_CTX_use_certificate_file
+#define SSL_CTX_use_PrivateKey bssl_SSL_CTX_use_PrivateKey
+#define SSL_CTX_use_PrivateKey_ASN1 bssl_SSL_CTX_use_PrivateKey_ASN1
+#define SSL_CTX_use_PrivateKey_file bssl_SSL_CTX_use_PrivateKey_file
+#define SSL_CTX_use_psk_identity_hint bssl_SSL_CTX_use_psk_identity_hint
+#define SSL_CTX_use_RSAPrivateKey bssl_SSL_CTX_use_RSAPrivateKey
+#define SSL_CTX_use_RSAPrivateKey_ASN1 bssl_SSL_CTX_use_RSAPrivateKey_ASN1
+#define SSL_CTX_use_RSAPrivateKey_file bssl_SSL_CTX_use_RSAPrivateKey_file
+#define SSL_CUSTOM_EXTENSION_free bssl_SSL_CUSTOM_EXTENSION_free
+#define SSL_cutthrough_complete bssl_SSL_cutthrough_complete
+#define ssl_do_client_cert_cb bssl_ssl_do_client_cert_cb
+#define SSL_do_handshake bssl_SSL_do_handshake
+#define SSL_dup_CA_list bssl_SSL_dup_CA_list
+#define SSL_early_callback_ctx_extension_get bssl_SSL_early_callback_ctx_extension_get
+#define ssl_early_callback_init bssl_ssl_early_callback_init
+#define SSLeay bssl_SSLeay
+#define SSLeay_version bssl_SSLeay_version
+#define SSL_ECDH_CTX_cleanup bssl_SSL_ECDH_CTX_cleanup
+#define SSL_ECDH_CTX_compute_secret bssl_SSL_ECDH_CTX_compute_secret
+#define SSL_ECDH_CTX_generate_keypair bssl_SSL_ECDH_CTX_generate_keypair
+#define SSL_ECDH_CTX_init bssl_SSL_ECDH_CTX_init
+#define SSL_ECDH_CTX_init_for_dhe bssl_SSL_ECDH_CTX_init_for_dhe
+#define SSL_enable_ocsp_stapling bssl_SSL_enable_ocsp_stapling
+#define SSL_enable_signed_cert_timestamps bssl_SSL_enable_signed_cert_timestamps
+#define SSL_enable_tls_channel_id bssl_SSL_enable_tls_channel_id
+#define SSL_export_keying_material bssl_SSL_export_keying_material
+#define SSL_extension_supported bssl_SSL_extension_supported
+#define ssl_fill_hello_random bssl_ssl_fill_hello_random
+#define SSL_free bssl_SSL_free
+#define ssl_free_wbio_buffer bssl_ssl_free_wbio_buffer
+#define SSL_generate_key_block bssl_SSL_generate_key_block
+#define SSL_get0_alpn_selected bssl_SSL_get0_alpn_selected
+#define SSL_get0_certificate_types bssl_SSL_get0_certificate_types
+#define SSL_get0_chain_certs bssl_SSL_get0_chain_certs
+#define SSL_get0_next_proto_negotiated bssl_SSL_get0_next_proto_negotiated
+#define SSL_get0_ocsp_response bssl_SSL_get0_ocsp_response
+#define SSL_get0_param bssl_SSL_get0_param
+#define SSL_get0_signed_cert_timestamp_list bssl_SSL_get0_signed_cert_timestamp_list
+#define SSL_get1_session bssl_SSL_get1_session
+#define ssl_get_algorithm_prf bssl_ssl_get_algorithm_prf
+#define SSL_get_certificate bssl_SSL_get_certificate
+#define SSL_get_cipher_by_value bssl_SSL_get_cipher_by_value
+#define SSL_get_cipher_list bssl_SSL_get_cipher_list
+#define ssl_get_cipher_preferences bssl_ssl_get_cipher_preferences
+#define SSL_get_ciphers bssl_SSL_get_ciphers
+#define ssl_get_ciphers_by_id bssl_ssl_get_ciphers_by_id
+#define SSL_get_client_CA_list bssl_SSL_get_client_CA_list
+#define SSL_get_client_random bssl_SSL_get_client_random
+#define ssl_get_compatible_server_ciphers bssl_ssl_get_compatible_server_ciphers
+#define SSL_get_current_cipher bssl_SSL_get_current_cipher
+#define SSL_get_current_compression bssl_SSL_get_current_compression
+#define SSL_get_current_expansion bssl_SSL_get_current_expansion
+#define SSL_get_curve_name bssl_SSL_get_curve_name
+#define SSL_get_default_timeout bssl_SSL_get_default_timeout
+#define SSL_get_error bssl_SSL_get_error
+#define SSL_get_ex_data bssl_SSL_get_ex_data
+#define SSL_get_ex_data_X509_STORE_CTX_idx bssl_SSL_get_ex_data_X509_STORE_CTX_idx
+#define SSL_get_ex_new_index bssl_SSL_get_ex_new_index
+#define SSL_get_extms_support bssl_SSL_get_extms_support
+#define SSL_get_fd bssl_SSL_get_fd
+#define SSL_get_finished bssl_SSL_get_finished
+#define ssl_get_handshake_digest bssl_ssl_get_handshake_digest
+#define SSL_get_info_callback bssl_SSL_get_info_callback
+#define SSL_get_ivs bssl_SSL_get_ivs
+#define SSL_get_key_block_len bssl_SSL_get_key_block_len
+#define SSL_get_max_cert_list bssl_SSL_get_max_cert_list
+#define SSL_get_mode bssl_SSL_get_mode
+#define ssl_get_new_session bssl_ssl_get_new_session
+#define SSL_get_options bssl_SSL_get_options
+#define SSL_get_peer_cert_chain bssl_SSL_get_peer_cert_chain
+#define SSL_get_peer_certificate bssl_SSL_get_peer_certificate
+#define SSL_get_peer_finished bssl_SSL_get_peer_finished
+#define SSL_get_pending_cipher bssl_SSL_get_pending_cipher
+#define ssl_get_prev_session bssl_ssl_get_prev_session
+#define SSL_get_privatekey bssl_SSL_get_privatekey
+#define SSL_get_psk_identity bssl_SSL_get_psk_identity
+#define SSL_get_psk_identity_hint bssl_SSL_get_psk_identity_hint
+#define SSL_get_quiet_shutdown bssl_SSL_get_quiet_shutdown
+#define SSL_get_rbio bssl_SSL_get_rbio
+#define SSL_get_rc4_state bssl_SSL_get_rc4_state
+#define SSL_get_read_ahead bssl_SSL_get_read_ahead
+#define SSL_get_read_sequence bssl_SSL_get_read_sequence
+#define SSL_get_rfd bssl_SSL_get_rfd
+#define SSL_get_secure_renegotiation_support bssl_SSL_get_secure_renegotiation_support
+#define SSL_get_selected_srtp_profile bssl_SSL_get_selected_srtp_profile
+#define SSL_get_server_key_exchange_hash bssl_SSL_get_server_key_exchange_hash
+#define SSL_get_servername bssl_SSL_get_servername
+#define SSL_get_servername_type bssl_SSL_get_servername_type
+#define SSL_get_server_random bssl_SSL_get_server_random
+#define SSL_get_server_tmp_key bssl_SSL_get_server_tmp_key
+#define SSL_get_session bssl_SSL_get_session
+#define SSL_get_shared_ciphers bssl_SSL_get_shared_ciphers
+#define SSL_get_shutdown bssl_SSL_get_shutdown
+#define SSL_get_srtp_profiles bssl_SSL_get_srtp_profiles
+#define SSL_get_SSL_CTX bssl_SSL_get_SSL_CTX
+#define SSL_get_structure_sizes bssl_SSL_get_structure_sizes
+#define SSL_get_tls_channel_id bssl_SSL_get_tls_channel_id
+#define SSL_get_tls_unique bssl_SSL_get_tls_unique
+#define SSL_get_verify_callback bssl_SSL_get_verify_callback
+#define SSL_get_verify_depth bssl_SSL_get_verify_depth
+#define SSL_get_verify_mode bssl_SSL_get_verify_mode
+#define SSL_get_verify_result bssl_SSL_get_verify_result
+#define SSL_get_version bssl_SSL_get_version
+#define SSL_get_wbio bssl_SSL_get_wbio
+#define SSL_get_wfd bssl_SSL_get_wfd
+#define SSL_get_write_sequence bssl_SSL_get_write_sequence
+#define ssl_has_private_key bssl_ssl_has_private_key
+#define SSL_in_false_start bssl_SSL_in_false_start
+#define SSL_in_init bssl_SSL_in_init
+#define ssl_init_wbio_buffer bssl_ssl_init_wbio_buffer
+#define SSL_is_init_finished bssl_SSL_is_init_finished
+#define SSL_is_server bssl_SSL_is_server
+#define SSL_library_init bssl_SSL_library_init
+#define SSL_load_client_CA_file bssl_SSL_load_client_CA_file
+#define SSL_load_error_strings bssl_SSL_load_error_strings
+#define ssl_log_master_secret bssl_ssl_log_master_secret
+#define ssl_log_rsa_client_key_exchange bssl_ssl_log_rsa_client_key_exchange
+#define SSL_magic_pending_session_ptr bssl_SSL_magic_pending_session_ptr
+#define ssl_max_seal_overhead bssl_ssl_max_seal_overhead
+#define SSL_need_tmp_RSA bssl_SSL_need_tmp_RSA
+#define SSL_new bssl_SSL_new
+#define ssl_nid_to_curve_id bssl_ssl_nid_to_curve_id
+#define SSL_num_renegotiations bssl_SSL_num_renegotiations
+#define ssl_parse_clienthello_tlsext bssl_ssl_parse_clienthello_tlsext
+#define ssl_parse_serverhello_tlsext bssl_ssl_parse_serverhello_tlsext
+#define SSL_peek bssl_SSL_peek
+#define SSL_pending bssl_SSL_pending
+#define ssl_private_key_decrypt bssl_ssl_private_key_decrypt
+#define ssl_private_key_decrypt_complete bssl_ssl_private_key_decrypt_complete
+#define ssl_private_key_max_signature_len bssl_ssl_private_key_max_signature_len
+#define ssl_private_key_sign bssl_ssl_private_key_sign
+#define ssl_private_key_sign_complete bssl_ssl_private_key_sign_complete
+#define ssl_private_key_type bssl_ssl_private_key_type
+#define SSL_read bssl_SSL_read
+#define ssl_read_buffer bssl_ssl_read_buffer
+#define ssl_read_buffer_clear bssl_ssl_read_buffer_clear
+#define ssl_read_buffer_consume bssl_ssl_read_buffer_consume
+#define ssl_read_buffer_discard bssl_ssl_read_buffer_discard
+#define ssl_read_buffer_extend_to bssl_ssl_read_buffer_extend_to
+#define ssl_read_buffer_len bssl_ssl_read_buffer_len
+#define ssl_record_prefix_len bssl_ssl_record_prefix_len
+#define ssl_record_sequence_update bssl_ssl_record_sequence_update
+#define SSL_renegotiate bssl_SSL_renegotiate
+#define SSL_renegotiate_pending bssl_SSL_renegotiate_pending
+#define ssl_seal_prefix_len bssl_ssl_seal_prefix_len
+#define SSL_select_next_proto bssl_SSL_select_next_proto
+#define SSL_SESSION_free bssl_SSL_SESSION_free
+#define SSL_SESSION_from_bytes bssl_SSL_SESSION_from_bytes
+#define SSL_SESSION_get0_peer bssl_SSL_SESSION_get0_peer
+#define SSL_SESSION_get_ex_data bssl_SSL_SESSION_get_ex_data
+#define SSL_SESSION_get_ex_new_index bssl_SSL_SESSION_get_ex_new_index
+#define SSL_SESSION_get_id bssl_SSL_SESSION_get_id
+#define SSL_SESSION_get_key_exchange_info bssl_SSL_SESSION_get_key_exchange_info
+#define SSL_SESSION_get_master_key bssl_SSL_SESSION_get_master_key
+#define SSL_SESSION_get_time bssl_SSL_SESSION_get_time
+#define SSL_SESSION_get_timeout bssl_SSL_SESSION_get_timeout
+#define SSL_SESSION_get_version bssl_SSL_SESSION_get_version
+#define SSL_SESSION_new bssl_SSL_SESSION_new
+#define SSL_session_reused bssl_SSL_session_reused
+#define SSL_SESSION_set1_id_context bssl_SSL_SESSION_set1_id_context
+#define SSL_SESSION_set_ex_data bssl_SSL_SESSION_set_ex_data
+#define SSL_SESSION_set_time bssl_SSL_SESSION_set_time
+#define SSL_SESSION_set_timeout bssl_SSL_SESSION_set_timeout
+#define SSL_SESSION_to_bytes bssl_SSL_SESSION_to_bytes
+#define SSL_SESSION_to_bytes_for_ticket bssl_SSL_SESSION_to_bytes_for_ticket
+#define SSL_SESSION_up_ref bssl_SSL_SESSION_up_ref
+#define SSL_set0_chain bssl_SSL_set0_chain
+#define SSL_set0_verify_cert_store bssl_SSL_set0_verify_cert_store
+#define SSL_set1_chain bssl_SSL_set1_chain
+#define SSL_set1_curves bssl_SSL_set1_curves
+#define SSL_set1_param bssl_SSL_set1_param
+#define SSL_set1_tls_channel_id bssl_SSL_set1_tls_channel_id
+#define SSL_set1_verify_cert_store bssl_SSL_set1_verify_cert_store
+#define SSL_set_accept_state bssl_SSL_set_accept_state
+#define SSL_set_alpn_protos bssl_SSL_set_alpn_protos
+#define SSL_set_bio bssl_SSL_set_bio
+#define SSL_set_cert_cb bssl_SSL_set_cert_cb
+#define SSL_set_cipher_list bssl_SSL_set_cipher_list
+#define SSL_set_client_CA_list bssl_SSL_set_client_CA_list
+#define ssl_set_client_disabled bssl_ssl_set_client_disabled
+#define SSL_set_connect_state bssl_SSL_set_connect_state
+#define SSL_set_ex_data bssl_SSL_set_ex_data
+#define SSL_set_fd bssl_SSL_set_fd
+#define SSL_set_info_callback bssl_SSL_set_info_callback
+#define SSL_set_max_cert_list bssl_SSL_set_max_cert_list
+#define SSL_set_max_send_fragment bssl_SSL_set_max_send_fragment
+#define SSL_set_max_version bssl_SSL_set_max_version
+#define SSL_set_min_version bssl_SSL_set_min_version
+#define SSL_set_mode bssl_SSL_set_mode
+#define SSL_set_msg_callback bssl_SSL_set_msg_callback
+#define SSL_set_msg_callback_arg bssl_SSL_set_msg_callback_arg
+#define SSL_set_mtu bssl_SSL_set_mtu
+#define SSL_set_options bssl_SSL_set_options
+#define SSL_set_private_key_digest_prefs bssl_SSL_set_private_key_digest_prefs
+#define SSL_set_private_key_method bssl_SSL_set_private_key_method
+#define SSL_set_psk_client_callback bssl_SSL_set_psk_client_callback
+#define SSL_set_psk_server_callback bssl_SSL_set_psk_server_callback
+#define SSL_set_purpose bssl_SSL_set_purpose
+#define SSL_set_quiet_shutdown bssl_SSL_set_quiet_shutdown
+#define SSL_set_read_ahead bssl_SSL_set_read_ahead
+#define ssl_set_read_state bssl_ssl_set_read_state
+#define SSL_set_reject_peer_renegotiations bssl_SSL_set_reject_peer_renegotiations
+#define SSL_set_renegotiate_mode bssl_SSL_set_renegotiate_mode
+#define SSL_set_rfd bssl_SSL_set_rfd
+#define SSL_set_session bssl_SSL_set_session
+#define SSL_set_session_id_context bssl_SSL_set_session_id_context
+#define SSL_set_shutdown bssl_SSL_set_shutdown
+#define SSL_set_srtp_profiles bssl_SSL_set_srtp_profiles
+#define SSL_set_SSL_CTX bssl_SSL_set_SSL_CTX
+#define SSL_set_state bssl_SSL_set_state
+#define SSL_set_tlsext_host_name bssl_SSL_set_tlsext_host_name
+#define SSL_set_tlsext_use_srtp bssl_SSL_set_tlsext_use_srtp
+#define SSL_set_tmp_dh bssl_SSL_set_tmp_dh
+#define SSL_set_tmp_dh_callback bssl_SSL_set_tmp_dh_callback
+#define SSL_set_tmp_ecdh bssl_SSL_set_tmp_ecdh
+#define SSL_set_tmp_rsa bssl_SSL_set_tmp_rsa
+#define SSL_set_tmp_rsa_callback bssl_SSL_set_tmp_rsa_callback
+#define SSL_set_trust bssl_SSL_set_trust
+#define SSL_set_verify bssl_SSL_set_verify
+#define SSL_set_verify_depth bssl_SSL_set_verify_depth
+#define SSL_set_verify_result bssl_SSL_set_verify_result
+#define SSL_set_wfd bssl_SSL_set_wfd
+#define ssl_set_write_state bssl_ssl_set_write_state
+#define SSL_shutdown bssl_SSL_shutdown
+#define SSL_state bssl_SSL_state
+#define SSL_state_string bssl_SSL_state_string
+#define SSL_state_string_long bssl_SSL_state_string_long
+#define SSL_total_renegotiations bssl_SSL_total_renegotiations
+#define ssl_update_cache bssl_ssl_update_cache
+#define SSL_use_certificate bssl_SSL_use_certificate
+#define SSL_use_certificate_ASN1 bssl_SSL_use_certificate_ASN1
+#define SSL_use_certificate_file bssl_SSL_use_certificate_file
+#define SSL_use_PrivateKey bssl_SSL_use_PrivateKey
+#define SSL_use_PrivateKey_ASN1 bssl_SSL_use_PrivateKey_ASN1
+#define SSL_use_PrivateKey_file bssl_SSL_use_PrivateKey_file
+#define SSL_use_psk_identity_hint bssl_SSL_use_psk_identity_hint
+#define SSL_use_RSAPrivateKey bssl_SSL_use_RSAPrivateKey
+#define SSL_use_RSAPrivateKey_ASN1 bssl_SSL_use_RSAPrivateKey_ASN1
+#define SSL_use_RSAPrivateKey_file bssl_SSL_use_RSAPrivateKey_file
+#define SSLv23_client_method bssl_SSLv23_client_method
+#define SSLv23_method bssl_SSLv23_method
+#define SSLv23_server_method bssl_SSLv23_server_method
+#define SSLv3_client_method bssl_SSLv3_client_method
+#define SSLv3_enc_data bssl_SSLv3_enc_data
+#define SSLv3_method bssl_SSLv3_method
+#define SSLv3_server_method bssl_SSLv3_server_method
+#define ssl_verify_alarm_type bssl_ssl_verify_alarm_type
+#define ssl_verify_cert_chain bssl_ssl_verify_cert_chain
+#define SSL_version bssl_SSL_version
+#define SSL_want bssl_SSL_want
+#define SSL_write bssl_SSL_write
+#define ssl_write_buffer_clear bssl_ssl_write_buffer_clear
+#define ssl_write_buffer_flush bssl_ssl_write_buffer_flush
+#define ssl_write_buffer_init bssl_ssl_write_buffer_init
+#define ssl_write_buffer_is_pending bssl_ssl_write_buffer_is_pending
+#define ssl_write_buffer_set_len bssl_ssl_write_buffer_set_len
+#define string_to_hex bssl_string_to_hex
+#define SXNET_add_id_asc bssl_SXNET_add_id_asc
+#define SXNET_add_id_INTEGER bssl_SXNET_add_id_INTEGER
+#define SXNET_add_id_ulong bssl_SXNET_add_id_ulong
+#define SXNET_free bssl_SXNET_free
+#define SXNET_get_id_asc bssl_SXNET_get_id_asc
+#define SXNET_get_id_INTEGER bssl_SXNET_get_id_INTEGER
+#define SXNET_get_id_ulong bssl_SXNET_get_id_ulong
+#define SXNETID_free bssl_SXNETID_free
+#define SXNETID_it bssl_SXNETID_it
+#define SXNETID_new bssl_SXNETID_new
+#define SXNET_it bssl_SXNET_it
+#define SXNET_new bssl_SXNET_new
+#define tls12_add_sigandhash bssl_tls12_add_sigandhash
+#define tls12_check_peer_sigalg bssl_tls12_check_peer_sigalg
+#define tls12_get_hash bssl_tls12_get_hash
+#define tls12_get_psigalgs bssl_tls12_get_psigalgs
+#define tls12_get_sigid bssl_tls12_get_sigid
+#define tls1_change_cipher_state bssl_tls1_change_cipher_state
+#define tls1_channel_id_hash bssl_tls1_channel_id_hash
+#define tls1_check_curve_id bssl_tls1_check_curve_id
+#define tls1_check_ec_cert bssl_tls1_check_ec_cert
+#define tls1_choose_signing_digest bssl_tls1_choose_signing_digest
+#define tls1_generate_master_secret bssl_tls1_generate_master_secret
+#define tls1_get_shared_curve bssl_tls1_get_shared_curve
+#define tls1_handshake_digest bssl_tls1_handshake_digest
+#define tls1_parse_peer_sigalgs bssl_tls1_parse_peer_sigalgs
+#define tls1_record_handshake_hashes_for_channel_id bssl_tls1_record_handshake_hashes_for_channel_id
+#define tls1_set_curves bssl_tls1_set_curves
+#define tls1_setup_key_block bssl_tls1_setup_key_block
+#define TLS_method bssl_TLS_method
+#define tls_open_record bssl_tls_open_record
+#define tls_process_ticket bssl_tls_process_ticket
+#define tls_seal_record bssl_tls_seal_record
+#define TLSv1_1_client_method bssl_TLSv1_1_client_method
+#define TLSv1_1_method bssl_TLSv1_1_method
+#define TLSv1_1_server_method bssl_TLSv1_1_server_method
+#define TLSv1_2_client_method bssl_TLSv1_2_client_method
+#define TLSv1_2_method bssl_TLSv1_2_method
+#define TLSv1_2_server_method bssl_TLSv1_2_server_method
+#define TLSv1_client_method bssl_TLSv1_client_method
+#define TLSv1_enc_data bssl_TLSv1_enc_data
+#define TLSv1_method bssl_TLSv1_method
+#define TLSv1_server_method bssl_TLSv1_server_method
+#define tree_find_sk bssl_tree_find_sk
+#define USERNOTICE_free bssl_USERNOTICE_free
+#define USERNOTICE_it bssl_USERNOTICE_it
+#define USERNOTICE_new bssl_USERNOTICE_new
+#define UTF8_getc bssl_UTF8_getc
+#define UTF8_putc bssl_UTF8_putc
+#define v2i_ASN1_BIT_STRING bssl_v2i_ASN1_BIT_STRING
+#define v2i_GENERAL_NAME bssl_v2i_GENERAL_NAME
+#define v2i_GENERAL_NAME_ex bssl_v2i_GENERAL_NAME_ex
+#define v2i_GENERAL_NAMES bssl_v2i_GENERAL_NAMES
+#define v3_akey_id bssl_v3_akey_id
+#define v3_alt bssl_v3_alt
+#define v3_bcons bssl_v3_bcons
+#define v3_cpols bssl_v3_cpols
+#define v3_crld bssl_v3_crld
+#define v3_crl_num bssl_v3_crl_num
+#define v3_crl_reason bssl_v3_crl_reason
+#define v3_delta_crl bssl_v3_delta_crl
+#define v3_ext_ku bssl_v3_ext_ku
+#define v3_freshest_crl bssl_v3_freshest_crl
+#define v3_idp bssl_v3_idp
+#define v3_info bssl_v3_info
+#define v3_inhibit_anyp bssl_v3_inhibit_anyp
+#define v3_key_usage bssl_v3_key_usage
+#define v3_name_constraints bssl_v3_name_constraints
+#define v3_nscert bssl_v3_nscert
+#define v3_ns_ia5_list bssl_v3_ns_ia5_list
+#define v3_ocsp_accresp bssl_v3_ocsp_accresp
+#define v3_pci bssl_v3_pci
+#define v3_pkey_usage_period bssl_v3_pkey_usage_period
+#define v3_policy_constraints bssl_v3_policy_constraints
+#define v3_policy_mappings bssl_v3_policy_mappings
+#define v3_sinfo bssl_v3_sinfo
+#define v3_skey_id bssl_v3_skey_id
+#define v3_sxnet bssl_v3_sxnet
+#define vpaes_cbc_encrypt bssl_vpaes_cbc_encrypt
+#define vpaes_decrypt bssl_vpaes_decrypt
+#define vpaes_encrypt bssl_vpaes_encrypt
+#define vpaes_set_decrypt_key bssl_vpaes_set_decrypt_key
+#define vpaes_set_encrypt_key bssl_vpaes_set_encrypt_key
+#define X25519 bssl_X25519
+#define x25519_ge_add bssl_x25519_ge_add
+#define x25519_ge_frombytes_vartime bssl_x25519_ge_frombytes_vartime
+#define x25519_ge_p1p1_to_p2 bssl_x25519_ge_p1p1_to_p2
+#define x25519_ge_p1p1_to_p3 bssl_x25519_ge_p1p1_to_p3
+#define x25519_ge_p3_to_cached bssl_x25519_ge_p3_to_cached
+#define x25519_ge_scalarmult bssl_x25519_ge_scalarmult
+#define x25519_ge_scalarmult_base bssl_x25519_ge_scalarmult_base
+#define x25519_ge_scalarmult_small_precomp bssl_x25519_ge_scalarmult_small_precomp
+#define x25519_ge_sub bssl_x25519_ge_sub
+#define x25519_ge_tobytes bssl_x25519_ge_tobytes
+#define X25519_keypair bssl_X25519_keypair
+#define X25519_public_from_private bssl_X25519_public_from_private
+#define x25519_sc_reduce bssl_x25519_sc_reduce
+#define x25519_x86_64 bssl_x25519_x86_64
+#define x25519_x86_64_freeze bssl_x25519_x86_64_freeze
+#define x25519_x86_64_ladderstep bssl_x25519_x86_64_ladderstep
+#define x25519_x86_64_mul bssl_x25519_x86_64_mul
+#define x25519_x86_64_square bssl_x25519_x86_64_square
+#define x25519_x86_64_work_cswap bssl_x25519_x86_64_work_cswap
+#define X509_add1_ext_i2d bssl_X509_add1_ext_i2d
+#define X509_add1_reject_object bssl_X509_add1_reject_object
+#define X509_add1_trust_object bssl_X509_add1_trust_object
+#define X509_add_ext bssl_X509_add_ext
+#define X509_ALGOR_cmp bssl_X509_ALGOR_cmp
+#define X509_ALGOR_dup bssl_X509_ALGOR_dup
+#define X509_ALGOR_free bssl_X509_ALGOR_free
+#define X509_ALGOR_get0 bssl_X509_ALGOR_get0
+#define X509_ALGOR_it bssl_X509_ALGOR_it
+#define X509_ALGOR_new bssl_X509_ALGOR_new
+#define X509_ALGOR_set0 bssl_X509_ALGOR_set0
+#define X509_ALGOR_set_md bssl_X509_ALGOR_set_md
+#define X509_ALGORS_it bssl_X509_ALGORS_it
+#define X509_alias_get0 bssl_X509_alias_get0
+#define X509_alias_set1 bssl_X509_alias_set1
+#define X509at_add1_attr bssl_X509at_add1_attr
+#define X509at_add1_attr_by_NID bssl_X509at_add1_attr_by_NID
+#define X509at_add1_attr_by_OBJ bssl_X509at_add1_attr_by_OBJ
+#define X509at_add1_attr_by_txt bssl_X509at_add1_attr_by_txt
+#define X509at_delete_attr bssl_X509at_delete_attr
+#define X509at_get0_data_by_OBJ bssl_X509at_get0_data_by_OBJ
+#define X509at_get_attr bssl_X509at_get_attr
+#define X509at_get_attr_by_NID bssl_X509at_get_attr_by_NID
+#define X509at_get_attr_by_OBJ bssl_X509at_get_attr_by_OBJ
+#define X509at_get_attr_count bssl_X509at_get_attr_count
+#define X509_ATTRIBUTE_count bssl_X509_ATTRIBUTE_count
+#define X509_ATTRIBUTE_create bssl_X509_ATTRIBUTE_create
+#define X509_ATTRIBUTE_create_by_NID bssl_X509_ATTRIBUTE_create_by_NID
+#define X509_ATTRIBUTE_create_by_OBJ bssl_X509_ATTRIBUTE_create_by_OBJ
+#define X509_ATTRIBUTE_create_by_txt bssl_X509_ATTRIBUTE_create_by_txt
+#define X509_ATTRIBUTE_dup bssl_X509_ATTRIBUTE_dup
+#define X509_ATTRIBUTE_free bssl_X509_ATTRIBUTE_free
+#define X509_ATTRIBUTE_get0_data bssl_X509_ATTRIBUTE_get0_data
+#define X509_ATTRIBUTE_get0_object bssl_X509_ATTRIBUTE_get0_object
+#define X509_ATTRIBUTE_get0_type bssl_X509_ATTRIBUTE_get0_type
+#define X509_ATTRIBUTE_it bssl_X509_ATTRIBUTE_it
+#define X509_ATTRIBUTE_new bssl_X509_ATTRIBUTE_new
+#define X509_ATTRIBUTE_set1_data bssl_X509_ATTRIBUTE_set1_data
+#define X509_ATTRIBUTE_set1_object bssl_X509_ATTRIBUTE_set1_object
+#define X509_ATTRIBUTE_SET_it bssl_X509_ATTRIBUTE_SET_it
+#define X509_CERT_AUX_free bssl_X509_CERT_AUX_free
+#define X509_CERT_AUX_it bssl_X509_CERT_AUX_it
+#define X509_CERT_AUX_new bssl_X509_CERT_AUX_new
+#define X509_CERT_AUX_print bssl_X509_CERT_AUX_print
+#define X509_certificate_type bssl_X509_certificate_type
+#define X509_CERT_PAIR_free bssl_X509_CERT_PAIR_free
+#define X509_CERT_PAIR_it bssl_X509_CERT_PAIR_it
+#define X509_CERT_PAIR_new bssl_X509_CERT_PAIR_new
+#define X509_chain_check_suiteb bssl_X509_chain_check_suiteb
+#define X509_chain_up_ref bssl_X509_chain_up_ref
+#define X509_check_akid bssl_X509_check_akid
+#define X509_check_ca bssl_X509_check_ca
+#define X509_check_email bssl_X509_check_email
+#define X509_check_host bssl_X509_check_host
+#define X509_check_ip bssl_X509_check_ip
+#define X509_check_ip_asc bssl_X509_check_ip_asc
+#define X509_check_issued bssl_X509_check_issued
+#define X509_check_private_key bssl_X509_check_private_key
+#define X509_check_purpose bssl_X509_check_purpose
+#define X509_check_trust bssl_X509_check_trust
+#define X509_CINF_free bssl_X509_CINF_free
+#define X509_CINF_it bssl_X509_CINF_it
+#define X509_CINF_new bssl_X509_CINF_new
+#define X509_cmp bssl_X509_cmp
+#define X509_cmp_current_time bssl_X509_cmp_current_time
+#define X509_cmp_time bssl_X509_cmp_time
+#define X509_CRL_add0_revoked bssl_X509_CRL_add0_revoked
+#define X509_CRL_add1_ext_i2d bssl_X509_CRL_add1_ext_i2d
+#define X509_CRL_add_ext bssl_X509_CRL_add_ext
+#define X509_CRL_check_suiteb bssl_X509_CRL_check_suiteb
+#define X509_CRL_cmp bssl_X509_CRL_cmp
+#define X509_CRL_delete_ext bssl_X509_CRL_delete_ext
+#define X509_CRL_diff bssl_X509_CRL_diff
+#define X509_CRL_digest bssl_X509_CRL_digest
+#define X509_CRL_dup bssl_X509_CRL_dup
+#define X509_CRL_free bssl_X509_CRL_free
+#define X509_CRL_get0_by_cert bssl_X509_CRL_get0_by_cert
+#define X509_CRL_get0_by_serial bssl_X509_CRL_get0_by_serial
+#define X509_CRL_get_ext bssl_X509_CRL_get_ext
+#define X509_CRL_get_ext_by_critical bssl_X509_CRL_get_ext_by_critical
+#define X509_CRL_get_ext_by_NID bssl_X509_CRL_get_ext_by_NID
+#define X509_CRL_get_ext_by_OBJ bssl_X509_CRL_get_ext_by_OBJ
+#define X509_CRL_get_ext_count bssl_X509_CRL_get_ext_count
+#define X509_CRL_get_ext_d2i bssl_X509_CRL_get_ext_d2i
+#define X509_CRL_get_meth_data bssl_X509_CRL_get_meth_data
+#define X509_CRL_INFO_free bssl_X509_CRL_INFO_free
+#define X509_CRL_INFO_it bssl_X509_CRL_INFO_it
+#define X509_CRL_INFO_new bssl_X509_CRL_INFO_new
+#define X509_CRL_it bssl_X509_CRL_it
+#define X509_CRL_match bssl_X509_CRL_match
+#define X509_CRL_METHOD_free bssl_X509_CRL_METHOD_free
+#define X509_CRL_METHOD_new bssl_X509_CRL_METHOD_new
+#define X509_CRL_new bssl_X509_CRL_new
+#define X509_CRL_print bssl_X509_CRL_print
+#define X509_CRL_print_fp bssl_X509_CRL_print_fp
+#define X509_CRL_set_default_method bssl_X509_CRL_set_default_method
+#define X509_CRL_set_issuer_name bssl_X509_CRL_set_issuer_name
+#define X509_CRL_set_lastUpdate bssl_X509_CRL_set_lastUpdate
+#define X509_CRL_set_meth_data bssl_X509_CRL_set_meth_data
+#define X509_CRL_set_nextUpdate bssl_X509_CRL_set_nextUpdate
+#define X509_CRL_set_version bssl_X509_CRL_set_version
+#define X509_CRL_sign bssl_X509_CRL_sign
+#define X509_CRL_sign_ctx bssl_X509_CRL_sign_ctx
+#define X509_CRL_sort bssl_X509_CRL_sort
+#define X509_CRL_up_ref bssl_X509_CRL_up_ref
+#define X509_CRL_verify bssl_X509_CRL_verify
+#define X509_delete_ext bssl_X509_delete_ext
+#define X509_digest bssl_X509_digest
+#define x509_digest_sign_algorithm bssl_x509_digest_sign_algorithm
+#define x509_digest_verify_init bssl_x509_digest_verify_init
+#define X509_dup bssl_X509_dup
+#define X509_email_free bssl_X509_email_free
+#define X509_EXTENSION_create_by_NID bssl_X509_EXTENSION_create_by_NID
+#define X509_EXTENSION_create_by_OBJ bssl_X509_EXTENSION_create_by_OBJ
+#define X509_EXTENSION_dup bssl_X509_EXTENSION_dup
+#define X509_EXTENSION_free bssl_X509_EXTENSION_free
+#define X509_EXTENSION_get_critical bssl_X509_EXTENSION_get_critical
+#define X509_EXTENSION_get_data bssl_X509_EXTENSION_get_data
+#define X509_EXTENSION_get_object bssl_X509_EXTENSION_get_object
+#define X509_EXTENSION_it bssl_X509_EXTENSION_it
+#define X509_EXTENSION_new bssl_X509_EXTENSION_new
+#define X509_EXTENSION_set_critical bssl_X509_EXTENSION_set_critical
+#define X509_EXTENSION_set_data bssl_X509_EXTENSION_set_data
+#define X509_EXTENSION_set_object bssl_X509_EXTENSION_set_object
+#define X509_EXTENSIONS_it bssl_X509_EXTENSIONS_it
+#define X509_find_by_issuer_and_serial bssl_X509_find_by_issuer_and_serial
+#define X509_find_by_subject bssl_X509_find_by_subject
+#define X509_free bssl_X509_free
+#define X509_get0_pubkey_bitstr bssl_X509_get0_pubkey_bitstr
+#define X509_get0_signature bssl_X509_get0_signature
+#define X509_get1_email bssl_X509_get1_email
+#define X509_get1_ocsp bssl_X509_get1_ocsp
+#define X509_get_default_cert_area bssl_X509_get_default_cert_area
+#define X509_get_default_cert_dir bssl_X509_get_default_cert_dir
+#define X509_get_default_cert_dir_env bssl_X509_get_default_cert_dir_env
+#define X509_get_default_cert_file bssl_X509_get_default_cert_file
+#define X509_get_default_cert_file_env bssl_X509_get_default_cert_file_env
+#define X509_get_default_private_dir bssl_X509_get_default_private_dir
+#define X509_get_ex_data bssl_X509_get_ex_data
+#define X509_get_ex_new_index bssl_X509_get_ex_new_index
+#define X509_get_ext bssl_X509_get_ext
+#define X509_get_ext_by_critical bssl_X509_get_ext_by_critical
+#define X509_get_ext_by_NID bssl_X509_get_ext_by_NID
+#define X509_get_ext_by_OBJ bssl_X509_get_ext_by_OBJ
+#define X509_get_ext_count bssl_X509_get_ext_count
+#define X509_get_ext_d2i bssl_X509_get_ext_d2i
+#define X509_get_issuer_name bssl_X509_get_issuer_name
+#define X509_get_pubkey bssl_X509_get_pubkey
+#define X509_get_serialNumber bssl_X509_get_serialNumber
+#define X509_get_signature_nid bssl_X509_get_signature_nid
+#define X509_get_subject_name bssl_X509_get_subject_name
+#define X509_gmtime_adj bssl_X509_gmtime_adj
+#define X509_INFO_free bssl_X509_INFO_free
+#define X509_INFO_new bssl_X509_INFO_new
+#define X509_issuer_and_serial_cmp bssl_X509_issuer_and_serial_cmp
+#define X509_issuer_and_serial_hash bssl_X509_issuer_and_serial_hash
+#define X509_issuer_name_cmp bssl_X509_issuer_name_cmp
+#define X509_issuer_name_hash bssl_X509_issuer_name_hash
+#define X509_issuer_name_hash_old bssl_X509_issuer_name_hash_old
+#define X509_it bssl_X509_it
+#define X509_keyid_get0 bssl_X509_keyid_get0
+#define X509_keyid_set1 bssl_X509_keyid_set1
+#define X509_load_cert_crl_file bssl_X509_load_cert_crl_file
+#define X509_load_cert_file bssl_X509_load_cert_file
+#define X509_load_crl_file bssl_X509_load_crl_file
+#define X509_LOOKUP_by_alias bssl_X509_LOOKUP_by_alias
+#define X509_LOOKUP_by_fingerprint bssl_X509_LOOKUP_by_fingerprint
+#define X509_LOOKUP_by_issuer_serial bssl_X509_LOOKUP_by_issuer_serial
+#define X509_LOOKUP_by_subject bssl_X509_LOOKUP_by_subject
+#define X509_LOOKUP_ctrl bssl_X509_LOOKUP_ctrl
+#define X509_LOOKUP_file bssl_X509_LOOKUP_file
+#define X509_LOOKUP_free bssl_X509_LOOKUP_free
+#define X509_LOOKUP_hash_dir bssl_X509_LOOKUP_hash_dir
+#define X509_LOOKUP_init bssl_X509_LOOKUP_init
+#define X509_LOOKUP_new bssl_X509_LOOKUP_new
+#define X509_LOOKUP_shutdown bssl_X509_LOOKUP_shutdown
+#define X509_NAME_add_entry bssl_X509_NAME_add_entry
+#define X509_NAME_add_entry_by_NID bssl_X509_NAME_add_entry_by_NID
+#define X509_NAME_add_entry_by_OBJ bssl_X509_NAME_add_entry_by_OBJ
+#define X509_NAME_add_entry_by_txt bssl_X509_NAME_add_entry_by_txt
+#define X509_NAME_cmp bssl_X509_NAME_cmp
+#define X509_NAME_delete_entry bssl_X509_NAME_delete_entry
+#define X509_NAME_digest bssl_X509_NAME_digest
+#define X509_NAME_dup bssl_X509_NAME_dup
+#define X509_NAME_ENTRIES_it bssl_X509_NAME_ENTRIES_it
+#define X509_NAME_entry_count bssl_X509_NAME_entry_count
+#define X509_NAME_ENTRY_create_by_NID bssl_X509_NAME_ENTRY_create_by_NID
+#define X509_NAME_ENTRY_create_by_OBJ bssl_X509_NAME_ENTRY_create_by_OBJ
+#define X509_NAME_ENTRY_create_by_txt bssl_X509_NAME_ENTRY_create_by_txt
+#define X509_NAME_ENTRY_dup bssl_X509_NAME_ENTRY_dup
+#define X509_NAME_ENTRY_free bssl_X509_NAME_ENTRY_free
+#define X509_NAME_ENTRY_get_data bssl_X509_NAME_ENTRY_get_data
+#define X509_NAME_ENTRY_get_object bssl_X509_NAME_ENTRY_get_object
+#define X509_NAME_ENTRY_it bssl_X509_NAME_ENTRY_it
+#define X509_NAME_ENTRY_new bssl_X509_NAME_ENTRY_new
+#define X509_NAME_ENTRY_set_data bssl_X509_NAME_ENTRY_set_data
+#define X509_NAME_ENTRY_set_object bssl_X509_NAME_ENTRY_set_object
+#define X509_NAME_free bssl_X509_NAME_free
+#define X509_NAME_get_entry bssl_X509_NAME_get_entry
+#define X509_NAME_get_index_by_NID bssl_X509_NAME_get_index_by_NID
+#define X509_NAME_get_index_by_OBJ bssl_X509_NAME_get_index_by_OBJ
+#define X509_NAME_get_text_by_NID bssl_X509_NAME_get_text_by_NID
+#define X509_NAME_get_text_by_OBJ bssl_X509_NAME_get_text_by_OBJ
+#define X509_NAME_hash bssl_X509_NAME_hash
+#define X509_NAME_hash_old bssl_X509_NAME_hash_old
+#define X509_NAME_INTERNAL_it bssl_X509_NAME_INTERNAL_it
+#define X509_NAME_it bssl_X509_NAME_it
+#define X509_NAME_new bssl_X509_NAME_new
+#define X509_NAME_oneline bssl_X509_NAME_oneline
+#define X509_NAME_print bssl_X509_NAME_print
+#define X509_NAME_print_ex bssl_X509_NAME_print_ex
+#define X509_NAME_print_ex_fp bssl_X509_NAME_print_ex_fp
+#define X509_NAME_set bssl_X509_NAME_set
+#define X509_new bssl_X509_new
+#define X509_OBJECT_free_contents bssl_X509_OBJECT_free_contents
+#define X509_OBJECT_idx_by_subject bssl_X509_OBJECT_idx_by_subject
+#define X509_OBJECT_retrieve_by_subject bssl_X509_OBJECT_retrieve_by_subject
+#define X509_OBJECT_retrieve_match bssl_X509_OBJECT_retrieve_match
+#define X509_OBJECT_up_ref_count bssl_X509_OBJECT_up_ref_count
+#define X509_ocspid_print bssl_X509_ocspid_print
+#define X509_PKEY_free bssl_X509_PKEY_free
+#define X509_PKEY_new bssl_X509_PKEY_new
+#define X509_policy_check bssl_X509_policy_check
+#define X509_policy_level_get0_node bssl_X509_policy_level_get0_node
+#define X509_policy_level_node_count bssl_X509_policy_level_node_count
+#define X509_policy_node_get0_parent bssl_X509_policy_node_get0_parent
+#define X509_policy_node_get0_policy bssl_X509_policy_node_get0_policy
+#define X509_policy_node_get0_qualifiers bssl_X509_policy_node_get0_qualifiers
+#define X509_POLICY_NODE_print bssl_X509_POLICY_NODE_print
+#define X509_policy_tree_free bssl_X509_policy_tree_free
+#define X509_policy_tree_get0_level bssl_X509_policy_tree_get0_level
+#define X509_policy_tree_get0_policies bssl_X509_policy_tree_get0_policies
+#define X509_policy_tree_get0_user_policies bssl_X509_policy_tree_get0_user_policies
+#define X509_policy_tree_level_count bssl_X509_policy_tree_level_count
+#define X509_print bssl_X509_print
+#define X509_print_ex bssl_X509_print_ex
+#define X509_print_ex_fp bssl_X509_print_ex_fp
+#define X509_print_fp bssl_X509_print_fp
+#define x509_print_rsa_pss_params bssl_x509_print_rsa_pss_params
+#define X509_pubkey_digest bssl_X509_pubkey_digest
+#define X509_PUBKEY_free bssl_X509_PUBKEY_free
+#define X509_PUBKEY_get bssl_X509_PUBKEY_get
+#define X509_PUBKEY_get0_param bssl_X509_PUBKEY_get0_param
+#define X509_PUBKEY_it bssl_X509_PUBKEY_it
+#define X509_PUBKEY_new bssl_X509_PUBKEY_new
+#define X509_PUBKEY_set bssl_X509_PUBKEY_set
+#define X509_PUBKEY_set0_param bssl_X509_PUBKEY_set0_param
+#define X509_PURPOSE_add bssl_X509_PURPOSE_add
+#define X509_PURPOSE_cleanup bssl_X509_PURPOSE_cleanup
+#define X509_PURPOSE_get0 bssl_X509_PURPOSE_get0
+#define X509_PURPOSE_get0_name bssl_X509_PURPOSE_get0_name
+#define X509_PURPOSE_get0_sname bssl_X509_PURPOSE_get0_sname
+#define X509_PURPOSE_get_by_id bssl_X509_PURPOSE_get_by_id
+#define X509_PURPOSE_get_by_sname bssl_X509_PURPOSE_get_by_sname
+#define X509_PURPOSE_get_count bssl_X509_PURPOSE_get_count
+#define X509_PURPOSE_get_id bssl_X509_PURPOSE_get_id
+#define X509_PURPOSE_get_trust bssl_X509_PURPOSE_get_trust
+#define X509_PURPOSE_set bssl_X509_PURPOSE_set
+#define X509_reject_clear bssl_X509_reject_clear
+#define X509_REQ_add1_attr bssl_X509_REQ_add1_attr
+#define X509_REQ_add1_attr_by_NID bssl_X509_REQ_add1_attr_by_NID
+#define X509_REQ_add1_attr_by_OBJ bssl_X509_REQ_add1_attr_by_OBJ
+#define X509_REQ_add1_attr_by_txt bssl_X509_REQ_add1_attr_by_txt
+#define X509_REQ_add_extensions bssl_X509_REQ_add_extensions
+#define X509_REQ_add_extensions_nid bssl_X509_REQ_add_extensions_nid
+#define X509_REQ_check_private_key bssl_X509_REQ_check_private_key
+#define X509_REQ_delete_attr bssl_X509_REQ_delete_attr
+#define X509_REQ_digest bssl_X509_REQ_digest
+#define X509_REQ_dup bssl_X509_REQ_dup
+#define X509_REQ_extension_nid bssl_X509_REQ_extension_nid
+#define X509_REQ_free bssl_X509_REQ_free
+#define X509_REQ_get1_email bssl_X509_REQ_get1_email
+#define X509_REQ_get_attr bssl_X509_REQ_get_attr
+#define X509_REQ_get_attr_by_NID bssl_X509_REQ_get_attr_by_NID
+#define X509_REQ_get_attr_by_OBJ bssl_X509_REQ_get_attr_by_OBJ
+#define X509_REQ_get_attr_count bssl_X509_REQ_get_attr_count
+#define X509_REQ_get_extension_nids bssl_X509_REQ_get_extension_nids
+#define X509_REQ_get_extensions bssl_X509_REQ_get_extensions
+#define X509_REQ_get_pubkey bssl_X509_REQ_get_pubkey
+#define X509_REQ_INFO_free bssl_X509_REQ_INFO_free
+#define X509_REQ_INFO_it bssl_X509_REQ_INFO_it
+#define X509_REQ_INFO_new bssl_X509_REQ_INFO_new
+#define X509_REQ_it bssl_X509_REQ_it
+#define X509_REQ_new bssl_X509_REQ_new
+#define X509_REQ_print bssl_X509_REQ_print
+#define X509_REQ_print_ex bssl_X509_REQ_print_ex
+#define X509_REQ_print_fp bssl_X509_REQ_print_fp
+#define X509_REQ_set_extension_nids bssl_X509_REQ_set_extension_nids
+#define X509_REQ_set_pubkey bssl_X509_REQ_set_pubkey
+#define X509_REQ_set_subject_name bssl_X509_REQ_set_subject_name
+#define X509_REQ_set_version bssl_X509_REQ_set_version
+#define X509_REQ_sign bssl_X509_REQ_sign
+#define X509_REQ_sign_ctx bssl_X509_REQ_sign_ctx
+#define X509_REQ_to_X509 bssl_X509_REQ_to_X509
+#define X509_REQ_verify bssl_X509_REQ_verify
+#define X509_REVOKED_add1_ext_i2d bssl_X509_REVOKED_add1_ext_i2d
+#define X509_REVOKED_add_ext bssl_X509_REVOKED_add_ext
+#define X509_REVOKED_delete_ext bssl_X509_REVOKED_delete_ext
+#define X509_REVOKED_dup bssl_X509_REVOKED_dup
+#define X509_REVOKED_free bssl_X509_REVOKED_free
+#define X509_REVOKED_get_ext bssl_X509_REVOKED_get_ext
+#define X509_REVOKED_get_ext_by_critical bssl_X509_REVOKED_get_ext_by_critical
+#define X509_REVOKED_get_ext_by_NID bssl_X509_REVOKED_get_ext_by_NID
+#define X509_REVOKED_get_ext_by_OBJ bssl_X509_REVOKED_get_ext_by_OBJ
+#define X509_REVOKED_get_ext_count bssl_X509_REVOKED_get_ext_count
+#define X509_REVOKED_get_ext_d2i bssl_X509_REVOKED_get_ext_d2i
+#define X509_REVOKED_it bssl_X509_REVOKED_it
+#define X509_REVOKED_new bssl_X509_REVOKED_new
+#define X509_REVOKED_set_revocationDate bssl_X509_REVOKED_set_revocationDate
+#define X509_REVOKED_set_serialNumber bssl_X509_REVOKED_set_serialNumber
+#define x509_rsa_ctx_to_pss bssl_x509_rsa_ctx_to_pss
+#define x509_rsa_pss_to_ctx bssl_x509_rsa_pss_to_ctx
+#define X509_set_ex_data bssl_X509_set_ex_data
+#define X509_set_issuer_name bssl_X509_set_issuer_name
+#define X509_set_notAfter bssl_X509_set_notAfter
+#define X509_set_notBefore bssl_X509_set_notBefore
+#define X509_set_pubkey bssl_X509_set_pubkey
+#define X509_set_serialNumber bssl_X509_set_serialNumber
+#define X509_set_subject_name bssl_X509_set_subject_name
+#define X509_set_version bssl_X509_set_version
+#define X509_SIG_free bssl_X509_SIG_free
+#define X509_SIG_it bssl_X509_SIG_it
+#define X509_sign bssl_X509_sign
+#define X509_signature_dump bssl_X509_signature_dump
+#define X509_signature_print bssl_X509_signature_print
+#define X509_sign_ctx bssl_X509_sign_ctx
+#define X509_SIG_new bssl_X509_SIG_new
+#define X509_STORE_add_cert bssl_X509_STORE_add_cert
+#define X509_STORE_add_crl bssl_X509_STORE_add_crl
+#define X509_STORE_add_lookup bssl_X509_STORE_add_lookup
+#define X509_STORE_CTX_cleanup bssl_X509_STORE_CTX_cleanup
+#define X509_STORE_CTX_free bssl_X509_STORE_CTX_free
+#define X509_STORE_CTX_get0_current_crl bssl_X509_STORE_CTX_get0_current_crl
+#define X509_STORE_CTX_get0_current_issuer bssl_X509_STORE_CTX_get0_current_issuer
+#define X509_STORE_CTX_get0_param bssl_X509_STORE_CTX_get0_param
+#define X509_STORE_CTX_get0_parent_ctx bssl_X509_STORE_CTX_get0_parent_ctx
+#define X509_STORE_CTX_get0_policy_tree bssl_X509_STORE_CTX_get0_policy_tree
+#define X509_STORE_CTX_get0_store bssl_X509_STORE_CTX_get0_store
+#define X509_STORE_CTX_get1_chain bssl_X509_STORE_CTX_get1_chain
+#define X509_STORE_CTX_get1_issuer bssl_X509_STORE_CTX_get1_issuer
+#define X509_STORE_CTX_get_chain bssl_X509_STORE_CTX_get_chain
+#define X509_STORE_CTX_get_current_cert bssl_X509_STORE_CTX_get_current_cert
+#define X509_STORE_CTX_get_error bssl_X509_STORE_CTX_get_error
+#define X509_STORE_CTX_get_error_depth bssl_X509_STORE_CTX_get_error_depth
+#define X509_STORE_CTX_get_ex_data bssl_X509_STORE_CTX_get_ex_data
+#define X509_STORE_CTX_get_ex_new_index bssl_X509_STORE_CTX_get_ex_new_index
+#define X509_STORE_CTX_get_explicit_policy bssl_X509_STORE_CTX_get_explicit_policy
+#define X509_STORE_CTX_init bssl_X509_STORE_CTX_init
+#define X509_STORE_CTX_new bssl_X509_STORE_CTX_new
+#define X509_STORE_CTX_purpose_inherit bssl_X509_STORE_CTX_purpose_inherit
+#define X509_STORE_CTX_set0_crls bssl_X509_STORE_CTX_set0_crls
+#define X509_STORE_CTX_set0_param bssl_X509_STORE_CTX_set0_param
+#define X509_STORE_CTX_set_cert bssl_X509_STORE_CTX_set_cert
+#define X509_STORE_CTX_set_chain bssl_X509_STORE_CTX_set_chain
+#define X509_STORE_CTX_set_default bssl_X509_STORE_CTX_set_default
+#define X509_STORE_CTX_set_depth bssl_X509_STORE_CTX_set_depth
+#define X509_STORE_CTX_set_error bssl_X509_STORE_CTX_set_error
+#define X509_STORE_CTX_set_ex_data bssl_X509_STORE_CTX_set_ex_data
+#define X509_STORE_CTX_set_flags bssl_X509_STORE_CTX_set_flags
+#define X509_STORE_CTX_set_purpose bssl_X509_STORE_CTX_set_purpose
+#define X509_STORE_CTX_set_time bssl_X509_STORE_CTX_set_time
+#define X509_STORE_CTX_set_trust bssl_X509_STORE_CTX_set_trust
+#define X509_STORE_CTX_set_verify_cb bssl_X509_STORE_CTX_set_verify_cb
+#define X509_STORE_CTX_trusted_stack bssl_X509_STORE_CTX_trusted_stack
+#define X509_STORE_free bssl_X509_STORE_free
+#define X509_STORE_get1_certs bssl_X509_STORE_get1_certs
+#define X509_STORE_get1_crls bssl_X509_STORE_get1_crls
+#define X509_STORE_get_by_subject bssl_X509_STORE_get_by_subject
+#define X509_STORE_load_locations bssl_X509_STORE_load_locations
+#define X509_STORE_new bssl_X509_STORE_new
+#define X509_STORE_set1_param bssl_X509_STORE_set1_param
+#define X509_STORE_set_default_paths bssl_X509_STORE_set_default_paths
+#define X509_STORE_set_depth bssl_X509_STORE_set_depth
+#define X509_STORE_set_flags bssl_X509_STORE_set_flags
+#define X509_STORE_set_lookup_crls_cb bssl_X509_STORE_set_lookup_crls_cb
+#define X509_STORE_set_purpose bssl_X509_STORE_set_purpose
+#define X509_STORE_set_trust bssl_X509_STORE_set_trust
+#define X509_STORE_set_verify_cb bssl_X509_STORE_set_verify_cb
+#define X509_STORE_up_ref bssl_X509_STORE_up_ref
+#define X509_subject_name_cmp bssl_X509_subject_name_cmp
+#define X509_subject_name_hash bssl_X509_subject_name_hash
+#define X509_subject_name_hash_old bssl_X509_subject_name_hash_old
+#define X509_supported_extension bssl_X509_supported_extension
+#define X509_time_adj bssl_X509_time_adj
+#define X509_time_adj_ex bssl_X509_time_adj_ex
+#define X509_to_X509_REQ bssl_X509_to_X509_REQ
+#define X509_TRUST_add bssl_X509_TRUST_add
+#define X509_TRUST_cleanup bssl_X509_TRUST_cleanup
+#define X509_trust_clear bssl_X509_trust_clear
+#define X509_TRUST_get0 bssl_X509_TRUST_get0
+#define X509_TRUST_get0_name bssl_X509_TRUST_get0_name
+#define X509_TRUST_get_by_id bssl_X509_TRUST_get_by_id
+#define X509_TRUST_get_count bssl_X509_TRUST_get_count
+#define X509_TRUST_get_flags bssl_X509_TRUST_get_flags
+#define X509_TRUST_get_trust bssl_X509_TRUST_get_trust
+#define X509_TRUST_set bssl_X509_TRUST_set
+#define X509_TRUST_set_default bssl_X509_TRUST_set_default
+#define X509_up_ref bssl_X509_up_ref
+#define X509V3_add1_i2d bssl_X509V3_add1_i2d
+#define X509v3_add_ext bssl_X509v3_add_ext
+#define X509V3_add_standard_extensions bssl_X509V3_add_standard_extensions
+#define X509V3_add_value bssl_X509V3_add_value
+#define X509V3_add_value_bool bssl_X509V3_add_value_bool
+#define X509V3_add_value_bool_nf bssl_X509V3_add_value_bool_nf
+#define X509V3_add_value_int bssl_X509V3_add_value_int
+#define X509V3_add_value_uchar bssl_X509V3_add_value_uchar
+#define X509V3_conf_free bssl_X509V3_conf_free
+#define X509v3_delete_ext bssl_X509v3_delete_ext
+#define X509V3_EXT_add bssl_X509V3_EXT_add
+#define X509V3_EXT_add_alias bssl_X509V3_EXT_add_alias
+#define X509V3_EXT_add_list bssl_X509V3_EXT_add_list
+#define X509V3_EXT_add_nconf bssl_X509V3_EXT_add_nconf
+#define X509V3_EXT_add_nconf_sk bssl_X509V3_EXT_add_nconf_sk
+#define X509V3_EXT_cleanup bssl_X509V3_EXT_cleanup
+#define X509V3_EXT_CRL_add_nconf bssl_X509V3_EXT_CRL_add_nconf
+#define X509V3_EXT_d2i bssl_X509V3_EXT_d2i
+#define X509V3_extensions_print bssl_X509V3_extensions_print
+#define X509V3_EXT_free bssl_X509V3_EXT_free
+#define X509V3_EXT_get bssl_X509V3_EXT_get
+#define X509V3_EXT_get_nid bssl_X509V3_EXT_get_nid
+#define X509V3_EXT_i2d bssl_X509V3_EXT_i2d
+#define X509V3_EXT_nconf bssl_X509V3_EXT_nconf
+#define X509V3_EXT_nconf_nid bssl_X509V3_EXT_nconf_nid
+#define X509V3_EXT_print bssl_X509V3_EXT_print
+#define X509V3_EXT_print_fp bssl_X509V3_EXT_print_fp
+#define X509V3_EXT_REQ_add_nconf bssl_X509V3_EXT_REQ_add_nconf
+#define X509V3_EXT_val_prn bssl_X509V3_EXT_val_prn
+#define X509V3_get_d2i bssl_X509V3_get_d2i
+#define X509v3_get_ext bssl_X509v3_get_ext
+#define X509v3_get_ext_by_critical bssl_X509v3_get_ext_by_critical
+#define X509v3_get_ext_by_NID bssl_X509v3_get_ext_by_NID
+#define X509v3_get_ext_by_OBJ bssl_X509v3_get_ext_by_OBJ
+#define X509v3_get_ext_count bssl_X509v3_get_ext_count
+#define X509V3_get_section bssl_X509V3_get_section
+#define X509V3_get_string bssl_X509V3_get_string
+#define X509V3_get_value_bool bssl_X509V3_get_value_bool
+#define X509V3_get_value_int bssl_X509V3_get_value_int
+#define X509V3_NAME_from_section bssl_X509V3_NAME_from_section
+#define X509V3_parse_list bssl_X509V3_parse_list
+#define X509V3_section_free bssl_X509V3_section_free
+#define X509V3_set_ctx bssl_X509V3_set_ctx
+#define X509V3_set_nconf bssl_X509V3_set_nconf
+#define X509V3_string_free bssl_X509V3_string_free
+#define X509_VAL_free bssl_X509_VAL_free
+#define X509_VAL_it bssl_X509_VAL_it
+#define X509_VAL_new bssl_X509_VAL_new
+#define X509_verify bssl_X509_verify
+#define X509_verify_cert bssl_X509_verify_cert
+#define X509_verify_cert_error_string bssl_X509_verify_cert_error_string
+#define X509_VERIFY_PARAM_add0_policy bssl_X509_VERIFY_PARAM_add0_policy
+#define X509_VERIFY_PARAM_add0_table bssl_X509_VERIFY_PARAM_add0_table
+#define X509_VERIFY_PARAM_add1_host bssl_X509_VERIFY_PARAM_add1_host
+#define X509_VERIFY_PARAM_clear_flags bssl_X509_VERIFY_PARAM_clear_flags
+#define X509_VERIFY_PARAM_free bssl_X509_VERIFY_PARAM_free
+#define X509_VERIFY_PARAM_get0 bssl_X509_VERIFY_PARAM_get0
+#define X509_VERIFY_PARAM_get0_name bssl_X509_VERIFY_PARAM_get0_name
+#define X509_VERIFY_PARAM_get0_peername bssl_X509_VERIFY_PARAM_get0_peername
+#define X509_VERIFY_PARAM_get_count bssl_X509_VERIFY_PARAM_get_count
+#define X509_VERIFY_PARAM_get_depth bssl_X509_VERIFY_PARAM_get_depth
+#define X509_VERIFY_PARAM_get_flags bssl_X509_VERIFY_PARAM_get_flags
+#define X509_VERIFY_PARAM_inherit bssl_X509_VERIFY_PARAM_inherit
+#define X509_VERIFY_PARAM_lookup bssl_X509_VERIFY_PARAM_lookup
+#define X509_VERIFY_PARAM_new bssl_X509_VERIFY_PARAM_new
+#define X509_VERIFY_PARAM_set1 bssl_X509_VERIFY_PARAM_set1
+#define X509_VERIFY_PARAM_set1_email bssl_X509_VERIFY_PARAM_set1_email
+#define X509_VERIFY_PARAM_set1_host bssl_X509_VERIFY_PARAM_set1_host
+#define X509_VERIFY_PARAM_set1_ip bssl_X509_VERIFY_PARAM_set1_ip
+#define X509_VERIFY_PARAM_set1_ip_asc bssl_X509_VERIFY_PARAM_set1_ip_asc
+#define X509_VERIFY_PARAM_set1_name bssl_X509_VERIFY_PARAM_set1_name
+#define X509_VERIFY_PARAM_set1_policies bssl_X509_VERIFY_PARAM_set1_policies
+#define X509_VERIFY_PARAM_set_depth bssl_X509_VERIFY_PARAM_set_depth
+#define X509_VERIFY_PARAM_set_flags bssl_X509_VERIFY_PARAM_set_flags
+#define X509_VERIFY_PARAM_set_hostflags bssl_X509_VERIFY_PARAM_set_hostflags
+#define X509_VERIFY_PARAM_set_purpose bssl_X509_VERIFY_PARAM_set_purpose
+#define X509_VERIFY_PARAM_set_time bssl_X509_VERIFY_PARAM_set_time
+#define X509_VERIFY_PARAM_set_trust bssl_X509_VERIFY_PARAM_set_trust
+#define X509_VERIFY_PARAM_table_cleanup bssl_X509_VERIFY_PARAM_table_cleanup
+#define ZLONG_it bssl_ZLONG_it
+#endif
diff --git a/boringssl/include/openssl/buf.h b/boringssl/include/boringssl/buf.h
similarity index 98%
rename from boringssl/include/openssl/buf.h
rename to boringssl/include/boringssl/buf.h
index f4e315cd..11931468 100644
--- a/boringssl/include/openssl/buf.h
+++ b/boringssl/include/boringssl/buf.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -57,7 +58,7 @@
 #ifndef OPENSSL_HEADER_BUFFER_H
 #define OPENSSL_HEADER_BUFFER_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/boringssl/include/openssl/buffer.h b/boringssl/include/boringssl/buffer.h
similarity index 96%
rename from boringssl/include/openssl/buffer.h
rename to boringssl/include/boringssl/buffer.h
index c6b721c2..c7970430 100644
--- a/boringssl/include/openssl/buffer.h
+++ b/boringssl/include/boringssl/buffer.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2015, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/boringssl/include/openssl/bytestring.h b/boringssl/include/boringssl/bytestring.h
similarity index 99%
rename from boringssl/include/openssl/bytestring.h
rename to boringssl/include/boringssl/bytestring.h
index 68ede2dc..2e055eb1 100644
--- a/boringssl/include/openssl/bytestring.h
+++ b/boringssl/include/boringssl/bytestring.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +16,7 @@
 #ifndef OPENSSL_HEADER_BYTESTRING_H
 #define OPENSSL_HEADER_BYTESTRING_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/boringssl/include/openssl/cast.h b/boringssl/include/boringssl/cast.h
similarity index 98%
rename from boringssl/include/openssl/cast.h
rename to boringssl/include/boringssl/cast.h
index 80217239..f9e351ce 100644
--- a/boringssl/include/openssl/cast.h
+++ b/boringssl/include/boringssl/cast.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -57,7 +58,7 @@
 #ifndef OPENSSL_HEADER_CAST_H
 #define OPENSSL_HEADER_CAST_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #ifdef  __cplusplus
 extern "C" {
diff --git a/boringssl/include/openssl/chacha.h b/boringssl/include/boringssl/chacha.h
similarity index 96%
rename from boringssl/include/openssl/chacha.h
rename to boringssl/include/boringssl/chacha.h
index 64713c24..cf6ad684 100644
--- a/boringssl/include/openssl/chacha.h
+++ b/boringssl/include/boringssl/chacha.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +16,7 @@
 #ifndef OPENSSL_HEADER_CHACHA_H
 #define OPENSSL_HEADER_CHACHA_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #ifdef  __cplusplus
 extern "C" {
diff --git a/boringssl/include/openssl/cipher.h b/boringssl/include/boringssl/cipher.h
similarity index 99%
rename from boringssl/include/openssl/cipher.h
rename to boringssl/include/boringssl/cipher.h
index 53123086..2ce266d6 100644
--- a/boringssl/include/openssl/cipher.h
+++ b/boringssl/include/boringssl/cipher.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -57,7 +58,7 @@
 #ifndef OPENSSL_HEADER_CIPHER_H
 #define OPENSSL_HEADER_CIPHER_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/boringssl/include/openssl/cmac.h b/boringssl/include/boringssl/cmac.h
similarity index 98%
rename from boringssl/include/openssl/cmac.h
rename to boringssl/include/boringssl/cmac.h
index 0bb44b95..e6b523ad 100644
--- a/boringssl/include/openssl/cmac.h
+++ b/boringssl/include/boringssl/cmac.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2015, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +16,7 @@
 #ifndef OPENSSL_HEADER_CMAC_H
 #define OPENSSL_HEADER_CMAC_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/boringssl/include/openssl/conf.h b/boringssl/include/boringssl/conf.h
similarity index 98%
rename from boringssl/include/openssl/conf.h
rename to boringssl/include/boringssl/conf.h
index 2aa3b79e..a5b7ca72 100644
--- a/boringssl/include/openssl/conf.h
+++ b/boringssl/include/boringssl/conf.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -57,10 +58,10 @@
 #ifndef OPENSSL_HEADER_CONF_H
 #define OPENSSL_HEADER_CONF_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
-#include <openssl/stack.h>
-#include <openssl/lhash.h>
+#include <boringssl/stack.h>
+#include <boringssl/lhash.h>
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/boringssl/include/openssl/cpu.h b/boringssl/include/boringssl/cpu.h
similarity index 99%
rename from boringssl/include/openssl/cpu.h
rename to boringssl/include/boringssl/cpu.h
index 55be4c1f..d5c5dcf6 100644
--- a/boringssl/include/openssl/cpu.h
+++ b/boringssl/include/boringssl/cpu.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -61,7 +62,7 @@
 #ifndef OPENSSL_HEADER_CPU_H
 #define OPENSSL_HEADER_CPU_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/boringssl/include/openssl/crypto.h b/boringssl/include/boringssl/crypto.h
similarity index 95%
rename from boringssl/include/openssl/crypto.h
rename to boringssl/include/boringssl/crypto.h
index b52bcf80..ec068b94 100644
--- a/boringssl/include/openssl/crypto.h
+++ b/boringssl/include/boringssl/crypto.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,15 +16,15 @@
 #ifndef OPENSSL_HEADER_CRYPTO_H
 #define OPENSSL_HEADER_CRYPTO_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 /* Upstream OpenSSL defines |OPENSSL_malloc|, etc., in crypto.h rather than
  * mem.h. */
-#include <openssl/mem.h>
+#include <boringssl/mem.h>
 
 /* Upstream OpenSSL defines |CRYPTO_LOCK|, etc., in crypto.h rather than
  * thread.h. */
-#include <openssl/thread.h>
+#include <boringssl/thread.h>
 
 
 #if defined(__cplusplus)
diff --git a/boringssl/include/openssl/curve25519.h b/boringssl/include/boringssl/curve25519.h
similarity index 99%
rename from boringssl/include/openssl/curve25519.h
rename to boringssl/include/boringssl/curve25519.h
index a9441cd4..6e897733 100644
--- a/boringssl/include/openssl/curve25519.h
+++ b/boringssl/include/boringssl/curve25519.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2015, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +16,7 @@
 #ifndef OPENSSL_HEADER_CURVE25519_H
 #define OPENSSL_HEADER_CURVE25519_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/boringssl/include/openssl/des.h b/boringssl/include/boringssl/des.h
similarity index 99%
rename from boringssl/include/openssl/des.h
rename to boringssl/include/boringssl/des.h
index 2b8dd0f6..4cf7e00f 100644
--- a/boringssl/include/openssl/des.h
+++ b/boringssl/include/boringssl/des.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -57,7 +58,7 @@
 #ifndef OPENSSL_HEADER_DES_H
 #define OPENSSL_HEADER_DES_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/boringssl/include/openssl/dh.h b/boringssl/include/boringssl/dh.h
similarity index 98%
rename from boringssl/include/openssl/dh.h
rename to boringssl/include/boringssl/dh.h
index 5cdeb86e..541f82e3 100644
--- a/boringssl/include/openssl/dh.h
+++ b/boringssl/include/boringssl/dh.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -57,11 +58,11 @@
 #ifndef OPENSSL_HEADER_DH_H
 #define OPENSSL_HEADER_DH_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
-#include <openssl/engine.h>
-#include <openssl/ex_data.h>
-#include <openssl/thread.h>
+#include <boringssl/engine.h>
+#include <boringssl/ex_data.h>
+#include <boringssl/thread.h>
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/boringssl/include/openssl/digest.h b/boringssl/include/boringssl/digest.h
similarity index 99%
rename from boringssl/include/openssl/digest.h
rename to boringssl/include/boringssl/digest.h
index db3ead71..d12f6e6b 100644
--- a/boringssl/include/openssl/digest.h
+++ b/boringssl/include/boringssl/digest.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -57,7 +58,7 @@
 #ifndef OPENSSL_HEADER_DIGEST_H
 #define OPENSSL_HEADER_DIGEST_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/boringssl/include/openssl/dsa.h b/boringssl/include/boringssl/dsa.h
similarity index 99%
rename from boringssl/include/openssl/dsa.h
rename to boringssl/include/boringssl/dsa.h
index 0077a722..71829023 100644
--- a/boringssl/include/openssl/dsa.h
+++ b/boringssl/include/boringssl/dsa.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -60,11 +61,11 @@
 #ifndef OPENSSL_HEADER_DSA_H
 #define OPENSSL_HEADER_DSA_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
-#include <openssl/engine.h>
-#include <openssl/ex_data.h>
-#include <openssl/thread.h>
+#include <boringssl/engine.h>
+#include <boringssl/ex_data.h>
+#include <boringssl/thread.h>
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/boringssl/include/openssl/dtls1.h b/boringssl/include/boringssl/dtls1.h
similarity index 96%
rename from boringssl/include/openssl/dtls1.h
rename to boringssl/include/boringssl/dtls1.h
index 38ca801c..f683e7d1 100644
--- a/boringssl/include/openssl/dtls1.h
+++ b/boringssl/include/boringssl/dtls1.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2015, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/boringssl/include/openssl/ec.h b/boringssl/include/boringssl/ec.h
similarity index 99%
rename from boringssl/include/openssl/ec.h
rename to boringssl/include/boringssl/ec.h
index 143aa96c..7d5c39d5 100644
--- a/boringssl/include/openssl/ec.h
+++ b/boringssl/include/boringssl/ec.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Originally written by Bodo Moeller for the OpenSSL project.
  * ====================================================================
  * Copyright (c) 1998-2005 The OpenSSL Project.  All rights reserved.
@@ -68,7 +69,7 @@
 #ifndef OPENSSL_HEADER_EC_H
 #define OPENSSL_HEADER_EC_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #if defined(__cplusplus)
 extern "C" {
@@ -363,7 +364,7 @@ OPENSSL_EXPORT size_t EC_get_builtin_curves(EC_builtin_curve *out_curves,
                                             size_t max_num_curves);
 
 /* Old code expects to get EC_KEY from ec.h. */
-#include <openssl/ec_key.h>
+#include <boringssl/ec_key.h>
 
 
 #if defined(__cplusplus)
diff --git a/boringssl/include/openssl/ec_key.h b/boringssl/include/boringssl/ec_key.h
similarity index 99%
rename from boringssl/include/openssl/ec_key.h
rename to boringssl/include/boringssl/ec_key.h
index 63554a78..e0313497 100644
--- a/boringssl/include/openssl/ec_key.h
+++ b/boringssl/include/boringssl/ec_key.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Originally written by Bodo Moeller for the OpenSSL project.
  * ====================================================================
  * Copyright (c) 1998-2005 The OpenSSL Project.  All rights reserved.
@@ -68,11 +69,11 @@
 #ifndef OPENSSL_HEADER_EC_KEY_H
 #define OPENSSL_HEADER_EC_KEY_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
-#include <openssl/ec.h>
-#include <openssl/engine.h>
-#include <openssl/ex_data.h>
+#include <boringssl/ec.h>
+#include <boringssl/engine.h>
+#include <boringssl/ex_data.h>
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/boringssl/include/openssl/ecdh.h b/boringssl/include/boringssl/ecdh.h
similarity index 98%
rename from boringssl/include/openssl/ecdh.h
rename to boringssl/include/boringssl/ecdh.h
index 5fe3ae99..ae891bf1 100644
--- a/boringssl/include/openssl/ecdh.h
+++ b/boringssl/include/boringssl/ecdh.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* ====================================================================
  * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
  *
@@ -67,9 +68,9 @@
 #ifndef OPENSSL_HEADER_ECDH_H
 #define OPENSSL_HEADER_ECDH_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
-#include <openssl/ec_key.h>
+#include <boringssl/ec_key.h>
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/boringssl/include/openssl/ecdsa.h b/boringssl/include/boringssl/ecdsa.h
similarity index 99%
rename from boringssl/include/openssl/ecdsa.h
rename to boringssl/include/boringssl/ecdsa.h
index a060eab3..b27b2c89 100644
--- a/boringssl/include/openssl/ecdsa.h
+++ b/boringssl/include/boringssl/ecdsa.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* ====================================================================
  * Copyright (c) 1998-2005 The OpenSSL Project.  All rights reserved.
  *
@@ -53,9 +54,9 @@
 #ifndef OPENSSL_HEADER_ECDSA_H
 #define OPENSSL_HEADER_ECDSA_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
-#include <openssl/ec_key.h>
+#include <boringssl/ec_key.h>
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/boringssl/include/openssl/engine.h b/boringssl/include/boringssl/engine.h
similarity index 98%
rename from boringssl/include/openssl/engine.h
rename to boringssl/include/boringssl/engine.h
index 128a2ae1..b04280c3 100644
--- a/boringssl/include/openssl/engine.h
+++ b/boringssl/include/boringssl/engine.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +16,7 @@
 #ifndef OPENSSL_HEADER_ENGINE_H
 #define OPENSSL_HEADER_ENGINE_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/boringssl/include/openssl/err.h b/boringssl/include/boringssl/err.h
similarity index 99%
rename from boringssl/include/openssl/err.h
rename to boringssl/include/boringssl/err.h
index cac50e0f..8dda95e3 100644
--- a/boringssl/include/openssl/err.h
+++ b/boringssl/include/boringssl/err.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -111,7 +112,7 @@
 
 #include <stdio.h>
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/boringssl/include/openssl/evp.h b/boringssl/include/boringssl/evp.h
similarity index 99%
rename from boringssl/include/openssl/evp.h
rename to boringssl/include/boringssl/evp.h
index 398c7414..b2894db2 100644
--- a/boringssl/include/openssl/evp.h
+++ b/boringssl/include/boringssl/evp.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -57,19 +58,19 @@
 #ifndef OPENSSL_HEADER_EVP_H
 #define OPENSSL_HEADER_EVP_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
-#include <openssl/thread.h>
+#include <boringssl/thread.h>
 
 /* OpenSSL included digest and cipher functions in this header so we include
  * them for users that still expect that.
  *
  * TODO(fork): clean up callers so that they include what they use. */
-#include <openssl/aead.h>
-#include <openssl/base64.h>
-#include <openssl/cipher.h>
-#include <openssl/digest.h>
-#include <openssl/nid.h>
+#include <boringssl/aead.h>
+#include <boringssl/base64.h>
+#include <boringssl/cipher.h>
+#include <boringssl/digest.h>
+#include <boringssl/nid.h>
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/boringssl/include/openssl/ex_data.h b/boringssl/include/boringssl/ex_data.h
similarity index 99%
rename from boringssl/include/openssl/ex_data.h
rename to boringssl/include/boringssl/ex_data.h
index e78e0703..25235f83 100644
--- a/boringssl/include/openssl/ex_data.h
+++ b/boringssl/include/boringssl/ex_data.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -109,9 +110,9 @@
 #ifndef OPENSSL_HEADER_EX_DATA_H
 #define OPENSSL_HEADER_EX_DATA_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
-#include <openssl/stack.h>
+#include <boringssl/stack.h>
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/boringssl/include/openssl/hkdf.h b/boringssl/include/boringssl/hkdf.h
similarity index 96%
rename from boringssl/include/openssl/hkdf.h
rename to boringssl/include/boringssl/hkdf.h
index 8c96c4c2..8302eaa8 100644
--- a/boringssl/include/openssl/hkdf.h
+++ b/boringssl/include/boringssl/hkdf.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +16,7 @@
 #ifndef OPENSSL_HEADER_HKDF_H
 #define OPENSSL_HEADER_HKDF_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/boringssl/include/openssl/hmac.h b/boringssl/include/boringssl/hmac.h
similarity index 98%
rename from boringssl/include/openssl/hmac.h
rename to boringssl/include/boringssl/hmac.h
index 5a4e9c7f..3cdc8a8a 100644
--- a/boringssl/include/openssl/hmac.h
+++ b/boringssl/include/boringssl/hmac.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -57,9 +58,9 @@
 #ifndef OPENSSL_HEADER_HMAC_H
 #define OPENSSL_HEADER_HMAC_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
-#include <openssl/digest.h>
+#include <boringssl/digest.h>
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/boringssl/include/openssl/lhash.h b/boringssl/include/boringssl/lhash.h
similarity index 98%
rename from boringssl/include/openssl/lhash.h
rename to boringssl/include/boringssl/lhash.h
index 0d6d3aef..a1ffe28a 100644
--- a/boringssl/include/openssl/lhash.h
+++ b/boringssl/include/boringssl/lhash.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -57,8 +58,8 @@
 #ifndef OPENSSL_HEADER_LHASH_H
 #define OPENSSL_HEADER_LHASH_H
 
-#include <openssl/base.h>
-#include <openssl/type_check.h>
+#include <boringssl/base.h>
+#include <boringssl/type_check.h>
 
 #if defined(__cplusplus)
 extern "C" {
@@ -100,7 +101,7 @@ extern "C" {
  * LHASH_OF:SSL_SESSION */
 
 #define IN_LHASH_H
-#include <openssl/lhash_macros.h>
+#include <boringssl/lhash_macros.h>
 #undef IN_LHASH_H
 
 
diff --git a/boringssl/include/openssl/lhash_macros.h b/boringssl/include/boringssl/lhash_macros.h
similarity index 99%
rename from boringssl/include/openssl/lhash_macros.h
rename to boringssl/include/boringssl/lhash_macros.h
index 1d981073..9c84c743 100644
--- a/boringssl/include/openssl/lhash_macros.h
+++ b/boringssl/include/boringssl/lhash_macros.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/boringssl/include/openssl/md4.h b/boringssl/include/boringssl/md4.h
similarity index 98%
rename from boringssl/include/openssl/md4.h
rename to boringssl/include/boringssl/md4.h
index b66fcb0f..fd6232fa 100644
--- a/boringssl/include/openssl/md4.h
+++ b/boringssl/include/boringssl/md4.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -57,7 +58,7 @@
 #ifndef OPENSSL_HEADER_MD4_H
 #define OPENSSL_HEADER_MD4_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/boringssl/include/openssl/md5.h b/boringssl/include/boringssl/md5.h
similarity index 98%
rename from boringssl/include/openssl/md5.h
rename to boringssl/include/boringssl/md5.h
index 55162f02..cbfd6e30 100644
--- a/boringssl/include/openssl/md5.h
+++ b/boringssl/include/boringssl/md5.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -57,7 +58,7 @@
 #ifndef OPENSSL_HEADER_MD5_H
 #define OPENSSL_HEADER_MD5_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/boringssl/include/openssl/mem.h b/boringssl/include/boringssl/mem.h
similarity index 99%
rename from boringssl/include/openssl/mem.h
rename to boringssl/include/boringssl/mem.h
index 31756f03..e89839cb 100644
--- a/boringssl/include/openssl/mem.h
+++ b/boringssl/include/boringssl/mem.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -57,7 +58,7 @@
 #ifndef OPENSSL_HEADER_MEM_H
 #define OPENSSL_HEADER_MEM_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #include <stdlib.h>
 #include <stdarg.h>
diff --git a/boringssl/include/openssl/newhope.h b/boringssl/include/boringssl/newhope.h
similarity index 97%
rename from boringssl/include/openssl/newhope.h
rename to boringssl/include/boringssl/newhope.h
index af573bae..e079d3e8 100644
--- a/boringssl/include/openssl/newhope.h
+++ b/boringssl/include/boringssl/newhope.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2016, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,8 +16,8 @@
 #ifndef OPENSSL_HEADER_NEWHOPE_H
 #define OPENSSL_HEADER_NEWHOPE_H
 
-#include <openssl/base.h>
-#include <openssl/sha.h>
+#include <boringssl/base.h>
+#include <boringssl/sha.h>
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/boringssl/include/openssl/nid.h b/boringssl/include/boringssl/nid.h
similarity index 99%
rename from boringssl/include/openssl/nid.h
rename to boringssl/include/boringssl/nid.h
index d51a67c3..3baa680e 100644
--- a/boringssl/include/openssl/nid.h
+++ b/boringssl/include/boringssl/nid.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* THIS FILE IS GENERATED FROM objects.txt by objects.pl via the
  * following command:
  * perl objects.pl objects.txt obj_mac.num ../../include/openssl/nid.h */
diff --git a/boringssl/include/openssl/obj.h b/boringssl/include/boringssl/obj.h
similarity index 98%
rename from boringssl/include/openssl/obj.h
rename to boringssl/include/boringssl/obj.h
index 7e24820c..6467ad7d 100644
--- a/boringssl/include/openssl/obj.h
+++ b/boringssl/include/boringssl/obj.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -57,10 +58,10 @@
 #ifndef OPENSSL_HEADER_OBJ_H
 #define OPENSSL_HEADER_OBJ_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
-#include <openssl/bytestring.h>
-#include <openssl/nid.h>
+#include <boringssl/bytestring.h>
+#include <boringssl/nid.h>
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/boringssl/include/openssl/obj_mac.h b/boringssl/include/boringssl/obj_mac.h
similarity index 96%
rename from boringssl/include/openssl/obj_mac.h
rename to boringssl/include/boringssl/obj_mac.h
index e7ccadc1..2047d3aa 100644
--- a/boringssl/include/openssl/obj_mac.h
+++ b/boringssl/include/boringssl/obj_mac.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2016, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/boringssl/include/openssl/objects.h b/boringssl/include/boringssl/objects.h
similarity index 96%
rename from boringssl/include/openssl/objects.h
rename to boringssl/include/boringssl/objects.h
index dd6556f2..c2c28efd 100644
--- a/boringssl/include/openssl/objects.h
+++ b/boringssl/include/boringssl/objects.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/boringssl/include/openssl/opensslconf.h b/boringssl/include/boringssl/opensslconf.h
similarity index 98%
rename from boringssl/include/openssl/opensslconf.h
rename to boringssl/include/boringssl/opensslconf.h
index bf65fc3b..f6c52e47 100644
--- a/boringssl/include/openssl/opensslconf.h
+++ b/boringssl/include/boringssl/opensslconf.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/boringssl/include/openssl/opensslv.h b/boringssl/include/boringssl/opensslv.h
similarity index 96%
rename from boringssl/include/openssl/opensslv.h
rename to boringssl/include/boringssl/opensslv.h
index a3555d4f..001cf2a9 100644
--- a/boringssl/include/openssl/opensslv.h
+++ b/boringssl/include/boringssl/opensslv.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/boringssl/include/openssl/ossl_typ.h b/boringssl/include/boringssl/ossl_typ.h
similarity index 96%
rename from boringssl/include/openssl/ossl_typ.h
rename to boringssl/include/boringssl/ossl_typ.h
index c2b3fe7c..bafee977 100644
--- a/boringssl/include/openssl/ossl_typ.h
+++ b/boringssl/include/boringssl/ossl_typ.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/boringssl/include/openssl/pem.h b/boringssl/include/boringssl/pem.h
similarity index 98%
rename from boringssl/include/openssl/pem.h
rename to boringssl/include/boringssl/pem.h
index b899d9f7..221a1daa 100644
--- a/boringssl/include/openssl/pem.h
+++ b/boringssl/include/boringssl/pem.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -57,13 +58,13 @@
 #ifndef OPENSSL_HEADER_PEM_H
 #define OPENSSL_HEADER_PEM_H
 
-#include <openssl/base64.h>
-#include <openssl/bio.h>
-#include <openssl/cipher.h>
-#include <openssl/digest.h>
-#include <openssl/evp.h>
-#include <openssl/stack.h>
-#include <openssl/x509.h>
+#include <boringssl/base64.h>
+#include <boringssl/bio.h>
+#include <boringssl/cipher.h>
+#include <boringssl/digest.h>
+#include <boringssl/evp.h>
+#include <boringssl/stack.h>
+#include <boringssl/x509.h>
 
 #ifdef  __cplusplus
 extern "C" {
diff --git a/boringssl/include/openssl/pkcs12.h b/boringssl/include/boringssl/pkcs12.h
similarity index 96%
rename from boringssl/include/openssl/pkcs12.h
rename to boringssl/include/boringssl/pkcs12.h
index b5e95163..6dcbc974 100644
--- a/boringssl/include/openssl/pkcs12.h
+++ b/boringssl/include/boringssl/pkcs12.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/boringssl/include/openssl/pkcs7.h b/boringssl/include/boringssl/pkcs7.h
similarity index 96%
rename from boringssl/include/openssl/pkcs7.h
rename to boringssl/include/boringssl/pkcs7.h
index 6e5e4330..8188cf5b 100644
--- a/boringssl/include/openssl/pkcs7.h
+++ b/boringssl/include/boringssl/pkcs7.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/boringssl/include/openssl/pkcs8.h b/boringssl/include/boringssl/pkcs8.h
similarity index 99%
rename from boringssl/include/openssl/pkcs8.h
rename to boringssl/include/boringssl/pkcs8.h
index 28cf6ac1..a16bf598 100644
--- a/boringssl/include/openssl/pkcs8.h
+++ b/boringssl/include/boringssl/pkcs8.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -57,8 +58,8 @@
 #ifndef OPENSSL_HEADER_PKCS8_H
 #define OPENSSL_HEADER_PKCS8_H
 
-#include <openssl/base.h>
-#include <openssl/x509.h>
+#include <boringssl/base.h>
+#include <boringssl/x509.h>
 
 
 #if defined(__cplusplus)
diff --git a/boringssl/include/openssl/poly1305.h b/boringssl/include/boringssl/poly1305.h
similarity index 97%
rename from boringssl/include/openssl/poly1305.h
rename to boringssl/include/boringssl/poly1305.h
index b4e23e29..ddb00381 100644
--- a/boringssl/include/openssl/poly1305.h
+++ b/boringssl/include/boringssl/poly1305.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +16,7 @@
 #ifndef OPENSSL_HEADER_POLY1305_H
 #define OPENSSL_HEADER_POLY1305_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #ifdef  __cplusplus
 extern "C" {
diff --git a/boringssl/include/openssl/pqueue.h b/boringssl/include/boringssl/pqueue.h
similarity index 98%
rename from boringssl/include/openssl/pqueue.h
rename to boringssl/include/boringssl/pqueue.h
index ceb1fa2a..8bbec655 100644
--- a/boringssl/include/openssl/pqueue.h
+++ b/boringssl/include/boringssl/pqueue.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /*
  * DTLS implementation written by Nagendra Modadugu
  * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
@@ -57,7 +58,7 @@
 #ifndef OPENSSL_HEADER_PQUEUE_H
 #define OPENSSL_HEADER_PQUEUE_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/boringssl/include/openssl/rand.h b/boringssl/include/boringssl/rand.h
similarity index 98%
rename from boringssl/include/openssl/rand.h
rename to boringssl/include/boringssl/rand.h
index 322249c9..a149ee8e 100644
--- a/boringssl/include/openssl/rand.h
+++ b/boringssl/include/boringssl/rand.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +16,7 @@
 #ifndef OPENSSL_HEADER_RAND_H
 #define OPENSSL_HEADER_RAND_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/boringssl/include/openssl/rc4.h b/boringssl/include/boringssl/rc4.h
similarity index 98%
rename from boringssl/include/openssl/rc4.h
rename to boringssl/include/boringssl/rc4.h
index 68af8782..41c8edbf 100644
--- a/boringssl/include/openssl/rc4.h
+++ b/boringssl/include/boringssl/rc4.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -57,7 +58,7 @@
 #ifndef OPENSSL_HEADER_RC4_H
 #define OPENSSL_HEADER_RC4_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/boringssl/include/openssl/ripemd.h b/boringssl/include/boringssl/ripemd.h
similarity index 98%
rename from boringssl/include/openssl/ripemd.h
rename to boringssl/include/boringssl/ripemd.h
index cf1e49e2..b6607b0b 100644
--- a/boringssl/include/openssl/ripemd.h
+++ b/boringssl/include/boringssl/ripemd.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -57,7 +58,7 @@
 #ifndef OPENSSL_HEADER_RIPEMD_H
 #define OPENSSL_HEADER_RIPEMD_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #ifdef  __cplusplus
 extern "C" {
diff --git a/boringssl/include/openssl/rsa.h b/boringssl/include/boringssl/rsa.h
similarity index 99%
rename from boringssl/include/openssl/rsa.h
rename to boringssl/include/boringssl/rsa.h
index 83fdf163..a11a78f2 100644
--- a/boringssl/include/openssl/rsa.h
+++ b/boringssl/include/boringssl/rsa.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -57,11 +58,11 @@
 #ifndef OPENSSL_HEADER_RSA_H
 #define OPENSSL_HEADER_RSA_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
-#include <openssl/engine.h>
-#include <openssl/ex_data.h>
-#include <openssl/thread.h>
+#include <boringssl/engine.h>
+#include <boringssl/ex_data.h>
+#include <boringssl/thread.h>
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/boringssl/include/openssl/safestack.h b/boringssl/include/boringssl/safestack.h
similarity index 96%
rename from boringssl/include/openssl/safestack.h
rename to boringssl/include/boringssl/safestack.h
index 6e5e4330..8188cf5b 100644
--- a/boringssl/include/openssl/safestack.h
+++ b/boringssl/include/boringssl/safestack.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/boringssl/include/openssl/sha.h b/boringssl/include/boringssl/sha.h
similarity index 99%
rename from boringssl/include/openssl/sha.h
rename to boringssl/include/boringssl/sha.h
index 48a52e8f..2928fac5 100644
--- a/boringssl/include/openssl/sha.h
+++ b/boringssl/include/boringssl/sha.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -57,7 +58,7 @@
 #ifndef OPENSSL_HEADER_SHA_H
 #define OPENSSL_HEADER_SHA_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/boringssl/include/openssl/srtp.h b/boringssl/include/boringssl/srtp.h
similarity index 96%
rename from boringssl/include/openssl/srtp.h
rename to boringssl/include/boringssl/srtp.h
index 39f6a855..adeb1281 100644
--- a/boringssl/include/openssl/srtp.h
+++ b/boringssl/include/boringssl/srtp.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2015, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/boringssl/include/openssl/ssl.h b/boringssl/include/boringssl/ssl.h
similarity index 98%
rename from boringssl/include/openssl/ssl.h
rename to boringssl/include/boringssl/ssl.h
index 1d0b4867..8046a2a9 100644
--- a/boringssl/include/openssl/ssl.h
+++ b/boringssl/include/boringssl/ssl.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -142,24 +143,24 @@
 #ifndef OPENSSL_HEADER_SSL_H
 #define OPENSSL_HEADER_SSL_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
-#include <openssl/bio.h>
-#include <openssl/buf.h>
-#include <openssl/hmac.h>
-#include <openssl/lhash.h>
-#include <openssl/pem.h>
-#include <openssl/ssl3.h>
-#include <openssl/thread.h>
-#include <openssl/tls1.h>
-#include <openssl/x509.h>
+#include <boringssl/bio.h>
+#include <boringssl/buf.h>
+#include <boringssl/hmac.h>
+#include <boringssl/lhash.h>
+#include <boringssl/pem.h>
+#include <boringssl/ssl3.h>
+#include <boringssl/thread.h>
+#include <boringssl/tls1.h>
+#include <boringssl/x509.h>
 
 #if !defined(OPENSSL_WINDOWS)
 #include <sys/time.h>
 #endif
 
 /* wpa_supplicant expects to get the version functions from ssl.h */
-#include <openssl/crypto.h>
+#include <boringssl/crypto.h>
 
 /* Forward-declare struct timeval. On Windows, it is defined in winsock2.h and
  * Windows headers define too many macros to be included in public headers.
@@ -4340,79 +4341,77 @@ OPENSSL_EXPORT int SSL_set_ssl_method(SSL *s, const SSL_METHOD *method);
 #define SSL_CTRL_SET_TMP_RSA doesnt_exist
 #define SSL_CTRL_SET_TMP_RSA_CB doesnt_exist
 
-#define DTLSv1_get_timeout DTLSv1_get_timeout
-#define DTLSv1_handle_timeout DTLSv1_handle_timeout
-#define SSL_CTX_add0_chain_cert SSL_CTX_add0_chain_cert
-#define SSL_CTX_add1_chain_cert SSL_CTX_add1_chain_cert
-#define SSL_CTX_add_extra_chain_cert SSL_CTX_add_extra_chain_cert
-#define SSL_CTX_clear_extra_chain_certs SSL_CTX_clear_extra_chain_certs
-#define SSL_CTX_clear_chain_certs SSL_CTX_clear_chain_certs
-#define SSL_CTX_clear_mode SSL_CTX_clear_mode
-#define SSL_CTX_clear_options SSL_CTX_clear_options
-#define SSL_CTX_enable_tls_channel_id SSL_CTX_enable_tls_channel_id
-#define SSL_CTX_get0_chain_certs SSL_CTX_get0_chain_certs
-#define SSL_CTX_get_extra_chain_certs SSL_CTX_get_extra_chain_certs
-#define SSL_CTX_get_max_cert_list SSL_CTX_get_max_cert_list
-#define SSL_CTX_get_mode SSL_CTX_get_mode
-#define SSL_CTX_get_options SSL_CTX_get_options
-#define SSL_CTX_get_read_ahead SSL_CTX_get_read_ahead
-#define SSL_CTX_get_session_cache_mode SSL_CTX_get_session_cache_mode
-#define SSL_CTX_get_tlsext_ticket_keys SSL_CTX_get_tlsext_ticket_keys
-#define SSL_CTX_need_tmp_RSA SSL_CTX_need_tmp_RSA
-#define SSL_CTX_sess_get_cache_size SSL_CTX_sess_get_cache_size
-#define SSL_CTX_sess_number SSL_CTX_sess_number
-#define SSL_CTX_sess_set_cache_size SSL_CTX_sess_set_cache_size
-#define SSL_CTX_set0_chain SSL_CTX_set0_chain
-#define SSL_CTX_set1_chain SSL_CTX_set1_chain
-#define SSL_CTX_set1_curves SSL_CTX_set1_curves
-#define SSL_CTX_set1_tls_channel_id SSL_CTX_set1_tls_channel_id
-#define SSL_CTX_set_max_cert_list SSL_CTX_set_max_cert_list
-#define SSL_CTX_set_max_send_fragment SSL_CTX_set_max_send_fragment
-#define SSL_CTX_set_mode SSL_CTX_set_mode
-#define SSL_CTX_set_msg_callback_arg SSL_CTX_set_msg_callback_arg
-#define SSL_CTX_set_options SSL_CTX_set_options
-#define SSL_CTX_set_read_ahead SSL_CTX_set_read_ahead
-#define SSL_CTX_set_session_cache_mode SSL_CTX_set_session_cache_mode
-#define SSL_CTX_set_tlsext_servername_arg SSL_CTX_set_tlsext_servername_arg
-#define SSL_CTX_set_tlsext_servername_callback \
-    SSL_CTX_set_tlsext_servername_callback
-#define SSL_CTX_set_tlsext_ticket_key_cb SSL_CTX_set_tlsext_ticket_key_cb
-#define SSL_CTX_set_tlsext_ticket_keys SSL_CTX_set_tlsext_ticket_keys
-#define SSL_CTX_set_tmp_dh SSL_CTX_set_tmp_dh
-#define SSL_CTX_set_tmp_ecdh SSL_CTX_set_tmp_ecdh
-#define SSL_CTX_set_tmp_rsa SSL_CTX_set_tmp_rsa
-#define SSL_add0_chain_cert SSL_add0_chain_cert
-#define SSL_add1_chain_cert SSL_add1_chain_cert
-#define SSL_clear_chain_certs SSL_clear_chain_certs
-#define SSL_clear_mode SSL_clear_mode
-#define SSL_clear_options SSL_clear_options
-#define SSL_enable_tls_channel_id SSL_enable_tls_channel_id
-#define SSL_get0_certificate_types SSL_get0_certificate_types
-#define SSL_get0_chain_certs SSL_get0_chain_certs
-#define SSL_get_max_cert_list SSL_get_max_cert_list
-#define SSL_get_mode SSL_get_mode
-#define SSL_get_options SSL_get_options
-#define SSL_get_secure_renegotiation_support \
-    SSL_get_secure_renegotiation_support
-#define SSL_get_tls_channel_id SSL_get_tls_channel_id
-#define SSL_need_tmp_RSA SSL_need_tmp_RSA
-#define SSL_num_renegotiations SSL_num_renegotiations
-#define SSL_session_reused SSL_session_reused
-#define SSL_set0_chain SSL_set0_chain
-#define SSL_set1_chain SSL_set1_chain
-#define SSL_set1_curves SSL_set1_curves
-#define SSL_set1_tls_channel_id SSL_set1_tls_channel_id
-#define SSL_set_max_cert_list SSL_set_max_cert_list
-#define SSL_set_max_send_fragment SSL_set_max_send_fragment
-#define SSL_set_mode SSL_set_mode
-#define SSL_set_msg_callback_arg SSL_set_msg_callback_arg
-#define SSL_set_mtu SSL_set_mtu
-#define SSL_set_options SSL_set_options
-#define SSL_set_tlsext_host_name SSL_set_tlsext_host_name
-#define SSL_set_tmp_dh SSL_set_tmp_dh
-#define SSL_set_tmp_ecdh SSL_set_tmp_ecdh
-#define SSL_set_tmp_rsa SSL_set_tmp_rsa
-#define SSL_total_renegotiations SSL_total_renegotiations
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 #if defined(__cplusplus)
diff --git a/boringssl/include/openssl/ssl3.h b/boringssl/include/boringssl/ssl3.h
similarity index 99%
rename from boringssl/include/openssl/ssl3.h
rename to boringssl/include/boringssl/ssl3.h
index 957b740e..9de2529f 100644
--- a/boringssl/include/openssl/ssl3.h
+++ b/boringssl/include/boringssl/ssl3.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* ssl/ssl3.h */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
@@ -117,8 +118,8 @@
 #ifndef OPENSSL_HEADER_SSL3_H
 #define OPENSSL_HEADER_SSL3_H
 
-#include <openssl/aead.h>
-#include <openssl/type_check.h>
+#include <boringssl/aead.h>
+#include <boringssl/type_check.h>
 
 #ifdef  __cplusplus
 extern "C" {
diff --git a/boringssl/include/openssl/stack.h b/boringssl/include/boringssl/stack.h
similarity index 98%
rename from boringssl/include/openssl/stack.h
rename to boringssl/include/boringssl/stack.h
index 16b9f4f6..cfe51fac 100644
--- a/boringssl/include/openssl/stack.h
+++ b/boringssl/include/boringssl/stack.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -57,9 +58,9 @@
 #ifndef OPENSSL_HEADER_STACK_H
 #define OPENSSL_HEADER_STACK_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
-#include <openssl/type_check.h>
+#include <boringssl/type_check.h>
 
 #if defined(__cplusplus)
 extern "C" {
@@ -190,7 +191,7 @@ DEFINE_SPECIAL_STACK_OF(OPENSSL_BLOCK, uint8_t)
  * SPECIAL_STACK_OF:OPENSSL_BLOCK */
 
 #define IN_STACK_H
-#include <openssl/stack_macros.h>
+#include <boringssl/stack_macros.h>
 #undef IN_STACK_H
 
 
diff --git a/boringssl/include/openssl/stack_macros.h b/boringssl/include/boringssl/stack_macros.h
similarity index 99%
rename from boringssl/include/openssl/stack_macros.h
rename to boringssl/include/boringssl/stack_macros.h
index 809424c7..a07f57ce 100644
--- a/boringssl/include/openssl/stack_macros.h
+++ b/boringssl/include/boringssl/stack_macros.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/boringssl/include/openssl/thread.h b/boringssl/include/boringssl/thread.h
similarity index 99%
rename from boringssl/include/openssl/thread.h
rename to boringssl/include/boringssl/thread.h
index ac4ced07..3161a7ae 100644
--- a/boringssl/include/openssl/thread.h
+++ b/boringssl/include/boringssl/thread.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -59,7 +60,7 @@
 
 #include <sys/types.h>
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/boringssl/include/openssl/time_support.h b/boringssl/include/boringssl/time_support.h
similarity index 98%
rename from boringssl/include/openssl/time_support.h
rename to boringssl/include/boringssl/time_support.h
index 274b17d1..523d5d2b 100644
--- a/boringssl/include/openssl/time_support.h
+++ b/boringssl/include/boringssl/time_support.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Written by Richard Levitte (richard@levitte.org) for the OpenSSL
  * project 2001.
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
@@ -58,7 +59,7 @@
 #ifndef OPENSSL_HEADER_TIME_SUPPORT_H
 #define OPENSSL_HEADER_TIME_SUPPORT_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #include <time.h>
 
diff --git a/boringssl/include/openssl/tls1.h b/boringssl/include/boringssl/tls1.h
similarity index 99%
rename from boringssl/include/openssl/tls1.h
rename to boringssl/include/boringssl/tls1.h
index e0f13997..644b0584 100644
--- a/boringssl/include/openssl/tls1.h
+++ b/boringssl/include/boringssl/tls1.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -150,7 +151,7 @@
 #ifndef OPENSSL_HEADER_TLS1_H
 #define OPENSSL_HEADER_TLS1_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #ifdef  __cplusplus
 extern "C" {
diff --git a/boringssl/include/openssl/type_check.h b/boringssl/include/boringssl/type_check.h
similarity index 98%
rename from boringssl/include/openssl/type_check.h
rename to boringssl/include/boringssl/type_check.h
index 674913a3..5b0b8da2 100644
--- a/boringssl/include/openssl/type_check.h
+++ b/boringssl/include/boringssl/type_check.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -57,7 +58,7 @@
 #ifndef OPENSSL_HEADER_TYPE_CHECK_H
 #define OPENSSL_HEADER_TYPE_CHECK_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/boringssl/include/openssl/x509.h b/boringssl/include/boringssl/x509.h
similarity index 99%
rename from boringssl/include/openssl/x509.h
rename to boringssl/include/boringssl/x509.h
index 4b977b90..055e528a 100644
--- a/boringssl/include/openssl/x509.h
+++ b/boringssl/include/boringssl/x509.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -63,24 +64,24 @@
 #ifndef HEADER_X509_H
 #define HEADER_X509_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #include <time.h>
 
-#include <openssl/asn1.h>
-#include <openssl/bio.h>
-#include <openssl/cipher.h>
-#include <openssl/dh.h>
-#include <openssl/dsa.h>
-#include <openssl/ecdh.h>
-#include <openssl/ecdsa.h>
-#include <openssl/ec.h>
-#include <openssl/evp.h>
-#include <openssl/obj.h>
-#include <openssl/rsa.h>
-#include <openssl/sha.h>
-#include <openssl/stack.h>
-#include <openssl/thread.h>
+#include <boringssl/asn1.h>
+#include <boringssl/bio.h>
+#include <boringssl/cipher.h>
+#include <boringssl/dh.h>
+#include <boringssl/dsa.h>
+#include <boringssl/ecdh.h>
+#include <boringssl/ecdsa.h>
+#include <boringssl/ec.h>
+#include <boringssl/evp.h>
+#include <boringssl/obj.h>
+#include <boringssl/rsa.h>
+#include <boringssl/sha.h>
+#include <boringssl/stack.h>
+#include <boringssl/thread.h>
 
 #ifdef  __cplusplus
 extern "C" {
@@ -549,7 +550,7 @@ struct pkcs8_priv_key_info_st
 }
 #endif
 
-#include <openssl/x509_vfy.h>
+#include <boringssl/x509_vfy.h>
 
 #ifdef  __cplusplus
 extern "C" {
diff --git a/boringssl/include/openssl/x509_vfy.h b/boringssl/include/boringssl/x509_vfy.h
similarity index 99%
rename from boringssl/include/openssl/x509_vfy.h
rename to boringssl/include/boringssl/x509_vfy.h
index a9d05195..65b62eb4 100644
--- a/boringssl/include/openssl/x509_vfy.h
+++ b/boringssl/include/boringssl/x509_vfy.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -56,7 +57,7 @@
  */
 
 #ifndef HEADER_X509_H
-#include <openssl/x509.h>
+#include <boringssl/x509.h>
 /* openssl/x509.h ends up #include-ing this file at about the only
  * appropriate moment. */
 #endif
@@ -64,9 +65,9 @@
 #ifndef HEADER_X509_VFY_H
 #define HEADER_X509_VFY_H
 
-#include <openssl/bio.h>
-#include <openssl/lhash.h>
-#include <openssl/thread.h>
+#include <boringssl/bio.h>
+#include <boringssl/lhash.h>
+#include <boringssl/thread.h>
 
 #ifdef  __cplusplus
 extern "C" {
diff --git a/boringssl/include/openssl/x509v3.h b/boringssl/include/boringssl/x509v3.h
similarity index 99%
rename from boringssl/include/openssl/x509v3.h
rename to boringssl/include/boringssl/x509v3.h
index fa78f33a..303f0e2d 100644
--- a/boringssl/include/openssl/x509v3.h
+++ b/boringssl/include/boringssl/x509v3.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999. */
 /* ====================================================================
@@ -55,9 +56,9 @@
 #ifndef HEADER_X509V3_H
 #define HEADER_X509V3_H
 
-#include <openssl/bio.h>
-#include <openssl/conf.h>
-#include <openssl/x509.h>
+#include <boringssl/bio.h>
+#include <boringssl/conf.h>
+#include <boringssl/x509.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/boringssl/ssl/CMakeLists.txt b/boringssl/ssl/CMakeLists.txt
index c82cb9bc..fbc3b222 100644
--- a/boringssl/ssl/CMakeLists.txt
+++ b/boringssl/ssl/CMakeLists.txt
@@ -3,7 +3,7 @@ include_directories(../include)
 add_subdirectory(pqueue)
 
 add_library(
-  ssl
+  bssl
 
   custom_extensions.c
   d1_both.c
@@ -39,7 +39,7 @@ add_library(
   $<TARGET_OBJECTS:pqueue>
 )
 
-target_link_libraries(ssl crypto)
+target_link_libraries(bssl bsslcrypto)
 
 add_executable(
   ssl_test
@@ -49,5 +49,5 @@ add_executable(
   $<TARGET_OBJECTS:test_support>
 )
 
-target_link_libraries(ssl_test ssl crypto)
+target_link_libraries(ssl_test bssl bsslcrypto)
 add_dependencies(all_tests ssl_test)
diff --git a/boringssl/ssl/custom_extensions.c b/boringssl/ssl/custom_extensions.c
index c94543d8..b8bc8f3d 100644
--- a/boringssl/ssl/custom_extensions.c
+++ b/boringssl/ssl/custom_extensions.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -12,15 +13,15 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
 
-#include <openssl/ssl.h>
+#include <boringssl/ssl.h>
 
 #include <assert.h>
 #include <string.h>
 
-#include <openssl/bytestring.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/stack.h>
+#include <boringssl/bytestring.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/stack.h>
 
 #include "internal.h"
 
diff --git a/boringssl/ssl/d1_both.c b/boringssl/ssl/d1_both.c
index cc95a70b..e120fb2c 100644
--- a/boringssl/ssl/d1_both.c
+++ b/boringssl/ssl/d1_both.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /*
  * DTLS implementation written by Nagendra Modadugu
  * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. 
@@ -111,18 +112,18 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/ssl.h>
+#include <boringssl/ssl.h>
 
 #include <assert.h>
 #include <limits.h>
 #include <string.h>
 
-#include <openssl/buf.h>
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/mem.h>
-#include <openssl/rand.h>
-#include <openssl/x509.h>
+#include <boringssl/buf.h>
+#include <boringssl/err.h>
+#include <boringssl/evp.h>
+#include <boringssl/mem.h>
+#include <boringssl/rand.h>
+#include <boringssl/x509.h>
 
 #include "internal.h"
 
diff --git a/boringssl/ssl/d1_clnt.c b/boringssl/ssl/d1_clnt.c
index 2fc9094b..b8099e3b 100644
--- a/boringssl/ssl/d1_clnt.c
+++ b/boringssl/ssl/d1_clnt.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /*
  * DTLS implementation written by Nagendra Modadugu
  * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. 
@@ -112,19 +113,19 @@
  * [including the GNU Public Licence.]
  */
 
-#include <openssl/ssl.h>
+#include <boringssl/ssl.h>
 
 #include <assert.h>
 #include <string.h>
 
-#include <openssl/bn.h>
-#include <openssl/buf.h>
-#include <openssl/dh.h>
-#include <openssl/evp.h>
-#include <openssl/err.h>
-#include <openssl/md5.h>
-#include <openssl/mem.h>
-#include <openssl/rand.h>
+#include <boringssl/bn.h>
+#include <boringssl/buf.h>
+#include <boringssl/dh.h>
+#include <boringssl/evp.h>
+#include <boringssl/err.h>
+#include <boringssl/md5.h>
+#include <boringssl/mem.h>
+#include <boringssl/rand.h>
 
 #include "internal.h"
 
diff --git a/boringssl/ssl/d1_lib.c b/boringssl/ssl/d1_lib.c
index e48fbf1a..e963e972 100644
--- a/boringssl/ssl/d1_lib.c
+++ b/boringssl/ssl/d1_lib.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /*
  * DTLS implementation written by Nagendra Modadugu
  * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
@@ -54,14 +55,14 @@
  * (eay@cryptsoft.com).  This product includes software written by Tim
  * Hudson (tjh@cryptsoft.com). */
 
-#include <openssl/ssl.h>
+#include <boringssl/ssl.h>
 
 #include <limits.h>
 #include <string.h>
 
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/nid.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/nid.h>
 
 #include "internal.h"
 
diff --git a/boringssl/ssl/d1_meth.c b/boringssl/ssl/d1_meth.c
index 49a2595e..d4033c2a 100644
--- a/boringssl/ssl/d1_meth.c
+++ b/boringssl/ssl/d1_meth.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /*
  * DTLS implementation written by Nagendra Modadugu
  * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. 
@@ -54,7 +55,7 @@
  * (eay@cryptsoft.com).  This product includes software written by Tim
  * Hudson (tjh@cryptsoft.com). */
 
-#include <openssl/ssl.h>
+#include <boringssl/ssl.h>
 
 #include "internal.h"
 
diff --git a/boringssl/ssl/d1_pkt.c b/boringssl/ssl/d1_pkt.c
index 4690486c..d185dfac 100644
--- a/boringssl/ssl/d1_pkt.c
+++ b/boringssl/ssl/d1_pkt.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* DTLS implementation written by Nagendra Modadugu
  * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. */
 /* ====================================================================
@@ -109,16 +110,16 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/ssl.h>
+#include <boringssl/ssl.h>
 
 #include <assert.h>
 #include <string.h>
 
-#include <openssl/buf.h>
-#include <openssl/mem.h>
-#include <openssl/evp.h>
-#include <openssl/err.h>
-#include <openssl/rand.h>
+#include <boringssl/buf.h>
+#include <boringssl/mem.h>
+#include <boringssl/evp.h>
+#include <boringssl/err.h>
+#include <boringssl/rand.h>
 
 #include "internal.h"
 
diff --git a/boringssl/ssl/d1_srtp.c b/boringssl/ssl/d1_srtp.c
index e7b1607a..46b3396c 100644
--- a/boringssl/ssl/d1_srtp.c
+++ b/boringssl/ssl/d1_srtp.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -114,12 +115,12 @@
   Copyright (C) 2011, RTFM, Inc.
 */
 
-#include <openssl/ssl.h>
+#include <boringssl/ssl.h>
 
 #include <string.h>
 
-#include <openssl/bytestring.h>
-#include <openssl/err.h>
+#include <boringssl/bytestring.h>
+#include <boringssl/err.h>
 
 #include "internal.h"
 
diff --git a/boringssl/ssl/d1_srvr.c b/boringssl/ssl/d1_srvr.c
index d3532810..50b04295 100644
--- a/boringssl/ssl/d1_srvr.c
+++ b/boringssl/ssl/d1_srvr.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /*
  * DTLS implementation written by Nagendra Modadugu
  * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. 
@@ -112,18 +113,18 @@
  * [including the GNU Public Licence.]
  */
 
-#include <openssl/ssl.h>
+#include <boringssl/ssl.h>
 
 #include <assert.h>
 
-#include <openssl/bn.h>
-#include <openssl/buf.h>
-#include <openssl/dh.h>
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/md5.h>
-#include <openssl/rand.h>
-#include <openssl/x509.h>
+#include <boringssl/bn.h>
+#include <boringssl/buf.h>
+#include <boringssl/dh.h>
+#include <boringssl/err.h>
+#include <boringssl/evp.h>
+#include <boringssl/md5.h>
+#include <boringssl/rand.h>
+#include <boringssl/x509.h>
 
 #include "internal.h"
 
diff --git a/boringssl/ssl/dtls_record.c b/boringssl/ssl/dtls_record.c
index eaf6df76..f24501f4 100644
--- a/boringssl/ssl/dtls_record.c
+++ b/boringssl/ssl/dtls_record.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* DTLS implementation written by Nagendra Modadugu
  * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. */
 /* ====================================================================
@@ -109,13 +110,13 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/ssl.h>
+#include <boringssl/ssl.h>
 
 #include <assert.h>
 #include <string.h>
 
-#include <openssl/bytestring.h>
-#include <openssl/err.h>
+#include <boringssl/bytestring.h>
+#include <boringssl/err.h>
 
 #include "internal.h"
 
diff --git a/boringssl/ssl/internal.h b/boringssl/ssl/internal.h
index 982f3040..7d1f1841 100644
--- a/boringssl/ssl/internal.h
+++ b/boringssl/ssl/internal.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -142,12 +143,12 @@
 #ifndef OPENSSL_HEADER_SSL_INTERNAL_H
 #define OPENSSL_HEADER_SSL_INTERNAL_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
-#include <openssl/aead.h>
-#include <openssl/pqueue.h>
-#include <openssl/ssl.h>
-#include <openssl/stack.h>
+#include <boringssl/aead.h>
+#include <boringssl/pqueue.h>
+#include <boringssl/ssl.h>
+#include <boringssl/stack.h>
 
 #if defined(OPENSSL_WINDOWS)
 /* Windows defines struct timeval in winsock2.h. */
diff --git a/boringssl/ssl/pqueue/CMakeLists.txt b/boringssl/ssl/pqueue/CMakeLists.txt
index 3a8b82bc..1bf20aad 100644
--- a/boringssl/ssl/pqueue/CMakeLists.txt
+++ b/boringssl/ssl/pqueue/CMakeLists.txt
@@ -16,5 +16,5 @@ add_executable(
   $<TARGET_OBJECTS:test_support>
 )
 
-target_link_libraries(pqueue_test ssl crypto)
+target_link_libraries(pqueue_test bssl bsslcrypto)
 add_dependencies(all_tests pqueue_test)
diff --git a/boringssl/ssl/pqueue/pqueue.c b/boringssl/ssl/pqueue/pqueue.c
index e6897611..cdf6ecfc 100644
--- a/boringssl/ssl/pqueue/pqueue.c
+++ b/boringssl/ssl/pqueue/pqueue.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /*
  * DTLS implementation written by Nagendra Modadugu
  * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
@@ -54,12 +55,12 @@
  * (eay@cryptsoft.com).  This product includes software written by Tim
  * Hudson (tjh@cryptsoft.com). */
 
-#include <openssl/pqueue.h>
+#include <boringssl/pqueue.h>
 
 #include <assert.h>
 #include <string.h>
 
-#include <openssl/mem.h>
+#include <boringssl/mem.h>
 
 
 typedef struct _pqueue {
diff --git a/boringssl/ssl/pqueue/pqueue_test.c b/boringssl/ssl/pqueue/pqueue_test.c
index f76e4a3c..ef42b088 100644
--- a/boringssl/ssl/pqueue/pqueue_test.c
+++ b/boringssl/ssl/pqueue/pqueue_test.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,9 +16,9 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <openssl/crypto.h>
-#include <openssl/pqueue.h>
-#include <openssl/ssl.h>
+#include <boringssl/crypto.h>
+#include <boringssl/pqueue.h>
+#include <boringssl/ssl.h>
 
 
 static void clear_and_free_queue(pqueue q) {
diff --git a/boringssl/ssl/s3_both.c b/boringssl/ssl/s3_both.c
index 5d364abf..cf2cf760 100644
--- a/boringssl/ssl/s3_both.c
+++ b/boringssl/ssl/s3_both.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -110,21 +111,21 @@
  * ECC cipher suite support in OpenSSL originally developed by
  * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project. */
 
-#include <openssl/ssl.h>
+#include <boringssl/ssl.h>
 
 #include <assert.h>
 #include <limits.h>
 #include <string.h>
 
-#include <openssl/buf.h>
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/mem.h>
-#include <openssl/md5.h>
-#include <openssl/nid.h>
-#include <openssl/rand.h>
-#include <openssl/sha.h>
-#include <openssl/x509.h>
+#include <boringssl/buf.h>
+#include <boringssl/err.h>
+#include <boringssl/evp.h>
+#include <boringssl/mem.h>
+#include <boringssl/md5.h>
+#include <boringssl/nid.h>
+#include <boringssl/rand.h>
+#include <boringssl/sha.h>
+#include <boringssl/x509.h>
 
 #include "internal.h"
 
diff --git a/boringssl/ssl/s3_clnt.c b/boringssl/ssl/s3_clnt.c
index 6f381cfa..301f8e39 100644
--- a/boringssl/ssl/s3_clnt.c
+++ b/boringssl/ssl/s3_clnt.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -147,24 +148,24 @@
  * OTHERWISE.
  */
 
-#include <openssl/ssl.h>
+#include <boringssl/ssl.h>
 
 #include <assert.h>
 #include <string.h>
 
-#include <openssl/bn.h>
-#include <openssl/buf.h>
-#include <openssl/bytestring.h>
-#include <openssl/dh.h>
-#include <openssl/ec_key.h>
-#include <openssl/ecdsa.h>
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/md5.h>
-#include <openssl/mem.h>
-#include <openssl/rand.h>
-#include <openssl/x509.h>
-#include <openssl/x509v3.h>
+#include <boringssl/bn.h>
+#include <boringssl/buf.h>
+#include <boringssl/bytestring.h>
+#include <boringssl/dh.h>
+#include <boringssl/ec_key.h>
+#include <boringssl/ecdsa.h>
+#include <boringssl/err.h>
+#include <boringssl/evp.h>
+#include <boringssl/md5.h>
+#include <boringssl/mem.h>
+#include <boringssl/rand.h>
+#include <boringssl/x509.h>
+#include <boringssl/x509v3.h>
 
 #include "internal.h"
 #include "../crypto/dh/internal.h"
diff --git a/boringssl/ssl/s3_enc.c b/boringssl/ssl/s3_enc.c
index 04aa08c9..c71826ed 100644
--- a/boringssl/ssl/s3_enc.c
+++ b/boringssl/ssl/s3_enc.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -133,16 +134,16 @@
  * OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS OR
  * OTHERWISE. */
 
-#include <openssl/ssl.h>
+#include <boringssl/ssl.h>
 
 #include <assert.h>
 #include <string.h>
 
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/mem.h>
-#include <openssl/md5.h>
-#include <openssl/nid.h>
+#include <boringssl/err.h>
+#include <boringssl/evp.h>
+#include <boringssl/mem.h>
+#include <boringssl/md5.h>
+#include <boringssl/nid.h>
 
 #include "internal.h"
 
diff --git a/boringssl/ssl/s3_lib.c b/boringssl/ssl/s3_lib.c
index 7df046f0..7452c5e7 100644
--- a/boringssl/ssl/s3_lib.c
+++ b/boringssl/ssl/s3_lib.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -146,18 +147,18 @@
  * OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS OR
  * OTHERWISE. */
 
-#include <openssl/ssl.h>
+#include <boringssl/ssl.h>
 
 #include <assert.h>
 #include <string.h>
 
-#include <openssl/buf.h>
-#include <openssl/dh.h>
-#include <openssl/digest.h>
-#include <openssl/err.h>
-#include <openssl/md5.h>
-#include <openssl/mem.h>
-#include <openssl/nid.h>
+#include <boringssl/buf.h>
+#include <boringssl/dh.h>
+#include <boringssl/digest.h>
+#include <boringssl/err.h>
+#include <boringssl/md5.h>
+#include <boringssl/mem.h>
+#include <boringssl/nid.h>
 
 #include "internal.h"
 
diff --git a/boringssl/ssl/s3_meth.c b/boringssl/ssl/s3_meth.c
index b60b5f2c..21f2a25a 100644
--- a/boringssl/ssl/s3_meth.c
+++ b/boringssl/ssl/s3_meth.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,7 +55,7 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/ssl.h>
+#include <boringssl/ssl.h>
 
 #include "internal.h"
 
diff --git a/boringssl/ssl/s3_pkt.c b/boringssl/ssl/s3_pkt.c
index d9c21d42..ae5cf9e9 100644
--- a/boringssl/ssl/s3_pkt.c
+++ b/boringssl/ssl/s3_pkt.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -106,17 +107,17 @@
  * (eay@cryptsoft.com).  This product includes software written by Tim
  * Hudson (tjh@cryptsoft.com). */
 
-#include <openssl/ssl.h>
+#include <boringssl/ssl.h>
 
 #include <assert.h>
 #include <limits.h>
 #include <string.h>
 
-#include <openssl/buf.h>
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/mem.h>
-#include <openssl/rand.h>
+#include <boringssl/buf.h>
+#include <boringssl/err.h>
+#include <boringssl/evp.h>
+#include <boringssl/mem.h>
+#include <boringssl/rand.h>
 
 #include "internal.h"
 
diff --git a/boringssl/ssl/s3_srvr.c b/boringssl/ssl/s3_srvr.c
index f06ee568..30c8547e 100644
--- a/boringssl/ssl/s3_srvr.c
+++ b/boringssl/ssl/s3_srvr.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -146,27 +147,27 @@
  * OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS OR
  * OTHERWISE. */
 
-#include <openssl/ssl.h>
+#include <boringssl/ssl.h>
 
 #include <assert.h>
 #include <string.h>
 
-#include <openssl/bn.h>
-#include <openssl/buf.h>
-#include <openssl/bytestring.h>
-#include <openssl/cipher.h>
-#include <openssl/dh.h>
-#include <openssl/ec.h>
-#include <openssl/ecdsa.h>
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/hmac.h>
-#include <openssl/md5.h>
-#include <openssl/mem.h>
-#include <openssl/nid.h>
-#include <openssl/rand.h>
-#include <openssl/sha.h>
-#include <openssl/x509.h>
+#include <boringssl/bn.h>
+#include <boringssl/buf.h>
+#include <boringssl/bytestring.h>
+#include <boringssl/cipher.h>
+#include <boringssl/dh.h>
+#include <boringssl/ec.h>
+#include <boringssl/ecdsa.h>
+#include <boringssl/err.h>
+#include <boringssl/evp.h>
+#include <boringssl/hmac.h>
+#include <boringssl/md5.h>
+#include <boringssl/mem.h>
+#include <boringssl/nid.h>
+#include <boringssl/rand.h>
+#include <boringssl/sha.h>
+#include <boringssl/x509.h>
 
 #include "internal.h"
 #include "../crypto/internal.h"
diff --git a/boringssl/ssl/ssl_aead_ctx.c b/boringssl/ssl/ssl_aead_ctx.c
index 4de9d45e..ba661939 100644
--- a/boringssl/ssl/ssl_aead_ctx.c
+++ b/boringssl/ssl/ssl_aead_ctx.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2015, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -12,15 +13,15 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
 
-#include <openssl/ssl.h>
+#include <boringssl/ssl.h>
 
 #include <assert.h>
 #include <string.h>
 
-#include <openssl/aead.h>
-#include <openssl/err.h>
-#include <openssl/rand.h>
-#include <openssl/type_check.h>
+#include <boringssl/aead.h>
+#include <boringssl/err.h>
+#include <boringssl/rand.h>
+#include <boringssl/type_check.h>
 
 #include "internal.h"
 
diff --git a/boringssl/ssl/ssl_asn1.c b/boringssl/ssl/ssl_asn1.c
index 5ec33eb4..52d8e23d 100644
--- a/boringssl/ssl/ssl_asn1.c
+++ b/boringssl/ssl/ssl_asn1.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -80,15 +81,15 @@
  * OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS OR
  * OTHERWISE. */
 
-#include <openssl/ssl.h>
+#include <boringssl/ssl.h>
 
 #include <limits.h>
 #include <string.h>
 
-#include <openssl/bytestring.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/x509.h>
+#include <boringssl/bytestring.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/x509.h>
 
 #include "internal.h"
 
diff --git a/boringssl/ssl/ssl_buffer.c b/boringssl/ssl/ssl_buffer.c
index 272b13b0..dfe3a04d 100644
--- a/boringssl/ssl/ssl_buffer.c
+++ b/boringssl/ssl/ssl_buffer.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2015, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -12,17 +13,17 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
 
-#include <openssl/ssl.h>
+#include <boringssl/ssl.h>
 
 #include <assert.h>
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <openssl/bio.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/type_check.h>
+#include <boringssl/bio.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/type_check.h>
 
 #include "internal.h"
 
diff --git a/boringssl/ssl/ssl_cert.c b/boringssl/ssl/ssl_cert.c
index 0eb0d8bf..987f1eba 100644
--- a/boringssl/ssl/ssl_cert.c
+++ b/boringssl/ssl/ssl_cert.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -112,18 +113,18 @@
  * ECC cipher suite support in OpenSSL originally developed by
  * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project. */
 
-#include <openssl/ssl.h>
+#include <boringssl/ssl.h>
 
 #include <string.h>
 
-#include <openssl/bn.h>
-#include <openssl/buf.h>
-#include <openssl/ec_key.h>
-#include <openssl/dh.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/x509.h>
-#include <openssl/x509v3.h>
+#include <boringssl/bn.h>
+#include <boringssl/buf.h>
+#include <boringssl/ec_key.h>
+#include <boringssl/dh.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/x509.h>
+#include <boringssl/x509v3.h>
 
 #include "../crypto/dh/internal.h"
 #include "../crypto/internal.h"
diff --git a/boringssl/ssl/ssl_cipher.c b/boringssl/ssl/ssl_cipher.c
index 58ce582c..e9c9a11d 100644
--- a/boringssl/ssl/ssl_cipher.c
+++ b/boringssl/ssl/ssl_cipher.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -138,17 +139,17 @@
  * OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS OR
  * OTHERWISE. */
 
-#include <openssl/ssl.h>
+#include <boringssl/ssl.h>
 
 #include <assert.h>
 #include <string.h>
 
-#include <openssl/buf.h>
-#include <openssl/err.h>
-#include <openssl/md5.h>
-#include <openssl/mem.h>
-#include <openssl/sha.h>
-#include <openssl/stack.h>
+#include <boringssl/buf.h>
+#include <boringssl/err.h>
+#include <boringssl/md5.h>
+#include <boringssl/mem.h>
+#include <boringssl/sha.h>
+#include <boringssl/stack.h>
 
 #include "internal.h"
 
diff --git a/boringssl/ssl/ssl_ecdh.c b/boringssl/ssl/ssl_ecdh.c
index d48c93f7..d5193ab4 100644
--- a/boringssl/ssl/ssl_ecdh.c
+++ b/boringssl/ssl/ssl_ecdh.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2015, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -12,18 +13,18 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
 
-#include <openssl/ssl.h>
+#include <boringssl/ssl.h>
 
 #include <assert.h>
 #include <string.h>
 
-#include <openssl/bn.h>
-#include <openssl/bytestring.h>
-#include <openssl/curve25519.h>
-#include <openssl/ec.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/nid.h>
+#include <boringssl/bn.h>
+#include <boringssl/bytestring.h>
+#include <boringssl/curve25519.h>
+#include <boringssl/ec.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/nid.h>
 
 #include "internal.h"
 
diff --git a/boringssl/ssl/ssl_file.c b/boringssl/ssl/ssl_file.c
index 748d50ca..8d8d5488 100644
--- a/boringssl/ssl/ssl_file.c
+++ b/boringssl/ssl/ssl_file.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -108,18 +109,18 @@
  *
  */
 
-#include <openssl/ssl.h>
+#include <boringssl/ssl.h>
 
 #include <errno.h>
 #include <string.h>
 
-#include <openssl/asn1.h>
-#include <openssl/bio.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/pem.h>
-#include <openssl/stack.h>
-#include <openssl/x509.h>
+#include <boringssl/asn1.h>
+#include <boringssl/bio.h>
+#include <boringssl/err.h>
+#include <boringssl/mem.h>
+#include <boringssl/pem.h>
+#include <boringssl/stack.h>
+#include <boringssl/x509.h>
 
 #include "internal.h"
 
diff --git a/boringssl/ssl/ssl_lib.c b/boringssl/ssl/ssl_lib.c
index d62cdae0..0c024af8 100644
--- a/boringssl/ssl/ssl_lib.c
+++ b/boringssl/ssl/ssl_lib.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -138,19 +139,19 @@
  * OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS OR
  * OTHERWISE. */
 
-#include <openssl/ssl.h>
+#include <boringssl/ssl.h>
 
 #include <assert.h>
 #include <string.h>
 
-#include <openssl/bytestring.h>
-#include <openssl/crypto.h>
-#include <openssl/dh.h>
-#include <openssl/err.h>
-#include <openssl/lhash.h>
-#include <openssl/mem.h>
-#include <openssl/rand.h>
-#include <openssl/x509v3.h>
+#include <boringssl/bytestring.h>
+#include <boringssl/crypto.h>
+#include <boringssl/dh.h>
+#include <boringssl/err.h>
+#include <boringssl/lhash.h>
+#include <boringssl/mem.h>
+#include <boringssl/rand.h>
+#include <boringssl/x509v3.h>
 
 #include "internal.h"
 #include "../crypto/internal.h"
diff --git a/boringssl/ssl/ssl_rsa.c b/boringssl/ssl/ssl_rsa.c
index c17d2da4..c8ace38c 100644
--- a/boringssl/ssl/ssl_rsa.c
+++ b/boringssl/ssl/ssl_rsa.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,14 +55,14 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include <openssl/ssl.h>
+#include <boringssl/ssl.h>
 
 #include <limits.h>
 
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/mem.h>
-#include <openssl/x509.h>
+#include <boringssl/err.h>
+#include <boringssl/evp.h>
+#include <boringssl/mem.h>
+#include <boringssl/x509.h>
 
 #include "internal.h"
 
diff --git a/boringssl/ssl/ssl_session.c b/boringssl/ssl/ssl_session.c
index 12d065e7..d86963ad 100644
--- a/boringssl/ssl/ssl_session.c
+++ b/boringssl/ssl/ssl_session.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -133,15 +134,15 @@
  * OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS OR
  * OTHERWISE. */
 
-#include <openssl/ssl.h>
+#include <boringssl/ssl.h>
 
 #include <assert.h>
 #include <string.h>
 
-#include <openssl/err.h>
-#include <openssl/lhash.h>
-#include <openssl/mem.h>
-#include <openssl/rand.h>
+#include <boringssl/err.h>
+#include <boringssl/lhash.h>
+#include <boringssl/mem.h>
+#include <boringssl/rand.h>
 
 #include "internal.h"
 #include "../crypto/internal.h"
diff --git a/boringssl/ssl/ssl_stat.c b/boringssl/ssl/ssl_stat.c
index 8fa197d5..77f4fcb5 100644
--- a/boringssl/ssl/ssl_stat.c
+++ b/boringssl/ssl/ssl_stat.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -81,7 +82,7 @@
  * OTHERWISE.
  */
 
-#include <openssl/ssl.h>
+#include <boringssl/ssl.h>
 
 #include "internal.h"
 
diff --git a/boringssl/ssl/ssl_test.cc b/boringssl/ssl/ssl_test.cc
index 590a2c16..98e22b45 100644
--- a/boringssl/ssl/ssl_test.cc
+++ b/boringssl/ssl/ssl_test.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -21,13 +22,13 @@
 #include <utility>
 #include <vector>
 
-#include <openssl/base64.h>
-#include <openssl/bio.h>
-#include <openssl/crypto.h>
-#include <openssl/err.h>
-#include <openssl/pem.h>
-#include <openssl/ssl.h>
-#include <openssl/x509.h>
+#include <boringssl/base64.h>
+#include <boringssl/bio.h>
+#include <boringssl/crypto.h>
+#include <boringssl/err.h>
+#include <boringssl/pem.h>
+#include <boringssl/ssl.h>
+#include <boringssl/x509.h>
 
 #include "test/scoped_types.h"
 #include "../crypto/test/test_util.h"
diff --git a/boringssl/ssl/t1_enc.c b/boringssl/ssl/t1_enc.c
index b5992077..4a9bcc17 100644
--- a/boringssl/ssl/t1_enc.c
+++ b/boringssl/ssl/t1_enc.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -133,18 +134,18 @@
  * OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS OR
  * OTHERWISE. */
 
-#include <openssl/ssl.h>
+#include <boringssl/ssl.h>
 
 #include <assert.h>
 #include <string.h>
 
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/hmac.h>
-#include <openssl/md5.h>
-#include <openssl/mem.h>
-#include <openssl/nid.h>
-#include <openssl/rand.h>
+#include <boringssl/err.h>
+#include <boringssl/evp.h>
+#include <boringssl/hmac.h>
+#include <boringssl/md5.h>
+#include <boringssl/mem.h>
+#include <boringssl/nid.h>
+#include <boringssl/rand.h>
 
 #include "internal.h"
 
diff --git a/boringssl/ssl/t1_lib.c b/boringssl/ssl/t1_lib.c
index eac9579d..047e2558 100644
--- a/boringssl/ssl/t1_lib.c
+++ b/boringssl/ssl/t1_lib.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -106,22 +107,22 @@
  * (eay@cryptsoft.com).  This product includes software written by Tim
  * Hudson (tjh@cryptsoft.com). */
 
-#include <openssl/ssl.h>
+#include <boringssl/ssl.h>
 
 #include <assert.h>
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <openssl/bytestring.h>
-#include <openssl/digest.h>
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/hmac.h>
-#include <openssl/mem.h>
-#include <openssl/nid.h>
-#include <openssl/rand.h>
-#include <openssl/type_check.h>
+#include <boringssl/bytestring.h>
+#include <boringssl/digest.h>
+#include <boringssl/err.h>
+#include <boringssl/evp.h>
+#include <boringssl/hmac.h>
+#include <boringssl/mem.h>
+#include <boringssl/nid.h>
+#include <boringssl/rand.h>
+#include <boringssl/type_check.h>
 
 #include "internal.h"
 
diff --git a/boringssl/ssl/test/CMakeLists.txt b/boringssl/ssl/test/CMakeLists.txt
index 3b079030..f00a633e 100644
--- a/boringssl/ssl/test/CMakeLists.txt
+++ b/boringssl/ssl/test/CMakeLists.txt
@@ -11,4 +11,4 @@ add_executable(
   $<TARGET_OBJECTS:test_support>
 )
 
-target_link_libraries(bssl_shim ssl crypto)
+target_link_libraries(bssl_shim bssl bsslcrypto)
diff --git a/boringssl/ssl/test/async_bio.cc b/boringssl/ssl/test/async_bio.cc
index 7a5737bb..ca140feb 100644
--- a/boringssl/ssl/test/async_bio.cc
+++ b/boringssl/ssl/test/async_bio.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -17,7 +18,7 @@
 #include <errno.h>
 #include <string.h>
 
-#include <openssl/mem.h>
+#include <boringssl/mem.h>
 
 
 namespace {
diff --git a/boringssl/ssl/test/async_bio.h b/boringssl/ssl/test/async_bio.h
index fbc40163..f1cd8415 100644
--- a/boringssl/ssl/test/async_bio.h
+++ b/boringssl/ssl/test/async_bio.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +16,7 @@
 #ifndef HEADER_ASYNC_BIO
 #define HEADER_ASYNC_BIO
 
-#include <openssl/bio.h>
+#include <boringssl/bio.h>
 
 #include "../../crypto/test/scoped_types.h"
 
diff --git a/boringssl/ssl/test/bssl_shim.cc b/boringssl/ssl/test/bssl_shim.cc
index 5effa580..e5d041f5 100644
--- a/boringssl/ssl/test/bssl_shim.cc
+++ b/boringssl/ssl/test/bssl_shim.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -16,7 +17,7 @@
 #define __STDC_FORMAT_MACROS
 #endif
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #if !defined(OPENSSL_WINDOWS)
 #include <arpa/inet.h>
@@ -39,16 +40,16 @@
 #include <inttypes.h>
 #include <string.h>
 
-#include <openssl/bio.h>
-#include <openssl/buf.h>
-#include <openssl/bytestring.h>
-#include <openssl/cipher.h>
-#include <openssl/crypto.h>
-#include <openssl/err.h>
-#include <openssl/hmac.h>
-#include <openssl/nid.h>
-#include <openssl/rand.h>
-#include <openssl/ssl.h>
+#include <boringssl/bio.h>
+#include <boringssl/buf.h>
+#include <boringssl/bytestring.h>
+#include <boringssl/cipher.h>
+#include <boringssl/crypto.h>
+#include <boringssl/err.h>
+#include <boringssl/hmac.h>
+#include <boringssl/nid.h>
+#include <boringssl/rand.h>
+#include <boringssl/ssl.h>
 
 #include <memory>
 #include <string>
diff --git a/boringssl/ssl/test/packeted_bio.cc b/boringssl/ssl/test/packeted_bio.cc
index e831082a..f0910f07 100644
--- a/boringssl/ssl/test/packeted_bio.cc
+++ b/boringssl/ssl/test/packeted_bio.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -19,7 +20,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <openssl/mem.h>
+#include <boringssl/mem.h>
 
 
 namespace {
diff --git a/boringssl/ssl/test/packeted_bio.h b/boringssl/ssl/test/packeted_bio.h
index 75cfa13b..5bd159d9 100644
--- a/boringssl/ssl/test/packeted_bio.h
+++ b/boringssl/ssl/test/packeted_bio.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,8 +16,8 @@
 #ifndef HEADER_PACKETED_BIO
 #define HEADER_PACKETED_BIO
 
-#include <openssl/base.h>
-#include <openssl/bio.h>
+#include <boringssl/base.h>
+#include <boringssl/bio.h>
 
 #include "../../crypto/test/scoped_types.h"
 
diff --git a/boringssl/ssl/test/runner/curve25519/const_amd64.s b/boringssl/ssl/test/runner/curve25519/const_amd64.s
index 797f9b05..740f2745 100644
--- a/boringssl/ssl/test/runner/curve25519/const_amd64.s
+++ b/boringssl/ssl/test/runner/curve25519/const_amd64.s
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 // Copyright 2012 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/boringssl/ssl/test/runner/curve25519/cswap_amd64.s b/boringssl/ssl/test/runner/curve25519/cswap_amd64.s
index 45484d1b..c25c69d4 100644
--- a/boringssl/ssl/test/runner/curve25519/cswap_amd64.s
+++ b/boringssl/ssl/test/runner/curve25519/cswap_amd64.s
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 // Copyright 2012 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/boringssl/ssl/test/runner/curve25519/freeze_amd64.s b/boringssl/ssl/test/runner/curve25519/freeze_amd64.s
index 37599fac..6c584998 100644
--- a/boringssl/ssl/test/runner/curve25519/freeze_amd64.s
+++ b/boringssl/ssl/test/runner/curve25519/freeze_amd64.s
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 // Copyright 2012 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/boringssl/ssl/test/runner/curve25519/ladderstep_amd64.s b/boringssl/ssl/test/runner/curve25519/ladderstep_amd64.s
index 3949f9cf..57fa5232 100644
--- a/boringssl/ssl/test/runner/curve25519/ladderstep_amd64.s
+++ b/boringssl/ssl/test/runner/curve25519/ladderstep_amd64.s
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 // Copyright 2012 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/boringssl/ssl/test/runner/curve25519/mul_amd64.s b/boringssl/ssl/test/runner/curve25519/mul_amd64.s
index e48d183e..53075811 100644
--- a/boringssl/ssl/test/runner/curve25519/mul_amd64.s
+++ b/boringssl/ssl/test/runner/curve25519/mul_amd64.s
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 // Copyright 2012 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/boringssl/ssl/test/runner/curve25519/square_amd64.s b/boringssl/ssl/test/runner/curve25519/square_amd64.s
index 78d1a50d..dea04b71 100644
--- a/boringssl/ssl/test/runner/curve25519/square_amd64.s
+++ b/boringssl/ssl/test/runner/curve25519/square_amd64.s
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 // Copyright 2012 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/boringssl/ssl/test/runner/poly1305/const_amd64.s b/boringssl/ssl/test/runner/poly1305/const_amd64.s
index 8e861f33..6bfd95a5 100644
--- a/boringssl/ssl/test/runner/poly1305/const_amd64.s
+++ b/boringssl/ssl/test/runner/poly1305/const_amd64.s
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 // Copyright 2012 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/boringssl/ssl/test/runner/poly1305/poly1305_amd64.s b/boringssl/ssl/test/runner/poly1305/poly1305_amd64.s
index f8d4ee92..6fabb44b 100644
--- a/boringssl/ssl/test/runner/poly1305/poly1305_amd64.s
+++ b/boringssl/ssl/test/runner/poly1305/poly1305_amd64.s
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 // Copyright 2012 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/boringssl/ssl/test/runner/poly1305/poly1305_arm.s b/boringssl/ssl/test/runner/poly1305/poly1305_arm.s
index c1538674..dcc73bf2 100644
--- a/boringssl/ssl/test/runner/poly1305/poly1305_arm.s
+++ b/boringssl/ssl/test/runner/poly1305/poly1305_arm.s
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 // Copyright 2015 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/boringssl/ssl/test/scoped_types.h b/boringssl/ssl/test/scoped_types.h
index 7e92ceed..c08a1614 100644
--- a/boringssl/ssl/test/scoped_types.h
+++ b/boringssl/ssl/test/scoped_types.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2015, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +16,7 @@
 #ifndef OPENSSL_HEADER_SSL_TEST_SCOPED_TYPES_H
 #define OPENSSL_HEADER_SSL_TEST_SCOPED_TYPES_H
 
-#include <openssl/ssl.h>
+#include <boringssl/ssl.h>
 
 #include "../../crypto/test/scoped_types.h"
 
diff --git a/boringssl/ssl/test/test_config.cc b/boringssl/ssl/test/test_config.cc
index 67a017d8..51d5a348 100644
--- a/boringssl/ssl/test/test_config.cc
+++ b/boringssl/ssl/test/test_config.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -20,7 +21,7 @@
 
 #include <memory>
 
-#include <openssl/base64.h>
+#include <boringssl/base64.h>
 
 namespace {
 
diff --git a/boringssl/ssl/test/test_config.h b/boringssl/ssl/test/test_config.h
index fe117d8b..66c1a651 100644
--- a/boringssl/ssl/test/test_config.h
+++ b/boringssl/ssl/test/test_config.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/boringssl/ssl/tls_record.c b/boringssl/ssl/tls_record.c
index b71da17f..804a9fe3 100644
--- a/boringssl/ssl/tls_record.c
+++ b/boringssl/ssl/tls_record.c
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -106,13 +107,13 @@
  * (eay@cryptsoft.com).  This product includes software written by Tim
  * Hudson (tjh@cryptsoft.com). */
 
-#include <openssl/ssl.h>
+#include <boringssl/ssl.h>
 
 #include <assert.h>
 #include <string.h>
 
-#include <openssl/bytestring.h>
-#include <openssl/err.h>
+#include <boringssl/bytestring.h>
+#include <boringssl/err.h>
 
 #include "internal.h"
 
diff --git a/boringssl/tool/CMakeLists.txt b/boringssl/tool/CMakeLists.txt
index f0af2835..deccb012 100644
--- a/boringssl/tool/CMakeLists.txt
+++ b/boringssl/tool/CMakeLists.txt
@@ -1,7 +1,7 @@
 include_directories(../include)
 
 add_executable(
-  bssl
+  bssl_test
 
   args.cc
   ciphers.cc
@@ -19,12 +19,12 @@ add_executable(
 )
 
 if (APPLE OR WIN32 OR ANDROID)
-  target_link_libraries(bssl ssl crypto)
+  target_link_libraries(bssl_test bssl bsslcrypto)
 else()
   find_library(FOUND_LIBRT rt)
   if (FOUND_LIBRT)
-    target_link_libraries(bssl ssl crypto -lrt)
+    target_link_libraries(bssl_test bssl bsslcrypto -lrt)
   else()
-    target_link_libraries(bssl ssl crypto)
+    target_link_libraries(bssl_test bssl bsslcrypto)
   endif()
 endif()
diff --git a/boringssl/tool/args.cc b/boringssl/tool/args.cc
index 9ec18a3f..0e18b77b 100644
--- a/boringssl/tool/args.cc
+++ b/boringssl/tool/args.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/boringssl/tool/ciphers.cc b/boringssl/tool/ciphers.cc
index d7cc36b8..769289aa 100644
--- a/boringssl/tool/ciphers.cc
+++ b/boringssl/tool/ciphers.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2015, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -18,7 +19,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#include <openssl/ssl.h>
+#include <boringssl/ssl.h>
 
 #include "../crypto/test/scoped_types.h"
 #include "../ssl/test/scoped_types.h"
diff --git a/boringssl/tool/client.cc b/boringssl/tool/client.cc
index dbec1846..342c7140 100644
--- a/boringssl/tool/client.cc
+++ b/boringssl/tool/client.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -12,13 +13,13 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #include <stdio.h>
 
-#include <openssl/err.h>
-#include <openssl/pem.h>
-#include <openssl/ssl.h>
+#include <boringssl/err.h>
+#include <boringssl/pem.h>
+#include <boringssl/ssl.h>
 
 #include "../crypto/test/scoped_types.h"
 #include "../ssl/test/scoped_types.h"
diff --git a/boringssl/tool/const.cc b/boringssl/tool/const.cc
index 7b7001e5..aa6fc7d6 100644
--- a/boringssl/tool/const.cc
+++ b/boringssl/tool/const.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/boringssl/tool/digest.cc b/boringssl/tool/digest.cc
index 012202ce..6ab8048f 100644
--- a/boringssl/tool/digest.cc
+++ b/boringssl/tool/digest.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -12,7 +13,7 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #include <memory>
 #include <string>
@@ -39,7 +40,7 @@
 typedef int ssize_t;
 #endif
 
-#include <openssl/digest.h>
+#include <boringssl/digest.h>
 
 #include "internal.h"
 
diff --git a/boringssl/tool/generate_ed25519.cc b/boringssl/tool/generate_ed25519.cc
index 15d36924..03108c12 100644
--- a/boringssl/tool/generate_ed25519.cc
+++ b/boringssl/tool/generate_ed25519.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2015, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -12,7 +13,7 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
 
-#include <openssl/curve25519.h>
+#include <boringssl/curve25519.h>
 
 #include <errno.h>
 #include <stdio.h>
diff --git a/boringssl/tool/genrsa.cc b/boringssl/tool/genrsa.cc
index 4b394015..afee69c7 100644
--- a/boringssl/tool/genrsa.cc
+++ b/boringssl/tool/genrsa.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2015, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -12,11 +13,11 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
 
-#include <openssl/bio.h>
-#include <openssl/bn.h>
-#include <openssl/err.h>
-#include <openssl/pem.h>
-#include <openssl/rsa.h>
+#include <boringssl/bio.h>
+#include <boringssl/bn.h>
+#include <boringssl/err.h>
+#include <boringssl/pem.h>
+#include <boringssl/rsa.h>
 
 #include "../crypto/test/scoped_types.h"
 #include "internal.h"
diff --git a/boringssl/tool/internal.h b/boringssl/tool/internal.h
index 6d26209f..a56b12e1 100644
--- a/boringssl/tool/internal.h
+++ b/boringssl/tool/internal.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +16,7 @@
 #ifndef OPENSSL_HEADER_TOOL_INTERNAL_H
 #define OPENSSL_HEADER_TOOL_INTERNAL_H
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #include <string>
 #include <vector>
diff --git a/boringssl/tool/pkcs12.cc b/boringssl/tool/pkcs12.cc
index fe830d66..9765f18c 100644
--- a/boringssl/tool/pkcs12.cc
+++ b/boringssl/tool/pkcs12.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -12,7 +13,7 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #include <memory>
 #include <string>
@@ -30,11 +31,11 @@
 #include <unistd.h>
 #endif
 
-#include <openssl/bytestring.h>
-#include <openssl/err.h>
-#include <openssl/pem.h>
-#include <openssl/pkcs8.h>
-#include <openssl/stack.h>
+#include <boringssl/bytestring.h>
+#include <boringssl/err.h>
+#include <boringssl/pem.h>
+#include <boringssl/pkcs8.h>
+#include <boringssl/stack.h>
 
 #include "internal.h"
 
diff --git a/boringssl/tool/rand.cc b/boringssl/tool/rand.cc
index 3701748c..0ca8f406 100644
--- a/boringssl/tool/rand.cc
+++ b/boringssl/tool/rand.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2015, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -18,7 +19,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#include <openssl/rand.h>
+#include <boringssl/rand.h>
 
 #include "internal.h"
 
diff --git a/boringssl/tool/server.cc b/boringssl/tool/server.cc
index 14f37a44..149bba68 100644
--- a/boringssl/tool/server.cc
+++ b/boringssl/tool/server.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -12,10 +13,10 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
-#include <openssl/err.h>
-#include <openssl/ssl.h>
+#include <boringssl/err.h>
+#include <boringssl/ssl.h>
 
 #include "internal.h"
 #include "transport_common.h"
diff --git a/boringssl/tool/speed.cc b/boringssl/tool/speed.cc
index 68d78e2b..78480ba8 100644
--- a/boringssl/tool/speed.cc
+++ b/boringssl/tool/speed.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -20,14 +21,14 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <openssl/aead.h>
-#include <openssl/curve25519.h>
-#include <openssl/digest.h>
-#include <openssl/err.h>
-#include <openssl/newhope.h>
-#include <openssl/nid.h>
-#include <openssl/rand.h>
-#include <openssl/rsa.h>
+#include <boringssl/aead.h>
+#include <boringssl/curve25519.h>
+#include <boringssl/digest.h>
+#include <boringssl/err.h>
+#include <boringssl/newhope.h>
+#include <boringssl/nid.h>
+#include <boringssl/rand.h>
+#include <boringssl/rsa.h>
 
 #if defined(OPENSSL_WINDOWS)
 #pragma warning(push, 3)
diff --git a/boringssl/tool/tool.cc b/boringssl/tool/tool.cc
index 34851b47..dc237435 100644
--- a/boringssl/tool/tool.cc
+++ b/boringssl/tool/tool.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,9 +16,9 @@
 #include <string>
 #include <vector>
 
-#include <openssl/crypto.h>
-#include <openssl/err.h>
-#include <openssl/ssl.h>
+#include <boringssl/crypto.h>
+#include <boringssl/err.h>
+#include <boringssl/ssl.h>
 
 #if defined(OPENSSL_WINDOWS)
 #include <fcntl.h>
diff --git a/boringssl/tool/transport_common.cc b/boringssl/tool/transport_common.cc
index 91152143..9bcd0d59 100644
--- a/boringssl/tool/transport_common.cc
+++ b/boringssl/tool/transport_common.cc
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -12,7 +13,7 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
 
-#include <openssl/base.h>
+#include <boringssl/base.h>
 
 #include <string>
 #include <vector>
@@ -42,9 +43,9 @@ typedef int ssize_t;
 #pragma comment(lib, "Ws2_32.lib")
 #endif
 
-#include <openssl/err.h>
-#include <openssl/ssl.h>
-#include <openssl/x509.h>
+#include <boringssl/err.h>
+#include <boringssl/ssl.h>
+#include <boringssl/x509.h>
 
 #include "internal.h"
 #include "transport_common.h"
diff --git a/boringssl/tool/transport_common.h b/boringssl/tool/transport_common.h
index b7010158..cba47476 100644
--- a/boringssl/tool/transport_common.h
+++ b/boringssl/tool/transport_common.h
@@ -1,3 +1,4 @@
+#include <boringssl/bssl.h>
 /* Copyright (c) 2014, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +16,7 @@
 #ifndef OPENSSL_HEADER_TOOL_TRANSPORT_COMMON_H
 #define OPENSSL_HEADER_TOOL_TRANSPORT_COMMON_H
 
-#include <openssl/ssl.h>
+#include <boringssl/ssl.h>
 #include <string.h>
 
 // InitSocketLibrary calls the Windows socket init functions, if needed.
diff --git a/src/crypto/curve25519.cc b/src/crypto/curve25519.cc
index 06c2f01b..ee1f66ee 100644
--- a/src/crypto/curve25519.cc
+++ b/src/crypto/curve25519.cc
@@ -4,7 +4,7 @@
 
 #include "crypto/curve25519.h"
 
-#include <openssl/curve25519.h>
+#include <boringssl/curve25519.h>
 #include <stdint.h>
 
 namespace crypto {
diff --git a/src/crypto/hkdf.cc b/src/crypto/hkdf.cc
index 41e2d09b..a4cdd1ea 100644
--- a/src/crypto/hkdf.cc
+++ b/src/crypto/hkdf.cc
@@ -16,13 +16,13 @@ namespace crypto {
 
 const size_t kSHA256HashLength = 32;
 
-HKDF::HKDF(const base::StringPiece& secret,
+CryptoHKDF::CryptoHKDF(const base::StringPiece& secret,
            const base::StringPiece& salt,
            const base::StringPiece& info,
            size_t key_bytes_to_generate,
            size_t iv_bytes_to_generate,
            size_t subkey_secret_bytes_to_generate)
-    : HKDF(secret,
+    : CryptoHKDF(secret,
            salt,
            info,
            key_bytes_to_generate,
@@ -31,7 +31,7 @@ HKDF::HKDF(const base::StringPiece& secret,
            iv_bytes_to_generate,
            subkey_secret_bytes_to_generate) {}
 
-HKDF::HKDF(const base::StringPiece& secret,
+CryptoHKDF::CryptoHKDF(const base::StringPiece& secret,
            const base::StringPiece& salt,
            const base::StringPiece& info,
            size_t client_key_bytes_to_generate,
@@ -50,7 +50,7 @@ HKDF::HKDF(const base::StringPiece& secret,
 
   // Perform the Extract step to transform the input key and
   // salt into the pseudorandom key (PRK) used for Expand.
-  HMAC prk_hmac(HMAC::SHA256);
+  CryptoHMAC prk_hmac(CryptoHMAC::CryptoSHA256);
   bool result = prk_hmac.Init(actual_salt);
   DCHECK(result);
 
@@ -77,7 +77,7 @@ HKDF::HKDF(const base::StringPiece& secret,
   std::unique_ptr<char[]> buf(new char[kSHA256HashLength + info.size() + 1]);
   uint8_t digest[kSHA256HashLength];
 
-  HMAC hmac(HMAC::SHA256);
+  CryptoHMAC hmac(CryptoHMAC::CryptoSHA256);
   result = hmac.Init(prk, sizeof(prk));
   DCHECK(result);
 
@@ -130,7 +130,7 @@ HKDF::HKDF(const base::StringPiece& secret,
   }
 }
 
-HKDF::~HKDF() {
+CryptoHKDF::~CryptoHKDF() {
 }
 
 }  // namespace crypto
diff --git a/src/crypto/hkdf.h b/src/crypto/hkdf.h
index b8c07c6c..ac6585c0 100644
--- a/src/crypto/hkdf.h
+++ b/src/crypto/hkdf.h
@@ -18,7 +18,7 @@ namespace crypto {
 // HKDF implements the key derivation function specified in RFC 5869 (using
 // SHA-256) and outputs key material, as needed by QUIC.
 // See https://tools.ietf.org/html/rfc5869 for details.
-class CRYPTO_EXPORT HKDF {
+class CRYPTO_EXPORT CryptoHKDF {
  public:
   // |secret|: the input shared secret (or, from RFC 5869, the IKM).
   // |salt|: an (optional) public salt / non-secret random value. While
@@ -34,7 +34,7 @@ class CRYPTO_EXPORT HKDF {
   // client and server.
   // |subkey_secret_bytes_to_generate|: the number of bytes of subkey secret to
   // generate, shared between client and server.
-  HKDF(const base::StringPiece& secret,
+  CryptoHKDF(const base::StringPiece& secret,
        const base::StringPiece& salt,
        const base::StringPiece& info,
        size_t key_bytes_to_generate,
@@ -43,7 +43,7 @@ class CRYPTO_EXPORT HKDF {
 
   // An alternative constructor that allows the client and server key/IV
   // lengths to be different.
-  HKDF(const base::StringPiece& secret,
+  CryptoHKDF(const base::StringPiece& secret,
        const base::StringPiece& salt,
        const base::StringPiece& info,
        size_t client_key_bytes_to_generate,
@@ -51,7 +51,7 @@ class CRYPTO_EXPORT HKDF {
        size_t client_iv_bytes_to_generate,
        size_t server_iv_bytes_to_generate,
        size_t subkey_secret_bytes_to_generate);
-  ~HKDF();
+  ~CryptoHKDF();
 
   base::StringPiece client_write_key() const {
     return client_write_key_;
diff --git a/src/crypto/hmac.cc b/src/crypto/hmac.cc
index fa91628e..66a9fa62 100644
--- a/src/crypto/hmac.cc
+++ b/src/crypto/hmac.cc
@@ -4,7 +4,7 @@
 
 #include "crypto/hmac.h"
 
-#include <openssl/hmac.h>
+#include <boringssl/hmac.h>
 #include <stddef.h>
 
 #include <algorithm>
@@ -17,22 +17,22 @@
 
 namespace crypto {
 
-HMAC::HMAC(HashAlgorithm hash_alg) : hash_alg_(hash_alg), initialized_(false) {
+CryptoHMAC::CryptoHMAC(HashAlgorithm hash_alg) : hash_alg_(hash_alg), initialized_(false) {
   // Only SHA-1 and SHA-256 hash algorithms are supported now.
-  DCHECK(hash_alg_ == SHA1 || hash_alg_ == SHA256);
+  DCHECK(hash_alg_ == CryptoSHA1 || hash_alg_ == CryptoSHA256);
 }
 
-HMAC::~HMAC() {
+CryptoHMAC::~CryptoHMAC() {
   // Zero out key copy.
   key_.assign(key_.size(), 0);
   STLClearObject(&key_);
 }
 
-size_t HMAC::DigestLength() const {
+size_t CryptoHMAC::DigestLength() const {
   switch (hash_alg_) {
-    case SHA1:
+    case CryptoSHA1:
       return 20;
-    case SHA256:
+    case CryptoSHA256:
       return 32;
     default:
       NOTREACHED();
@@ -40,7 +40,7 @@ size_t HMAC::DigestLength() const {
   }
 }
 
-bool HMAC::Init(const unsigned char* key, size_t key_length) {
+bool CryptoHMAC::Init(const unsigned char* key, size_t key_length) {
   // Init must not be called more than once on the same HMAC object.
   DCHECK(!initialized_);
   initialized_ = true;
@@ -48,7 +48,7 @@ bool HMAC::Init(const unsigned char* key, size_t key_length) {
   return true;
 }
 
-bool HMAC::Init(SymmetricKey* key) {
+bool CryptoHMAC::Init(SymmetricKey* key) {
   std::string raw_key;
   bool result = key->GetRawKey(&raw_key) && Init(raw_key);
   // Zero out key copy.  This might get optimized away, but one can hope.
@@ -57,26 +57,26 @@ bool HMAC::Init(SymmetricKey* key) {
   return result;
 }
 
-bool HMAC::Sign(const base::StringPiece& data,
+bool CryptoHMAC::Sign(const base::StringPiece& data,
                 unsigned char* digest,
                 size_t digest_length) const {
   DCHECK(initialized_);
 
   ScopedOpenSSLSafeSizeBuffer<EVP_MAX_MD_SIZE> result(digest, digest_length);
-  return !!::HMAC(hash_alg_ == SHA1 ? EVP_sha1() : EVP_sha256(), key_.data(),
+  return !!::HMAC(hash_alg_ == CryptoSHA1 ? EVP_sha1() : EVP_sha256(), key_.data(),
                   key_.size(),
                   reinterpret_cast<const unsigned char*>(data.data()),
                   data.size(), result.safe_buffer(), nullptr);
 }
 
-bool HMAC::Verify(const base::StringPiece& data,
+bool CryptoHMAC::Verify(const base::StringPiece& data,
                   const base::StringPiece& digest) const {
   if (digest.size() != DigestLength())
     return false;
   return VerifyTruncated(data, digest);
 }
 
-bool HMAC::VerifyTruncated(const base::StringPiece& data,
+bool CryptoHMAC::VerifyTruncated(const base::StringPiece& data,
                            const base::StringPiece& digest) const {
   if (digest.empty())
     return false;
diff --git a/src/crypto/hmac.h b/src/crypto/hmac.h
index 24213338..cdfcdcdc 100644
--- a/src/crypto/hmac.h
+++ b/src/crypto/hmac.h
@@ -23,16 +23,16 @@ namespace crypto {
 // Simplify the interface and reduce includes by abstracting out the internals.
 class SymmetricKey;
 
-class CRYPTO_EXPORT HMAC {
+class CRYPTO_EXPORT CryptoHMAC {
  public:
   // The set of supported hash functions. Extend as required.
   enum HashAlgorithm {
-    SHA1,
-    SHA256,
+    CryptoSHA1,
+    CryptoSHA256,
   };
 
-  explicit HMAC(HashAlgorithm hash_alg);
-  ~HMAC();
+  explicit CryptoHMAC(HashAlgorithm hash_alg);
+  ~CryptoHMAC();
 
   // Returns the length of digest that this HMAC will create.
   size_t DigestLength() const;
@@ -89,7 +89,7 @@ class CRYPTO_EXPORT HMAC {
   bool initialized_;
   std::vector<unsigned char> key_;
 
-  DISALLOW_COPY_AND_ASSIGN(HMAC);
+  DISALLOW_COPY_AND_ASSIGN(CryptoHMAC);
 };
 
 }  // namespace crypto
diff --git a/src/crypto/openssl_util.cc b/src/crypto/openssl_util.cc
index 28355d68..b6e6edac 100644
--- a/src/crypto/openssl_util.cc
+++ b/src/crypto/openssl_util.cc
@@ -4,8 +4,8 @@
 
 #include "crypto/openssl_util.h"
 
-#include <openssl/crypto.h>
-#include <openssl/err.h>
+#include <boringssl/crypto.h>
+#include <boringssl/err.h>
 #include <stddef.h>
 #include <stdint.h>
 
diff --git a/src/crypto/scoped_openssl_types.h b/src/crypto/scoped_openssl_types.h
index 76dd0f4c..a84ef3be 100644
--- a/src/crypto/scoped_openssl_types.h
+++ b/src/crypto/scoped_openssl_types.h
@@ -5,14 +5,14 @@
 #ifndef CRYPTO_SCOPED_OPENSSL_TYPES_H_
 #define CRYPTO_SCOPED_OPENSSL_TYPES_H_
 
-#include <openssl/bio.h>
-#include <openssl/bn.h>
-#include <openssl/dsa.h>
-#include <openssl/ec.h>
-#include <openssl/ecdsa.h>
-#include <openssl/evp.h>
-#include <openssl/mem.h>
-#include <openssl/rsa.h>
+#include <boringssl/bio.h>
+#include <boringssl/bn.h>
+#include <boringssl/dsa.h>
+#include <boringssl/ec.h>
+#include <boringssl/ecdsa.h>
+#include <boringssl/evp.h>
+#include <boringssl/mem.h>
+#include <boringssl/rsa.h>
 #include <stdint.h>
 
 #include <memory>
diff --git a/src/crypto/secure_hash.cc b/src/crypto/secure_hash.cc
index 76d42d33..625a8c63 100644
--- a/src/crypto/secure_hash.cc
+++ b/src/crypto/secure_hash.cc
@@ -4,8 +4,8 @@
 
 #include "crypto/secure_hash.h"
 
-#include <openssl/mem.h>
-#include <openssl/sha.h>
+#include <boringssl/mem.h>
+#include <boringssl/sha.h>
 #include <stddef.h>
 
 #include "base/logging.h"
@@ -55,7 +55,7 @@ class SecureHashSHA256 : public SecureHash {
 
 std::unique_ptr<SecureHash> SecureHash::Create(Algorithm algorithm) {
   switch (algorithm) {
-    case SHA256:
+    case CryptoSHA256:
       return base::MakeUnique<SecureHashSHA256>();
     default:
       NOTIMPLEMENTED();
diff --git a/src/crypto/secure_hash.h b/src/crypto/secure_hash.h
index 30b9fdc5..84fde527 100644
--- a/src/crypto/secure_hash.h
+++ b/src/crypto/secure_hash.h
@@ -19,7 +19,7 @@ namespace crypto {
 class CRYPTO_EXPORT SecureHash {
  public:
   enum Algorithm {
-    SHA256,
+    CryptoSHA256,
   };
   virtual ~SecureHash() {}
 
diff --git a/src/crypto/symmetric_key.cc b/src/crypto/symmetric_key.cc
index e3ecf624..f001186b 100644
--- a/src/crypto/symmetric_key.cc
+++ b/src/crypto/symmetric_key.cc
@@ -4,8 +4,8 @@
 
 #include "crypto/symmetric_key.h"
 
-#include <openssl/evp.h>
-#include <openssl/rand.h>
+#include <boringssl/evp.h>
+#include <boringssl/rand.h>
 #include <stddef.h>
 #include <stdint.h>
 
diff --git a/src/net/quic/crypto/aead_base_decrypter.cc b/src/net/quic/crypto/aead_base_decrypter.cc
index 8b6661a9..7dde45c8 100644
--- a/src/net/quic/crypto/aead_base_decrypter.cc
+++ b/src/net/quic/crypto/aead_base_decrypter.cc
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <openssl/err.h>
-#include <openssl/evp.h>
+#include <boringssl/err.h>
+#include <boringssl/evp.h>
 
 #include <memory>
 
diff --git a/src/net/quic/crypto/aead_base_encrypter.cc b/src/net/quic/crypto/aead_base_encrypter.cc
index 108df582..cbf260df 100644
--- a/src/net/quic/crypto/aead_base_encrypter.cc
+++ b/src/net/quic/crypto/aead_base_encrypter.cc
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <openssl/err.h>
-#include <openssl/evp.h>
+#include <boringssl/err.h>
+#include <boringssl/evp.h>
 #include <string.h>
 
 #include <memory>
diff --git a/src/net/quic/crypto/aes_128_gcm_12_decrypter.cc b/src/net/quic/crypto/aes_128_gcm_12_decrypter.cc
index e0d500aa..c3cc8b81 100644
--- a/src/net/quic/crypto/aes_128_gcm_12_decrypter.cc
+++ b/src/net/quic/crypto/aes_128_gcm_12_decrypter.cc
@@ -4,8 +4,8 @@
 
 #include "net/quic/crypto/aes_128_gcm_12_decrypter.h"
 
-#include <openssl/evp.h>
-#include <openssl/tls1.h>
+#include <boringssl/evp.h>
+#include <boringssl/tls1.h>
 
 namespace net {
 
diff --git a/src/net/quic/crypto/aes_128_gcm_12_encrypter.cc b/src/net/quic/crypto/aes_128_gcm_12_encrypter.cc
index 2d7ea8f2..e9b57c29 100644
--- a/src/net/quic/crypto/aes_128_gcm_12_encrypter.cc
+++ b/src/net/quic/crypto/aes_128_gcm_12_encrypter.cc
@@ -4,7 +4,7 @@
 
 #include "net/quic/crypto/aes_128_gcm_12_encrypter.h"
 
-#include <openssl/evp.h>
+#include <boringssl/evp.h>
 
 namespace net {
 
diff --git a/src/net/quic/crypto/chacha20_poly1305_decrypter.cc b/src/net/quic/crypto/chacha20_poly1305_decrypter.cc
index ccd1c242..549fc881 100644
--- a/src/net/quic/crypto/chacha20_poly1305_decrypter.cc
+++ b/src/net/quic/crypto/chacha20_poly1305_decrypter.cc
@@ -4,8 +4,8 @@
 
 #include "net/quic/crypto/chacha20_poly1305_decrypter.h"
 
-#include <openssl/evp.h>
-#include <openssl/tls1.h>
+#include <boringssl/evp.h>
+#include <boringssl/tls1.h>
 
 namespace net {
 
diff --git a/src/net/quic/crypto/chacha20_poly1305_encrypter.cc b/src/net/quic/crypto/chacha20_poly1305_encrypter.cc
index b4381097..a6782c3b 100644
--- a/src/net/quic/crypto/chacha20_poly1305_encrypter.cc
+++ b/src/net/quic/crypto/chacha20_poly1305_encrypter.cc
@@ -4,7 +4,7 @@
 
 #include "net/quic/crypto/chacha20_poly1305_encrypter.h"
 
-#include <openssl/evp.h>
+#include <boringssl/evp.h>
 
 namespace net {
 
diff --git a/src/net/quic/crypto/channel_id.cc b/src/net/quic/crypto/channel_id.cc
index 3d93be0a..0a9cd7a4 100644
--- a/src/net/quic/crypto/channel_id.cc
+++ b/src/net/quic/crypto/channel_id.cc
@@ -4,11 +4,11 @@
 
 #include "net/quic/crypto/channel_id.h"
 
-#include <openssl/bn.h>
-#include <openssl/ec.h>
-#include <openssl/ecdsa.h>
-#include <openssl/obj_mac.h>
-#include <openssl/sha.h>
+#include <boringssl/bn.h>
+#include <boringssl/ec.h>
+#include <boringssl/ecdsa.h>
+#include <boringssl/obj_mac.h>
+#include <boringssl/sha.h>
 
 #include "crypto/openssl_util.h"
 #include "crypto/scoped_openssl_types.h"
diff --git a/src/net/quic/crypto/crypto_utils.cc b/src/net/quic/crypto/crypto_utils.cc
index 6ec4e5e8..ad06e7b5 100644
--- a/src/net/quic/crypto/crypto_utils.cc
+++ b/src/net/quic/crypto/crypto_utils.cc
@@ -108,7 +108,7 @@ bool CryptoUtils::DeriveKeys(StringPiece premaster_secret,
     nonce = nonce_storage;
   }
 
-  crypto::HKDF hkdf(premaster_secret, nonce, hkdf_input, key_bytes,
+  crypto::CryptoHKDF hkdf(premaster_secret, nonce, hkdf_input, key_bytes,
                     nonce_prefix_bytes, subkey_secret_bytes);
 
   // Key derivation depends on the key diversification method being employed.
@@ -201,7 +201,7 @@ bool CryptoUtils::ExportKeyingMaterial(StringPiece subkey_secret,
   info.append(reinterpret_cast<char*>(&context_length), sizeof(context_length));
   info.append(context.data(), context.length());
 
-  crypto::HKDF hkdf(subkey_secret, StringPiece() /* no salt */, info,
+  crypto::CryptoHKDF hkdf(subkey_secret, StringPiece() /* no salt */, info,
                     result_len, 0 /* no fixed IV */, 0 /* no subkey secret */);
   hkdf.client_write_key().CopyToString(result);
   return true;
@@ -330,7 +330,7 @@ void CryptoUtils::HashHandshakeMessage(const CryptoHandshakeMessage& message,
                                        string* output) {
   const QuicData& serialized = message.GetSerialized();
   std::unique_ptr<crypto::SecureHash> hash(
-      crypto::SecureHash::Create(crypto::SecureHash::SHA256));
+      crypto::SecureHash::Create(crypto::SecureHash::CryptoSHA256));
   hash->Update(serialized.data(), serialized.length());
   uint8_t digest[32];
   hash->Finish(digest, sizeof(digest));
diff --git a/src/net/quic/crypto/p256_key_exchange.cc b/src/net/quic/crypto/p256_key_exchange.cc
index 47e68ba5..bc1b100e 100644
--- a/src/net/quic/crypto/p256_key_exchange.cc
+++ b/src/net/quic/crypto/p256_key_exchange.cc
@@ -4,9 +4,9 @@
 
 #include "net/quic/crypto/p256_key_exchange.h"
 
-#include <openssl/ec.h>
-#include <openssl/ecdh.h>
-#include <openssl/evp.h>
+#include <boringssl/ec.h>
+#include <boringssl/ecdh.h>
+#include <boringssl/evp.h>
 
 #include "base/logging.h"
 
diff --git a/src/net/quic/crypto/quic_crypto_server_config.cc b/src/net/quic/crypto/quic_crypto_server_config.cc
index 11b96ffd..e41acb0d 100644
--- a/src/net/quic/crypto/quic_crypto_server_config.cc
+++ b/src/net/quic/crypto/quic_crypto_server_config.cc
@@ -63,7 +63,7 @@ const size_t kMultiplier = 3;
 const int kMaxTokenAddresses = 4;
 
 string DeriveSourceAddressTokenKey(StringPiece source_address_token_secret) {
-  crypto::HKDF hkdf(source_address_token_secret, StringPiece() /* no salt */,
+  crypto::CryptoHKDF hkdf(source_address_token_secret, StringPiece() /* no salt */,
                     "QUIC source address token key",
                     CryptoSecretBoxer::GetKeySize(), 0 /* no fixed IV needed */,
                     0 /* no subkey secret */);
@@ -330,7 +330,7 @@ QuicServerConfigProtobuf* QuicCryptoServerConfig::GenerateConfig(
     // thus we make it a hash of the rest of the server config.
     std::unique_ptr<QuicData> serialized(
         CryptoFramer::ConstructHandshakeMessage(msg));
-    std::unique_ptr<SecureHash> hash(SecureHash::Create(SecureHash::SHA256));
+    std::unique_ptr<SecureHash> hash(SecureHash::Create(SecureHash::CryptoSHA256));
     hash->Update(serialized->data(), serialized->length());
 
     char scid_bytes[16];
diff --git a/src/net/quic/crypto/quic_decrypter.cc b/src/net/quic/crypto/quic_decrypter.cc
index 7b2df54d..ab9b8c13 100644
--- a/src/net/quic/crypto/quic_decrypter.cc
+++ b/src/net/quic/crypto/quic_decrypter.cc
@@ -38,7 +38,7 @@ void QuicDecrypter::DiversifyPreliminaryKey(StringPiece preliminary_key,
                                             size_t nonce_prefix_size,
                                             string* out_key,
                                             string* out_nonce_prefix) {
-  crypto::HKDF hkdf(preliminary_key.as_string() + nonce_prefix.as_string(),
+  crypto::CryptoHKDF hkdf(preliminary_key.as_string() + nonce_prefix.as_string(),
                     StringPiece(nonce, kDiversificationNonceSize),
                     "QUIC key diversification", 0, key_size, 0,
                     nonce_prefix_size, 0);
diff --git a/src/net/quic/crypto/scoped_evp_aead_ctx.h b/src/net/quic/crypto/scoped_evp_aead_ctx.h
index d8067fc0..d2b578bf 100644
--- a/src/net/quic/crypto/scoped_evp_aead_ctx.h
+++ b/src/net/quic/crypto/scoped_evp_aead_ctx.h
@@ -5,7 +5,7 @@
 #ifndef NET_QUIC_CRYPTO_SCOPED_EVP_AEAD_CTX_H_
 #define NET_QUIC_CRYPTO_SCOPED_EVP_AEAD_CTX_H_
 
-#include <openssl/evp.h>
+#include <boringssl/evp.h>
 
 #include "base/macros.h"
 
diff --git a/src/net/quic/quic_crypto_server_stream.cc b/src/net/quic/quic_crypto_server_stream.cc
index d222fe30..defcab32 100644
--- a/src/net/quic/quic_crypto_server_stream.cc
+++ b/src/net/quic/quic_crypto_server_stream.cc
@@ -399,7 +399,7 @@ bool QuicCryptoServerStream::GetBase64SHA256ClientChannelID(
 
   const string& channel_id(crypto_negotiated_params_.channel_id);
   std::unique_ptr<crypto::SecureHash> hash(
-      crypto::SecureHash::Create(crypto::SecureHash::SHA256));
+      crypto::SecureHash::Create(crypto::SecureHash::CryptoSHA256));
   hash->Update(channel_id.data(), channel_id.size());
   uint8_t digest[32];
   hash->Finish(digest, sizeof(digest));