Use "" not <> for internal/ includes

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4217)

79 files changed, 99 insertions, 103 deletions

diff --git a/crypto/asn1/bio_asn1.c b/crypto/asn1/bio_asn1.c
index e28ab27767..9146fb744b 100644
--- a/crypto/asn1/bio_asn1.c
+++ b/crypto/asn1/bio_asn1.c
@@ -14,7 +14,7 @@
  */
 
 #include <string.h>
-#include <internal/bio.h>
+#include "internal/bio.h"
 #include <openssl/asn1.h>
 #include "internal/cryptlib.h"
 
diff --git a/crypto/async/async.c b/crypto/async/async.c
index 8c699af78e..1359b5061a 100644
--- a/crypto/async/async.c
+++ b/crypto/async/async.c
@@ -19,7 +19,7 @@
 #include "async_locl.h"
 
 #include <openssl/err.h>
-#include <internal/cryptlib_int.h>
+#include "internal/cryptlib_int.h"
 #include <string.h>
 
 #define ASYNC_JOB_RUNNING   0
diff --git a/crypto/async/async_locl.h b/crypto/async/async_locl.h
index f0ac05a3db..d7790293f7 100644
--- a/crypto/async/async_locl.h
+++ b/crypto/async/async_locl.h
@@ -20,7 +20,7 @@
 # include <windows.h>
 #endif
 
-#include <internal/async.h>
+#include "internal/async.h"
 #include <openssl/crypto.h>
 
 typedef struct async_ctx_st async_ctx;
diff --git a/crypto/bio/b_addr.c b/crypto/bio/b_addr.c
index 6d854927fe..b2cd83c392 100644
--- a/crypto/bio/b_addr.c
+++ b/crypto/bio/b_addr.c
@@ -16,7 +16,7 @@
 #ifndef OPENSSL_NO_SOCK
 #include <openssl/err.h>
 #include <openssl/buffer.h>
-#include <internal/thread_once.h>
+#include "internal/thread_once.h"
 
 CRYPTO_RWLOCK *bio_lookup_lock;
 static CRYPTO_ONCE bio_lookup_init = CRYPTO_ONCE_STATIC_INIT;
diff --git a/crypto/bio/bio_lcl.h b/crypto/bio/bio_lcl.h
index f7de429cbb..337621be7f 100644
--- a/crypto/bio/bio_lcl.h
+++ b/crypto/bio/bio_lcl.h
@@ -87,7 +87,7 @@ union bio_addr_st {
 /* END BIO_ADDRINFO/BIO_ADDR stuff. */
 
 #include "internal/cryptlib.h"
-#include <internal/bio.h>
+#include "internal/bio.h"
 
 typedef struct bio_f_buffer_ctx_struct {
     /*-
diff --git a/crypto/bio/bio_meth.c b/crypto/bio/bio_meth.c
index 3cbac5bf85..be6420c028 100644
--- a/crypto/bio/bio_meth.c
+++ b/crypto/bio/bio_meth.c
@@ -8,7 +8,7 @@
  */
 
 #include "bio_lcl.h"
-#include <internal/thread_once.h>
+#include "internal/thread_once.h"
 
 CRYPTO_RWLOCK *bio_type_lock = NULL;
 static CRYPTO_ONCE bio_type_init = CRYPTO_ONCE_STATIC_INIT;
diff --git a/crypto/bn/bn_srp.c b/crypto/bn/bn_srp.c
index 58b1691eee..a68a4ac49f 100644
--- a/crypto/bn/bn_srp.c
+++ b/crypto/bn/bn_srp.c
@@ -13,7 +13,7 @@
 #ifndef OPENSSL_NO_SRP
 
 #include <openssl/srp.h>
-#include <internal/bn_srp.h>
+#include "internal/bn_srp.h"
 
 # if (BN_BYTES == 8)
 #  if (defined(_WIN32) || defined(_WIN64)) && !defined(__MINGW32__)
diff --git a/crypto/conf/conf_lib.c b/crypto/conf/conf_lib.c
index 3532114917..74759c56d5 100644
--- a/crypto/conf/conf_lib.c
+++ b/crypto/conf/conf_lib.c
@@ -9,7 +9,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <internal/conf.h>
+#include "internal/conf.h"
 #include <openssl/crypto.h>
 #include <openssl/err.h>
 #include <openssl/conf.h>
diff --git a/crypto/conf/conf_sap.c b/crypto/conf/conf_sap.c
index bed95abea4..0815109d81 100644
--- a/crypto/conf/conf_sap.c
+++ b/crypto/conf/conf_sap.c
@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include <openssl/crypto.h>
 #include "internal/cryptlib.h"
-#include <internal/conf.h>
+#include "internal/conf.h"
 #include <openssl/x509.h>
 #include <openssl/asn1.h>
 #include <openssl/engine.h>
diff --git a/crypto/engine/eng_int.h b/crypto/engine/eng_int.h
index 0af8b8f8f9..60fdf820f0 100644
--- a/crypto/engine/eng_int.h
+++ b/crypto/engine/eng_int.h
@@ -12,8 +12,8 @@
 # define HEADER_ENGINE_INT_H
 
 # include "internal/cryptlib.h"
-# include <internal/engine.h>
-# include <internal/thread_once.h>
+# include "internal/engine.h"
+# include "internal/thread_once.h"
 # include "internal/refcount.h"
 
 #ifdef  __cplusplus
diff --git a/crypto/engine/eng_openssl.c b/crypto/engine/eng_openssl.c
index dce5cccfd8..02885f4680 100644
--- a/crypto/engine/eng_openssl.c
+++ b/crypto/engine/eng_openssl.c
@@ -11,7 +11,7 @@
 #include <stdio.h>
 #include <openssl/crypto.h>
 #include "internal/cryptlib.h"
-#include <internal/engine.h>
+#include "internal/engine.h"
 #include <openssl/pem.h>
 #include <openssl/evp.h>
 #include <openssl/rand.h>
diff --git a/crypto/engine/eng_rdrand.c b/crypto/engine/eng_rdrand.c
index b3defcbe4f..7be64e3fd4 100644
--- a/crypto/engine/eng_rdrand.c
+++ b/crypto/engine/eng_rdrand.c
@@ -11,7 +11,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <internal/engine.h>
+#include "internal/engine.h"
 #include <openssl/rand.h>
 #include <openssl/err.h>
 #include <openssl/crypto.h>
diff --git a/crypto/err/err.c b/crypto/err/err.c
index eec071236e..ab08435af1 100644
--- a/crypto/err/err.c
+++ b/crypto/err/err.c
@@ -10,16 +10,16 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <string.h>
-#include <internal/cryptlib_int.h>
-#include <internal/err.h>
-#include <internal/err_int.h>
+#include "internal/cryptlib_int.h"
+#include "internal/err.h"
+#include "internal/err_int.h"
 #include <openssl/lhash.h>
 #include <openssl/err.h>
 #include <openssl/crypto.h>
 #include <openssl/buffer.h>
 #include <openssl/bio.h>
 #include <openssl/opensslconf.h>
-#include <internal/thread_once.h>
+#include "internal/thread_once.h"
 
 static int err_load_strings(const ERR_STRING_DATA *str);
 
diff --git a/crypto/evp/c_allc.c b/crypto/evp/c_allc.c
index 76edfbd37b..58a0691df7 100644
--- a/crypto/evp/c_allc.c
+++ b/crypto/evp/c_allc.c
@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include "internal/cryptlib.h"
 #include <openssl/evp.h>
-#include <internal/evp_int.h>
+#include "internal/evp_int.h"
 #include <openssl/pkcs12.h>
 #include <openssl/objects.h>
 
diff --git a/crypto/evp/c_alld.c b/crypto/evp/c_alld.c
index 86b2fc8584..088f65cd80 100644
--- a/crypto/evp/c_alld.c
+++ b/crypto/evp/c_alld.c
@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include "internal/cryptlib.h"
 #include <openssl/evp.h>
-#include <internal/evp_int.h>
+#include "internal/evp_int.h"
 #include <openssl/pkcs12.h>
 #include <openssl/objects.h>
 
diff --git a/crypto/evp/e_rc5.c b/crypto/evp/e_rc5.c
index f69ba5b2f5..a2f26d8c5f 100644
--- a/crypto/evp/e_rc5.c
+++ b/crypto/evp/e_rc5.c
@@ -13,7 +13,7 @@
 #ifndef OPENSSL_NO_RC5
 
 # include <openssl/evp.h>
-# include <internal/evp_int.h>
+# include "internal/evp_int.h"
 # include <openssl/objects.h>
 # include "evp_locl.h"
 # include <openssl/rc5.h>
diff --git a/crypto/evp/names.c b/crypto/evp/names.c
index a92be1fedf..41c3ceee3a 100644
--- a/crypto/evp/names.c
+++ b/crypto/evp/names.c
@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include "internal/cryptlib.h"
 #include <openssl/evp.h>
-#include <internal/objects.h>
+#include "internal/objects.h"
 #include <openssl/x509.h>
 #include "internal/evp_int.h"
 
diff --git a/crypto/evp/pbe_scrypt.c b/crypto/evp/pbe_scrypt.c
index 101bb1edbd..a52cd751f6 100644
--- a/crypto/evp/pbe_scrypt.c
+++ b/crypto/evp/pbe_scrypt.c
@@ -12,7 +12,7 @@
 #include <string.h>
 #include <openssl/evp.h>
 #include <openssl/err.h>
-#include <internal/numbers.h>
+#include "internal/numbers.h"
 
 #ifndef OPENSSL_NO_SCRYPT
 
diff --git a/crypto/init.c b/crypto/init.c
index fc01c827f3..c8f0a3f1ee 100644
--- a/crypto/init.c
+++ b/crypto/init.c
@@ -7,24 +7,24 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include <internal/cryptlib_int.h>
+#include "internal/cryptlib_int.h"
 #include <openssl/err.h>
-#include <internal/rand_int.h>
-#include <internal/bio.h>
+#include "internal/rand_int.h"
+#include "internal/bio.h"
 #include <openssl/evp.h>
-#include <internal/evp_int.h>
-#include <internal/conf.h>
-#include <internal/async.h>
-#include <internal/engine.h>
-#include <internal/comp.h>
-#include <internal/err.h>
-#include <internal/err_int.h>
-#include <internal/objects.h>
+#include "internal/evp_int.h"
+#include "internal/conf.h"
+#include "internal/async.h"
+#include "internal/engine.h"
+#include "internal/comp.h"
+#include "internal/err.h"
+#include "internal/err_int.h"
+#include "internal/objects.h"
 #include <stdlib.h>
 #include <assert.h>
-#include <internal/thread_once.h>
-#include <internal/dso.h>
-#include <internal/store.h>
+#include "internal/thread_once.h"
+#include "internal/dso.h"
+#include "internal/store.h"
 
 static int stopped = 0;
 
diff --git a/crypto/objects/o_names.c b/crypto/objects/o_names.c
index cf96c56779..73676445c1 100644
--- a/crypto/objects/o_names.c
+++ b/crypto/objects/o_names.c
@@ -16,7 +16,7 @@
 #include <openssl/objects.h>
 #include <openssl/safestack.h>
 #include <openssl/e_os2.h>
-#include <internal/thread_once.h>
+#include "internal/thread_once.h"
 #include "obj_lcl.h"
 
 /*
diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c
index 58f88ba4fa..fd297e2082 100644
--- a/crypto/x509/x509_vfy.c
+++ b/crypto/x509/x509_vfy.c
@@ -22,8 +22,8 @@
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
 #include <openssl/objects.h>
-#include <internal/dane.h>
-#include <internal/x509_int.h>
+#include "internal/dane.h"
+#include "internal/x509_int.h"
 #include "x509_lcl.h"
 
 /* CRL score values */
diff --git a/e_os.h b/e_os.h
index 87d98c24be..b90ed27479 100644
--- a/e_os.h
+++ b/e_os.h
@@ -14,7 +14,7 @@
 
 # include <openssl/e_os2.h>
 # include <openssl/crypto.h>
-# include <internal/nelem.h>
+# include "internal/nelem.h"
 
 /*
  * <openssl/e_os2.h> contains what we can justify to make visible to the
diff --git a/include/internal/dso.h b/include/internal/dso.h
index c076c5887a..402a76f6df 100644
--- a/include/internal/dso.h
+++ b/include/internal/dso.h
@@ -11,7 +11,7 @@
 # define HEADER_DSO_H
 
 # include <openssl/crypto.h>
-# include <internal/dsoerr.h>
+# include "internal/dsoerr.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/test/asn1_internal_test.c b/test/asn1_internal_test.c
index 06e324b5b7..34f7349114 100644
--- a/test/asn1_internal_test.c
+++ b/test/asn1_internal_test.c
@@ -16,7 +16,7 @@
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 #include "testutil.h"
-#include <internal/nelem.h>
+#include "internal/nelem.h"
 
 /**********************************************************************
  *
diff --git a/test/asn1_time_test.c b/test/asn1_time_test.c
index c185ece98f..96394a1bf8 100644
--- a/test/asn1_time_test.c
+++ b/test/asn1_time_test.c
@@ -16,7 +16,7 @@
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 #include "testutil.h"
-#include <internal/nelem.h>
+#include "internal/nelem.h"
 
 struct testdata {
     char *data;             /* TIME string value */
diff --git a/test/bad_dtls_test.c b/test/bad_dtls_test.c
index 932cb0eb1d..7f6ffdc3ca 100644
--- a/test/bad_dtls_test.c
+++ b/test/bad_dtls_test.c
@@ -37,10 +37,8 @@
 #include <openssl/err.h>
 #include <openssl/rand.h>
 #include <openssl/kdf.h>
-
 #include "../ssl/packet_locl.h"
-#include <internal/nelem.h>
-
+#include "internal/nelem.h"
 #include "testutil.h"
 
 /* For DTLS1_BAD_VER packets the MAC doesn't include the handshake header */
diff --git a/test/bftest.c b/test/bftest.c
index 0639ec888d..36029c2f7b 100644
--- a/test/bftest.c
+++ b/test/bftest.c
@@ -16,11 +16,9 @@
 #include <string.h>
 #include <stdlib.h>
 #include <openssl/opensslconf.h> /* To see if OPENSSL_NO_BF is defined */
-
 #include "testutil.h"
 
-#include <internal/nelem.h>
-
+#include "internal/nelem.h"
 #ifndef OPENSSL_NO_BF
 # include <openssl/blowfish.h>
 
diff --git a/test/bntest.c b/test/bntest.c
index da07446adb..667cba67a7 100644
--- a/test/bntest.c
+++ b/test/bntest.c
@@ -12,9 +12,9 @@
 #include <string.h>
 #include <ctype.h>
 
-#include <internal/nelem.h>
+#include "internal/nelem.h"
 #include "../e_os.h"
-#include <internal/numbers.h>
+#include "internal/numbers.h"
 #include <openssl/bn.h>
 #include <openssl/crypto.h>
 #include <openssl/err.h>
diff --git a/test/casttest.c b/test/casttest.c
index 417a4cba2e..179d7d56d3 100644
--- a/test/casttest.c
+++ b/test/casttest.c
@@ -12,7 +12,7 @@
 #include <stdlib.h>
 
 #include <openssl/opensslconf.h> /* To see if OPENSSL_NO_CAST is defined */
-#include <internal/nelem.h>
+#include "internal/nelem.h"
 #include "testutil.h"
 
 #ifndef OPENSSL_NO_CAST
diff --git a/test/cipher_overhead_test.c b/test/cipher_overhead_test.c
index a07ac7e86b..f8c6fd738e 100644
--- a/test/cipher_overhead_test.c
+++ b/test/cipher_overhead_test.c
@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include <internal/nelem.h>
+#include "internal/nelem.h"
 #include "testutil.h"
 
 #ifdef __VMS
diff --git a/test/cipherbytes_test.c b/test/cipherbytes_test.c
index 13d6b23aaa..6418b42408 100644
--- a/test/cipherbytes_test.c
+++ b/test/cipherbytes_test.c
@@ -18,7 +18,7 @@
 #include <openssl/ssl3.h>
 #include <openssl/tls1.h>
 
-#include <internal/nelem.h>
+#include "internal/nelem.h"
 #include "testutil.h"
 
 static SSL_CTX *ctx;
diff --git a/test/cipherlist_test.c b/test/cipherlist_test.c
index 6ec963110e..2d8288d214 100644
--- a/test/cipherlist_test.c
+++ b/test/cipherlist_test.c
@@ -18,7 +18,7 @@
 #include <openssl/ssl3.h>
 #include <openssl/tls1.h>
 
-#include <internal/nelem.h>
+#include "internal/nelem.h"
 #include "testutil.h"
 
 typedef struct cipherlist_test_fixture {
diff --git a/test/ciphername_test.c b/test/ciphername_test.c
index 0eac902ca9..303e28f50f 100644
--- a/test/ciphername_test.c
+++ b/test/ciphername_test.c
@@ -19,7 +19,7 @@
 #include <openssl/ssl3.h>
 #include <openssl/tls1.h>
 
-#include <internal/nelem.h>
+#include "internal/nelem.h"
 #include "testutil.h"
 
 typedef struct cipher_id_name {
diff --git a/test/constant_time_test.c b/test/constant_time_test.c
index 24cbaf3660..200cb376c5 100644
--- a/test/constant_time_test.c
+++ b/test/constant_time_test.c
@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <internal/nelem.h>
+#include "internal/nelem.h"
 #include "internal/constant_time_locl.h"
 #include "testutil.h"
 #include "internal/numbers.h"
diff --git a/test/crltest.c b/test/crltest.c
index f5af4b1e4f..5ea9cdc4ee 100644
--- a/test/crltest.c
+++ b/test/crltest.c
@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include <internal/nelem.h>
+#include "internal/nelem.h"
 #include <string.h>
 #include <openssl/bio.h>
 #include <openssl/crypto.h>
diff --git a/test/d2i_test.c b/test/d2i_test.c
index 48edba4946..255982e2af 100644
--- a/test/d2i_test.c
+++ b/test/d2i_test.c
@@ -20,7 +20,7 @@
 #include <openssl/err.h>
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
-#include <internal/nelem.h>
+#include "internal/nelem.h"
 
 static const ASN1_ITEM *item_type;
 static const char *test_file;
diff --git a/test/danetest.c b/test/danetest.c
index de51c83f56..54a79ab51f 100644
--- a/test/danetest.c
+++ b/test/danetest.c
@@ -24,7 +24,7 @@
 #endif
 #include "testutil.h"
 
-#include <internal/nelem.h>
+#include "internal/nelem.h"
 
 #define _UC(c) ((unsigned char)(c))
 
@@ -422,7 +422,7 @@ int setup_tests(void)
     return 1;
 }
 
-#include <internal/dane.h>
+#include "internal/dane.h"
 
 static void store_ctx_dane_init(X509_STORE_CTX *store_ctx, SSL *ssl)
 {
diff --git a/test/dhtest.c b/test/dhtest.c
index ac09c445fa..7500f37983 100644
--- a/test/dhtest.c
+++ b/test/dhtest.c
@@ -11,7 +11,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <internal/nelem.h>
+#include "internal/nelem.h"
 #include <openssl/crypto.h>
 #include <openssl/bio.h>
 #include <openssl/bn.h>
diff --git a/test/drbgtest.c b/test/drbgtest.c
index 28d0d905c3..2363b5025c 100644
--- a/test/drbgtest.c
+++ b/test/drbgtest.c
@@ -8,7 +8,7 @@
  */
 
 #include <string.h>
-#include <internal/nelem.h>
+#include "internal/nelem.h"
 #include <openssl/crypto.h>
 #include <openssl/err.h>
 #include <openssl/rand.h>
diff --git a/test/dsatest.c b/test/dsatest.c
index d25a1d701f..fa2ec4af12 100644
--- a/test/dsatest.c
+++ b/test/dsatest.c
@@ -19,7 +19,7 @@
 #include <openssl/dsa.h>
 
 #include "testutil.h"
-#include <internal/nelem.h>
+#include "internal/nelem.h"
 
 #ifndef OPENSSL_NO_DSA
 static int dsa_cb(int p, int n, BN_GENCB *arg);
diff --git a/test/dtlsv1listentest.c b/test/dtlsv1listentest.c
index 00120cc0ab..807bb6d0a1 100644
--- a/test/dtlsv1listentest.c
+++ b/test/dtlsv1listentest.c
@@ -12,7 +12,7 @@
 #include <openssl/bio.h>
 #include <openssl/err.h>
 #include <openssl/conf.h>
-#include <internal/nelem.h>
+#include "internal/nelem.h"
 #include "testutil.h"
 
 #ifndef OPENSSL_NO_SOCK
diff --git a/test/ecstresstest.c b/test/ecstresstest.c
index b47095cba0..3c6d2d5a59 100644
--- a/test/ecstresstest.c
+++ b/test/ecstresstest.c
@@ -8,7 +8,7 @@
  * or in the file LICENSE in the source distribution.
  */
 
-#include <internal/nelem.h>
+#include "internal/nelem.h"
 #include "testutil.h"
 
 #include <stdio.h>
diff --git a/test/ectest.c b/test/ectest.c
index 85847e0870..3267a3daf5 100644
--- a/test/ectest.c
+++ b/test/ectest.c
@@ -8,7 +8,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include <internal/nelem.h>
+#include "internal/nelem.h"
 #include "testutil.h"
 
 #ifndef OPENSSL_NO_EC
diff --git a/test/evp_extra_test.c b/test/evp_extra_test.c
index 5ca95e4fd6..e3fab29a82 100644
--- a/test/evp_extra_test.c
+++ b/test/evp_extra_test.c
@@ -16,7 +16,7 @@
 #include <openssl/rsa.h>
 #include <openssl/x509.h>
 #include "testutil.h"
-#include <internal/nelem.h>
+#include "internal/nelem.h"
 
 /*
  * kExampleRSAKeyDER is an RSA private key in ASN.1, DER format. Of course, you
diff --git a/test/exptest.c b/test/exptest.c
index 62a2377dfd..cde4d6bc45 100644
--- a/test/exptest.c
+++ b/test/exptest.c
@@ -11,7 +11,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <internal/nelem.h>
+#include "internal/nelem.h"
 
 #include <openssl/bio.h>
 #include <openssl/bn.h>
diff --git a/test/handshake_helper.c b/test/handshake_helper.c
index b33cdd5640..322957ad89 100644
--- a/test/handshake_helper.c
+++ b/test/handshake_helper.c
@@ -18,7 +18,7 @@
 
 #ifndef OPENSSL_NO_SOCK
 # define USE_SOCKETS
-# include <internal/nelem.h>
+# include "internal/nelem.h"
 #endif
 
 #include "handshake_helper.h"
diff --git a/test/hmactest.c b/test/hmactest.c
index abd1193d81..ca775773a6 100644
--- a/test/hmactest.c
+++ b/test/hmactest.c
@@ -11,7 +11,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <internal/nelem.h>
+#include "internal/nelem.h"
 
 # include <openssl/hmac.h>
 # include <openssl/sha.h>
diff --git a/test/ideatest.c b/test/ideatest.c
index 5b715fe1c9..c80e18f80a 100644
--- a/test/ideatest.c
+++ b/test/ideatest.c
@@ -9,7 +9,7 @@
 
 #include <string.h>
 
-#include <internal/nelem.h>
+#include "internal/nelem.h"
 #include "testutil.h"
 
 #ifndef OPENSSL_NO_IDEA
diff --git a/test/igetest.c b/test/igetest.c
index 8a1db67704..46910f8eeb 100644
--- a/test/igetest.c
+++ b/test/igetest.c
@@ -12,7 +12,7 @@
 #include <openssl/rand.h>
 #include <stdio.h>
 #include <string.h>
-#include <internal/nelem.h>
+#include "internal/nelem.h"
 #include "testutil.h"
 
 #define TEST_SIZE       128
diff --git a/test/lhash_test.c b/test/lhash_test.c
index 6deea8d992..162286b7cd 100644
--- a/test/lhash_test.c
+++ b/test/lhash_test.c
@@ -16,7 +16,7 @@
 #include <openssl/err.h>
 #include <openssl/crypto.h>
 
-#include <internal/nelem.h>
+#include "internal/nelem.h"
 #include "testutil.h"
 
 /*
diff --git a/test/md2test.c b/test/md2test.c
index df55932f82..c5360d68a7 100644
--- a/test/md2test.c
+++ b/test/md2test.c
@@ -9,7 +9,7 @@
 
 #include <string.h>
 
-#include <internal/nelem.h>
+#include "internal/nelem.h"
 #include "testutil.h"
 
 #ifndef OPENSSL_NO_MD2
diff --git a/test/mdc2_internal_test.c b/test/mdc2_internal_test.c
index c5e74ea5ef..64aa2dc168 100644
--- a/test/mdc2_internal_test.c
+++ b/test/mdc2_internal_test.c
@@ -14,7 +14,7 @@
 
 #include <openssl/mdc2.h>
 #include "testutil.h"
-#include <internal/nelem.h>
+#include "internal/nelem.h"
 
 typedef struct {
     const char *input;
diff --git a/test/mdc2test.c b/test/mdc2test.c
index 5dfe60e8bf..0658843ce5 100644
--- a/test/mdc2test.c
+++ b/test/mdc2test.c
@@ -9,7 +9,7 @@
 
 #include <string.h>
 
-#include <internal/nelem.h>
+#include "internal/nelem.h"
 #include "testutil.h"
 
 #if defined(OPENSSL_NO_DES) && !defined(OPENSSL_NO_MDC2)
diff --git a/test/modes_internal_test.c b/test/modes_internal_test.c
index 3fd0498b8b..f3e46fed80 100644
--- a/test/modes_internal_test.c
+++ b/test/modes_internal_test.c
@@ -16,7 +16,7 @@
 #include <openssl/modes.h>
 #include "../crypto/modes/modes_lcl.h"
 #include "testutil.h"
-#include <internal/nelem.h>
+#include "internal/nelem.h"
 
 typedef struct {
     size_t size;
diff --git a/test/poly1305_internal_test.c b/test/poly1305_internal_test.c
index 55b76440ea..d1d71c92ee 100644
--- a/test/poly1305_internal_test.c
+++ b/test/poly1305_internal_test.c
@@ -15,7 +15,7 @@
 #include "testutil.h"
 #include "internal/poly1305.h"
 #include "../crypto/poly1305/poly1305_local.h"
-#include <internal/nelem.h>
+#include "internal/nelem.h"
 
 typedef struct {
     size_t size;
diff --git a/test/rc2test.c b/test/rc2test.c
index fc00076b17..e64d1a7285 100644
--- a/test/rc2test.c
+++ b/test/rc2test.c
@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include <internal/nelem.h>
+#include "internal/nelem.h"
 #include "testutil.h"
 
 #ifndef OPENSSL_NO_RC2
diff --git a/test/rc4test.c b/test/rc4test.c
index e3f41b6208..15706ea3f0 100644
--- a/test/rc4test.c
+++ b/test/rc4test.c
@@ -9,7 +9,7 @@
 
 #include <string.h>
 
-#include <internal/nelem.h>
+#include "internal/nelem.h"
 #include "testutil.h"
 
 #ifndef OPENSSL_NO_RC4
diff --git a/test/rc5test.c b/test/rc5test.c
index 9aa214f814..d49366d993 100644
--- a/test/rc5test.c
+++ b/test/rc5test.c
@@ -9,7 +9,7 @@
 
 #include <string.h>
 
-#include <internal/nelem.h>
+#include "internal/nelem.h"
 #include "testutil.h"
 
 #ifndef OPENSSL_NO_RC5
diff --git a/test/rsa_test.c b/test/rsa_test.c
index 13dcde1890..2ad4de4734 100644
--- a/test/rsa_test.c
+++ b/test/rsa_test.c
@@ -12,7 +12,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <internal/nelem.h>
+#include "internal/nelem.h"
 
 #include <openssl/crypto.h>
 #include <openssl/err.h>
diff --git a/test/sanitytest.c b/test/sanitytest.c
index 80a19e992d..743c03b2d9 100644
--- a/test/sanitytest.c
+++ b/test/sanitytest.c
@@ -8,7 +8,7 @@
  */
 
 #include <string.h>
-#include <internal/numbers.h>
+#include "internal/numbers.h"
 
 #include "testutil.h"
 
diff --git a/test/servername_test.c b/test/servername_test.c
index f1b66ee510..e0c473e267 100644
--- a/test/servername_test.c
+++ b/test/servername_test.c
@@ -21,7 +21,7 @@
 #include "../ssl/packet_locl.h"
 
 #include "testutil.h"
-#include <internal/nelem.h>
+#include "internal/nelem.h"
 
 #define CLIENT_VERSION_LEN      2
 
diff --git a/test/siphash_internal_test.c b/test/siphash_internal_test.c
index 60a2d8dd01..5401e8c2e6 100644
--- a/test/siphash_internal_test.c
+++ b/test/siphash_internal_test.c
@@ -16,7 +16,7 @@
 #include "testutil.h"
 #include "internal/siphash.h"
 #include "../crypto/siphash/siphash_local.h"
-#include <internal/nelem.h>
+#include "internal/nelem.h"
 
 static BIO* b_stderr = NULL;
 static BIO* b_stdout = NULL;
diff --git a/test/ssl_cert_table_internal_test.c b/test/ssl_cert_table_internal_test.c
index 9f52015214..b298cfe225 100644
--- a/test/ssl_cert_table_internal_test.c
+++ b/test/ssl_cert_table_internal_test.c
@@ -14,7 +14,7 @@
 
 #include <openssl/ssl.h>
 #include "testutil.h"
-#include <internal/nelem.h>
+#include "internal/nelem.h"
 
 #ifdef __VMS
 # pragma names save
diff --git a/test/ssl_test_ctx.c b/test/ssl_test_ctx.c
index c9b0c43252..d4642e78ac 100644
--- a/test/ssl_test_ctx.c
+++ b/test/ssl_test_ctx.c
@@ -12,7 +12,7 @@
 #include <openssl/e_os2.h>
 #include <openssl/crypto.h>
 
-#include <internal/nelem.h>
+#include "internal/nelem.h"
 #include "../e_os.h"
 #include "ssl_test_ctx.h"
 #include "testutil.h"
diff --git a/test/ssl_test_ctx_test.c b/test/ssl_test_ctx_test.c
index 2376ce178f..194919d1f3 100644
--- a/test/ssl_test_ctx_test.c
+++ b/test/ssl_test_ctx_test.c
@@ -15,7 +15,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <internal/nelem.h>
+#include "internal/nelem.h"
 #include "ssl_test_ctx.h"
 #include "testutil.h"
 #include <openssl/e_os2.h>
diff --git a/test/sslapitest.c b/test/sslapitest.c
index 571da55294..622f159f1a 100644
--- a/test/sslapitest.c
+++ b/test/sslapitest.c
@@ -17,7 +17,7 @@
 
 #include "ssltestlib.h"
 #include "testutil.h"
-#include <internal/nelem.h>
+#include "internal/nelem.h"
 #include "../ssl/ssl_locl.h"
 
 static char *cert = NULL;
diff --git a/test/ssltest_old.c b/test/ssltest_old.c
index 9e3bb7a83d..b95a5a44fc 100644
--- a/test/ssltest_old.c
+++ b/test/ssltest_old.c
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <time.h>
 
-#include <internal/nelem.h>
+#include "internal/nelem.h"
 
 #define USE_SOCKETS
 #include "e_os.h"
diff --git a/test/ssltestlib.c b/test/ssltestlib.c
index 410d323a9a..4473c670d7 100644
--- a/test/ssltestlib.c
+++ b/test/ssltestlib.c
@@ -9,7 +9,7 @@
 
 #include <string.h>
 
-#include <internal/nelem.h>
+#include "internal/nelem.h"
 #include "ssltestlib.h"
 #include "testutil.h"
 
diff --git a/test/stack_test.c b/test/stack_test.c
index 922dfdd41c..c0ec46a6bd 100644
--- a/test/stack_test.c
+++ b/test/stack_test.c
@@ -16,7 +16,7 @@
 #include <openssl/err.h>
 #include <openssl/crypto.h>
 
-#include <internal/nelem.h>
+#include "internal/nelem.h"
 #include "testutil.h"
 
 /* The macros below generate unused functions which error out one of the clang
diff --git a/test/test_test.c b/test/test_test.c
index 742cd61a6f..2ec2b51159 100644
--- a/test/test_test.c
+++ b/test/test_test.c
@@ -16,7 +16,7 @@
 #include <openssl/crypto.h>
 #include <openssl/bn.h>
 
-#include <internal/nelem.h>
+#include "internal/nelem.h"
 #include "testutil.h"
 
 #define TEST(expected, test) test_case((expected), #test, (test))
diff --git a/test/testutil/driver.c b/test/testutil/driver.c
index 1859706996..2c28a73eb2 100644
--- a/test/testutil/driver.c
+++ b/test/testutil/driver.c
@@ -14,7 +14,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include <internal/nelem.h>
+#include "internal/nelem.h"
 #include <openssl/bio.h>
 
 /*
diff --git a/test/testutil/format_output.c b/test/testutil/format_output.c
index 9b04a94f42..9b9bab118c 100644
--- a/test/testutil/format_output.c
+++ b/test/testutil/format_output.c
@@ -13,7 +13,7 @@
 
 #include <string.h>
 #include <ctype.h>
-#include <internal/nelem.h>
+#include "internal/nelem.h"
 
 /* The size of memory buffers to display on failure */
 #define MEM_BUFFER_SIZE     (2000)
diff --git a/test/testutil/main.c b/test/testutil/main.c
index 2f4eeb6798..6781a5245a 100644
--- a/test/testutil/main.c
+++ b/test/testutil/main.c
@@ -8,7 +8,7 @@
  */
 
 #include "../testutil.h"
-#include <internal/nelem.h>
+#include "internal/nelem.h"
 #include "output.h"
 #include "tu_local.h"
 
diff --git a/test/testutil/tests.c b/test/testutil/tests.c
index cea81ca2ec..eb0a3938d1 100644
--- a/test/testutil/tests.c
+++ b/test/testutil/tests.c
@@ -14,7 +14,7 @@
 #include <errno.h>
 #include <string.h>
 #include <ctype.h>
-#include <internal/nelem.h>
+#include "internal/nelem.h"
 
 /*
  * Output a failed test first line.
diff --git a/test/time_offset_test.c b/test/time_offset_test.c
index 8814ccb47a..f3b20dd242 100644
--- a/test/time_offset_test.c
+++ b/test/time_offset_test.c
@@ -16,7 +16,7 @@
 #include <openssl/asn1.h>
 #include <openssl/x509.h>
 #include "testutil.h"
-#include <internal/nelem.h>
+#include "internal/nelem.h"
 
 typedef struct {
     const char *data;
diff --git a/test/v3nametest.c b/test/v3nametest.c
index dee4832864..a4ba775b5c 100644
--- a/test/v3nametest.c
+++ b/test/v3nametest.c
@@ -8,7 +8,7 @@
  */
 
 #include <string.h>
-#include <internal/nelem.h>
+#include "internal/nelem.h"
 #include "../e_os.h"
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
diff --git a/test/x509_internal_test.c b/test/x509_internal_test.c
index 930c01ce7b..2385d53ab2 100644
--- a/test/x509_internal_test.c
+++ b/test/x509_internal_test.c
@@ -15,7 +15,7 @@
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
 #include "testutil.h"
-#include <internal/nelem.h>
+#include "internal/nelem.h"
 
 /**********************************************************************
  *
diff --git a/test/x509_time_test.c b/test/x509_time_test.c
index e8cec0cfea..5983bdf11e 100644
--- a/test/x509_time_test.c
+++ b/test/x509_time_test.c
@@ -15,7 +15,7 @@
 #include <openssl/asn1.h>
 #include <openssl/x509.h>
 #include "testutil.h"
-#include <internal/nelem.h>
+#include "internal/nelem.h"
 
 typedef struct {
     const char *data;
diff --git a/test/x509aux.c b/test/x509aux.c
index d38aeb0263..b66e1de71a 100644
--- a/test/x509aux.c
+++ b/test/x509aux.c
@@ -16,7 +16,7 @@
 #include <openssl/pem.h>
 #include <openssl/conf.h>
 #include <openssl/err.h>
-#include <internal/nelem.h>
+#include "internal/nelem.h"
 #include "testutil.h"
 
 static int test_certs(int num)