Reorganize local header files Apart from public and internal header files, there is a third type called local header files, which are located next to source files in the source directory. Currently, they have different suffixes like '*_lcl.h', '*_local.h', or '*_int.h' This commit changes the different suffixes to '*_local.h' uniformly. Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/9333)

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 9b08cf4..e00e1c0 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf

@@ -450,7 +450,7 @@
 #   32-bit message digests. (For the moment of this writing) HP C
 #   doesn't seem to "digest" too many local variables (they make "him"
 #   chew forever:-). For more details look-up MD32_XARRAY comment in
-#   crypto/sha/sha_lcl.h.
+#   crypto/sha/sha_local.h.
 # - originally there were 32-bit hpux-parisc2-* targets. They were
 #   scrapped, because a) they were not interchangeable with other 32-bit
 #   targets; b) performance-critical 32-bit assembly modules implement

diff --git a/crypto/aes/aes_core.c b/crypto/aes/aes_core.c
index 2f59c19..a094a9a 100644
--- a/crypto/aes/aes_core.c
+++ b/crypto/aes/aes_core.c

@@ -41,7 +41,7 @@
 #include <stdlib.h>
 #include <openssl/crypto.h>
 #include <openssl/aes.h>
-#include "aes_locl.h"
+#include "aes_local.h"
 
 #ifndef AES_ASM
 /*-

diff --git a/crypto/aes/aes_ecb.c b/crypto/aes/aes_ecb.c
index f7f0f15..f4a75f1 100644
--- a/crypto/aes/aes_ecb.c
+++ b/crypto/aes/aes_ecb.c

@@ -10,7 +10,7 @@
 #include <assert.h>
 
 #include <openssl/aes.h>
-#include "aes_locl.h"
+#include "aes_local.h"
 
 void AES_ecb_encrypt(const unsigned char *in, unsigned char *out,
                      const AES_KEY *key, const int enc)

diff --git a/crypto/aes/aes_ige.c b/crypto/aes/aes_ige.c
index 351c173..b95d3d4 100644
--- a/crypto/aes/aes_ige.c
+++ b/crypto/aes/aes_ige.c

@@ -14,7 +14,7 @@
 #else
 
 #include <openssl/aes.h>
-#include "aes_locl.h"
+#include "aes_local.h"
 
 #define N_WORDS (AES_BLOCK_SIZE / sizeof(unsigned long))
 typedef struct {

diff --git a/crypto/aes/aes_locl.h b/crypto/aes/aes_local.h
similarity index 100%
rename from crypto/aes/aes_locl.h
rename to crypto/aes/aes_local.h


diff --git a/crypto/aes/aes_misc.c b/crypto/aes/aes_misc.c
index 0217dc3..35be71d 100644
--- a/crypto/aes/aes_misc.c
+++ b/crypto/aes/aes_misc.c

@@ -9,7 +9,7 @@
 
 #include <openssl/opensslv.h>
 #include <openssl/aes.h>
-#include "aes_locl.h"
+#include "aes_local.h"
 
 const char *AES_options(void)
 {

diff --git a/crypto/aes/aes_x86core.c b/crypto/aes/aes_x86core.c
index 1661028..da525b6 100644
--- a/crypto/aes/aes_x86core.c
+++ b/crypto/aes/aes_x86core.c

@@ -46,7 +46,7 @@
 
 #include <stdlib.h>
 #include <openssl/aes.h>
-#include "aes_locl.h"
+#include "aes_local.h"
 
 /*
  * These two parameters control which table, 256-byte or 2KB, is

diff --git a/crypto/asn1/a_bitstr.c b/crypto/asn1/a_bitstr.c
index f7db9a3..a1a82f2 100644
--- a/crypto/asn1/a_bitstr.c
+++ b/crypto/asn1/a_bitstr.c

@@ -11,7 +11,7 @@
 #include <stdio.h>
 #include "internal/cryptlib.h"
 #include <openssl/asn1.h>
-#include "asn1_locl.h"
+#include "asn1_local.h"
 
 int ASN1_BIT_STRING_set(ASN1_BIT_STRING *x, unsigned char *d, int len)
 {

diff --git a/crypto/asn1/a_gentm.c b/crypto/asn1/a_gentm.c
index 2f4fbf6..d82126b 100644
--- a/crypto/asn1/a_gentm.c
+++ b/crypto/asn1/a_gentm.c

@@ -15,7 +15,7 @@
 #include <time.h>
 #include "internal/cryptlib.h"
 #include <openssl/asn1.h>
-#include "asn1_locl.h"
+#include "asn1_local.h"
 
 /* This is the primary function used to parse ASN1_GENERALIZEDTIME */
 int asn1_generalizedtime_to_tm(struct tm *tm, const ASN1_GENERALIZEDTIME *d)

diff --git a/crypto/asn1/a_int.c b/crypto/asn1/a_int.c
index f6cc42e..5676952 100644
--- a/crypto/asn1/a_int.c
+++ b/crypto/asn1/a_int.c

@@ -13,7 +13,7 @@
 #include <limits.h>
 #include <openssl/asn1.h>
 #include <openssl/bn.h>
-#include "asn1_locl.h"
+#include "asn1_local.h"
 
 ASN1_INTEGER *ASN1_INTEGER_dup(const ASN1_INTEGER *x)
 {

diff --git a/crypto/asn1/a_object.c b/crypto/asn1/a_object.c
index cc55410..123f930 100644
--- a/crypto/asn1/a_object.c
+++ b/crypto/asn1/a_object.c

@@ -16,7 +16,7 @@
 #include <openssl/objects.h>
 #include <openssl/bn.h>
 #include "crypto/asn1.h"
-#include "asn1_locl.h"
+#include "asn1_local.h"
 
 int i2d_ASN1_OBJECT(const ASN1_OBJECT *a, unsigned char **pp)
 {

diff --git a/crypto/asn1/a_time.c b/crypto/asn1/a_time.c
index af060c4..c978248 100644
--- a/crypto/asn1/a_time.c
+++ b/crypto/asn1/a_time.c

@@ -19,7 +19,7 @@
 #include "crypto/ctype.h"
 #include "internal/cryptlib.h"
 #include <openssl/asn1t.h>
-#include "asn1_locl.h"
+#include "asn1_local.h"
 
 IMPLEMENT_ASN1_MSTRING(ASN1_TIME, B_ASN1_TIME)
 

diff --git a/crypto/asn1/a_type.c b/crypto/asn1/a_type.c
index 9b8810c..3a75385 100644
--- a/crypto/asn1/a_type.c
+++ b/crypto/asn1/a_type.c

@@ -11,7 +11,7 @@
 #include "internal/cryptlib.h"
 #include <openssl/asn1t.h>
 #include <openssl/objects.h>
-#include "asn1_locl.h"
+#include "asn1_local.h"
 
 int ASN1_TYPE_get(const ASN1_TYPE *a)
 {

diff --git a/crypto/asn1/a_utctm.c b/crypto/asn1/a_utctm.c
index 000cd4b..47eb93f 100644
--- a/crypto/asn1/a_utctm.c
+++ b/crypto/asn1/a_utctm.c

@@ -11,7 +11,7 @@
 #include <time.h>
 #include "internal/cryptlib.h"
 #include <openssl/asn1.h>
-#include "asn1_locl.h"
+#include "asn1_local.h"
 
 /* This is the primary function used to parse ASN1_UTCTIME */
 int asn1_utctime_to_tm(struct tm *tm, const ASN1_UTCTIME *d)

diff --git a/crypto/asn1/asn1_lib.c b/crypto/asn1/asn1_lib.c
index 9a0ec68..6399de7 100644
--- a/crypto/asn1/asn1_lib.c
+++ b/crypto/asn1/asn1_lib.c

@@ -11,7 +11,7 @@
 #include <limits.h>
 #include "internal/cryptlib.h"
 #include <openssl/asn1.h>
-#include "asn1_locl.h"
+#include "asn1_local.h"
 
 static int asn1_get_length(const unsigned char **pp, int *inf, long *rl,
                            long max);

diff --git a/crypto/asn1/asn1_locl.h b/crypto/asn1/asn1_local.h
similarity index 100%
rename from crypto/asn1/asn1_locl.h
rename to crypto/asn1/asn1_local.h


diff --git a/crypto/asn1/asn_mime.c b/crypto/asn1/asn_mime.c
index 571523e..3282163 100644
--- a/crypto/asn1/asn_mime.c
+++ b/crypto/asn1/asn_mime.c

@@ -16,7 +16,7 @@
 #include <openssl/asn1t.h>
 #include "crypto/evp.h"
 #include "internal/bio.h"
-#include "asn1_locl.h"
+#include "asn1_local.h"
 
 /*
  * Generalised MIME like utilities for streaming ASN1. Although many have a

diff --git a/crypto/asn1/tasn_dec.c b/crypto/asn1/tasn_dec.c
index 87c01f0..e7c4952 100644
--- a/crypto/asn1/tasn_dec.c
+++ b/crypto/asn1/tasn_dec.c

@@ -15,7 +15,7 @@
 #include <openssl/buffer.h>
 #include <openssl/err.h>
 #include "internal/numbers.h"
-#include "asn1_locl.h"
+#include "asn1_local.h"
 
 
 /*

diff --git a/crypto/asn1/tasn_enc.c b/crypto/asn1/tasn_enc.c
index 0ca8460..a499665 100644
--- a/crypto/asn1/tasn_enc.c
+++ b/crypto/asn1/tasn_enc.c

@@ -14,7 +14,7 @@
 #include <openssl/asn1t.h>
 #include <openssl/objects.h>
 #include "crypto/asn1.h"
-#include "asn1_locl.h"
+#include "asn1_local.h"
 
 static int asn1_i2d_ex_primitive(const ASN1_VALUE **pval, unsigned char **out,
                                  const ASN1_ITEM *it, int tag, int aclass);

diff --git a/crypto/asn1/tasn_fre.c b/crypto/asn1/tasn_fre.c
index bffa6f1..5749e2c 100644
--- a/crypto/asn1/tasn_fre.c
+++ b/crypto/asn1/tasn_fre.c

@@ -11,7 +11,7 @@
 #include <openssl/asn1.h>
 #include <openssl/asn1t.h>
 #include <openssl/objects.h>
-#include "asn1_locl.h"
+#include "asn1_local.h"
 
 /* Free up an ASN1 structure */
 

diff --git a/crypto/asn1/tasn_new.c b/crypto/asn1/tasn_new.c
index f9b924c..155080d 100644
--- a/crypto/asn1/tasn_new.c
+++ b/crypto/asn1/tasn_new.c

@@ -13,7 +13,7 @@
 #include <openssl/err.h>
 #include <openssl/asn1t.h>
 #include <string.h>
-#include "asn1_locl.h"
+#include "asn1_local.h"
 
 static int asn1_item_embed_new(ASN1_VALUE **pval, const ASN1_ITEM *it,
                                int embed);

diff --git a/crypto/asn1/tasn_prn.c b/crypto/asn1/tasn_prn.c
index 149300e..ff86400 100644
--- a/crypto/asn1/tasn_prn.c
+++ b/crypto/asn1/tasn_prn.c

@@ -16,7 +16,7 @@
 #include <openssl/err.h>
 #include <openssl/x509v3.h>
 #include "crypto/asn1.h"
-#include "asn1_locl.h"
+#include "asn1_local.h"
 
 /*
  * Print routines.

diff --git a/crypto/asn1/tasn_scn.c b/crypto/asn1/tasn_scn.c
index d09cf57..a8401c9 100644
--- a/crypto/asn1/tasn_scn.c
+++ b/crypto/asn1/tasn_scn.c

@@ -15,7 +15,7 @@
 #include <openssl/buffer.h>
 #include <openssl/err.h>
 #include <openssl/x509v3.h>
-#include "asn1_locl.h"
+#include "asn1_local.h"
 
 /*
  * General ASN1 structure recursive scanner: iterate through all fields

diff --git a/crypto/asn1/tasn_utl.c b/crypto/asn1/tasn_utl.c
index 53dad7a..a31c7c2 100644
--- a/crypto/asn1/tasn_utl.c
+++ b/crypto/asn1/tasn_utl.c

@@ -15,7 +15,7 @@
 #include <openssl/asn1t.h>
 #include <openssl/objects.h>
 #include <openssl/err.h>
-#include "asn1_locl.h"
+#include "asn1_local.h"
 
 /* Utility functions for manipulating fields and offsets */
 

diff --git a/crypto/asn1/x_int64.c b/crypto/asn1/x_int64.c
index 1b55f4f..211cdc4 100644
--- a/crypto/asn1/x_int64.c
+++ b/crypto/asn1/x_int64.c

@@ -12,7 +12,7 @@
 #include "internal/numbers.h"
 #include <openssl/asn1t.h>
 #include <openssl/bn.h>
-#include "asn1_locl.h"
+#include "asn1_local.h"
 
 /*
  * Custom primitive types for handling int32_t, int64_t, uint32_t, uint64_t.

diff --git a/crypto/async/arch/async_null.c b/crypto/async/arch/async_null.c
index 1ffc5d1..675c1d3 100644
--- a/crypto/async/arch/async_null.c
+++ b/crypto/async/arch/async_null.c

@@ -8,7 +8,7 @@
  */
 
 /* This must be the first #include file */
-#include "../async_locl.h"
+#include "../async_local.h"
 
 #ifdef ASYNC_NULL
 int ASYNC_is_capable(void)

diff --git a/crypto/async/arch/async_posix.c b/crypto/async/arch/async_posix.c
index 2a1cdfc..7476970 100644
--- a/crypto/async/arch/async_posix.c
+++ b/crypto/async/arch/async_posix.c

@@ -8,7 +8,7 @@
  */
 
 /* This must be the first #include file */
-#include "../async_locl.h"
+#include "../async_local.h"
 
 #ifdef ASYNC_POSIX
 

diff --git a/crypto/async/arch/async_win.c b/crypto/async/arch/async_win.c
index 848f432..0db9efe 100644
--- a/crypto/async/arch/async_win.c
+++ b/crypto/async/arch/async_win.c

@@ -8,7 +8,7 @@
  */
 
 /* This must be the first #include file */
-#include "../async_locl.h"
+#include "../async_local.h"
 
 #ifdef ASYNC_WIN
 

diff --git a/crypto/async/async.c b/crypto/async/async.c
index 7490419..4743bb7 100644
--- a/crypto/async/async.c
+++ b/crypto/async/async.c

@@ -16,7 +16,7 @@
 #undef _FORTIFY_SOURCE
 
 /* This must be the first #include file */
-#include "async_locl.h"
+#include "async_local.h"
 
 #include <openssl/err.h>
 #include "crypto/cryptlib.h"

diff --git a/crypto/async/async_locl.h b/crypto/async/async_local.h
similarity index 100%
rename from crypto/async/async_locl.h
rename to crypto/async/async_local.h


diff --git a/crypto/async/async_wait.c b/crypto/async/async_wait.c
index 642b781..87e480d 100644
--- a/crypto/async/async_wait.c
+++ b/crypto/async/async_wait.c

@@ -8,7 +8,7 @@
  */
 
 /* This must be the first #include file */
-#include "async_locl.h"
+#include "async_local.h"
 
 #include <openssl/err.h>
 

diff --git a/crypto/bf/bf_cfb64.c b/crypto/bf/bf_cfb64.c
index ec1ec0d..6f4fe33 100644
--- a/crypto/bf/bf_cfb64.c
+++ b/crypto/bf/bf_cfb64.c

@@ -8,7 +8,7 @@
  */
 
 #include <openssl/blowfish.h>
-#include "bf_locl.h"
+#include "bf_local.h"
 
 /*
  * The input and output encrypted as though 64bit cfb mode is being used.

diff --git a/crypto/bf/bf_ecb.c b/crypto/bf/bf_ecb.c
index e07da39..512d717 100644
--- a/crypto/bf/bf_ecb.c
+++ b/crypto/bf/bf_ecb.c

@@ -8,7 +8,7 @@
  */
 
 #include <openssl/blowfish.h>
-#include "bf_locl.h"
+#include "bf_local.h"
 #include <openssl/opensslv.h>
 
 /*

diff --git a/crypto/bf/bf_enc.c b/crypto/bf/bf_enc.c
index 216163a..3f0c5b4 100644
--- a/crypto/bf/bf_enc.c
+++ b/crypto/bf/bf_enc.c

@@ -8,7 +8,7 @@
  */
 
 #include <openssl/blowfish.h>
-#include "bf_locl.h"
+#include "bf_local.h"
 
 /*
  * Blowfish as implemented from 'Blowfish: Springer-Verlag paper' (From

diff --git a/crypto/bf/bf_locl.h b/crypto/bf/bf_local.h
similarity index 100%
rename from crypto/bf/bf_locl.h
rename to crypto/bf/bf_local.h


diff --git a/crypto/bf/bf_ofb64.c b/crypto/bf/bf_ofb64.c
index 7403833..8df34aa 100644
--- a/crypto/bf/bf_ofb64.c
+++ b/crypto/bf/bf_ofb64.c

@@ -8,7 +8,7 @@
  */
 
 #include <openssl/blowfish.h>
-#include "bf_locl.h"
+#include "bf_local.h"
 
 /*
  * The input and output encrypted as though 64bit ofb mode is being used.

diff --git a/crypto/bf/bf_skey.c b/crypto/bf/bf_skey.c
index 29d8044..e358b1d 100644
--- a/crypto/bf/bf_skey.c
+++ b/crypto/bf/bf_skey.c

@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <openssl/blowfish.h>
-#include "bf_locl.h"
+#include "bf_local.h"
 #include "bf_pi.h"
 
 void BF_set_key(BF_KEY *key, int len, const unsigned char *data)

diff --git a/crypto/bio/b_addr.c b/crypto/bio/b_addr.c
index ae82f09..40cf89d 100644
--- a/crypto/bio/b_addr.c
+++ b/crypto/bio/b_addr.c

@@ -10,7 +10,7 @@
 #include <assert.h>
 #include <string.h>
 
-#include "bio_lcl.h"
+#include "bio_local.h"
 #include <openssl/crypto.h>
 
 #ifndef OPENSSL_NO_SOCK
@@ -22,7 +22,7 @@
 static CRYPTO_ONCE bio_lookup_init = CRYPTO_ONCE_STATIC_INIT;
 
 /*
- * Throughout this file and bio_lcl.h, the existence of the macro
+ * Throughout this file and bio_local.h, the existence of the macro
  * AI_PASSIVE is used to detect the availability of struct addrinfo,
  * getnameinfo() and getaddrinfo().  If that macro doesn't exist,
  * we use our own implementation instead, using gethostbyname,
@@ -695,7 +695,7 @@
             hints.ai_flags |= AI_PASSIVE;
 
         /* Note that |res| SHOULD be a 'struct addrinfo **' thanks to
-         * macro magic in bio_lcl.h
+         * macro magic in bio_local.h
          */
       retry:
         switch ((gai_ret = getaddrinfo(host, service, &hints, res))) {

diff --git a/crypto/bio/b_dump.c b/crypto/bio/b_dump.c
index 018c4ac..b99ebc0 100644
--- a/crypto/bio/b_dump.c
+++ b/crypto/bio/b_dump.c

@@ -12,7 +12,7 @@
  */
 
 #include <stdio.h>
-#include "bio_lcl.h"
+#include "bio_local.h"
 
 #define DUMP_WIDTH      16
 #define DUMP_WIDTH_LESS_INDENT(i) (DUMP_WIDTH - ((i - (i > 6 ? 6 : i) + 3) / 4))

diff --git a/crypto/bio/b_sock.c b/crypto/bio/b_sock.c
index 1747cce..8e40d86 100644
--- a/crypto/bio/b_sock.c
+++ b/crypto/bio/b_sock.c

@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
-#include "bio_lcl.h"
+#include "bio_local.h"
 #ifndef OPENSSL_NO_SOCK
 # define SOCKET_PROTOCOL IPPROTO_TCP
 # ifdef SO_MAXCONN

diff --git a/crypto/bio/b_sock2.c b/crypto/bio/b_sock2.c
index abfd704..942825a 100644
--- a/crypto/bio/b_sock2.c
+++ b/crypto/bio/b_sock2.c

@@ -11,7 +11,7 @@
 #include <stdlib.h>
 #include <errno.h>
 
-#include "bio_lcl.h"
+#include "bio_local.h"
 
 #include <openssl/err.h>
 

diff --git a/crypto/bio/bf_buff.c b/crypto/bio/bf_buff.c
index f39f6f0..80db0b5 100644
--- a/crypto/bio/bf_buff.c
+++ b/crypto/bio/bf_buff.c

@@ -9,7 +9,7 @@
 
 #include <stdio.h>
 #include <errno.h>
-#include "bio_lcl.h"
+#include "bio_local.h"
 #include "internal/cryptlib.h"
 
 static int buffer_write(BIO *h, const char *buf, int num);

diff --git a/crypto/bio/bf_lbuf.c b/crypto/bio/bf_lbuf.c
index edc7274..6b5a241a 100644
--- a/crypto/bio/bf_lbuf.c
+++ b/crypto/bio/bf_lbuf.c

@@ -9,7 +9,7 @@
 
 #include <stdio.h>
 #include <errno.h>
-#include "bio_lcl.h"
+#include "bio_local.h"
 #include "internal/cryptlib.h"
 #include <openssl/evp.h>
 

diff --git a/crypto/bio/bf_nbio.c b/crypto/bio/bf_nbio.c
index cbf14cf..6f6ccfb 100644
--- a/crypto/bio/bf_nbio.c
+++ b/crypto/bio/bf_nbio.c

@@ -9,7 +9,7 @@
 
 #include <stdio.h>
 #include <errno.h>
-#include "bio_lcl.h"
+#include "bio_local.h"
 #include "internal/cryptlib.h"
 #include <openssl/rand.h>
 

diff --git a/crypto/bio/bf_null.c b/crypto/bio/bf_null.c
index 8e1a803..e548bdc 100644
--- a/crypto/bio/bf_null.c
+++ b/crypto/bio/bf_null.c

@@ -9,7 +9,7 @@
 
 #include <stdio.h>
 #include <errno.h>
-#include "bio_lcl.h"
+#include "bio_local.h"
 #include "internal/cryptlib.h"
 
 /*

diff --git a/crypto/bio/bio_cb.c b/crypto/bio/bio_cb.c
index 3ff6dfe..154fb5c 100644
--- a/crypto/bio/bio_cb.c
+++ b/crypto/bio/bio_cb.c

@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "bio_lcl.h"
+#include "bio_local.h"
 #include "internal/cryptlib.h"
 #include <openssl/err.h>
 

diff --git a/crypto/bio/bio_lib.c b/crypto/bio/bio_lib.c
index 9d63b49..b60568e 100644
--- a/crypto/bio/bio_lib.c
+++ b/crypto/bio/bio_lib.c

@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include <errno.h>
 #include <openssl/crypto.h>
-#include "bio_lcl.h"
+#include "bio_local.h"
 #include "internal/cryptlib.h"
 
 

diff --git a/crypto/bio/bio_lcl.h b/crypto/bio/bio_local.h
similarity index 97%
rename from crypto/bio/bio_lcl.h
rename to crypto/bio/bio_local.h
index 95f3a93..024120f 100644
--- a/crypto/bio/bio_lcl.h
+++ b/crypto/bio/bio_local.h

@@ -28,10 +28,10 @@
  * that also includes bio.h.
  */
 # ifdef HEADER_CRYPTLIB_H
-#  error internal/cryptlib.h included before bio_lcl.h
+#  error internal/cryptlib.h included before bio_local.h
 # endif
 # ifdef HEADER_BIO_H
-#  error openssl/bio.h included before bio_lcl.h
+#  error openssl/bio.h included before bio_local.h
 # endif
 
 /*

diff --git a/crypto/bio/bio_meth.c b/crypto/bio/bio_meth.c
index c1b3048..d32aead 100644
--- a/crypto/bio/bio_meth.c
+++ b/crypto/bio/bio_meth.c

@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "bio_lcl.h"
+#include "bio_local.h"
 #include "internal/thread_once.h"
 
 CRYPTO_RWLOCK *bio_type_lock = NULL;

diff --git a/crypto/bio/bss_acpt.c b/crypto/bio/bss_acpt.c
index 830c1b9..3c2b279 100644
--- a/crypto/bio/bss_acpt.c
+++ b/crypto/bio/bss_acpt.c

@@ -9,7 +9,7 @@
 
 #include <stdio.h>
 #include <errno.h>
-#include "bio_lcl.h"
+#include "bio_local.h"
 
 #ifndef OPENSSL_NO_SOCK
 

diff --git a/crypto/bio/bss_bio.c b/crypto/bio/bss_bio.c
index 8a9d859..268f010 100644
--- a/crypto/bio/bss_bio.c
+++ b/crypto/bio/bss_bio.c

@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "bio_lcl.h"
+#include "bio_local.h"
 #include <openssl/err.h>
 #include <openssl/crypto.h>
 

diff --git a/crypto/bio/bss_conn.c b/crypto/bio/bss_conn.c
index 56fb392..afcf436 100644
--- a/crypto/bio/bss_conn.c
+++ b/crypto/bio/bss_conn.c

@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include <errno.h>
 
-#include "bio_lcl.h"
+#include "bio_local.h"
 
 #ifndef OPENSSL_NO_SOCK
 

diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c
index c52b0f0..ff96145 100644
--- a/crypto/bio/bss_dgram.c
+++ b/crypto/bio/bss_dgram.c

@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include <errno.h>
 
-#include "bio_lcl.h"
+#include "bio_local.h"
 #ifndef OPENSSL_NO_DGRAM
 
 # ifndef OPENSSL_NO_SCTP

diff --git a/crypto/bio/bss_fd.c b/crypto/bio/bss_fd.c
index c599dad..9db3317 100644
--- a/crypto/bio/bss_fd.c
+++ b/crypto/bio/bss_fd.c

@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include <errno.h>
 
-#include "bio_lcl.h"
+#include "bio_local.h"
 
 #if defined(OPENSSL_NO_POSIX_IO)
 /*

diff --git a/crypto/bio/bss_file.c b/crypto/bio/bss_file.c
index c1acad9..a57bd97 100644
--- a/crypto/bio/bss_file.c
+++ b/crypto/bio/bss_file.c

@@ -27,7 +27,7 @@
 
 #include <stdio.h>
 #include <errno.h>
-#include "bio_lcl.h"
+#include "bio_local.h"
 #include <openssl/err.h>
 
 #if !defined(OPENSSL_NO_STDIO)

diff --git a/crypto/bio/bss_log.c b/crypto/bio/bss_log.c
index 083f004..274e523 100644
--- a/crypto/bio/bss_log.c
+++ b/crypto/bio/bss_log.c

@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <errno.h>
 
-#include "bio_lcl.h"
+#include "bio_local.h"
 #include "internal/cryptlib.h"
 
 #if defined(OPENSSL_SYS_WINCE)

diff --git a/crypto/bio/bss_mem.c b/crypto/bio/bss_mem.c
index 19a3bd8..4043043 100644
--- a/crypto/bio/bss_mem.c
+++ b/crypto/bio/bss_mem.c

@@ -9,7 +9,7 @@
 
 #include <stdio.h>
 #include <errno.h>
-#include "bio_lcl.h"
+#include "bio_local.h"
 #include "internal/cryptlib.h"
 
 static int mem_write(BIO *h, const char *buf, int num);

diff --git a/crypto/bio/bss_null.c b/crypto/bio/bss_null.c
index 091f82f..f677bbb 100644
--- a/crypto/bio/bss_null.c
+++ b/crypto/bio/bss_null.c

@@ -9,7 +9,7 @@
 
 #include <stdio.h>
 #include <errno.h>
-#include "bio_lcl.h"
+#include "bio_local.h"
 #include "internal/cryptlib.h"
 
 static int null_write(BIO *h, const char *buf, int num);

diff --git a/crypto/bio/bss_sock.c b/crypto/bio/bss_sock.c
index 0c99459..ed51349 100644
--- a/crypto/bio/bss_sock.c
+++ b/crypto/bio/bss_sock.c

@@ -9,7 +9,7 @@
 
 #include <stdio.h>
 #include <errno.h>
-#include "bio_lcl.h"
+#include "bio_local.h"
 #include "internal/cryptlib.h"
 #include "internal/ktls.h"
 

diff --git a/crypto/bn/README.pod b/crypto/bn/README.pod
index 237f2af..1286fc0 100644
--- a/crypto/bn/README.pod
+++ b/crypto/bn/README.pod

@@ -188,7 +188,7 @@
 
 The implementations use the following macros which, depending on the
 architecture, may use "long long" C operations or inline assembler.
-They are defined in C<bn_lcl.h>.
+They are defined in C<bn_local.h>.
 
 mul(B<r>, B<a>, B<w>, B<c>) computes B<w>*B<a>+B<c> and places the
 low word of the result in B<r> and the high word in B<c>.

diff --git a/crypto/bn/asm/x86_64-gcc.c b/crypto/bn/asm/x86_64-gcc.c
index af32fcf..68453b3 100644
--- a/crypto/bn/asm/x86_64-gcc.c
+++ b/crypto/bn/asm/x86_64-gcc.c

@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "../bn_lcl.h"
+#include "../bn_local.h"
 #if !(defined(__GNUC__) && __GNUC__>=2)
 # include "../bn_asm.c"         /* kind of dirty hack for Sun Studio */
 #else

diff --git a/crypto/bn/bn_add.c b/crypto/bn/bn_add.c
index f35a1a4..545e103 100644
--- a/crypto/bn/bn_add.c
+++ b/crypto/bn/bn_add.c

@@ -8,7 +8,7 @@
  */
 
 #include "internal/cryptlib.h"
-#include "bn_lcl.h"
+#include "bn_local.h"
 
 /* signed add of b to a. */
 int BN_add(BIGNUM *r, const BIGNUM *a, const BIGNUM *b)

diff --git a/crypto/bn/bn_asm.c b/crypto/bn/bn_asm.c
index 41d448b..257701d 100644
--- a/crypto/bn/bn_asm.c
+++ b/crypto/bn/bn_asm.c

@@ -10,7 +10,7 @@
 #include <assert.h>
 #include <openssl/crypto.h>
 #include "internal/cryptlib.h"
-#include "bn_lcl.h"
+#include "bn_local.h"
 
 #if defined(BN_LLONG) || defined(BN_UMULT_HIGH)
 

diff --git a/crypto/bn/bn_blind.c b/crypto/bn/bn_blind.c
index 826f3f0..c078d8d 100644
--- a/crypto/bn/bn_blind.c
+++ b/crypto/bn/bn_blind.c

@@ -9,7 +9,7 @@
 
 #include <openssl/opensslconf.h>
 #include "internal/cryptlib.h"
-#include "bn_lcl.h"
+#include "bn_local.h"
 
 #define BN_BLINDING_COUNTER     32
 

diff --git a/crypto/bn/bn_conv.c b/crypto/bn/bn_conv.c
index 3c5ae75..fd21464 100644
--- a/crypto/bn/bn_conv.c
+++ b/crypto/bn/bn_conv.c

@@ -9,7 +9,7 @@
 
 #include <openssl/err.h>
 #include "crypto/ctype.h"
-#include "bn_lcl.h"
+#include "bn_local.h"
 
 static const char Hex[] = "0123456789ABCDEF";
 

diff --git a/crypto/bn/bn_ctx.c b/crypto/bn/bn_ctx.c
index a60c744..ecc0034 100644
--- a/crypto/bn/bn_ctx.c
+++ b/crypto/bn/bn_ctx.c

@@ -9,7 +9,7 @@
 
 #include <openssl/trace.h>
 #include "internal/cryptlib.h"
-#include "bn_lcl.h"
+#include "bn_local.h"
 
 /*-
  * TODO list

diff --git a/crypto/bn/bn_depr.c b/crypto/bn/bn_depr.c
index 2ff0eed..18d02d8 100644
--- a/crypto/bn/bn_depr.c
+++ b/crypto/bn/bn_depr.c

@@ -20,7 +20,7 @@
 # include <stdio.h>
 # include <time.h>
 # include "internal/cryptlib.h"
-# include "bn_lcl.h"
+# include "bn_local.h"
 
 BIGNUM *BN_generate_prime(BIGNUM *ret, int bits, int safe,
                           const BIGNUM *add, const BIGNUM *rem,

diff --git a/crypto/bn/bn_dh.c b/crypto/bn/bn_dh.c
index 4e97a98..390f904 100644
--- a/crypto/bn/bn_dh.c
+++ b/crypto/bn/bn_dh.c

@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "bn_lcl.h"
+#include "bn_local.h"
 #include "internal/nelem.h"
 
 #ifndef OPENSSL_NO_DH

diff --git a/crypto/bn/bn_div.c b/crypto/bn/bn_div.c
index 88fcaf7..4245970 100644
--- a/crypto/bn/bn_div.c
+++ b/crypto/bn/bn_div.c

@@ -10,7 +10,7 @@
 #include <assert.h>
 #include <openssl/bn.h>
 #include "internal/cryptlib.h"
-#include "bn_lcl.h"
+#include "bn_local.h"
 
 /* The old slow way */
 #if 0

diff --git a/crypto/bn/bn_exp.c b/crypto/bn/bn_exp.c
index 9ea120b..50190b0 100644
--- a/crypto/bn/bn_exp.c
+++ b/crypto/bn/bn_exp.c

@@ -8,8 +8,8 @@
  */
 
 #include "internal/cryptlib.h"
-#include "internal/constant_time_locl.h"
-#include "bn_lcl.h"
+#include "internal/constant_time.h"
+#include "bn_local.h"
 
 #include <stdlib.h>
 #ifdef _WIN32

diff --git a/crypto/bn/bn_exp2.c b/crypto/bn/bn_exp2.c
index 4157a96..99f843b 100644
--- a/crypto/bn/bn_exp2.c
+++ b/crypto/bn/bn_exp2.c

@@ -9,7 +9,7 @@
 
 #include <stdio.h>
 #include "internal/cryptlib.h"
-#include "bn_lcl.h"
+#include "bn_local.h"
 
 #define TABLE_SIZE      32
 

diff --git a/crypto/bn/bn_gcd.c b/crypto/bn/bn_gcd.c
index 9ee5440..87eb9da 100644
--- a/crypto/bn/bn_gcd.c
+++ b/crypto/bn/bn_gcd.c

@@ -8,7 +8,7 @@
  */
 
 #include "internal/cryptlib.h"
-#include "bn_lcl.h"
+#include "bn_local.h"
 
 static BIGNUM *euclid(BIGNUM *a, BIGNUM *b);
 

diff --git a/crypto/bn/bn_gf2m.c b/crypto/bn/bn_gf2m.c
index e025dae..bfece40 100644
--- a/crypto/bn/bn_gf2m.c
+++ b/crypto/bn/bn_gf2m.c

@@ -12,7 +12,7 @@
 #include <limits.h>
 #include <stdio.h>
 #include "internal/cryptlib.h"
-#include "bn_lcl.h"
+#include "bn_local.h"
 
 #ifndef OPENSSL_NO_EC2M
 

diff --git a/crypto/bn/bn_intern.c b/crypto/bn/bn_intern.c
index f30e9b3..d924036 100644
--- a/crypto/bn/bn_intern.c
+++ b/crypto/bn/bn_intern.c

@@ -8,7 +8,7 @@
  */
 
 #include "internal/cryptlib.h"
-#include "bn_lcl.h"
+#include "bn_local.h"
 
 /*
  * Determine the modified width-(w+1) Non-Adjacent Form (wNAF) of 'scalar'.

diff --git a/crypto/bn/bn_kron.c b/crypto/bn/bn_kron.c
index 2f8787b..8258536 100644
--- a/crypto/bn/bn_kron.c
+++ b/crypto/bn/bn_kron.c

@@ -8,7 +8,7 @@
  */
 
 #include "internal/cryptlib.h"
-#include "bn_lcl.h"
+#include "bn_local.h"
 
 /* least significant word */
 #define BN_lsw(n) (((n)->top == 0) ? (BN_ULONG) 0 : (n)->d[0])

diff --git a/crypto/bn/bn_lib.c b/crypto/bn/bn_lib.c
index 01c9da1..bdd4caa 100644
--- a/crypto/bn/bn_lib.c
+++ b/crypto/bn/bn_lib.c

@@ -10,9 +10,9 @@
 #include <assert.h>
 #include <limits.h>
 #include "internal/cryptlib.h"
-#include "bn_lcl.h"
+#include "bn_local.h"
 #include <openssl/opensslconf.h>
-#include "internal/constant_time_locl.h"
+#include "internal/constant_time.h"
 
 /* This stuff appears to be completely unused, so is deprecated */
 #if !OPENSSL_API_0_9_8

diff --git a/crypto/bn/bn_lcl.h b/crypto/bn/bn_local.h
similarity index 100%
rename from crypto/bn/bn_lcl.h
rename to crypto/bn/bn_local.h


diff --git a/crypto/bn/bn_mod.c b/crypto/bn/bn_mod.c
index 20f643a..18933d0 100644
--- a/crypto/bn/bn_mod.c
+++ b/crypto/bn/bn_mod.c

@@ -8,7 +8,7 @@
  */
 
 #include "internal/cryptlib.h"
-#include "bn_lcl.h"
+#include "bn_local.h"
 
 int BN_nnmod(BIGNUM *r, const BIGNUM *m, const BIGNUM *d, BN_CTX *ctx)
 {

diff --git a/crypto/bn/bn_mont.c b/crypto/bn/bn_mont.c
index cb71417..6e6848c 100644
--- a/crypto/bn/bn_mont.c
+++ b/crypto/bn/bn_mont.c

@@ -15,7 +15,7 @@
  */
 
 #include "internal/cryptlib.h"
-#include "bn_lcl.h"
+#include "bn_local.h"
 
 #define MONT_WORD               /* use the faster word-based algorithm */
 

diff --git a/crypto/bn/bn_mpi.c b/crypto/bn/bn_mpi.c
index ff7eabf..504cddf 100644
--- a/crypto/bn/bn_mpi.c
+++ b/crypto/bn/bn_mpi.c

@@ -9,7 +9,7 @@
 
 #include <stdio.h>
 #include "internal/cryptlib.h"
-#include "bn_lcl.h"
+#include "bn_local.h"
 
 int BN_bn2mpi(const BIGNUM *a, unsigned char *d)
 {

diff --git a/crypto/bn/bn_mul.c b/crypto/bn/bn_mul.c
index 4fc1e8c..dc6b6f5 100644
--- a/crypto/bn/bn_mul.c
+++ b/crypto/bn/bn_mul.c

@@ -9,7 +9,7 @@
 
 #include <assert.h>
 #include "internal/cryptlib.h"
-#include "bn_lcl.h"
+#include "bn_local.h"
 
 #if defined(OPENSSL_NO_ASM) || !defined(OPENSSL_BN_ASM_PART_WORDS)
 /*

diff --git a/crypto/bn/bn_nist.c b/crypto/bn/bn_nist.c
index 1870708..1788123 100644
--- a/crypto/bn/bn_nist.c
+++ b/crypto/bn/bn_nist.c

@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "bn_lcl.h"
+#include "bn_local.h"
 #include "internal/cryptlib.h"
 
 #define BN_NIST_192_TOP (192+BN_BITS2-1)/BN_BITS2

diff --git a/crypto/bn/bn_prime.c b/crypto/bn/bn_prime.c
index 9e735b7..99b3199 100644
--- a/crypto/bn/bn_prime.c
+++ b/crypto/bn/bn_prime.c

@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include <time.h>
 #include "internal/cryptlib.h"
-#include "bn_lcl.h"
+#include "bn_local.h"
 
 /*
  * The quick sieve algorithm approach to weeding out primes is Philip

diff --git a/crypto/bn/bn_print.c b/crypto/bn/bn_print.c
index 2274b85..ccc954c 100644
--- a/crypto/bn/bn_print.c
+++ b/crypto/bn/bn_print.c

@@ -9,7 +9,7 @@
 
 #include <stdio.h>
 #include <openssl/bio.h>
-#include "bn_lcl.h"
+#include "bn_local.h"
 
 static const char Hex[] = "0123456789ABCDEF";
 

diff --git a/crypto/bn/bn_rand.c b/crypto/bn/bn_rand.c
index 836ff54..d61b08d 100644
--- a/crypto/bn/bn_rand.c
+++ b/crypto/bn/bn_rand.c

@@ -11,7 +11,7 @@
 #include <time.h>
 #include "internal/cryptlib.h"
 #include "crypto/rand.h"
-#include "bn_lcl.h"
+#include "bn_local.h"
 #include <openssl/rand.h>
 #include <openssl/sha.h>
 #include <openssl/evp.h>

diff --git a/crypto/bn/bn_recp.c b/crypto/bn/bn_recp.c
index 7eda16d..2cfe315 100644
--- a/crypto/bn/bn_recp.c
+++ b/crypto/bn/bn_recp.c

@@ -8,7 +8,7 @@
  */
 
 #include "internal/cryptlib.h"
-#include "bn_lcl.h"
+#include "bn_local.h"
 
 void BN_RECP_CTX_init(BN_RECP_CTX *recp)
 {

diff --git a/crypto/bn/bn_rsa_fips186_4.c b/crypto/bn/bn_rsa_fips186_4.c
index 2a0f35f..e5e4ecc 100644
--- a/crypto/bn/bn_rsa_fips186_4.c
+++ b/crypto/bn/bn_rsa_fips186_4.c

@@ -29,7 +29,7 @@
  */
 #include <stdio.h>
 #include <openssl/bn.h>
-#include "bn_lcl.h"
+#include "bn_local.h"
 #include "crypto/bn.h"
 
 /*

diff --git a/crypto/bn/bn_shift.c b/crypto/bn/bn_shift.c
index 13a4337..b1f8dbd 100644
--- a/crypto/bn/bn_shift.c
+++ b/crypto/bn/bn_shift.c

@@ -9,7 +9,7 @@
 
 #include <assert.h>
 #include "internal/cryptlib.h"
-#include "bn_lcl.h"
+#include "bn_local.h"
 
 int BN_lshift1(BIGNUM *r, const BIGNUM *a)
 {

diff --git a/crypto/bn/bn_sqr.c b/crypto/bn/bn_sqr.c
index 6e1aa99..990bed9 100644
--- a/crypto/bn/bn_sqr.c
+++ b/crypto/bn/bn_sqr.c

@@ -8,7 +8,7 @@
  */
 
 #include "internal/cryptlib.h"
-#include "bn_lcl.h"
+#include "bn_local.h"
 
 /* r must not be a */
 /*

diff --git a/crypto/bn/bn_sqrt.c b/crypto/bn/bn_sqrt.c
index 2107487..d39f65f 100644
--- a/crypto/bn/bn_sqrt.c
+++ b/crypto/bn/bn_sqrt.c

@@ -8,7 +8,7 @@
  */
 
 #include "internal/cryptlib.h"
-#include "bn_lcl.h"
+#include "bn_local.h"
 
 BIGNUM *BN_mod_sqrt(BIGNUM *in, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
 /*

diff --git a/crypto/bn/bn_srp.c b/crypto/bn/bn_srp.c
index 412bc5e..34e11ce 100644
--- a/crypto/bn/bn_srp.c
+++ b/crypto/bn/bn_srp.c

@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "bn_lcl.h"
+#include "bn_local.h"
 #include "internal/nelem.h"
 
 #ifndef OPENSSL_NO_SRP

diff --git a/crypto/bn/bn_word.c b/crypto/bn/bn_word.c
index 1fb41e8..93c0147 100644
--- a/crypto/bn/bn_word.c
+++ b/crypto/bn/bn_word.c

@@ -8,7 +8,7 @@
  */
 
 #include "internal/cryptlib.h"
-#include "bn_lcl.h"
+#include "bn_local.h"
 
 BN_ULONG BN_mod_word(const BIGNUM *a, BN_ULONG w)
 {

diff --git a/crypto/bn/bn_x931p.c b/crypto/bn/bn_x931p.c
index c79e427..211886f 100644
--- a/crypto/bn/bn_x931p.c
+++ b/crypto/bn/bn_x931p.c

@@ -9,7 +9,7 @@
 
 #include <stdio.h>
 #include <openssl/bn.h>
-#include "bn_lcl.h"
+#include "bn_local.h"
 
 /* X9.31 routines for prime derivation */
 

diff --git a/crypto/camellia/camellia.c b/crypto/camellia/camellia.c
index 75080a1..cb285d0 100644
--- a/crypto/camellia/camellia.c
+++ b/crypto/camellia/camellia.c

@@ -40,7 +40,7 @@
  */
 
 #include <openssl/camellia.h>
-#include "cmll_locl.h"
+#include "cmll_local.h"
 #include <string.h>
 #include <stdlib.h>
 

diff --git a/crypto/camellia/cmll_ecb.c b/crypto/camellia/cmll_ecb.c
index 1385b2f..6a2c777 100644
--- a/crypto/camellia/cmll_ecb.c
+++ b/crypto/camellia/cmll_ecb.c

@@ -8,7 +8,7 @@
  */
 
 #include <openssl/camellia.h>
-#include "cmll_locl.h"
+#include "cmll_local.h"
 
 void Camellia_ecb_encrypt(const unsigned char *in, unsigned char *out,
                           const CAMELLIA_KEY *key, const int enc)

diff --git a/crypto/camellia/cmll_locl.h b/crypto/camellia/cmll_local.h
similarity index 100%
rename from crypto/camellia/cmll_locl.h
rename to crypto/camellia/cmll_local.h


diff --git a/crypto/camellia/cmll_misc.c b/crypto/camellia/cmll_misc.c
index 987bdb9..b38fcc0 100644
--- a/crypto/camellia/cmll_misc.c
+++ b/crypto/camellia/cmll_misc.c

@@ -9,7 +9,7 @@
 
 #include <openssl/opensslv.h>
 #include <openssl/camellia.h>
-#include "cmll_locl.h"
+#include "cmll_local.h"
 
 int Camellia_set_key(const unsigned char *userKey, const int bits,
                      CAMELLIA_KEY *key)

diff --git a/crypto/cast/c_cfb64.c b/crypto/cast/c_cfb64.c
index 7bac5c7..1ae13bc 100644
--- a/crypto/cast/c_cfb64.c
+++ b/crypto/cast/c_cfb64.c

@@ -8,7 +8,7 @@
  */
 
 #include <openssl/cast.h>
-#include "cast_lcl.h"
+#include "cast_local.h"
 
 /*
  * The input and output encrypted as though 64bit cfb mode is being used.

diff --git a/crypto/cast/c_ecb.c b/crypto/cast/c_ecb.c
index 50b225e..2b841ac 100644
--- a/crypto/cast/c_ecb.c
+++ b/crypto/cast/c_ecb.c

@@ -8,7 +8,7 @@
  */
 
 #include <openssl/cast.h>
-#include "cast_lcl.h"
+#include "cast_local.h"
 #include <openssl/opensslv.h>
 
 void CAST_ecb_encrypt(const unsigned char *in, unsigned char *out,

diff --git a/crypto/cast/c_enc.c b/crypto/cast/c_enc.c
index ad8a02a..7e2461d 100644
--- a/crypto/cast/c_enc.c
+++ b/crypto/cast/c_enc.c

@@ -8,7 +8,7 @@
  */
 
 #include <openssl/cast.h>
-#include "cast_lcl.h"
+#include "cast_local.h"
 
 void CAST_encrypt(CAST_LONG *data, const CAST_KEY *key)
 {

diff --git a/crypto/cast/c_ofb64.c b/crypto/cast/c_ofb64.c
index 797917c..bc598d4 100644
--- a/crypto/cast/c_ofb64.c
+++ b/crypto/cast/c_ofb64.c

@@ -8,7 +8,7 @@
  */
 
 #include <openssl/cast.h>
-#include "cast_lcl.h"
+#include "cast_local.h"
 
 /*
  * The input and output encrypted as though 64bit ofb mode is being used.

diff --git a/crypto/cast/c_skey.c b/crypto/cast/c_skey.c
index 1f353a7..c21ecdf 100644
--- a/crypto/cast/c_skey.c
+++ b/crypto/cast/c_skey.c

@@ -8,7 +8,7 @@
  */
 
 #include <openssl/cast.h>
-#include "cast_lcl.h"
+#include "cast_local.h"
 #include "cast_s.h"
 
 #define CAST_exp(l,A,a,n) \

diff --git a/crypto/cast/cast_lcl.h b/crypto/cast/cast_local.h
similarity index 100%
rename from crypto/cast/cast_lcl.h
rename to crypto/cast/cast_local.h


diff --git a/crypto/cmp/cmp_asn.c b/crypto/cmp/cmp_asn.c
index e764e53..fa7c26d 100644
--- a/crypto/cmp/cmp_asn.c
+++ b/crypto/cmp/cmp_asn.c

@@ -11,7 +11,7 @@
 
 #include <openssl/asn1t.h>
 
-#include "cmp_int.h"
+#include "cmp_local.h"
 
 /* explicit #includes not strictly needed since implied by the above: */
 #include <openssl/cmp.h>

diff --git a/crypto/cmp/cmp_ctx.c b/crypto/cmp/cmp_ctx.c
index 4bec73c..6ec23ad 100644
--- a/crypto/cmp/cmp_ctx.c
+++ b/crypto/cmp/cmp_ctx.c

@@ -13,7 +13,7 @@
 #include <openssl/bio.h>
 #include <openssl/ocsp.h> /* for OCSP_REVOKED_STATUS_* */
 
-#include "cmp_int.h"
+#include "cmp_local.h"
 
 /* explicit #includes not strictly needed since implied by the above: */
 #include <openssl/cmp.h>

diff --git a/crypto/cmp/cmp_int.h b/crypto/cmp/cmp_local.h
similarity index 100%
rename from crypto/cmp/cmp_int.h
rename to crypto/cmp/cmp_local.h


diff --git a/crypto/cmp/cmp_util.c b/crypto/cmp/cmp_util.c
index 1ca981b..9490496 100644
--- a/crypto/cmp/cmp_util.c
+++ b/crypto/cmp/cmp_util.c

@@ -11,7 +11,7 @@
 
 #include <string.h>
 #include <openssl/cmp_util.h>
-#include "cmp_int.h" /* just for decls of internal functions defined here */
+#include "cmp_local.h" /* just for decls of internal functions defined here */
 #include <openssl/cmperr.h>
 #include <openssl/err.h> /* should be implied by cmperr.h */
 #include <openssl/x509v3.h>

diff --git a/crypto/cms/cms_asn1.c b/crypto/cms/cms_asn1.c
index 64d5d3b..082885d 100644
--- a/crypto/cms/cms_asn1.c
+++ b/crypto/cms/cms_asn1.c

@@ -11,7 +11,7 @@
 #include <openssl/pem.h>
 #include <openssl/x509v3.h>
 #include <openssl/cms.h>
-#include "cms_lcl.h"
+#include "cms_local.h"
 
 
 ASN1_SEQUENCE(CMS_IssuerAndSerialNumber) = {

diff --git a/crypto/cms/cms_att.c b/crypto/cms/cms_att.c
index e548180..2c8138f 100644
--- a/crypto/cms/cms_att.c
+++ b/crypto/cms/cms_att.c

@@ -12,7 +12,7 @@
 #include <openssl/x509v3.h>
 #include <openssl/err.h>
 #include <openssl/cms.h>
-#include "cms_lcl.h"
+#include "cms_local.h"
 #include "internal/nelem.h"
 
 /*-

diff --git a/crypto/cms/cms_cd.c b/crypto/cms/cms_cd.c
index 5a11928..ac40275 100644
--- a/crypto/cms/cms_cd.c
+++ b/crypto/cms/cms_cd.c

@@ -15,7 +15,7 @@
 #include <openssl/cms.h>
 #include <openssl/bio.h>
 #include <openssl/comp.h>
-#include "cms_lcl.h"
+#include "cms_local.h"
 
 #ifdef ZLIB
 

diff --git a/crypto/cms/cms_dd.c b/crypto/cms/cms_dd.c
index 8bdbdfd..9da2647 100644
--- a/crypto/cms/cms_dd.c
+++ b/crypto/cms/cms_dd.c

@@ -13,7 +13,7 @@
 #include <openssl/x509v3.h>
 #include <openssl/err.h>
 #include <openssl/cms.h>
-#include "cms_lcl.h"
+#include "cms_local.h"
 
 /* CMS DigestedData Utilities */
 

diff --git a/crypto/cms/cms_enc.c b/crypto/cms/cms_enc.c
index d3a087b..3a17a27 100644
--- a/crypto/cms/cms_enc.c
+++ b/crypto/cms/cms_enc.c

@@ -14,7 +14,7 @@
 #include <openssl/err.h>
 #include <openssl/cms.h>
 #include <openssl/rand.h>
-#include "cms_lcl.h"
+#include "cms_local.h"
 
 /* CMS EncryptedData Utilities */
 

diff --git a/crypto/cms/cms_env.c b/crypto/cms/cms_env.c
index 15248dd..bcb6162 100644
--- a/crypto/cms/cms_env.c
+++ b/crypto/cms/cms_env.c

@@ -14,7 +14,7 @@
 #include <openssl/err.h>
 #include <openssl/cms.h>
 #include <openssl/aes.h>
-#include "cms_lcl.h"
+#include "cms_local.h"
 #include "crypto/asn1.h"
 #include "crypto/evp.h"
 

diff --git a/crypto/cms/cms_ess.c b/crypto/cms/cms_ess.c
index ded7738..1a6c05f 100644
--- a/crypto/cms/cms_ess.c
+++ b/crypto/cms/cms_ess.c

@@ -15,7 +15,7 @@
 #include <openssl/err.h>
 #include <openssl/cms.h>
 #include <openssl/ess.h>
-#include "cms_lcl.h"
+#include "cms_local.h"
 #include "crypto/ess.h"
 #include "crypto/cms.h"
 

diff --git a/crypto/cms/cms_io.c b/crypto/cms/cms_io.c
index f3b5874..06c5a1b 100644
--- a/crypto/cms/cms_io.c
+++ b/crypto/cms/cms_io.c

@@ -12,7 +12,7 @@
 #include <openssl/err.h>
 #include <openssl/pem.h>
 #include <openssl/cms.h>
-#include "cms_lcl.h"
+#include "cms_local.h"
 
 /* unfortunately cannot constify BIO_new_NDEF() due to this and PKCS7_stream() */
 int CMS_stream(unsigned char ***boundary, CMS_ContentInfo *cms)

diff --git a/crypto/cms/cms_kari.c b/crypto/cms/cms_kari.c
index 364903b..bffa935 100644
--- a/crypto/cms/cms_kari.c
+++ b/crypto/cms/cms_kari.c

@@ -14,7 +14,7 @@
 #include <openssl/err.h>
 #include <openssl/cms.h>
 #include <openssl/aes.h>
-#include "cms_lcl.h"
+#include "cms_local.h"
 #include "crypto/asn1.h"
 
 /* Key Agreement Recipient Info (KARI) routines */

diff --git a/crypto/cms/cms_lib.c b/crypto/cms/cms_lib.c
index 29eacce..5de5e9d 100644
--- a/crypto/cms/cms_lib.c
+++ b/crypto/cms/cms_lib.c

@@ -14,7 +14,7 @@
 #include <openssl/bio.h>
 #include <openssl/asn1.h>
 #include <openssl/cms.h>
-#include "cms_lcl.h"
+#include "cms_local.h"
 
 IMPLEMENT_ASN1_FUNCTIONS(CMS_ContentInfo)
 IMPLEMENT_ASN1_PRINT_FUNCTION(CMS_ContentInfo)

diff --git a/crypto/cms/cms_lcl.h b/crypto/cms/cms_local.h
similarity index 100%
rename from crypto/cms/cms_lcl.h
rename to crypto/cms/cms_local.h


diff --git a/crypto/cms/cms_pwri.c b/crypto/cms/cms_pwri.c
index d1cb16f..740c7e6 100644
--- a/crypto/cms/cms_pwri.c
+++ b/crypto/cms/cms_pwri.c

@@ -15,7 +15,7 @@
 #include <openssl/cms.h>
 #include <openssl/rand.h>
 #include <openssl/aes.h>
-#include "cms_lcl.h"
+#include "cms_local.h"
 #include "crypto/asn1.h"
 
 int CMS_RecipientInfo_set0_password(CMS_RecipientInfo *ri,

diff --git a/crypto/cms/cms_sd.c b/crypto/cms/cms_sd.c
index 1cea861..b207ebe 100644
--- a/crypto/cms/cms_sd.c
+++ b/crypto/cms/cms_sd.c

@@ -15,7 +15,7 @@
 #include <openssl/err.h>
 #include <openssl/cms.h>
 #include <openssl/ess.h>
-#include "cms_lcl.h"
+#include "cms_local.h"
 #include "crypto/asn1.h"
 #include "crypto/evp.h"
 #include "crypto/cms.h"

diff --git a/crypto/cms/cms_smime.c b/crypto/cms/cms_smime.c
index 1117d74..171eeb3 100644
--- a/crypto/cms/cms_smime.c
+++ b/crypto/cms/cms_smime.c

@@ -13,7 +13,7 @@
 #include <openssl/x509v3.h>
 #include <openssl/err.h>
 #include <openssl/cms.h>
-#include "cms_lcl.h"
+#include "cms_local.h"
 #include "crypto/asn1.h"
 
 static BIO *cms_get_text_bio(BIO *out, unsigned int flags)

diff --git a/crypto/comp/c_zlib.c b/crypto/comp/c_zlib.c
index 17786e8..0d84a52 100644
--- a/crypto/comp/c_zlib.c
+++ b/crypto/comp/c_zlib.c

@@ -15,7 +15,7 @@
 #include <openssl/err.h>
 #include "crypto/cryptlib.h"
 #include "internal/bio.h"
-#include "comp_lcl.h"
+#include "comp_local.h"
 
 COMP_METHOD *COMP_zlib(void);
 

diff --git a/crypto/comp/comp_lib.c b/crypto/comp/comp_lib.c
index 44f0478..49195de 100644
--- a/crypto/comp/comp_lib.c
+++ b/crypto/comp/comp_lib.c

@@ -13,7 +13,7 @@
 #include <openssl/objects.h>
 #include <openssl/comp.h>
 #include <openssl/err.h>
-#include "comp_lcl.h"
+#include "comp_local.h"
 
 COMP_CTX *COMP_CTX_new(COMP_METHOD *meth)
 {

diff --git a/crypto/comp/comp_lcl.h b/crypto/comp/comp_local.h
similarity index 100%
rename from crypto/comp/comp_lcl.h
rename to crypto/comp/comp_local.h


diff --git a/crypto/conf/conf_lcl.h b/crypto/conf/conf_local.h
similarity index 100%
rename from crypto/conf/conf_lcl.h
rename to crypto/conf/conf_local.h


diff --git a/crypto/conf/conf_mall.c b/crypto/conf/conf_mall.c
index 28003a8..033c1ad 100644
--- a/crypto/conf/conf_mall.c
+++ b/crypto/conf/conf_mall.c

@@ -15,7 +15,7 @@
 #include <openssl/asn1.h>
 #include <openssl/engine.h>
 #include "internal/provider.h"
-#include "conf_lcl.h"
+#include "conf_local.h"
 
 /* Load all OpenSSL builtin modules */
 

diff --git a/crypto/conf/conf_ssl.c b/crypto/conf/conf_ssl.c
index d703f73..5855c50 100644
--- a/crypto/conf/conf_ssl.c
+++ b/crypto/conf/conf_ssl.c

@@ -12,7 +12,7 @@
 #include <openssl/conf.h>
 #include <openssl/err.h>
 #include "internal/sslconf.h"
-#include "conf_lcl.h"
+#include "conf_local.h"
 
 /*
  * SSL library configuration module placeholder. We load it here but defer

diff --git a/crypto/crmf/crmf_asn.c b/crypto/crmf/crmf_asn.c
index 05442c2..4380156 100644
--- a/crypto/crmf/crmf_asn.c
+++ b/crypto/crmf/crmf_asn.c

@@ -13,7 +13,7 @@
 
 #include <openssl/asn1t.h>
 
-#include "crmf_int.h"
+#include "crmf_local.h"
 
 /* explicit #includes not strictly needed since implied by the above: */
 #include <openssl/crmf.h>

diff --git a/crypto/crmf/crmf_lib.c b/crypto/crmf/crmf_lib.c
index 8544401..6ba3f7a 100644
--- a/crypto/crmf/crmf_lib.c
+++ b/crypto/crmf/crmf_lib.c

@@ -28,8 +28,8 @@
 
 #include <openssl/asn1t.h>
 
-#include "crmf_int.h"
-#include "internal/constant_time_locl.h"
+#include "crmf_local.h"
+#include "internal/constant_time.h"
 
 /* explicit #includes not strictly needed since implied by the above: */
 #include <openssl/crmf.h>

diff --git a/crypto/crmf/crmf_int.h b/crypto/crmf/crmf_local.h
similarity index 100%
rename from crypto/crmf/crmf_int.h
rename to crypto/crmf/crmf_local.h


diff --git a/crypto/crmf/crmf_pbm.c b/crypto/crmf/crmf_pbm.c
index 47dc86a..c5e08c4 100644
--- a/crypto/crmf/crmf_pbm.c
+++ b/crypto/crmf/crmf_pbm.c

@@ -17,7 +17,7 @@
 #include <openssl/rand.h>
 #include <openssl/evp.h>
 
-#include "crmf_int.h"
+#include "crmf_local.h"
 
 /* explicit #includes not strictly needed since implied by the above: */
 #include <openssl/asn1t.h>

diff --git a/crypto/ct/ct_b64.c b/crypto/ct/ct_b64.c
index cacec2f..f080088 100644
--- a/crypto/ct/ct_b64.c
+++ b/crypto/ct/ct_b64.c

@@ -14,7 +14,7 @@
 #include <openssl/err.h>
 #include <openssl/evp.h>
 
-#include "ct_locl.h"
+#include "ct_local.h"
 
 /*
  * Decodes the base64 string |in| into |out|.

diff --git a/crypto/ct/ct_locl.h b/crypto/ct/ct_local.h
similarity index 100%
rename from crypto/ct/ct_locl.h
rename to crypto/ct/ct_local.h


diff --git a/crypto/ct/ct_oct.c b/crypto/ct/ct_oct.c
index 76fc222..cdab02f 100644
--- a/crypto/ct/ct_oct.c
+++ b/crypto/ct/ct_oct.c

@@ -19,7 +19,7 @@
 #include <openssl/ct.h>
 #include <openssl/err.h>
 
-#include "ct_locl.h"
+#include "ct_local.h"
 
 int o2i_SCT_signature(SCT *sct, const unsigned char **in, size_t len)
 {

diff --git a/crypto/ct/ct_policy.c b/crypto/ct/ct_policy.c
index 9331147..0305970 100644
--- a/crypto/ct/ct_policy.c
+++ b/crypto/ct/ct_policy.c

@@ -15,7 +15,7 @@
 #include <openssl/err.h>
 #include <time.h>
 
-#include "ct_locl.h"
+#include "ct_local.h"
 
 /*
  * Number of seconds in the future that an SCT timestamp can be, by default,

diff --git a/crypto/ct/ct_prn.c b/crypto/ct/ct_prn.c
index 62d0123..4c5760d 100644
--- a/crypto/ct/ct_prn.c
+++ b/crypto/ct/ct_prn.c

@@ -14,7 +14,7 @@
 #include <openssl/asn1.h>
 #include <openssl/bio.h>
 
-#include "ct_locl.h"
+#include "ct_local.h"
 
 static void SCT_signature_algorithms_print(const SCT *sct, BIO *out)
 {

diff --git a/crypto/ct/ct_sct.c b/crypto/ct/ct_sct.c
index ce2f814..bd510d9 100644
--- a/crypto/ct/ct_sct.c
+++ b/crypto/ct/ct_sct.c

@@ -17,7 +17,7 @@
 #include <openssl/tls1.h>
 #include <openssl/x509.h>
 
-#include "ct_locl.h"
+#include "ct_local.h"
 
 SCT *SCT_new(void)
 {

diff --git a/crypto/ct/ct_sct_ctx.c b/crypto/ct/ct_sct_ctx.c
index 64d97b6..aa9d2d7 100644
--- a/crypto/ct/ct_sct_ctx.c
+++ b/crypto/ct/ct_sct_ctx.c

@@ -18,7 +18,7 @@
 #include <openssl/obj_mac.h>
 #include <openssl/x509.h>
 
-#include "ct_locl.h"
+#include "ct_local.h"
 
 SCT_CTX *SCT_CTX_new(void)
 {

diff --git a/crypto/ct/ct_vfy.c b/crypto/ct/ct_vfy.c
index c686de6..f206edd 100644
--- a/crypto/ct/ct_vfy.c
+++ b/crypto/ct/ct_vfy.c

@@ -14,7 +14,7 @@
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 
-#include "ct_locl.h"
+#include "ct_local.h"
 
 typedef enum sct_signature_type_t {
     SIGNATURE_TYPE_NOT_SET = -1,

diff --git a/crypto/ct/ct_x509v3.c b/crypto/ct/ct_x509v3.c
index 92d088a..1665b98 100644
--- a/crypto/ct/ct_x509v3.c
+++ b/crypto/ct/ct_x509v3.c

@@ -11,7 +11,7 @@
 # error "CT is disabled"
 #endif
 
-#include "ct_locl.h"
+#include "ct_local.h"
 
 static char *i2s_poison(const X509V3_EXT_METHOD *method, void *val)
 {

diff --git a/crypto/des/cbc_cksm.c b/crypto/des/cbc_cksm.c
index 707841b..1fb76b5 100644
--- a/crypto/des/cbc_cksm.c
+++ b/crypto/des/cbc_cksm.c

@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "des_locl.h"
+#include "des_local.h"
 
 DES_LONG DES_cbc_cksum(const unsigned char *in, DES_cblock *output,
                        long length, DES_key_schedule *schedule,

diff --git a/crypto/des/cfb64ede.c b/crypto/des/cfb64ede.c
index 82e9a37..cb5dad2 100644
--- a/crypto/des/cfb64ede.c
+++ b/crypto/des/cfb64ede.c

@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "des_locl.h"
+#include "des_local.h"
 
 /*
  * The input and output encrypted as though 64bit cfb mode is being used.

diff --git a/crypto/des/cfb64enc.c b/crypto/des/cfb64enc.c
index 8a75626..7c44f2a 100644
--- a/crypto/des/cfb64enc.c
+++ b/crypto/des/cfb64enc.c

@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "des_locl.h"
+#include "des_local.h"
 
 /*
  * The input and output encrypted as though 64bit cfb mode is being used.

diff --git a/crypto/des/cfb_enc.c b/crypto/des/cfb_enc.c
index 6d3155e..8630cc4 100644
--- a/crypto/des/cfb_enc.c
+++ b/crypto/des/cfb_enc.c

@@ -8,7 +8,7 @@
  */
 
 #include "e_os.h"
-#include "des_locl.h"
+#include "des_local.h"
 #include <assert.h>
 
 /*

diff --git a/crypto/des/des_enc.c b/crypto/des/des_enc.c
index bb740f7..5666c6e 100644
--- a/crypto/des/des_enc.c
+++ b/crypto/des/des_enc.c

@@ -8,7 +8,7 @@
  */
 
 #include <openssl/crypto.h>
-#include "des_locl.h"
+#include "des_local.h"
 #include "spr.h"
 
 void DES_encrypt1(DES_LONG *data, DES_key_schedule *ks, int enc)

diff --git a/crypto/des/des_locl.h b/crypto/des/des_local.h
similarity index 100%
rename from crypto/des/des_locl.h
rename to crypto/des/des_local.h


diff --git a/crypto/des/ecb3_enc.c b/crypto/des/ecb3_enc.c
index dbd0b5f..7244b7b 100644
--- a/crypto/des/ecb3_enc.c
+++ b/crypto/des/ecb3_enc.c

@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "des_locl.h"
+#include "des_local.h"
 
 void DES_ecb3_encrypt(const_DES_cblock *input, DES_cblock *output,
                       DES_key_schedule *ks1, DES_key_schedule *ks2,

diff --git a/crypto/des/ecb_enc.c b/crypto/des/ecb_enc.c
index 6e0b33d..39b8237 100644
--- a/crypto/des/ecb_enc.c
+++ b/crypto/des/ecb_enc.c

@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "des_locl.h"
+#include "des_local.h"
 #include <openssl/opensslv.h>
 #include <openssl/bio.h>
 

diff --git a/crypto/des/fcrypt.c b/crypto/des/fcrypt.c
index 91f59cc..9aebf28 100644
--- a/crypto/des/fcrypt.c
+++ b/crypto/des/fcrypt.c

@@ -19,7 +19,7 @@
 #endif
 
 #include <openssl/crypto.h>
-#include "des_locl.h"
+#include "des_local.h"
 
 /*
  * Added more values to handle illegal salt values the way normal crypt()

diff --git a/crypto/des/fcrypt_b.c b/crypto/des/fcrypt_b.c
index c522ddd..87ad1b3 100644
--- a/crypto/des/fcrypt_b.c
+++ b/crypto/des/fcrypt_b.c

@@ -10,7 +10,7 @@
 #include <stdio.h>
 
 #define DES_FCRYPT
-#include "des_locl.h"
+#include "des_local.h"
 #undef DES_FCRYPT
 
 #undef PERM_OP

diff --git a/crypto/des/ncbc_enc.c b/crypto/des/ncbc_enc.c
index 1b73d82..e8decf1 100644
--- a/crypto/des/ncbc_enc.c
+++ b/crypto/des/ncbc_enc.c

@@ -13,7 +13,7 @@
  *    des_enc.c  (DES_ncbc_encrypt)
  */
 
-#include "des_locl.h"
+#include "des_local.h"
 
 #ifdef CBC_ENC_C__DONT_UPDATE_IV
 void DES_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,

diff --git a/crypto/des/ofb64ede.c b/crypto/des/ofb64ede.c
index 8e916e7..284224d 100644
--- a/crypto/des/ofb64ede.c
+++ b/crypto/des/ofb64ede.c

@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "des_locl.h"
+#include "des_local.h"
 
 /*
  * The input and output encrypted as though 64bit ofb mode is being used.

diff --git a/crypto/des/ofb64enc.c b/crypto/des/ofb64enc.c
index 519e163..eec46ae 100644
--- a/crypto/des/ofb64enc.c
+++ b/crypto/des/ofb64enc.c

@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "des_locl.h"
+#include "des_local.h"
 
 /*
  * The input and output encrypted as though 64bit ofb mode is being used.

diff --git a/crypto/des/ofb_enc.c b/crypto/des/ofb_enc.c
index 96fbec9..7510000 100644
--- a/crypto/des/ofb_enc.c
+++ b/crypto/des/ofb_enc.c

@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "des_locl.h"
+#include "des_local.h"
 
 /*
  * The input and output are loaded in multiples of 8 bits. What this means is

diff --git a/crypto/des/pcbc_enc.c b/crypto/des/pcbc_enc.c
index c7c11c2..13df942 100644
--- a/crypto/des/pcbc_enc.c
+++ b/crypto/des/pcbc_enc.c

@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "des_locl.h"
+#include "des_local.h"
 
 void DES_pcbc_encrypt(const unsigned char *input, unsigned char *output,
                       long length, DES_key_schedule *schedule,

diff --git a/crypto/des/qud_cksm.c b/crypto/des/qud_cksm.c
index b6ce887..5123914 100644
--- a/crypto/des/qud_cksm.c
+++ b/crypto/des/qud_cksm.c

@@ -13,7 +13,7 @@
  * only based on the code in this paper and is almost definitely not the same
  * as the MIT implementation.
  */
-#include "des_locl.h"
+#include "des_local.h"
 
 #define Q_B0(a) (((DES_LONG)(a)))
 #define Q_B1(a) (((DES_LONG)(a))<<8)

diff --git a/crypto/des/set_key.c b/crypto/des/set_key.c
index d42cebd..7972d84 100644
--- a/crypto/des/set_key.c
+++ b/crypto/des/set_key.c

@@ -16,7 +16,7 @@
  * 1.0 First working version
  */
 #include <openssl/crypto.h>
-#include "des_locl.h"
+#include "des_local.h"
 
 static const unsigned char odd_parity[256] = {
     1, 1, 2, 2, 4, 4, 7, 7, 8, 8, 11, 11, 13, 13, 14, 14,

diff --git a/crypto/des/str2key.c b/crypto/des/str2key.c
index 81416eb..d348c06 100644
--- a/crypto/des/str2key.c
+++ b/crypto/des/str2key.c

@@ -8,7 +8,7 @@
  */
 
 #include <openssl/crypto.h>
-#include "des_locl.h"
+#include "des_local.h"
 
 void DES_string_to_key(const char *str, DES_cblock *key)
 {

diff --git a/crypto/des/xcbc_enc.c b/crypto/des/xcbc_enc.c
index 7fdce59..8a952f6 100644
--- a/crypto/des/xcbc_enc.c
+++ b/crypto/des/xcbc_enc.c

@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "des_locl.h"
+#include "des_local.h"
 
 /* RSA's DESX */
 

diff --git a/crypto/dh/dh_ameth.c b/crypto/dh/dh_ameth.c
index c0bcf25..bb319e7 100644
--- a/crypto/dh/dh_ameth.c
+++ b/crypto/dh/dh_ameth.c

@@ -11,7 +11,7 @@
 #include "internal/cryptlib.h"
 #include <openssl/x509.h>
 #include <openssl/asn1.h>
-#include "dh_locl.h"
+#include "dh_local.h"
 #include <openssl/bn.h>
 #include "crypto/asn1.h"
 #include "crypto/evp.h"

diff --git a/crypto/dh/dh_asn1.c b/crypto/dh/dh_asn1.c
index 71379d7..2708a81 100644
--- a/crypto/dh/dh_asn1.c
+++ b/crypto/dh/dh_asn1.c

@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include "internal/cryptlib.h"
 #include <openssl/bn.h>
-#include "dh_locl.h"
+#include "dh_local.h"
 #include <openssl/objects.h>
 #include <openssl/asn1t.h>
 

diff --git a/crypto/dh/dh_check.c b/crypto/dh/dh_check.c
index 2d19a8f..45c699b 100644
--- a/crypto/dh/dh_check.c
+++ b/crypto/dh/dh_check.c

@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include "internal/cryptlib.h"
 #include <openssl/bn.h>
-#include "dh_locl.h"
+#include "dh_local.h"
 
 # define DH_NUMBER_ITERATIONS_FOR_PRIME 64
 

diff --git a/crypto/dh/dh_gen.c b/crypto/dh/dh_gen.c
index 76d6ad0..0506bbe 100644
--- a/crypto/dh/dh_gen.c
+++ b/crypto/dh/dh_gen.c

@@ -15,7 +15,7 @@
 #include <stdio.h>
 #include "internal/cryptlib.h"
 #include <openssl/bn.h>
-#include "dh_locl.h"
+#include "dh_local.h"
 
 static int dh_builtin_genparams(DH *ret, int prime_len, int generator,
                                 BN_GENCB *cb);

diff --git a/crypto/dh/dh_key.c b/crypto/dh/dh_key.c
index 71f748f..a8a9dbe 100644
--- a/crypto/dh/dh_key.c
+++ b/crypto/dh/dh_key.c

@@ -9,7 +9,7 @@
 
 #include <stdio.h>
 #include "internal/cryptlib.h"
-#include "dh_locl.h"
+#include "dh_local.h"
 #include "crypto/bn.h"
 
 static int generate_key(DH *dh);

diff --git a/crypto/dh/dh_lib.c b/crypto/dh/dh_lib.c
index 0382e44..670ba1f 100644
--- a/crypto/dh/dh_lib.c
+++ b/crypto/dh/dh_lib.c

@@ -11,7 +11,7 @@
 #include "internal/cryptlib.h"
 #include "internal/refcount.h"
 #include <openssl/bn.h>
-#include "dh_locl.h"
+#include "dh_local.h"
 #include <openssl/engine.h>
 
 int DH_set_method(DH *dh, const DH_METHOD *meth)

diff --git a/crypto/dh/dh_locl.h b/crypto/dh/dh_local.h
similarity index 100%
rename from crypto/dh/dh_locl.h
rename to crypto/dh/dh_local.h


diff --git a/crypto/dh/dh_meth.c b/crypto/dh/dh_meth.c
index 8cdb61f..be04b76 100644
--- a/crypto/dh/dh_meth.c
+++ b/crypto/dh/dh_meth.c

@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "dh_locl.h"
+#include "dh_local.h"
 #include <string.h>
 #include <openssl/err.h>
 

diff --git a/crypto/dh/dh_pmeth.c b/crypto/dh/dh_pmeth.c
index 1f0f3d4..9eb17b4 100644
--- a/crypto/dh/dh_pmeth.c
+++ b/crypto/dh/dh_pmeth.c

@@ -12,7 +12,7 @@
 #include <openssl/asn1t.h>
 #include <openssl/x509.h>
 #include <openssl/evp.h>
-#include "dh_locl.h"
+#include "dh_local.h"
 #include <openssl/bn.h>
 #include <openssl/dsa.h>
 #include <openssl/objects.h>

diff --git a/crypto/dh/dh_rfc5114.c b/crypto/dh/dh_rfc5114.c
index 143a19f..823f6d9 100644
--- a/crypto/dh/dh_rfc5114.c
+++ b/crypto/dh/dh_rfc5114.c

@@ -9,7 +9,7 @@
 
 #include <stdio.h>
 #include "internal/cryptlib.h"
-#include "dh_locl.h"
+#include "dh_local.h"
 #include <openssl/bn.h>
 #include "crypto/bn_dh.h"
 

diff --git a/crypto/dh/dh_rfc7919.c b/crypto/dh/dh_rfc7919.c
index d634dbc..e36712f 100644
--- a/crypto/dh/dh_rfc7919.c
+++ b/crypto/dh/dh_rfc7919.c

@@ -9,7 +9,7 @@
 
 #include <stdio.h>
 #include "internal/cryptlib.h"
-#include "dh_locl.h"
+#include "dh_local.h"
 #include <openssl/bn.h>
 #include <openssl/objects.h>
 #include "crypto/bn_dh.h"

diff --git a/crypto/dsa/dsa_ameth.c b/crypto/dsa/dsa_ameth.c
index 3866461..3fbec04 100644
--- a/crypto/dsa/dsa_ameth.c
+++ b/crypto/dsa/dsa_ameth.c

@@ -17,7 +17,7 @@
 #include "crypto/asn1.h"
 #include "crypto/evp.h"
 #include "internal/param_build.h"
-#include "dsa_locl.h"
+#include "dsa_local.h"
 
 static int dsa_pub_decode(EVP_PKEY *pkey, X509_PUBKEY *pubkey)
 {

diff --git a/crypto/dsa/dsa_asn1.c b/crypto/dsa/dsa_asn1.c
index 55c4522..bf16e28 100644
--- a/crypto/dsa/dsa_asn1.c
+++ b/crypto/dsa/dsa_asn1.c

@@ -9,7 +9,7 @@
 
 #include <stdio.h>
 #include "internal/cryptlib.h"
-#include "dsa_locl.h"
+#include "dsa_local.h"
 #include <openssl/asn1.h>
 #include <openssl/asn1t.h>
 #include <openssl/rand.h>

diff --git a/crypto/dsa/dsa_gen.c b/crypto/dsa/dsa_gen.c
index 14cb8e9..00feba3 100644
--- a/crypto/dsa/dsa_gen.c
+++ b/crypto/dsa/dsa_gen.c

@@ -21,7 +21,7 @@
 #include <openssl/bn.h>
 #include <openssl/rand.h>
 #include <openssl/sha.h>
-#include "dsa_locl.h"
+#include "dsa_local.h"
 
 int DSA_generate_parameters_ex(DSA *ret, int bits,
                                const unsigned char *seed_in, int seed_len,

diff --git a/crypto/dsa/dsa_key.c b/crypto/dsa/dsa_key.c
index 86f79b8..6e5039a 100644
--- a/crypto/dsa/dsa_key.c
+++ b/crypto/dsa/dsa_key.c

@@ -11,7 +11,7 @@
 #include <time.h>
 #include "internal/cryptlib.h"
 #include <openssl/bn.h>
-#include "dsa_locl.h"
+#include "dsa_local.h"
 
 static int dsa_builtin_keygen(DSA *dsa);
 

diff --git a/crypto/dsa/dsa_lib.c b/crypto/dsa/dsa_lib.c
index 034300f..4670c43 100644
--- a/crypto/dsa/dsa_lib.c
+++ b/crypto/dsa/dsa_lib.c

@@ -11,7 +11,7 @@
 #include "internal/cryptlib.h"
 #include "internal/refcount.h"
 #include <openssl/bn.h>
-#include "dsa_locl.h"
+#include "dsa_local.h"
 #include <openssl/asn1.h>
 #include <openssl/engine.h>
 #include <openssl/dh.h>

diff --git a/crypto/dsa/dsa_locl.h b/crypto/dsa/dsa_local.h
similarity index 100%
rename from crypto/dsa/dsa_locl.h
rename to crypto/dsa/dsa_local.h


diff --git a/crypto/dsa/dsa_meth.c b/crypto/dsa/dsa_meth.c
index 2202260..226ea34 100644
--- a/crypto/dsa/dsa_meth.c
+++ b/crypto/dsa/dsa_meth.c

@@ -15,7 +15,7 @@
  * or in the file LICENSE in the source distribution.
  */
 
-#include "dsa_locl.h"
+#include "dsa_local.h"
 #include <string.h>
 #include <openssl/err.h>
 

diff --git a/crypto/dsa/dsa_ossl.c b/crypto/dsa/dsa_ossl.c
index 0b9a0af..5e34fc5 100644
--- a/crypto/dsa/dsa_ossl.c
+++ b/crypto/dsa/dsa_ossl.c

@@ -12,7 +12,7 @@
 #include "crypto/bn.h"
 #include <openssl/bn.h>
 #include <openssl/sha.h>
-#include "dsa_locl.h"
+#include "dsa_local.h"
 #include <openssl/asn1.h>
 
 static DSA_SIG *dsa_do_sign(const unsigned char *dgst, int dlen, DSA *dsa);

diff --git a/crypto/dsa/dsa_pmeth.c b/crypto/dsa/dsa_pmeth.c
index 93e84b9..24d5dbd 100644
--- a/crypto/dsa/dsa_pmeth.c
+++ b/crypto/dsa/dsa_pmeth.c

@@ -14,7 +14,7 @@
 #include <openssl/evp.h>
 #include <openssl/bn.h>
 #include "crypto/evp.h"
-#include "dsa_locl.h"
+#include "dsa_local.h"
 
 /* DSA pkey context structure */
 

diff --git a/crypto/dsa/dsa_sign.c b/crypto/dsa/dsa_sign.c
index 19582a0..68501ef 100644
--- a/crypto/dsa/dsa_sign.c
+++ b/crypto/dsa/dsa_sign.c

@@ -8,7 +8,7 @@
  */
 
 #include "internal/cryptlib.h"
-#include "dsa_locl.h"
+#include "dsa_local.h"
 #include <openssl/bn.h>
 
 DSA_SIG *DSA_do_sign(const unsigned char *dgst, int dlen, DSA *dsa)

diff --git a/crypto/dsa/dsa_vrf.c b/crypto/dsa/dsa_vrf.c
index 4066aa6..cf4412b 100644
--- a/crypto/dsa/dsa_vrf.c
+++ b/crypto/dsa/dsa_vrf.c

@@ -8,7 +8,7 @@
  */
 
 #include "internal/cryptlib.h"
-#include "dsa_locl.h"
+#include "dsa_local.h"
 
 int DSA_do_verify(const unsigned char *dgst, int dgst_len, DSA_SIG *sig,
                   DSA *dsa)

diff --git a/crypto/dso/dso_dl.c b/crypto/dso/dso_dl.c
index 1ce3ac6..5469789 100644
--- a/crypto/dso/dso_dl.c
+++ b/crypto/dso/dso_dl.c

@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "dso_locl.h"
+#include "dso_local.h"
 
 #ifdef DSO_DL
 

diff --git a/crypto/dso/dso_dlfcn.c b/crypto/dso/dso_dlfcn.c
index d076c7e..b01c2f6 100644
--- a/crypto/dso/dso_dlfcn.c
+++ b/crypto/dso/dso_dlfcn.c

@@ -16,7 +16,7 @@
 # define _GNU_SOURCE            /* make sure dladdr is declared */
 #endif
 
-#include "dso_locl.h"
+#include "dso_local.h"
 #include "e_os.h"
 
 #ifdef DSO_DLFCN

diff --git a/crypto/dso/dso_lib.c b/crypto/dso/dso_lib.c
index f1b193b..a464c39 100644
--- a/crypto/dso/dso_lib.c
+++ b/crypto/dso/dso_lib.c

@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "dso_locl.h"
+#include "dso_local.h"
 #include "internal/refcount.h"
 
 static DSO_METHOD *default_DSO_meth = NULL;

diff --git a/crypto/dso/dso_locl.h b/crypto/dso/dso_local.h
similarity index 100%
rename from crypto/dso/dso_locl.h
rename to crypto/dso/dso_local.h


diff --git a/crypto/dso/dso_openssl.c b/crypto/dso/dso_openssl.c
index 0e24438..3f264a6 100644
--- a/crypto/dso/dso_openssl.c
+++ b/crypto/dso/dso_openssl.c

@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "dso_locl.h"
+#include "dso_local.h"
 
 #ifdef DSO_NONE
 

diff --git a/crypto/dso/dso_vms.c b/crypto/dso/dso_vms.c
index 8b0af2e..d1993ce 100644
--- a/crypto/dso/dso_vms.c
+++ b/crypto/dso/dso_vms.c

@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "dso_locl.h"
+#include "dso_local.h"
 
 #ifdef OPENSSL_SYS_VMS
 

diff --git a/crypto/dso/dso_win32.c b/crypto/dso/dso_win32.c
index 9c77992..adf2e63 100644
--- a/crypto/dso/dso_win32.c
+++ b/crypto/dso/dso_win32.c

@@ -8,7 +8,7 @@
  */
 
 #include "e_os.h"
-#include "dso_locl.h"
+#include "dso_local.h"
 
 #if defined(DSO_WIN32)
 

diff --git a/crypto/ec/curve25519.c b/crypto/ec/curve25519.c
index ca2b6cc..89b1e3c 100644
--- a/crypto/ec/curve25519.c
+++ b/crypto/ec/curve25519.c

@@ -8,7 +8,7 @@
  */
 
 #include <string.h>
-#include "ec_lcl.h"
+#include "ec_local.h"
 #include <openssl/sha.h>
 
 #if defined(X25519_ASM) && (defined(__x86_64) || defined(__x86_64__) || \

diff --git a/crypto/ec/curve448/arch_32/arch_intrinsics.h b/crypto/ec/curve448/arch_32/arch_intrinsics.h
index 5db66f4..80b4d39 100644
--- a/crypto/ec/curve448/arch_32/arch_intrinsics.h
+++ b/crypto/ec/curve448/arch_32/arch_intrinsics.h

@@ -13,7 +13,7 @@
 #ifndef HEADER_ARCH_32_ARCH_INTRINSICS_H
 # define HEADER_ARCH_32_ARCH_INTRINSICS_H
 
-#include "internal/constant_time_locl.h"
+#include "internal/constant_time.h"
 
 # define ARCH_WORD_BITS 32
 

diff --git a/crypto/ec/curve448/curve448.c b/crypto/ec/curve448/curve448.c
index 59f4479..e3dffd0 100644
--- a/crypto/ec/curve448/curve448.c
+++ b/crypto/ec/curve448/curve448.c

@@ -15,7 +15,7 @@
 
 #include "point_448.h"
 #include "ed448.h"
-#include "curve448_lcl.h"
+#include "curve448_local.h"
 
 #define COFACTOR 4
 

diff --git a/crypto/ec/curve448/curve448_lcl.h b/crypto/ec/curve448/curve448_local.h
similarity index 100%
rename from crypto/ec/curve448/curve448_lcl.h
rename to crypto/ec/curve448/curve448_local.h


diff --git a/crypto/ec/curve448/eddsa.c b/crypto/ec/curve448/eddsa.c
index 45b6c4a..95fd665 100644
--- a/crypto/ec/curve448/eddsa.c
+++ b/crypto/ec/curve448/eddsa.c

@@ -12,7 +12,7 @@
 #include <string.h>
 #include <openssl/crypto.h>
 #include <openssl/evp.h>
-#include "curve448_lcl.h"
+#include "curve448_local.h"
 #include "word.h"
 #include "ed448.h"
 #include "internal/numbers.h"

diff --git a/crypto/ec/curve448/field.h b/crypto/ec/curve448/field.h
index 4e46d3e..1bade8b 100644
--- a/crypto/ec/curve448/field.h
+++ b/crypto/ec/curve448/field.h

@@ -13,7 +13,7 @@
 #ifndef HEADER_FIELD_H
 # define HEADER_FIELD_H
 
-# include "internal/constant_time_locl.h"
+# include "internal/constant_time.h"
 # include <string.h>
 # include <assert.h>
 # include "word.h"

diff --git a/crypto/ec/ec2_oct.c b/crypto/ec/ec2_oct.c
index f9ee3be..1f92680 100644
--- a/crypto/ec/ec2_oct.c
+++ b/crypto/ec/ec2_oct.c

@@ -10,7 +10,7 @@
 
 #include <openssl/err.h>
 
-#include "ec_lcl.h"
+#include "ec_local.h"
 
 #ifndef OPENSSL_NO_EC2M
 

diff --git a/crypto/ec/ec2_smpl.c b/crypto/ec/ec2_smpl.c
index a9e9a4c..21ce6e1 100644
--- a/crypto/ec/ec2_smpl.c
+++ b/crypto/ec/ec2_smpl.c

@@ -11,7 +11,7 @@
 #include <openssl/err.h>
 
 #include "crypto/bn.h"
-#include "ec_lcl.h"
+#include "ec_local.h"
 
 #ifndef OPENSSL_NO_EC2M
 

diff --git a/crypto/ec/ec_ameth.c b/crypto/ec/ec_ameth.c
index 74124bd..a0965ea 100644
--- a/crypto/ec/ec_ameth.c
+++ b/crypto/ec/ec_ameth.c

@@ -16,7 +16,7 @@
 #include <openssl/asn1t.h>
 #include "crypto/asn1.h"
 #include "crypto/evp.h"
-#include "ec_lcl.h"
+#include "ec_local.h"
 
 #ifndef OPENSSL_NO_CMS
 static int ecdh_cms_decrypt(CMS_RecipientInfo *ri);

diff --git a/crypto/ec/ec_asn1.c b/crypto/ec/ec_asn1.c
index 9a8a800..128ea71 100644
--- a/crypto/ec/ec_asn1.c
+++ b/crypto/ec/ec_asn1.c

@@ -8,7 +8,7 @@
  */
 
 #include <string.h>
-#include "ec_lcl.h"
+#include "ec_local.h"
 #include <openssl/err.h>
 #include <openssl/asn1t.h>
 #include <openssl/objects.h>

diff --git a/crypto/ec/ec_check.c b/crypto/ec/ec_check.c
index 974fcb2..f8723aa 100644
--- a/crypto/ec/ec_check.c
+++ b/crypto/ec/ec_check.c

@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "ec_lcl.h"
+#include "ec_local.h"
 #include <openssl/err.h>
 
 int EC_GROUP_check_named_curve(const EC_GROUP *group, int nist_only,

diff --git a/crypto/ec/ec_curve.c b/crypto/ec/ec_curve.c
index bf10938..2639b1b 100644
--- a/crypto/ec/ec_curve.c
+++ b/crypto/ec/ec_curve.c

@@ -9,7 +9,7 @@
  */
 
 #include <string.h>
-#include "ec_lcl.h"
+#include "ec_local.h"
 #include <openssl/err.h>
 #include <openssl/obj_mac.h>
 #include <openssl/opensslconf.h>

diff --git a/crypto/ec/ec_cvt.c b/crypto/ec/ec_cvt.c
index 4b4096b..ec8989f 100644
--- a/crypto/ec/ec_cvt.c
+++ b/crypto/ec/ec_cvt.c

@@ -10,7 +10,7 @@
 
 #include <openssl/err.h>
 #include "crypto/bn.h"
-#include "ec_lcl.h"
+#include "ec_local.h"
 
 EC_GROUP *EC_GROUP_new_curve_GFp(const BIGNUM *p, const BIGNUM *a,
                                  const BIGNUM *b, BN_CTX *ctx)

diff --git a/crypto/ec/ec_key.c b/crypto/ec/ec_key.c
index 6a02a3b..2ae5a65 100644
--- a/crypto/ec/ec_key.c
+++ b/crypto/ec/ec_key.c

@@ -10,7 +10,7 @@
 
 #include "internal/cryptlib.h"
 #include <string.h>
-#include "ec_lcl.h"
+#include "ec_local.h"
 #include "internal/refcount.h"
 #include <openssl/err.h>
 #include <openssl/engine.h>

diff --git a/crypto/ec/ec_kmeth.c b/crypto/ec/ec_kmeth.c
index 036fec8..9556a94 100644
--- a/crypto/ec/ec_kmeth.c
+++ b/crypto/ec/ec_kmeth.c

@@ -11,7 +11,7 @@
 #include <openssl/ec.h>
 #include <openssl/engine.h>
 #include <openssl/err.h>
-#include "ec_lcl.h"
+#include "ec_local.h"
 
 
 static const EC_KEY_METHOD openssl_ec_key_method = {

diff --git a/crypto/ec/ec_lib.c b/crypto/ec/ec_lib.c
index bc52e63..e45b835 100644
--- a/crypto/ec/ec_lib.c
+++ b/crypto/ec/ec_lib.c

@@ -13,7 +13,7 @@
 #include <openssl/err.h>
 #include <openssl/opensslv.h>
 
-#include "ec_lcl.h"
+#include "ec_local.h"
 
 /* functions for EC_GROUP objects */
 

diff --git a/crypto/ec/ec_lcl.h b/crypto/ec/ec_local.h
similarity index 100%
rename from crypto/ec/ec_lcl.h
rename to crypto/ec/ec_local.h


diff --git a/crypto/ec/ec_mult.c b/crypto/ec/ec_mult.c
index 1710dec..2f2e66c 100644
--- a/crypto/ec/ec_mult.c
+++ b/crypto/ec/ec_mult.c

@@ -13,7 +13,7 @@
 
 #include "internal/cryptlib.h"
 #include "crypto/bn.h"
-#include "ec_lcl.h"
+#include "ec_local.h"
 #include "internal/refcount.h"
 
 /*

diff --git a/crypto/ec/ec_oct.c b/crypto/ec/ec_oct.c
index 8783b59..e9b1b87 100644
--- a/crypto/ec/ec_oct.c
+++ b/crypto/ec/ec_oct.c

@@ -13,7 +13,7 @@
 #include <openssl/err.h>
 #include <openssl/opensslv.h>
 
-#include "ec_lcl.h"
+#include "ec_local.h"
 
 int EC_POINT_set_compressed_coordinates(const EC_GROUP *group, EC_POINT *point,
                                         const BIGNUM *x, int y_bit, BN_CTX *ctx)

diff --git a/crypto/ec/ec_pmeth.c b/crypto/ec/ec_pmeth.c
index 5834b86..1750e43 100644
--- a/crypto/ec/ec_pmeth.c
+++ b/crypto/ec/ec_pmeth.c

@@ -12,7 +12,7 @@
 #include <openssl/asn1t.h>
 #include <openssl/x509.h>
 #include <openssl/ec.h>
-#include "ec_lcl.h"
+#include "ec_local.h"
 #include <openssl/evp.h>
 #include "crypto/evp.h"
 

diff --git a/crypto/ec/ec_print.c b/crypto/ec/ec_print.c
index 0315b7a..bb372d8 100644
--- a/crypto/ec/ec_print.c
+++ b/crypto/ec/ec_print.c

@@ -9,7 +9,7 @@
 
 #include <openssl/crypto.h>
 #include <openssl/err.h>
-#include "ec_lcl.h"
+#include "ec_local.h"
 
 BIGNUM *EC_POINT_point2bn(const EC_GROUP *group,
                           const EC_POINT *point,

diff --git a/crypto/ec/ecdh_kdf.c b/crypto/ec/ecdh_kdf.c
index a190809..8c4d530 100644
--- a/crypto/ec/ecdh_kdf.c
+++ b/crypto/ec/ecdh_kdf.c

@@ -12,7 +12,7 @@
 #include <openssl/ec.h>
 #include <openssl/evp.h>
 #include <openssl/kdf.h>
-#include "ec_lcl.h"
+#include "ec_local.h"
 
 /* Key derivation function from X9.63/SECG */
 int ecdh_KDF_X9_63(unsigned char *out, size_t outlen,

diff --git a/crypto/ec/ecdh_ossl.c b/crypto/ec/ecdh_ossl.c
index b3fb879..5c64ce1 100644
--- a/crypto/ec/ecdh_ossl.c
+++ b/crypto/ec/ecdh_ossl.c

@@ -17,7 +17,7 @@
 #include <openssl/bn.h>
 #include <openssl/objects.h>
 #include <openssl/ec.h>
-#include "ec_lcl.h"
+#include "ec_local.h"
 
 int ossl_ecdh_compute_key(unsigned char **psec, size_t *pseclen,
                           const EC_POINT *pub_key, const EC_KEY *ecdh)

diff --git a/crypto/ec/ecdsa_ossl.c b/crypto/ec/ecdsa_ossl.c
index 432002c..5593d5d 100644
--- a/crypto/ec/ecdsa_ossl.c
+++ b/crypto/ec/ecdsa_ossl.c

@@ -12,7 +12,7 @@
 #include <openssl/obj_mac.h>
 #include <openssl/rand.h>
 #include "crypto/bn.h"
-#include "ec_lcl.h"
+#include "ec_local.h"
 
 int ossl_ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in, BIGNUM **kinvp,
                           BIGNUM **rp)

diff --git a/crypto/ec/ecdsa_sign.c b/crypto/ec/ecdsa_sign.c
index 01b3a6f..7d0215b 100644
--- a/crypto/ec/ecdsa_sign.c
+++ b/crypto/ec/ecdsa_sign.c

@@ -8,7 +8,7 @@
  */
 
 #include <openssl/ec.h>
-#include "ec_lcl.h"
+#include "ec_local.h"
 #include <openssl/err.h>
 
 ECDSA_SIG *ECDSA_do_sign(const unsigned char *dgst, int dlen, EC_KEY *eckey)

diff --git a/crypto/ec/ecdsa_vrf.c b/crypto/ec/ecdsa_vrf.c
index 7773dff..75dfe5b 100644
--- a/crypto/ec/ecdsa_vrf.c
+++ b/crypto/ec/ecdsa_vrf.c

@@ -8,7 +8,7 @@
  */
 
 #include <openssl/ec.h>
-#include "ec_lcl.h"
+#include "ec_local.h"
 #include <openssl/err.h>
 
 /*-

diff --git a/crypto/ec/ecp_mont.c b/crypto/ec/ecp_mont.c
index 61a203c..44b6635 100644
--- a/crypto/ec/ecp_mont.c
+++ b/crypto/ec/ecp_mont.c

@@ -10,7 +10,7 @@
 
 #include <openssl/err.h>
 
-#include "ec_lcl.h"
+#include "ec_local.h"
 
 const EC_METHOD *EC_GFp_mont_method(void)
 {

diff --git a/crypto/ec/ecp_nist.c b/crypto/ec/ecp_nist.c
index 99cc74b..3b5666d 100644
--- a/crypto/ec/ecp_nist.c
+++ b/crypto/ec/ecp_nist.c

@@ -12,7 +12,7 @@
 
 #include <openssl/err.h>
 #include <openssl/obj_mac.h>
-#include "ec_lcl.h"
+#include "ec_local.h"
 
 const EC_METHOD *EC_GFp_nist_method(void)
 {

diff --git a/crypto/ec/ecp_nistp224.c b/crypto/ec/ecp_nistp224.c
index 8922a47..a726f8e 100644
--- a/crypto/ec/ecp_nistp224.c
+++ b/crypto/ec/ecp_nistp224.c

@@ -38,7 +38,7 @@
 # include <stdint.h>
 # include <string.h>
 # include <openssl/err.h>
-# include "ec_lcl.h"
+# include "ec_local.h"
 
 # if defined(__SIZEOF_INT128__) && __SIZEOF_INT128__==16
   /* even with gcc, the typedef won't work for 32-bit platforms */

diff --git a/crypto/ec/ecp_nistp256.c b/crypto/ec/ecp_nistp256.c
index 4d284fa..4cbac52 100644
--- a/crypto/ec/ecp_nistp256.c
+++ b/crypto/ec/ecp_nistp256.c

@@ -39,7 +39,7 @@
 # include <stdint.h>
 # include <string.h>
 # include <openssl/err.h>
-# include "ec_lcl.h"
+# include "ec_local.h"
 
 # if defined(__SIZEOF_INT128__) && __SIZEOF_INT128__==16
   /* even with gcc, the typedef won't work for 32-bit platforms */

diff --git a/crypto/ec/ecp_nistp521.c b/crypto/ec/ecp_nistp521.c
index 7b134bb..6b5dc8e 100644
--- a/crypto/ec/ecp_nistp521.c
+++ b/crypto/ec/ecp_nistp521.c

@@ -38,7 +38,7 @@
 
 # include <string.h>
 # include <openssl/err.h>
-# include "ec_lcl.h"
+# include "ec_local.h"
 
 # if defined(__SIZEOF_INT128__) && __SIZEOF_INT128__==16
   /* even with gcc, the typedef won't work for 32-bit platforms */

diff --git a/crypto/ec/ecp_nistputil.c b/crypto/ec/ecp_nistputil.c
index 0715370..98e0b72 100644
--- a/crypto/ec/ecp_nistputil.c
+++ b/crypto/ec/ecp_nistputil.c

@@ -33,7 +33,7 @@
  */
 
 # include <stddef.h>
-# include "ec_lcl.h"
+# include "ec_local.h"
 
 /*
  * Convert an array of points into affine coordinates. (If the point at

diff --git a/crypto/ec/ecp_nistz256.c b/crypto/ec/ecp_nistz256.c
index f0f3ae3..603557c 100644
--- a/crypto/ec/ecp_nistz256.c
+++ b/crypto/ec/ecp_nistz256.c

@@ -22,7 +22,7 @@
 
 #include "internal/cryptlib.h"
 #include "crypto/bn.h"
-#include "ec_lcl.h"
+#include "ec_local.h"
 #include "internal/refcount.h"
 
 #if BN_BITS2 != 64

diff --git a/crypto/ec/ecp_oct.c b/crypto/ec/ecp_oct.c
index a00eac3..e6bc153 100644
--- a/crypto/ec/ecp_oct.c
+++ b/crypto/ec/ecp_oct.c

@@ -11,7 +11,7 @@
 #include <openssl/err.h>
 #include <openssl/symhacks.h>
 
-#include "ec_lcl.h"
+#include "ec_local.h"
 
 int ec_GFp_simple_set_compressed_coordinates(const EC_GROUP *group,
                                              EC_POINT *point,

diff --git a/crypto/ec/ecp_s390x_nistp.c b/crypto/ec/ecp_s390x_nistp.c
index 9533698..a7cb5d3 100644
--- a/crypto/ec/ecp_s390x_nistp.c
+++ b/crypto/ec/ecp_s390x_nistp.c

@@ -11,7 +11,7 @@
 #include <string.h>
 #include <openssl/err.h>
 #include <openssl/rand.h>
-#include "ec_lcl.h"
+#include "ec_local.h"
 #include "s390x_arch.h"
 
 /* Size of parameter blocks */

diff --git a/crypto/ec/ecp_smpl.c b/crypto/ec/ecp_smpl.c
index bf7aeb1..e06177e 100644
--- a/crypto/ec/ecp_smpl.c
+++ b/crypto/ec/ecp_smpl.c

@@ -11,7 +11,7 @@
 #include <openssl/err.h>
 #include <openssl/symhacks.h>
 
-#include "ec_lcl.h"
+#include "ec_local.h"
 
 const EC_METHOD *EC_GFp_simple_method(void)
 {

diff --git a/crypto/ec/ecx_meth.c b/crypto/ec/ecx_meth.c
index 2eedba3..eace1a8 100644
--- a/crypto/ec/ecx_meth.c
+++ b/crypto/ec/ecx_meth.c

@@ -14,8 +14,8 @@
 #include <openssl/rand.h>
 #include "crypto/asn1.h"
 #include "crypto/evp.h"
-#include "ec_lcl.h"
-#include "curve448/curve448_lcl.h"
+#include "ec_local.h"
+#include "curve448/curve448_local.h"
 
 #define X25519_BITS          253
 #define X25519_SECURITY_BITS 128

diff --git a/crypto/engine/README b/crypto/engine/README
index c7a5696..0f8a8fb 100644
--- a/crypto/engine/README
+++ b/crypto/engine/README

@@ -9,7 +9,7 @@
 lynched for sticking all this in CHANGES or the commit mails :-).
 
 ENGINE_TABLE underlies this restructuring, as described in the internal header
-"eng_int.h", implemented in eng_table.c, and used in each of the "class" files;
+"eng_local.h", implemented in eng_table.c, and used in each of the "class" files;
 tb_rsa.c, tb_dsa.c, etc.
 
 However, "EVP_CIPHER" underlies the motivation and design of ENGINE_TABLE so

diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c
index e1f09ac..0c5e4bd 100644
--- a/crypto/engine/eng_all.c
+++ b/crypto/engine/eng_all.c

@@ -8,7 +8,7 @@
  */
 
 #include "internal/cryptlib.h"
-#include "eng_int.h"
+#include "eng_local.h"
 
 void ENGINE_load_builtin_engines(void)
 {

diff --git a/crypto/engine/eng_cnf.c b/crypto/engine/eng_cnf.c
index 9f647c4..2219819 100644
--- a/crypto/engine/eng_cnf.c
+++ b/crypto/engine/eng_cnf.c

@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "eng_int.h"
+#include "eng_local.h"
 #include <openssl/conf.h>
 #include <openssl/trace.h>
 

diff --git a/crypto/engine/eng_ctrl.c b/crypto/engine/eng_ctrl.c
index d036f80..39cfb17 100644
--- a/crypto/engine/eng_ctrl.c
+++ b/crypto/engine/eng_ctrl.c

@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "eng_int.h"
+#include "eng_local.h"
 
 /*
  * When querying a ENGINE-specific control command's 'description', this

diff --git a/crypto/engine/eng_dyn.c b/crypto/engine/eng_dyn.c
index bde7602..7b1bc6e 100644
--- a/crypto/engine/eng_dyn.c
+++ b/crypto/engine/eng_dyn.c

@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "eng_int.h"
+#include "eng_local.h"
 #include "internal/dso.h"
 #include <openssl/crypto.h>
 

diff --git a/crypto/engine/eng_fat.c b/crypto/engine/eng_fat.c
index e6938a4..428e667 100644
--- a/crypto/engine/eng_fat.c
+++ b/crypto/engine/eng_fat.c

@@ -8,7 +8,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "eng_int.h"
+#include "eng_local.h"
 #include <openssl/conf.h>
 
 int ENGINE_set_default(ENGINE *e, unsigned int flags)

diff --git a/crypto/engine/eng_init.c b/crypto/engine/eng_init.c
index 6d74a2d..34f0138 100644
--- a/crypto/engine/eng_init.c
+++ b/crypto/engine/eng_init.c

@@ -8,7 +8,7 @@
  */
 
 #include "e_os.h"
-#include "eng_int.h"
+#include "eng_local.h"
 
 /*
  * Initialise a engine type for use (or up its functional reference count if

diff --git a/crypto/engine/eng_lib.c b/crypto/engine/eng_lib.c
index be893fe..4ba235c 100644
--- a/crypto/engine/eng_lib.c
+++ b/crypto/engine/eng_lib.c

@@ -8,7 +8,7 @@
  */
 
 #include "e_os.h"
-#include "eng_int.h"
+#include "eng_local.h"
 #include <openssl/rand.h>
 #include "internal/refcount.h"
 

diff --git a/crypto/engine/eng_list.c b/crypto/engine/eng_list.c
index a0c56c50..7659231 100644
--- a/crypto/engine/eng_list.c
+++ b/crypto/engine/eng_list.c

@@ -8,7 +8,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "eng_int.h"
+#include "eng_local.h"
 
 /*
  * The linked-list of pointers to engine types. engine_list_head incorporates

diff --git a/crypto/engine/eng_int.h b/crypto/engine/eng_local.h
similarity index 100%
rename from crypto/engine/eng_int.h
rename to crypto/engine/eng_local.h


diff --git a/crypto/engine/eng_pkey.c b/crypto/engine/eng_pkey.c
index 7282d5d..1f67eaa 100644
--- a/crypto/engine/eng_pkey.c
+++ b/crypto/engine/eng_pkey.c

@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "eng_int.h"
+#include "eng_local.h"
 
 /* Basic get/set stuff */
 

diff --git a/crypto/engine/eng_table.c b/crypto/engine/eng_table.c
index 62e9416..f6dfad9 100644
--- a/crypto/engine/eng_table.c
+++ b/crypto/engine/eng_table.c

@@ -11,7 +11,7 @@
 #include <openssl/evp.h>
 #include <openssl/lhash.h>
 #include <openssl/trace.h>
-#include "eng_int.h"
+#include "eng_local.h"
 
 /* The type of the items in the table */
 struct st_engine_pile {
@@ -27,7 +27,7 @@
     int uptodate;
 };
 
-/* The type exposed in eng_int.h */
+/* The type exposed in eng_local.h */
 struct st_engine_table {
     LHASH_OF(ENGINE_PILE) piles;
 };                              /* ENGINE_TABLE */
@@ -77,7 +77,7 @@
 }
 
 /*
- * Privately exposed (via eng_int.h) functions for adding and/or removing
+ * Privately exposed (via eng_local.h) functions for adding and/or removing
  * ENGINEs from the implementation table
  */
 int engine_table_register(ENGINE_TABLE **table, ENGINE_CLEANUP_CB *cleanup,

diff --git a/crypto/engine/tb_asnmth.c b/crypto/engine/tb_asnmth.c
index 2e01deb..5e35631 100644
--- a/crypto/engine/tb_asnmth.c
+++ b/crypto/engine/tb_asnmth.c

@@ -8,7 +8,7 @@
  */
 
 #include "e_os.h"
-#include "eng_int.h"
+#include "eng_local.h"
 #include <openssl/evp.h>
 #include "crypto/asn1.h"
 

diff --git a/crypto/engine/tb_cipher.c b/crypto/engine/tb_cipher.c
index 8aa3be7..c669907 100644
--- a/crypto/engine/tb_cipher.c
+++ b/crypto/engine/tb_cipher.c

@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "eng_int.h"
+#include "eng_local.h"
 
 static ENGINE_TABLE *cipher_table = NULL;
 

diff --git a/crypto/engine/tb_dh.c b/crypto/engine/tb_dh.c
index 5e2824a..e877fce 100644
--- a/crypto/engine/tb_dh.c
+++ b/crypto/engine/tb_dh.c

@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "eng_int.h"
+#include "eng_local.h"
 
 static ENGINE_TABLE *dh_table = NULL;
 static const int dummy_nid = 1;

diff --git a/crypto/engine/tb_digest.c b/crypto/engine/tb_digest.c
index 4221f6d..8a5a833 100644
--- a/crypto/engine/tb_digest.c
+++ b/crypto/engine/tb_digest.c

@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "eng_int.h"
+#include "eng_local.h"
 
 static ENGINE_TABLE *digest_table = NULL;
 

diff --git a/crypto/engine/tb_dsa.c b/crypto/engine/tb_dsa.c
index 15492d5..a22e8f6 100644
--- a/crypto/engine/tb_dsa.c
+++ b/crypto/engine/tb_dsa.c

@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "eng_int.h"
+#include "eng_local.h"
 
 static ENGINE_TABLE *dsa_table = NULL;
 static const int dummy_nid = 1;

diff --git a/crypto/engine/tb_eckey.c b/crypto/engine/tb_eckey.c
index 8c662e7..397dad8 100644
--- a/crypto/engine/tb_eckey.c
+++ b/crypto/engine/tb_eckey.c

@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "eng_int.h"
+#include "eng_local.h"
 
 static ENGINE_TABLE *dh_table = NULL;
 static const int dummy_nid = 1;

diff --git a/crypto/engine/tb_pkmeth.c b/crypto/engine/tb_pkmeth.c
index 4dab5d5..beb4fd7 100644
--- a/crypto/engine/tb_pkmeth.c
+++ b/crypto/engine/tb_pkmeth.c

@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "eng_int.h"
+#include "eng_local.h"
 #include <openssl/evp.h>
 
 static ENGINE_TABLE *pkey_meth_table = NULL;

diff --git a/crypto/engine/tb_rand.c b/crypto/engine/tb_rand.c
index 3b1b475..d7c7ef4 100644
--- a/crypto/engine/tb_rand.c
+++ b/crypto/engine/tb_rand.c

@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "eng_int.h"
+#include "eng_local.h"
 
 static ENGINE_TABLE *rand_table = NULL;
 static const int dummy_nid = 1;

diff --git a/crypto/engine/tb_rsa.c b/crypto/engine/tb_rsa.c
index 02c309a..5b7d671 100644
--- a/crypto/engine/tb_rsa.c
+++ b/crypto/engine/tb_rsa.c

@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "eng_int.h"
+#include "eng_local.h"
 
 static ENGINE_TABLE *rsa_table = NULL;
 static const int dummy_nid = 1;

diff --git a/crypto/err/err.c b/crypto/err/err.c
index 8db5385..eca0f6d 100644
--- a/crypto/err/err.c
+++ b/crypto/err/err.c

@@ -23,9 +23,9 @@
 #include <openssl/opensslconf.h>
 #include "internal/thread_once.h"
 #include "crypto/ctype.h"
-#include "internal/constant_time_locl.h"
+#include "internal/constant_time.h"
 #include "e_os.h"
-#include "err_locl.h"
+#include "err_local.h"
 
 /* Forward declaration in case it's not published because of configuration */
 ERR_STATE *ERR_get_state(void);

diff --git a/crypto/err/err_blocks.c b/crypto/err/err_blocks.c
index e50f580..20888e9 100644
--- a/crypto/err/err_blocks.c
+++ b/crypto/err/err_blocks.c

@@ -12,7 +12,7 @@
 
 #include <string.h>
 #include <openssl/err.h>
-#include "err_locl.h"
+#include "err_local.h"
 
 void ERR_new(void)
 {

diff --git a/crypto/err/err_locl.h b/crypto/err/err_local.h
similarity index 100%
rename from crypto/err/err_locl.h
rename to crypto/err/err_local.h


diff --git a/crypto/err/err_prn.c b/crypto/err/err_prn.c
index 1e1531b..27e987e 100644
--- a/crypto/err/err_prn.c
+++ b/crypto/err/err_prn.c

@@ -15,7 +15,7 @@
 #include <openssl/crypto.h>
 #include <openssl/buffer.h>
 #include <openssl/err.h>
-#include "err_locl.h"
+#include "err_local.h"
 
 void ERR_print_errors_cb(int (*cb) (const char *str, size_t len, void *u),
                          void *u)

diff --git a/crypto/err/openssl.ec b/crypto/err/openssl.ec
index 3c09eab..179a3ba 100644
--- a/crypto/err/openssl.ec
+++ b/crypto/err/openssl.ec

@@ -43,10 +43,10 @@
 
 # additional header files to be scanned for function names
 L NONE          include/openssl/x509_vfy.h      NONE
-L NONE          crypto/ec/ec_lcl.h              NONE
-L NONE          crypto/cms/cms_lcl.h            NONE
-L NONE          crypto/ct/ct_locl.h             NONE
-L NONE          ssl/ssl_locl.h                  NONE
+L NONE          crypto/ec/ec_local.h              NONE
+L NONE          crypto/cms/cms_local.h            NONE
+L NONE          crypto/ct/ct_local.h             NONE
+L NONE          ssl/ssl_local.h                  NONE
 
 # SSL/TLS alerts
 R SSL_R_SSLV3_ALERT_UNEXPECTED_MESSAGE          1010

diff --git a/crypto/evp/bio_md.c b/crypto/evp/bio_md.c
index e1b6c8c..8d502d0 100644
--- a/crypto/evp/bio_md.c
+++ b/crypto/evp/bio_md.c

@@ -13,7 +13,7 @@
 #include <openssl/buffer.h>
 #include <openssl/evp.h>
 #include "crypto/evp.h"
-#include "evp_locl.h"
+#include "evp_local.h"
 #include "internal/bio.h"
 
 /*

diff --git a/crypto/evp/cmeth_lib.c b/crypto/evp/cmeth_lib.c
index 7c7550e9..37cca7a 100644
--- a/crypto/evp/cmeth_lib.c
+++ b/crypto/evp/cmeth_lib.c

@@ -12,7 +12,7 @@
 #include <openssl/evp.h>
 #include "crypto/evp.h"
 #include "internal/provider.h"
-#include "evp_locl.h"
+#include "evp_local.h"
 
 EVP_CIPHER *EVP_CIPHER_meth_new(int cipher_type, int block_size, int key_len)
 {

diff --git a/crypto/evp/digest.c b/crypto/evp/digest.c
index ca5f7a9..1ce5292 100644
--- a/crypto/evp/digest.c
+++ b/crypto/evp/digest.c

@@ -16,7 +16,7 @@
 #include "internal/cryptlib.h"
 #include "crypto/evp.h"
 #include "internal/provider.h"
-#include "evp_locl.h"
+#include "evp_local.h"
 
 /* This call frees resources associated with the context */
 int EVP_MD_CTX_reset(EVP_MD_CTX *ctx)

diff --git a/crypto/evp/e_aes.c b/crypto/evp/e_aes.c
index 17e445d..49ed886 100644
--- a/crypto/evp/e_aes.c
+++ b/crypto/evp/e_aes.c

@@ -21,7 +21,7 @@
 #include "crypto/modes.h"
 #include "crypto/siv.h"
 #include "crypto/ciphermode_platform.h"
-#include "evp_locl.h"
+#include "evp_local.h"
 
 typedef struct {
     union {

diff --git a/crypto/evp/e_aes_cbc_hmac_sha1.c b/crypto/evp/e_aes_cbc_hmac_sha1.c
index eddb968..6b9362a 100644
--- a/crypto/evp/e_aes_cbc_hmac_sha1.c
+++ b/crypto/evp/e_aes_cbc_hmac_sha1.c

@@ -18,7 +18,7 @@
 #include "internal/cryptlib.h"
 #include "crypto/modes.h"
 #include "crypto/evp.h"
-#include "internal/constant_time_locl.h"
+#include "internal/constant_time.h"
 
 typedef struct {
     AES_KEY ks;

diff --git a/crypto/evp/e_aes_cbc_hmac_sha256.c b/crypto/evp/e_aes_cbc_hmac_sha256.c
index 7659d8f..771ef1d 100644
--- a/crypto/evp/e_aes_cbc_hmac_sha256.c
+++ b/crypto/evp/e_aes_cbc_hmac_sha256.c

@@ -17,7 +17,7 @@
 #include <openssl/rand.h>
 #include "internal/cryptlib.h"
 #include "crypto/modes.h"
-#include "internal/constant_time_locl.h"
+#include "internal/constant_time.h"
 #include "crypto/evp.h"
 
 typedef struct {

diff --git a/crypto/evp/e_aria.c b/crypto/evp/e_aria.c
index 9412d51..a8c4fc3 100644
--- a/crypto/evp/e_aria.c
+++ b/crypto/evp/e_aria.c

@@ -17,7 +17,7 @@
 # include "crypto/aria.h"
 # include "crypto/evp.h"
 # include "crypto/modes.h"
-# include "evp_locl.h"
+# include "evp_local.h"
 
 /* ARIA subkey Structure */
 typedef struct {

diff --git a/crypto/evp/e_chacha20_poly1305.c b/crypto/evp/e_chacha20_poly1305.c
index 17cce58..b7340b1 100644
--- a/crypto/evp/e_chacha20_poly1305.c
+++ b/crypto/evp/e_chacha20_poly1305.c

@@ -15,7 +15,7 @@
 # include <openssl/evp.h>
 # include <openssl/objects.h>
 # include "crypto/evp.h"
-# include "evp_locl.h"
+# include "evp_local.h"
 # include "crypto/chacha.h"
 
 typedef struct {

diff --git a/crypto/evp/e_des3.c b/crypto/evp/e_des3.c
index 1ceb3fc..8f9eab4 100644
--- a/crypto/evp/e_des3.c
+++ b/crypto/evp/e_des3.c

@@ -15,7 +15,7 @@
 # include "crypto/evp.h"
 # include <openssl/des.h>
 # include <openssl/rand.h>
-# include "evp_locl.h"
+# include "evp_local.h"
 
 typedef struct {
     union {

diff --git a/crypto/evp/e_rc5.c b/crypto/evp/e_rc5.c
index d92d10f..4783cc3 100644
--- a/crypto/evp/e_rc5.c
+++ b/crypto/evp/e_rc5.c

@@ -15,7 +15,7 @@
 # include <openssl/evp.h>
 # include "crypto/evp.h"
 # include <openssl/objects.h>
-# include "evp_locl.h"
+# include "evp_local.h"
 # include <openssl/rc5.h>
 
 static int r_32_12_16_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,

diff --git a/crypto/evp/encode.c b/crypto/evp/encode.c
index b8c82cf..fb657d1 100644
--- a/crypto/evp/encode.c
+++ b/crypto/evp/encode.c

@@ -12,7 +12,7 @@
 #include "internal/cryptlib.h"
 #include <openssl/evp.h>
 #include "crypto/evp.h"
-#include "evp_locl.h"
+#include "evp_local.h"
 
 static unsigned char conv_ascii2bin(unsigned char a,
                                     const unsigned char *table);

diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c
index 35bf429..a3fb5f7 100644
--- a/crypto/evp/evp_enc.c
+++ b/crypto/evp/evp_enc.c

@@ -19,7 +19,7 @@
 #include <openssl/core_names.h>
 #include "crypto/evp.h"
 #include "internal/provider.h"
-#include "evp_locl.h"
+#include "evp_local.h"
 
 int EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *ctx)
 {

diff --git a/crypto/evp/evp_fetch.c b/crypto/evp/evp_fetch.c
index 67ba201..5aa1319 100644
--- a/crypto/evp/evp_fetch.c
+++ b/crypto/evp/evp_fetch.c

@@ -17,8 +17,8 @@
 #include "internal/core.h"
 #include "internal/provider.h"
 #include "internal/namemap.h"
-#include "crypto/evp.h"    /* evp_locl.h needs it */
-#include "evp_locl.h"
+#include "crypto/evp.h"    /* evp_local.h needs it */
+#include "evp_local.h"
 
 static void default_method_store_free(void *vstore)
 {

diff --git a/crypto/evp/evp_lib.c b/crypto/evp/evp_lib.c
index 0789aa8..6a3ad85 100644
--- a/crypto/evp/evp_lib.c
+++ b/crypto/evp/evp_lib.c

@@ -16,7 +16,7 @@
 #include <openssl/dh.h>
 #include "crypto/evp.h"
 #include "internal/provider.h"
-#include "evp_locl.h"
+#include "evp_local.h"
 
 #if !defined(FIPS_MODE)
 int EVP_CIPHER_param_to_asn1(EVP_CIPHER_CTX *c, ASN1_TYPE *type)

diff --git a/crypto/evp/evp_locl.h b/crypto/evp/evp_local.h
similarity index 100%
rename from crypto/evp/evp_locl.h
rename to crypto/evp/evp_local.h


diff --git a/crypto/evp/evp_pbe.c b/crypto/evp/evp_pbe.c
index 2d87905..5ccb821 100644
--- a/crypto/evp/evp_pbe.c
+++ b/crypto/evp/evp_pbe.c

@@ -13,7 +13,7 @@
 #include <openssl/pkcs12.h>
 #include <openssl/x509.h>
 #include "crypto/evp.h"
-#include "evp_locl.h"
+#include "evp_local.h"
 
 /* Password based encryption (PBE) functions */
 

diff --git a/crypto/evp/evp_utils.c b/crypto/evp/evp_utils.c
index b3571be..7762261 100644
--- a/crypto/evp/evp_utils.c
+++ b/crypto/evp/evp_utils.c

@@ -12,10 +12,10 @@
 #include <openssl/core.h>
 #include <openssl/evp.h>
 #include <openssl/err.h>
-#include <openssl/asn1.h>        /* evp_locl.h needs it */
-#include <openssl/safestack.h>   /* evp_locl.h needs it */
-#include "crypto/evp.h"    /* evp_locl.h needs it */
-#include "evp_locl.h"
+#include <openssl/asn1.h>        /* evp_local.h needs it */
+#include <openssl/safestack.h>   /* evp_local.h needs it */
+#include "crypto/evp.h"    /* evp_local.h needs it */
+#include "evp_local.h"
 
 /*
  * EVP_CTRL_RET_UNSUPPORTED = -1 is the returned value from any ctrl function

diff --git a/crypto/evp/exchange.c b/crypto/evp/exchange.c
index 3caf03a..4c02c8a 100644
--- a/crypto/evp/exchange.c
+++ b/crypto/evp/exchange.c

@@ -14,7 +14,7 @@
 #include "crypto/evp.h"
 #include "internal/provider.h"
 #include "internal/numbers.h"   /* includes SIZE_MAX */
-#include "evp_locl.h"
+#include "evp_local.h"
 
 static EVP_KEYEXCH *evp_keyexch_new(OSSL_PROVIDER *prov)
 {

diff --git a/crypto/evp/kdf_lib.c b/crypto/evp/kdf_lib.c
index b2b28de..7163de3 100644
--- a/crypto/evp/kdf_lib.c
+++ b/crypto/evp/kdf_lib.c

@@ -21,7 +21,7 @@
 #include "crypto/evp.h"
 #include "internal/numbers.h"
 #include "internal/provider.h"
-#include "evp_locl.h"
+#include "evp_local.h"
 
 EVP_KDF_CTX *EVP_KDF_CTX_new(EVP_KDF *kdf)
 {

diff --git a/crypto/evp/kdf_meth.c b/crypto/evp/kdf_meth.c
index c2b6cea..3a2d028 100644
--- a/crypto/evp/kdf_meth.c
+++ b/crypto/evp/kdf_meth.c

@@ -14,7 +14,7 @@
 #include <openssl/kdf.h>
 #include "crypto/evp.h"
 #include "internal/provider.h"
-#include "evp_locl.h"
+#include "evp_local.h"
 
 static int evp_kdf_up_ref(void *vkdf)
 {

diff --git a/crypto/evp/keymgmt_lib.c b/crypto/evp/keymgmt_lib.c
index 1a4e9a2..0eb12ca 100644
--- a/crypto/evp/keymgmt_lib.c
+++ b/crypto/evp/keymgmt_lib.c

@@ -12,7 +12,7 @@
 #include "crypto/evp.h"
 #include "crypto/asn1.h"
 #include "internal/provider.h"
-#include "evp_locl.h"
+#include "evp_local.h"
 
 static OSSL_PARAM *paramdefs_to_params(const OSSL_PARAM *paramdefs)
 {

diff --git a/crypto/evp/keymgmt_meth.c b/crypto/evp/keymgmt_meth.c
index 1dbc9df..a5df564 100644
--- a/crypto/evp/keymgmt_meth.c
+++ b/crypto/evp/keymgmt_meth.c

@@ -14,7 +14,7 @@
 #include "internal/provider.h"
 #include "internal/refcount.h"
 #include "crypto/evp.h"
-#include "evp_locl.h"
+#include "evp_local.h"
 
 
 static void *keymgmt_new(void)

diff --git a/crypto/evp/m_sha3.c b/crypto/evp/m_sha3.c
index 727bb27..a4a556d 100644
--- a/crypto/evp/m_sha3.c
+++ b/crypto/evp/m_sha3.c

@@ -14,7 +14,7 @@
 #include <openssl/objects.h>
 #include "crypto/evp.h"
 #include "internal/sha3.h"
-#include "evp_locl.h"
+#include "evp_local.h"
 
 static int init(EVP_MD_CTX *ctx)
 {

diff --git a/crypto/evp/m_sigver.c b/crypto/evp/m_sigver.c
index 5307433..2e179be 100644
--- a/crypto/evp/m_sigver.c
+++ b/crypto/evp/m_sigver.c

@@ -13,7 +13,7 @@
 #include <openssl/objects.h>
 #include <openssl/x509.h>
 #include "crypto/evp.h"
-#include "evp_locl.h"
+#include "evp_local.h"
 
 static int update(EVP_MD_CTX *ctx, const void *data, size_t datalen)
 {

diff --git a/crypto/evp/mac_lib.c b/crypto/evp/mac_lib.c
index c38c453..1d6214c 100644
--- a/crypto/evp/mac_lib.c
+++ b/crypto/evp/mac_lib.c

@@ -17,7 +17,7 @@
 #include "internal/nelem.h"
 #include "crypto/evp.h"
 #include "internal/provider.h"
-#include "evp_locl.h"
+#include "evp_local.h"
 
 EVP_MAC_CTX *EVP_MAC_CTX_new(EVP_MAC *mac)
 {

diff --git a/crypto/evp/mac_meth.c b/crypto/evp/mac_meth.c
index 9e67d90..c01f04e 100644
--- a/crypto/evp/mac_meth.c
+++ b/crypto/evp/mac_meth.c

@@ -4,7 +4,7 @@
 #include <openssl/core_numbers.h>
 #include "crypto/evp.h"
 #include "internal/provider.h"
-#include "evp_locl.h"
+#include "evp_local.h"
 
 static int evp_mac_up_ref(void *vmac)
 {

diff --git a/crypto/evp/p5_crpt2.c b/crypto/evp/p5_crpt2.c
index 27fb959..2a27f53 100644
--- a/crypto/evp/p5_crpt2.c
+++ b/crypto/evp/p5_crpt2.c

@@ -17,7 +17,7 @@
 #include <openssl/trace.h>
 #include <openssl/core_names.h>
 #include "crypto/evp.h"
-#include "evp_locl.h"
+#include "evp_local.h"
 
 int PKCS5_PBKDF2_HMAC(const char *pass, int passlen,
                       const unsigned char *salt, int saltlen, int iter,

diff --git a/crypto/evp/pkey_mac.c b/crypto/evp/pkey_mac.c
index 2c60afe..005741d 100644
--- a/crypto/evp/pkey_mac.c
+++ b/crypto/evp/pkey_mac.c

@@ -14,7 +14,7 @@
 #include <openssl/params.h>
 #include <openssl/core_names.h>
 #include "crypto/evp.h"
-#include "evp_locl.h"
+#include "evp_local.h"
 
 /* MAC PKEY context structure */
 

diff --git a/crypto/evp/pmeth_fn.c b/crypto/evp/pmeth_fn.c
index 240738d..e3af13d 100644
--- a/crypto/evp/pmeth_fn.c
+++ b/crypto/evp/pmeth_fn.c

@@ -14,7 +14,7 @@
 #include "internal/cryptlib.h"
 #include "crypto/evp.h"
 #include "internal/provider.h"
-#include "evp_locl.h"
+#include "evp_local.h"
 
 static EVP_SIGNATURE *evp_signature_new(OSSL_PROVIDER *prov)
 {

diff --git a/crypto/evp/pmeth_lib.c b/crypto/evp/pmeth_lib.c
index 5f0a93e..7dbdb46 100644
--- a/crypto/evp/pmeth_lib.c
+++ b/crypto/evp/pmeth_lib.c

@@ -20,7 +20,7 @@
 #include "crypto/evp.h"
 #include "internal/numbers.h"
 #include "internal/provider.h"
-#include "evp_locl.h"
+#include "evp_local.h"
 
 typedef const EVP_PKEY_METHOD *(*pmeth_fn)(void);
 typedef int sk_cmp_fn_type(const char *const *a, const char *const *b);

diff --git a/crypto/hmac/hmac.c b/crypto/hmac/hmac.c
index d392753..17cc587 100644
--- a/crypto/hmac/hmac.c
+++ b/crypto/hmac/hmac.c

@@ -13,7 +13,7 @@
 #include "internal/cryptlib.h"
 #include <openssl/hmac.h>
 #include <openssl/opensslconf.h>
-#include "hmac_lcl.h"
+#include "hmac_local.h"
 
 int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,
                  const EVP_MD *md, ENGINE *impl)

diff --git a/crypto/hmac/hmac_lcl.h b/crypto/hmac/hmac_local.h
similarity index 100%
rename from crypto/hmac/hmac_lcl.h
rename to crypto/hmac/hmac_local.h


diff --git a/crypto/idea/i_cbc.c b/crypto/idea/i_cbc.c
index b6d236c..a78841f 100644
--- a/crypto/idea/i_cbc.c
+++ b/crypto/idea/i_cbc.c

@@ -8,7 +8,7 @@
  */
 
 #include <openssl/idea.h>
-#include "idea_lcl.h"
+#include "idea_local.h"
 
 void IDEA_cbc_encrypt(const unsigned char *in, unsigned char *out,
                       long length, IDEA_KEY_SCHEDULE *ks, unsigned char *iv,

diff --git a/crypto/idea/i_cfb64.c b/crypto/idea/i_cfb64.c
index 3b86712..45c15b9 100644
--- a/crypto/idea/i_cfb64.c
+++ b/crypto/idea/i_cfb64.c

@@ -8,7 +8,7 @@
  */
 
 #include <openssl/idea.h>
-#include "idea_lcl.h"
+#include "idea_local.h"
 
 /*
  * The input and output encrypted as though 64bit cfb mode is being used.

diff --git a/crypto/idea/i_ecb.c b/crypto/idea/i_ecb.c
index 4a721a2..9fee121 100644
--- a/crypto/idea/i_ecb.c
+++ b/crypto/idea/i_ecb.c

@@ -8,7 +8,7 @@
  */
 
 #include <openssl/idea.h>
-#include "idea_lcl.h"
+#include "idea_local.h"
 #include <openssl/opensslv.h>
 
 const char *IDEA_options(void)

diff --git a/crypto/idea/i_ofb64.c b/crypto/idea/i_ofb64.c
index 6c55321..517ded7 100644
--- a/crypto/idea/i_ofb64.c
+++ b/crypto/idea/i_ofb64.c

@@ -8,7 +8,7 @@
  */
 
 #include <openssl/idea.h>
-#include "idea_lcl.h"
+#include "idea_local.h"
 
 /*
  * The input and output encrypted as though 64bit ofb mode is being used.

diff --git a/crypto/idea/i_skey.c b/crypto/idea/i_skey.c
index a0197bf..0b0221b 100644
--- a/crypto/idea/i_skey.c
+++ b/crypto/idea/i_skey.c

@@ -8,7 +8,7 @@
  */
 
 #include <openssl/idea.h>
-#include "idea_lcl.h"
+#include "idea_local.h"
 
 static IDEA_INT inverse(unsigned int xin);
 void IDEA_set_encrypt_key(const unsigned char *key, IDEA_KEY_SCHEDULE *ks)

diff --git a/crypto/idea/idea_lcl.h b/crypto/idea/idea_local.h
similarity index 100%
rename from crypto/idea/idea_lcl.h
rename to crypto/idea/idea_local.h


diff --git a/crypto/lhash/lh_stats.c b/crypto/lhash/lh_stats.c
index 1b32b5d..5e38c42 100644
--- a/crypto/lhash/lh_stats.c
+++ b/crypto/lhash/lh_stats.c

@@ -18,7 +18,7 @@
 
 #include <openssl/bio.h>
 #include <openssl/lhash.h>
-#include "lhash_lcl.h"
+#include "lhash_local.h"
 
 # ifndef OPENSSL_NO_STDIO
 void OPENSSL_LH_stats(const OPENSSL_LHASH *lh, FILE *fp)

diff --git a/crypto/lhash/lhash.c b/crypto/lhash/lhash.c
index 6544589..76379a9 100644
--- a/crypto/lhash/lhash.c
+++ b/crypto/lhash/lhash.c

@@ -15,7 +15,7 @@
 #include <openssl/err.h>
 #include "crypto/ctype.h"
 #include "crypto/lhash.h"
-#include "lhash_lcl.h"
+#include "lhash_local.h"
 
 /*
  * A hashing implementation that appears to be based on the linear hashing

diff --git a/crypto/lhash/lhash_lcl.h b/crypto/lhash/lhash_local.h
similarity index 100%
rename from crypto/lhash/lhash_lcl.h
rename to crypto/lhash/lhash_local.h


diff --git a/crypto/md4/md4_dgst.c b/crypto/md4/md4_dgst.c
index 2ce66b6..cf95fbe 100644
--- a/crypto/md4/md4_dgst.c
+++ b/crypto/md4/md4_dgst.c

@@ -9,7 +9,7 @@
 
 #include <stdio.h>
 #include <openssl/opensslv.h>
-#include "md4_locl.h"
+#include "md4_local.h"
 
 /*
  * Implemented from RFC1186 The MD4 Message-Digest Algorithm
@@ -39,7 +39,7 @@
     const unsigned char *data = data_;
     register unsigned MD32_REG_T A, B, C, D, l;
 # ifndef MD32_XARRAY
-    /* See comment in crypto/sha/sha_locl.h for details. */
+    /* See comment in crypto/sha/sha_local.h for details. */
     unsigned MD32_REG_T XX0, XX1, XX2, XX3, XX4, XX5, XX6, XX7,
         XX8, XX9, XX10, XX11, XX12, XX13, XX14, XX15;
 #  define X(i)   XX##i

diff --git a/crypto/md4/md4_locl.h b/crypto/md4/md4_local.h
similarity index 100%
rename from crypto/md4/md4_locl.h
rename to crypto/md4/md4_local.h


diff --git a/crypto/md5/md5_dgst.c b/crypto/md5/md5_dgst.c
index 1c673e3..b594652 100644
--- a/crypto/md5/md5_dgst.c
+++ b/crypto/md5/md5_dgst.c

@@ -8,7 +8,7 @@
  */
 
 #include <stdio.h>
-#include "md5_locl.h"
+#include "md5_local.h"
 #include <openssl/opensslv.h>
 
 /*
@@ -39,7 +39,7 @@
     const unsigned char *data = data_;
     register unsigned MD32_REG_T A, B, C, D, l;
 # ifndef MD32_XARRAY
-    /* See comment in crypto/sha/sha_locl.h for details. */
+    /* See comment in crypto/sha/sha_local.h for details. */
     unsigned MD32_REG_T XX0, XX1, XX2, XX3, XX4, XX5, XX6, XX7,
         XX8, XX9, XX10, XX11, XX12, XX13, XX14, XX15;
 #  define X(i)   XX##i

diff --git a/crypto/md5/md5_locl.h b/crypto/md5/md5_local.h
similarity index 100%
rename from crypto/md5/md5_locl.h
rename to crypto/md5/md5_local.h


diff --git a/crypto/objects/o_names.c b/crypto/objects/o_names.c
index 531f524..52956eb 100644
--- a/crypto/objects/o_names.c
+++ b/crypto/objects/o_names.c

@@ -18,7 +18,7 @@
 #include <openssl/e_os2.h>
 #include "internal/thread_once.h"
 #include "crypto/lhash.h"
-#include "obj_lcl.h"
+#include "obj_local.h"
 #include "e_os.h"
 
 /*

diff --git a/crypto/objects/obj_dat.c b/crypto/objects/obj_dat.c
index 1c3fe9e..0c4ec98 100644
--- a/crypto/objects/obj_dat.c
+++ b/crypto/objects/obj_dat.c

@@ -16,7 +16,7 @@
 #include "crypto/objects.h"
 #include <openssl/bn.h>
 #include "crypto/asn1.h"
-#include "obj_lcl.h"
+#include "obj_local.h"
 
 /* obj_dat.h is generated from objects.h by obj_dat.pl */
 #include "obj_dat.h"

diff --git a/crypto/objects/obj_lcl.h b/crypto/objects/obj_local.h
similarity index 100%
rename from crypto/objects/obj_lcl.h
rename to crypto/objects/obj_local.h


diff --git a/crypto/ocsp/ocsp_asn.c b/crypto/ocsp/ocsp_asn.c
index 04752e9..4b43428 100644
--- a/crypto/ocsp/ocsp_asn.c
+++ b/crypto/ocsp/ocsp_asn.c

@@ -10,7 +10,7 @@
 #include <openssl/asn1.h>
 #include <openssl/asn1t.h>
 #include <openssl/ocsp.h>
-#include "ocsp_lcl.h"
+#include "ocsp_local.h"
 
 ASN1_SEQUENCE(OCSP_SIGNATURE) = {
         ASN1_EMBED(OCSP_SIGNATURE, signatureAlgorithm, X509_ALGOR),

diff --git a/crypto/ocsp/ocsp_cl.c b/crypto/ocsp/ocsp_cl.c
index 4ce7f03..8bd5503 100644
--- a/crypto/ocsp/ocsp_cl.c
+++ b/crypto/ocsp/ocsp_cl.c

@@ -16,7 +16,7 @@
 #include <openssl/pem.h>
 #include <openssl/x509v3.h>
 #include <openssl/ocsp.h>
-#include "ocsp_lcl.h"
+#include "ocsp_local.h"
 
 /*
  * Utility functions related to sending OCSP requests and extracting relevant

diff --git a/crypto/ocsp/ocsp_ext.c b/crypto/ocsp/ocsp_ext.c
index c5cf279..bffcf09 100644
--- a/crypto/ocsp/ocsp_ext.c
+++ b/crypto/ocsp/ocsp_ext.c

@@ -12,7 +12,7 @@
 #include <openssl/objects.h>
 #include <openssl/x509.h>
 #include <openssl/ocsp.h>
-#include "ocsp_lcl.h"
+#include "ocsp_local.h"
 #include <openssl/rand.h>
 #include <openssl/x509v3.h>
 

diff --git a/crypto/ocsp/ocsp_lib.c b/crypto/ocsp/ocsp_lib.c
index e68513e..90a92b9 100644
--- a/crypto/ocsp/ocsp_lib.c
+++ b/crypto/ocsp/ocsp_lib.c

@@ -14,7 +14,7 @@
 #include <openssl/pem.h>
 #include <openssl/x509v3.h>
 #include <openssl/ocsp.h>
-#include "ocsp_lcl.h"
+#include "ocsp_local.h"
 #include <openssl/asn1t.h>
 
 /* Convert a certificate and its issuer to an OCSP_CERTID */

diff --git a/crypto/ocsp/ocsp_lcl.h b/crypto/ocsp/ocsp_local.h
similarity index 100%
rename from crypto/ocsp/ocsp_lcl.h
rename to crypto/ocsp/ocsp_local.h


diff --git a/crypto/ocsp/ocsp_prn.c b/crypto/ocsp/ocsp_prn.c
index 73764ac..6d527df 100644
--- a/crypto/ocsp/ocsp_prn.c
+++ b/crypto/ocsp/ocsp_prn.c

@@ -10,7 +10,7 @@
 #include <openssl/bio.h>
 #include <openssl/err.h>
 #include <openssl/ocsp.h>
-#include "ocsp_lcl.h"
+#include "ocsp_local.h"
 #include "internal/cryptlib.h"
 #include <openssl/pem.h>
 

diff --git a/crypto/ocsp/ocsp_srv.c b/crypto/ocsp/ocsp_srv.c
index 20a1b2c..7e0aca1 100644
--- a/crypto/ocsp/ocsp_srv.c
+++ b/crypto/ocsp/ocsp_srv.c

@@ -14,7 +14,7 @@
 #include <openssl/pem.h>
 #include <openssl/x509v3.h>
 #include <openssl/ocsp.h>
-#include "ocsp_lcl.h"
+#include "ocsp_local.h"
 
 /*
  * Utility functions related to sending OCSP responses and extracting

diff --git a/crypto/ocsp/ocsp_vfy.c b/crypto/ocsp/ocsp_vfy.c
index 4e6c378..a364c8a 100644
--- a/crypto/ocsp/ocsp_vfy.c
+++ b/crypto/ocsp/ocsp_vfy.c

@@ -8,7 +8,7 @@
  */
 
 #include <openssl/ocsp.h>
-#include "ocsp_lcl.h"
+#include "ocsp_local.h"
 #include <openssl/err.h>
 #include <string.h>
 

diff --git a/crypto/ocsp/v3_ocsp.c b/crypto/ocsp/v3_ocsp.c
index 2e4503e..9648ba9 100644
--- a/crypto/ocsp/v3_ocsp.c
+++ b/crypto/ocsp/v3_ocsp.c

@@ -12,7 +12,7 @@
 # include <openssl/conf.h>
 # include <openssl/asn1.h>
 # include <openssl/ocsp.h>
-# include "ocsp_lcl.h"
+# include "ocsp_local.h"
 # include <openssl/x509v3.h>
 # include "../x509/ext_dat.h"
 

diff --git a/crypto/pkcs12/p12_add.c b/crypto/pkcs12/p12_add.c
index 1f915d1..f23bfed 100644
--- a/crypto/pkcs12/p12_add.c
+++ b/crypto/pkcs12/p12_add.c

@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include "internal/cryptlib.h"
 #include <openssl/pkcs12.h>
-#include "p12_lcl.h"
+#include "p12_local.h"
 
 /* Pack an object into an OCTET STRING and turn into a safebag */
 

diff --git a/crypto/pkcs12/p12_asn.c b/crypto/pkcs12/p12_asn.c
index f27d1d4..aabbd38 100644
--- a/crypto/pkcs12/p12_asn.c
+++ b/crypto/pkcs12/p12_asn.c

@@ -11,7 +11,7 @@
 #include "internal/cryptlib.h"
 #include <openssl/asn1t.h>
 #include <openssl/pkcs12.h>
-#include "p12_lcl.h"
+#include "p12_local.h"
 
 /* PKCS#12 ASN1 module */
 

diff --git a/crypto/pkcs12/p12_attr.c b/crypto/pkcs12/p12_attr.c
index 2ee65a9..e2ca95b 100644
--- a/crypto/pkcs12/p12_attr.c
+++ b/crypto/pkcs12/p12_attr.c

@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include "internal/cryptlib.h"
 #include <openssl/pkcs12.h>
-#include "p12_lcl.h"
+#include "p12_local.h"
 
 /* Add a local keyid to a safebag */
 

diff --git a/crypto/pkcs12/p12_crt.c b/crypto/pkcs12/p12_crt.c
index b6e52e2..063a5bb 100644
--- a/crypto/pkcs12/p12_crt.c
+++ b/crypto/pkcs12/p12_crt.c

@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include "internal/cryptlib.h"
 #include <openssl/pkcs12.h>
-#include "p12_lcl.h"
+#include "p12_local.h"
 
 static int pkcs12_add_bag(STACK_OF(PKCS12_SAFEBAG) **pbags,
                           PKCS12_SAFEBAG *bag);

diff --git a/crypto/pkcs12/p12_init.c b/crypto/pkcs12/p12_init.c
index 8b684c2..00c8d4f 100644
--- a/crypto/pkcs12/p12_init.c
+++ b/crypto/pkcs12/p12_init.c

@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include "internal/cryptlib.h"
 #include <openssl/pkcs12.h>
-#include "p12_lcl.h"
+#include "p12_local.h"
 
 /* Initialise a PKCS12 structure to take data */
 

diff --git a/crypto/pkcs12/p12_lcl.h b/crypto/pkcs12/p12_local.h
similarity index 100%
rename from crypto/pkcs12/p12_lcl.h
rename to crypto/pkcs12/p12_local.h


diff --git a/crypto/pkcs12/p12_mutl.c b/crypto/pkcs12/p12_mutl.c
index bcefa05..6998d32 100644
--- a/crypto/pkcs12/p12_mutl.c
+++ b/crypto/pkcs12/p12_mutl.c

@@ -13,7 +13,7 @@
 #include <openssl/hmac.h>
 #include <openssl/rand.h>
 #include <openssl/pkcs12.h>
-#include "p12_lcl.h"
+#include "p12_local.h"
 
 int PKCS12_mac_present(const PKCS12 *p12)
 {

diff --git a/crypto/pkcs12/p12_npas.c b/crypto/pkcs12/p12_npas.c
index 2bb69a2..eece1dd 100644
--- a/crypto/pkcs12/p12_npas.c
+++ b/crypto/pkcs12/p12_npas.c

@@ -13,7 +13,7 @@
 #include <openssl/pem.h>
 #include <openssl/err.h>
 #include <openssl/pkcs12.h>
-#include "p12_lcl.h"
+#include "p12_local.h"
 
 /* PKCS#12 password change routine */
 

diff --git a/crypto/pkcs12/p12_sbag.c b/crypto/pkcs12/p12_sbag.c
index a3024ef..2b4ca65 100644
--- a/crypto/pkcs12/p12_sbag.c
+++ b/crypto/pkcs12/p12_sbag.c

@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include "internal/cryptlib.h"
 #include <openssl/pkcs12.h>
-#include "p12_lcl.h"
+#include "p12_local.h"
 
 #if !OPENSSL_API_1_1_0
 ASN1_TYPE *PKCS12_get_attr(const PKCS12_SAFEBAG *bag, int attr_nid)

diff --git a/crypto/poly1305/poly1305.c b/crypto/poly1305/poly1305.c
index 31bca78..97c0530 100644
--- a/crypto/poly1305/poly1305.c
+++ b/crypto/poly1305/poly1305.c

@@ -89,7 +89,7 @@
 poly1305_blocks(void *ctx, const unsigned char *inp, size_t len, u32 padbit);
 
 /*
- * Type-agnostic "rip-off" from constant_time_locl.h
+ * Type-agnostic "rip-off" from constant_time.h
  */
 # define CONSTANT_TIME_CARRY(a,b) ( \
          (a ^ ((a ^ b) | ((a - b) ^ b))) >> (sizeof(a) * 8 - 1) \

diff --git a/crypto/ppccap.c b/crypto/ppccap.c
index 5b3ee75..0b2cc78 100644
--- a/crypto/ppccap.c
+++ b/crypto/ppccap.c

@@ -30,7 +30,7 @@
 #include <openssl/bn.h>
 #include <internal/cryptlib.h>
 #include <crypto/chacha.h>
-#include "bn/bn_lcl.h"
+#include "bn/bn_local.h"
 
 #include "ppc_arch.h"
 

diff --git a/crypto/property/defn_cache.c b/crypto/property/defn_cache.c
index aec05c1..9bfbd13 100644
--- a/crypto/property/defn_cache.c
+++ b/crypto/property/defn_cache.c

@@ -13,7 +13,7 @@
 #include <openssl/lhash.h>
 #include "internal/propertyerr.h"
 #include "internal/property.h"
-#include "property_lcl.h"
+#include "property_local.h"
 
 /*
  * Implement a property definition cache.

diff --git a/crypto/property/property.c b/crypto/property/property.c
index 4f67207..0111216 100644
--- a/crypto/property/property.c
+++ b/crypto/property/property.c

@@ -19,7 +19,7 @@
 #include "internal/thread_once.h"
 #include "crypto/lhash.h"
 #include "crypto/sparse_array.h"
-#include "property_lcl.h"
+#include "property_local.h"
 
 /* The number of elements in the query cache before we initiate a flush */
 #define IMPL_CACHE_FLUSH_THRESHOLD  500

diff --git a/crypto/property/property_lcl.h b/crypto/property/property_local.h
similarity index 100%
rename from crypto/property/property_lcl.h
rename to crypto/property/property_local.h


diff --git a/crypto/property/property_parse.c b/crypto/property/property_parse.c
index c9fb760..a16bcd6 100644
--- a/crypto/property/property_parse.c
+++ b/crypto/property/property_parse.c

@@ -16,7 +16,7 @@
 #include "internal/property.h"
 #include "crypto/ctype.h"
 #include "internal/nelem.h"
-#include "property_lcl.h"
+#include "property_local.h"
 #include "e_os.h"
 
 typedef enum {

diff --git a/crypto/property/property_string.c b/crypto/property/property_string.c
index d037f6a..55d3468 100644
--- a/crypto/property/property_string.c
+++ b/crypto/property/property_string.c

@@ -12,7 +12,7 @@
 #include <openssl/crypto.h>
 #include <openssl/lhash.h>
 #include "crypto/lhash.h"
-#include "property_lcl.h"
+#include "property_local.h"
 
 /*
  * Property strings are a consolidation of all strings seen by the property

diff --git a/crypto/rand/drbg_ctr.c b/crypto/rand/drbg_ctr.c
index 28db4ee..30420ae 100644
--- a/crypto/rand/drbg_ctr.c
+++ b/crypto/rand/drbg_ctr.c

@@ -13,7 +13,7 @@
 #include <openssl/err.h>
 #include <openssl/rand.h>
 #include "internal/thread_once.h"
-#include "rand_lcl.h"
+#include "rand_local.h"
 
 /*
  * Implementation of NIST SP 800-90A CTR DRBG.

diff --git a/crypto/rand/drbg_hash.c b/crypto/rand/drbg_hash.c
index 6bef917..4a64992 100644
--- a/crypto/rand/drbg_hash.c
+++ b/crypto/rand/drbg_hash.c

@@ -15,7 +15,7 @@
 #include <openssl/rand.h>
 #include "internal/thread_once.h"
 #include "internal/providercommon.h"
-#include "rand_lcl.h"
+#include "rand_local.h"
 
 /* 440 bits from SP800-90Ar1 10.1 table 2 */
 #define HASH_PRNG_SMALL_SEEDLEN   (440/8)

diff --git a/crypto/rand/drbg_hmac.c b/crypto/rand/drbg_hmac.c
index 14c4570..4d7676d 100644
--- a/crypto/rand/drbg_hmac.c
+++ b/crypto/rand/drbg_hmac.c

@@ -14,7 +14,7 @@
 #include <openssl/rand.h>
 #include "internal/thread_once.h"
 #include "internal/providercommon.h"
-#include "rand_lcl.h"
+#include "rand_local.h"
 
 /*
  * Called twice by SP800-90Ar1 10.1.2.2 HMAC_DRBG_Update_Process.

diff --git a/crypto/rand/drbg_lib.c b/crypto/rand/drbg_lib.c
index 5652526..90e3778 100644
--- a/crypto/rand/drbg_lib.c
+++ b/crypto/rand/drbg_lib.c

@@ -11,7 +11,7 @@
 #include <openssl/crypto.h>
 #include <openssl/err.h>
 #include <openssl/rand.h>
-#include "rand_lcl.h"
+#include "rand_local.h"
 #include "internal/thread_once.h"
 #include "crypto/rand.h"
 #include "crypto/cryptlib.h"

diff --git a/crypto/rand/rand_crng_test.c b/crypto/rand/rand_crng_test.c
index 29af636..950cc62 100644
--- a/crypto/rand/rand_crng_test.c
+++ b/crypto/rand/rand_crng_test.c

@@ -17,7 +17,7 @@
 #include "crypto/rand.h"
 #include "internal/thread_once.h"
 #include "internal/cryptlib.h"
-#include "rand_lcl.h"
+#include "rand_local.h"
 
 typedef struct crng_test_global_st {
     unsigned char crngt_prev[EVP_MAX_MD_SIZE];

diff --git a/crypto/rand/rand_lib.c b/crypto/rand/rand_lib.c
index 7f4f1b7..3508cfb 100644
--- a/crypto/rand/rand_lib.c
+++ b/crypto/rand/rand_lib.c

@@ -14,7 +14,7 @@
 #include "crypto/rand.h"
 #include <openssl/engine.h>
 #include "internal/thread_once.h"
-#include "rand_lcl.h"
+#include "rand_local.h"
 #include "e_os.h"
 
 #ifndef FIPS_MODE

diff --git a/crypto/rand/rand_lcl.h b/crypto/rand/rand_local.h
similarity index 100%
rename from crypto/rand/rand_lcl.h
rename to crypto/rand/rand_local.h


diff --git a/crypto/rand/rand_unix.c b/crypto/rand/rand_unix.c
index c0f995a..8ed4023 100644
--- a/crypto/rand/rand_unix.c
+++ b/crypto/rand/rand_unix.c

@@ -15,7 +15,7 @@
 #include "internal/cryptlib.h"
 #include <openssl/rand.h>
 #include <openssl/crypto.h>
-#include "rand_lcl.h"
+#include "rand_local.h"
 #include "crypto/rand.h"
 #include <stdio.h>
 #include "internal/dso.h"

diff --git a/crypto/rand/rand_vms.c b/crypto/rand/rand_vms.c
index 5fb2259..fa74e74 100644
--- a/crypto/rand/rand_vms.c
+++ b/crypto/rand/rand_vms.c

@@ -15,7 +15,7 @@
 # include "internal/cryptlib.h"
 # include <openssl/rand.h>
 # include "crypto/rand.h"
-# include "rand_lcl.h"
+# include "rand_local.h"
 # include <descrip.h>
 # include <dvidef.h>
 # include <jpidef.h>

diff --git a/crypto/rand/rand_vxworks.c b/crypto/rand/rand_vxworks.c
index a32cf45..d674698 100644
--- a/crypto/rand/rand_vxworks.c
+++ b/crypto/rand/rand_vxworks.c

@@ -13,7 +13,7 @@
 NON_EMPTY_TRANSLATION_UNIT
 #else
 # include <openssl/rand.h>
-# include "rand_lcl.h"
+# include "rand_local.h"
 # include "crypto/rand.h"
 # include "internal/cryptlib.h"
 # include <version.h>

diff --git a/crypto/rand/rand_win.c b/crypto/rand/rand_win.c
index ea0d53b..5f67c87 100644
--- a/crypto/rand/rand_win.c
+++ b/crypto/rand/rand_win.c

@@ -9,7 +9,7 @@
 
 #include "internal/cryptlib.h"
 #include <openssl/rand.h>
-#include "rand_lcl.h"
+#include "rand_local.h"
 #include "crypto/rand.h"
 #if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32)
 

diff --git a/crypto/rc2/rc2_cbc.c b/crypto/rc2/rc2_cbc.c
index 7545936..58a4b3e 100644
--- a/crypto/rc2/rc2_cbc.c
+++ b/crypto/rc2/rc2_cbc.c

@@ -8,7 +8,7 @@
  */
 
 #include <openssl/rc2.h>
-#include "rc2_locl.h"
+#include "rc2_local.h"
 
 void RC2_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
                      RC2_KEY *ks, unsigned char *iv, int encrypt)

diff --git a/crypto/rc2/rc2_ecb.c b/crypto/rc2/rc2_ecb.c
index 9a0d23e..fec2c10 100644
--- a/crypto/rc2/rc2_ecb.c
+++ b/crypto/rc2/rc2_ecb.c

@@ -8,7 +8,7 @@
  */
 
 #include <openssl/rc2.h>
-#include "rc2_locl.h"
+#include "rc2_local.h"
 #include <openssl/opensslv.h>
 
 /*-

diff --git a/crypto/rc2/rc2_locl.h b/crypto/rc2/rc2_local.h
similarity index 100%
rename from crypto/rc2/rc2_locl.h
rename to crypto/rc2/rc2_local.h


diff --git a/crypto/rc2/rc2_skey.c b/crypto/rc2/rc2_skey.c
index a453366..33068d4 100644
--- a/crypto/rc2/rc2_skey.c
+++ b/crypto/rc2/rc2_skey.c

@@ -8,7 +8,7 @@
  */
 
 #include <openssl/rc2.h>
-#include "rc2_locl.h"
+#include "rc2_local.h"
 
 static const unsigned char key_table[256] = {
     0xd9, 0x78, 0xf9, 0xc4, 0x19, 0xdd, 0xb5, 0xed, 0x28, 0xe9, 0xfd, 0x79,

diff --git a/crypto/rc2/rc2cfb64.c b/crypto/rc2/rc2cfb64.c
index d7521ef..9b85368 100644
--- a/crypto/rc2/rc2cfb64.c
+++ b/crypto/rc2/rc2cfb64.c

@@ -8,7 +8,7 @@
  */
 
 #include <openssl/rc2.h>
-#include "rc2_locl.h"
+#include "rc2_local.h"
 
 /*
  * The input and output encrypted as though 64bit cfb mode is being used.

diff --git a/crypto/rc2/rc2ofb64.c b/crypto/rc2/rc2ofb64.c
index e1be066..4270009 100644
--- a/crypto/rc2/rc2ofb64.c
+++ b/crypto/rc2/rc2ofb64.c

@@ -8,7 +8,7 @@
  */
 
 #include <openssl/rc2.h>
-#include "rc2_locl.h"
+#include "rc2_local.h"
 
 /*
  * The input and output encrypted as though 64bit ofb mode is being used.

diff --git a/crypto/rc4/rc4_enc.c b/crypto/rc4/rc4_enc.c
index 2632660..c4753d9 100644
--- a/crypto/rc4/rc4_enc.c
+++ b/crypto/rc4/rc4_enc.c

@@ -8,7 +8,7 @@
  */
 
 #include <openssl/rc4.h>
-#include "rc4_locl.h"
+#include "rc4_local.h"
 
 /*-
  * RC4 as implemented from a posting from

diff --git a/crypto/rc4/rc4_locl.h b/crypto/rc4/rc4_local.h
similarity index 100%
rename from crypto/rc4/rc4_locl.h
rename to crypto/rc4/rc4_local.h


diff --git a/crypto/rc4/rc4_skey.c b/crypto/rc4/rc4_skey.c
index e2325e9..42c4a20 100644
--- a/crypto/rc4/rc4_skey.c
+++ b/crypto/rc4/rc4_skey.c

@@ -8,7 +8,7 @@
  */
 
 #include <openssl/rc4.h>
-#include "rc4_locl.h"
+#include "rc4_local.h"
 #include <openssl/opensslv.h>
 
 const char *RC4_options(void)

diff --git a/crypto/rc5/rc5_ecb.c b/crypto/rc5/rc5_ecb.c
index 61770b6..51c14fd 100644
--- a/crypto/rc5/rc5_ecb.c
+++ b/crypto/rc5/rc5_ecb.c

@@ -8,7 +8,7 @@
  */
 
 #include <openssl/rc5.h>
-#include "rc5_locl.h"
+#include "rc5_local.h"
 #include <openssl/opensslv.h>
 
 void RC5_32_ecb_encrypt(const unsigned char *in, unsigned char *out,

diff --git a/crypto/rc5/rc5_enc.c b/crypto/rc5/rc5_enc.c
index e1b7197..c91fa99 100644
--- a/crypto/rc5/rc5_enc.c
+++ b/crypto/rc5/rc5_enc.c

@@ -9,7 +9,7 @@
 
 #include <stdio.h>
 #include <openssl/rc5.h>
-#include "rc5_locl.h"
+#include "rc5_local.h"
 
 void RC5_32_cbc_encrypt(const unsigned char *in, unsigned char *out,
                         long length, RC5_32_KEY *ks, unsigned char *iv,

diff --git a/crypto/rc5/rc5_locl.h b/crypto/rc5/rc5_local.h
similarity index 100%
rename from crypto/rc5/rc5_locl.h
rename to crypto/rc5/rc5_local.h


diff --git a/crypto/rc5/rc5_skey.c b/crypto/rc5/rc5_skey.c
index 43dc932..22a5df1 100644
--- a/crypto/rc5/rc5_skey.c
+++ b/crypto/rc5/rc5_skey.c

@@ -8,7 +8,7 @@
  */
 
 #include <openssl/rc5.h>
-#include "rc5_locl.h"
+#include "rc5_local.h"
 
 int RC5_32_set_key(RC5_32_KEY *key, int len, const unsigned char *data,
                    int rounds)

diff --git a/crypto/rc5/rc5cfb64.c b/crypto/rc5/rc5cfb64.c
index ed0641b..001e124 100644
--- a/crypto/rc5/rc5cfb64.c
+++ b/crypto/rc5/rc5cfb64.c

@@ -8,7 +8,7 @@
  */
 
 #include <openssl/rc5.h>
-#include "rc5_locl.h"
+#include "rc5_local.h"
 
 /*
  * The input and output encrypted as though 64bit cfb mode is being used.

diff --git a/crypto/rc5/rc5ofb64.c b/crypto/rc5/rc5ofb64.c
index 30cc0e4..c3ae5d8 100644
--- a/crypto/rc5/rc5ofb64.c
+++ b/crypto/rc5/rc5ofb64.c

@@ -8,7 +8,7 @@
  */
 
 #include <openssl/rc5.h>
-#include "rc5_locl.h"
+#include "rc5_local.h"
 
 /*
  * The input and output encrypted as though 64bit ofb mode is being used.

diff --git a/crypto/ripemd/rmd_dgst.c b/crypto/ripemd/rmd_dgst.c
index b66da1c..f4a69c8 100644
--- a/crypto/ripemd/rmd_dgst.c
+++ b/crypto/ripemd/rmd_dgst.c

@@ -8,7 +8,7 @@
  */
 
 #include <stdio.h>
-#include "rmd_locl.h"
+#include "rmd_local.h"
 #include <openssl/opensslv.h>
 
 #ifdef RMD160_ASM
@@ -39,7 +39,7 @@
     register unsigned MD32_REG_T A, B, C, D, E;
     unsigned MD32_REG_T a, b, c, d, e, l;
 # ifndef MD32_XARRAY
-    /* See comment in crypto/sha/sha_locl.h for details. */
+    /* See comment in crypto/sha/sha_local.h for details. */
     unsigned MD32_REG_T XX0, XX1, XX2, XX3, XX4, XX5, XX6, XX7,
         XX8, XX9, XX10, XX11, XX12, XX13, XX14, XX15;
 #  define X(i)   XX##i

diff --git a/crypto/ripemd/rmd_locl.h b/crypto/ripemd/rmd_local.h
similarity index 96%
rename from crypto/ripemd/rmd_locl.h
rename to crypto/ripemd/rmd_local.h
index bb4feb9..325cb98 100644
--- a/crypto/ripemd/rmd_locl.h
+++ b/crypto/ripemd/rmd_local.h

@@ -13,7 +13,7 @@
 #include <openssl/ripemd.h>
 
 /*
- * DO EXAMINE COMMENTS IN crypto/md5/md5_locl.h & crypto/md5/md5_dgst.c
+ * DO EXAMINE COMMENTS IN crypto/md5/md5_local.h & crypto/md5/md5_dgst.c
  * FOR EXPLANATIONS ON FOLLOWING "CODE."
  */
 #ifdef RMD160_ASM

diff --git a/crypto/rsa/rsa_ameth.c b/crypto/rsa/rsa_ameth.c
index 7b1c955..69e7c5e 100644
--- a/crypto/rsa/rsa_ameth.c
+++ b/crypto/rsa/rsa_ameth.c

@@ -15,7 +15,7 @@
 #include <openssl/cms.h>
 #include "crypto/asn1.h"
 #include "crypto/evp.h"
-#include "rsa_locl.h"
+#include "rsa_local.h"
 
 #ifndef OPENSSL_NO_CMS
 static int rsa_cms_sign(CMS_SignerInfo *si);

diff --git a/crypto/rsa/rsa_asn1.c b/crypto/rsa/rsa_asn1.c
index ad9d8b3..e6b8125 100644
--- a/crypto/rsa/rsa_asn1.c
+++ b/crypto/rsa/rsa_asn1.c

@@ -12,7 +12,7 @@
 #include <openssl/bn.h>
 #include <openssl/x509.h>
 #include <openssl/asn1t.h>
-#include "rsa_locl.h"
+#include "rsa_local.h"
 
 /*
  * Override the default free and new methods,

diff --git a/crypto/rsa/rsa_chk.c b/crypto/rsa/rsa_chk.c
index 96a13b3..6e2557f 100644
--- a/crypto/rsa/rsa_chk.c
+++ b/crypto/rsa/rsa_chk.c

@@ -9,7 +9,7 @@
 
 #include <openssl/bn.h>
 #include <openssl/err.h>
-#include "rsa_locl.h"
+#include "rsa_local.h"
 
 int RSA_check_key(const RSA *key)
 {

diff --git a/crypto/rsa/rsa_crpt.c b/crypto/rsa/rsa_crpt.c
index 4933982..6a408e9 100644
--- a/crypto/rsa/rsa_crpt.c
+++ b/crypto/rsa/rsa_crpt.c

@@ -12,7 +12,7 @@
 #include "internal/cryptlib.h"
 #include "crypto/bn.h"
 #include <openssl/rand.h>
-#include "rsa_locl.h"
+#include "rsa_local.h"
 
 int RSA_bits(const RSA *r)
 {

diff --git a/crypto/rsa/rsa_gen.c b/crypto/rsa/rsa_gen.c
index dfbb79f..c87b709 100644
--- a/crypto/rsa/rsa_gen.c
+++ b/crypto/rsa/rsa_gen.c

@@ -17,7 +17,7 @@
 #include <time.h>
 #include "internal/cryptlib.h"
 #include <openssl/bn.h>
-#include "rsa_locl.h"
+#include "rsa_local.h"
 
 static int rsa_builtin_keygen(RSA *rsa, int bits, int primes, BIGNUM *e_value,
                               BN_GENCB *cb);

diff --git a/crypto/rsa/rsa_lib.c b/crypto/rsa/rsa_lib.c
index 83e6a35..abdabfb 100644
--- a/crypto/rsa/rsa_lib.c
+++ b/crypto/rsa/rsa_lib.c

@@ -15,7 +15,7 @@
 #include <openssl/engine.h>
 #include <openssl/evp.h>
 #include "crypto/evp.h"
-#include "rsa_locl.h"
+#include "rsa_local.h"
 
 RSA *RSA_new(void)
 {

diff --git a/crypto/rsa/rsa_locl.h b/crypto/rsa/rsa_local.h
similarity index 100%
rename from crypto/rsa/rsa_locl.h
rename to crypto/rsa/rsa_local.h


diff --git a/crypto/rsa/rsa_meth.c b/crypto/rsa/rsa_meth.c
index 0306519..a2a0426 100644
--- a/crypto/rsa/rsa_meth.c
+++ b/crypto/rsa/rsa_meth.c

@@ -8,7 +8,7 @@
  */
 
 #include <string.h>
-#include "rsa_locl.h"
+#include "rsa_local.h"
 #include <openssl/err.h>
 
 RSA_METHOD *RSA_meth_new(const char *name, int flags)

diff --git a/crypto/rsa/rsa_mp.c b/crypto/rsa/rsa_mp.c
index d2e00f6..6a16ffd 100644
--- a/crypto/rsa/rsa_mp.c
+++ b/crypto/rsa/rsa_mp.c

@@ -10,7 +10,7 @@
 
 #include <openssl/bn.h>
 #include <openssl/err.h>
-#include "rsa_locl.h"
+#include "rsa_local.h"
 
 void rsa_multip_info_free_ex(RSA_PRIME_INFO *pinfo)
 {

diff --git a/crypto/rsa/rsa_oaep.c b/crypto/rsa/rsa_oaep.c
index 0945d4f..1ae7ed2 100644
--- a/crypto/rsa/rsa_oaep.c
+++ b/crypto/rsa/rsa_oaep.c

@@ -20,7 +20,7 @@
  * one-wayness.  For the RSA function, this is an equivalent notion.
  */
 
-#include "internal/constant_time_locl.h"
+#include "internal/constant_time.h"
 
 #include <stdio.h>
 #include "internal/cryptlib.h"
@@ -28,7 +28,7 @@
 #include <openssl/evp.h>
 #include <openssl/rand.h>
 #include <openssl/sha.h>
-#include "rsa_locl.h"
+#include "rsa_local.h"
 
 int RSA_padding_add_PKCS1_OAEP(unsigned char *to, int tlen,
                                const unsigned char *from, int flen,

diff --git a/crypto/rsa/rsa_ossl.c b/crypto/rsa/rsa_ossl.c
index 54171de..39d17cf 100644
--- a/crypto/rsa/rsa_ossl.c
+++ b/crypto/rsa/rsa_ossl.c

@@ -9,8 +9,8 @@
 
 #include "internal/cryptlib.h"
 #include "crypto/bn.h"
-#include "rsa_locl.h"
-#include "internal/constant_time_locl.h"
+#include "rsa_local.h"
+#include "internal/constant_time.h"
 
 static int rsa_ossl_public_encrypt(int flen, const unsigned char *from,
                                   unsigned char *to, RSA *rsa, int padding);

diff --git a/crypto/rsa/rsa_pk1.c b/crypto/rsa/rsa_pk1.c
index ff1ca02..da984f5 100644
--- a/crypto/rsa/rsa_pk1.c
+++ b/crypto/rsa/rsa_pk1.c

@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "internal/constant_time_locl.h"
+#include "internal/constant_time.h"
 
 #include <stdio.h>
 #include "internal/cryptlib.h"

diff --git a/crypto/rsa/rsa_pmeth.c b/crypto/rsa/rsa_pmeth.c
index dfbf00c..390188d 100644
--- a/crypto/rsa/rsa_pmeth.c
+++ b/crypto/rsa/rsa_pmeth.c

@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "internal/constant_time_locl.h"
+#include "internal/constant_time.h"
 
 #include <stdio.h>
 #include "internal/cryptlib.h"
@@ -19,7 +19,7 @@
 #include <openssl/x509v3.h>
 #include <openssl/cms.h>
 #include "crypto/evp.h"
-#include "rsa_locl.h"
+#include "rsa_local.h"
 
 /* RSA pkey context structure */
 

diff --git a/crypto/rsa/rsa_pss.c b/crypto/rsa/rsa_pss.c
index 51c03c7..15014ef 100644
--- a/crypto/rsa/rsa_pss.c
+++ b/crypto/rsa/rsa_pss.c

@@ -14,7 +14,7 @@
 #include <openssl/evp.h>
 #include <openssl/rand.h>
 #include <openssl/sha.h>
-#include "rsa_locl.h"
+#include "rsa_local.h"
 
 static const unsigned char zeroes[] = { 0, 0, 0, 0, 0, 0, 0, 0 };
 

diff --git a/crypto/rsa/rsa_sign.c b/crypto/rsa/rsa_sign.c
index 07b18ed..0ed9acf 100644
--- a/crypto/rsa/rsa_sign.c
+++ b/crypto/rsa/rsa_sign.c

@@ -14,7 +14,7 @@
 #include <openssl/objects.h>
 #include <openssl/x509.h>
 #include "crypto/x509.h"
-#include "rsa_locl.h"
+#include "rsa_local.h"
 
 /* Size of an SSL signature: MD5+SHA1 */
 #define SSL_SIG_LENGTH  36

diff --git a/crypto/rsa/rsa_sp800_56b_check.c b/crypto/rsa/rsa_sp800_56b_check.c
index 36d946d..cf15212 100644
--- a/crypto/rsa/rsa_sp800_56b_check.c
+++ b/crypto/rsa/rsa_sp800_56b_check.c

@@ -11,7 +11,7 @@
 #include <openssl/err.h>
 #include <openssl/bn.h>
 #include "crypto/bn.h"
-#include "rsa_locl.h"
+#include "rsa_local.h"
 
 /*
  * Part of the RSA keypair test.

diff --git a/crypto/rsa/rsa_sp800_56b_gen.c b/crypto/rsa/rsa_sp800_56b_gen.c
index 73c9c1d..c22b10c 100644
--- a/crypto/rsa/rsa_sp800_56b_gen.c
+++ b/crypto/rsa/rsa_sp800_56b_gen.c

@@ -11,7 +11,7 @@
 #include <openssl/err.h>
 #include <openssl/bn.h>
 #include "crypto/bn.h"
-#include "rsa_locl.h"
+#include "rsa_local.h"
 
 #define RSA_FIPS1864_MIN_KEYGEN_KEYSIZE 2048
 #define RSA_FIPS1864_MIN_KEYGEN_STRENGTH 112

diff --git a/crypto/rsa/rsa_ssl.c b/crypto/rsa/rsa_ssl.c
index 16bfe00..d57031e 100644
--- a/crypto/rsa/rsa_ssl.c
+++ b/crypto/rsa/rsa_ssl.c

@@ -12,7 +12,7 @@
 #include <openssl/bn.h>
 #include <openssl/rsa.h>
 #include <openssl/rand.h>
-#include "internal/constant_time_locl.h"
+#include "internal/constant_time.h"
 
 int RSA_padding_add_SSLv23(unsigned char *to, int tlen,
                            const unsigned char *from, int flen)

diff --git a/crypto/rsa/rsa_x931g.c b/crypto/rsa/rsa_x931g.c
index 7a52083..3798d02 100644
--- a/crypto/rsa/rsa_x931g.c
+++ b/crypto/rsa/rsa_x931g.c

@@ -12,7 +12,7 @@
 #include <time.h>
 #include <openssl/err.h>
 #include <openssl/bn.h>
-#include "rsa_locl.h"
+#include "rsa_local.h"
 
 /* X9.31 RSA key derivation and generation */
 

diff --git a/crypto/seed/seed.c b/crypto/seed/seed.c
index a73ec44..224fb1f 100644
--- a/crypto/seed/seed.c
+++ b/crypto/seed/seed.c

@@ -42,7 +42,7 @@
 # endif
 
 # include <openssl/seed.h>
-# include "seed_locl.h"
+# include "seed_local.h"
 
 # ifdef SS                      /* can get defined on Solaris by inclusion of
                                  * <stdlib.h> */

diff --git a/crypto/seed/seed_locl.h b/crypto/seed/seed_local.h
similarity index 100%
rename from crypto/seed/seed_locl.h
rename to crypto/seed/seed_local.h


diff --git a/crypto/sha/sha1dgst.c b/crypto/sha/sha1dgst.c
index 563ddbd..68c0a96 100644
--- a/crypto/sha/sha1dgst.c
+++ b/crypto/sha/sha1dgst.c

@@ -16,7 +16,7 @@
 
 /* The implementation is in ../md32_common.h */
 
-#include "sha_locl.h"
+#include "sha_local.h"
 #include "crypto/sha.h"
 
 int sha1_ctrl(SHA_CTX *sha1, int cmd, int mslen, void *ms)

diff --git a/crypto/sha/sha_locl.h b/crypto/sha/sha_local.h
similarity index 100%
rename from crypto/sha/sha_locl.h
rename to crypto/sha/sha_local.h


diff --git a/crypto/sm3/sm3.c b/crypto/sm3/sm3.c
index f5d6a86..ef03150 100644
--- a/crypto/sm3/sm3.c
+++ b/crypto/sm3/sm3.c

@@ -10,7 +10,7 @@
  */
 
 #include <openssl/e_os2.h>
-#include "sm3_locl.h"
+#include "sm3_local.h"
 
 int sm3_init(SM3_CTX *c)
 {

diff --git a/crypto/sm3/sm3_locl.h b/crypto/sm3/sm3_local.h
similarity index 100%
rename from crypto/sm3/sm3_locl.h
rename to crypto/sm3/sm3_local.h


diff --git a/crypto/store/loader_file.c b/crypto/store/loader_file.c
index 88302e5..078c7c2 100644
--- a/crypto/store/loader_file.c
+++ b/crypto/store/loader_file.c

@@ -29,7 +29,7 @@
 #include "internal/o_dir.h"
 #include "internal/cryptlib.h"
 #include "crypto/store.h"
-#include "store_locl.h"
+#include "store_local.h"
 
 #ifdef _WIN32
 # define stat    _stat

diff --git a/crypto/store/store_init.c b/crypto/store/store_init.c
index c5d8cc4..e1b953f 100644
--- a/crypto/store/store_init.c
+++ b/crypto/store/store_init.c

@@ -9,7 +9,7 @@
 
 #include <openssl/err.h>
 #include "crypto/store.h"
-#include "store_locl.h"
+#include "store_local.h"
 
 static CRYPTO_ONCE store_init = CRYPTO_ONCE_STATIC_INIT;
 DEFINE_RUN_ONCE_STATIC(do_store_init)

diff --git a/crypto/store/store_lib.c b/crypto/store/store_lib.c
index 2d3b307..92b957c 100644
--- a/crypto/store/store_lib.c
+++ b/crypto/store/store_lib.c

@@ -19,7 +19,7 @@
 #include <openssl/store.h>
 #include "internal/thread_once.h"
 #include "crypto/store.h"
-#include "store_locl.h"
+#include "store_local.h"
 
 struct ossl_store_ctx_st {
     const OSSL_STORE_LOADER *loader;

diff --git a/crypto/store/store_locl.h b/crypto/store/store_local.h
similarity index 100%
rename from crypto/store/store_locl.h
rename to crypto/store/store_local.h


diff --git a/crypto/store/store_register.c b/crypto/store/store_register.c
index 8cd5783..399ec8c 100644
--- a/crypto/store/store_register.c
+++ b/crypto/store/store_register.c

@@ -13,7 +13,7 @@
 
 #include <openssl/err.h>
 #include <openssl/lhash.h>
-#include "store_locl.h"
+#include "store_local.h"
 
 static CRYPTO_RWLOCK *registry_lock;
 static CRYPTO_ONCE registry_init = CRYPTO_ONCE_STATIC_INIT;

diff --git a/crypto/ts/ts_asn1.c b/crypto/ts/ts_asn1.c
index 52ac2aa..49f92b2 100644
--- a/crypto/ts/ts_asn1.c
+++ b/crypto/ts/ts_asn1.c

@@ -10,7 +10,7 @@
 #include <openssl/ts.h>
 #include <openssl/err.h>
 #include <openssl/asn1t.h>
-#include "ts_lcl.h"
+#include "ts_local.h"
 
 ASN1_SEQUENCE(TS_MSG_IMPRINT) = {
         ASN1_SIMPLE(TS_MSG_IMPRINT, hash_algo, X509_ALGOR),

diff --git a/crypto/ts/ts_lib.c b/crypto/ts/ts_lib.c
index 5c1e15a..5a99c9d 100644
--- a/crypto/ts/ts_lib.c
+++ b/crypto/ts/ts_lib.c

@@ -14,7 +14,7 @@
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
 #include <openssl/ts.h>
-#include "ts_lcl.h"
+#include "ts_local.h"
 
 int TS_ASN1_INTEGER_print_bio(BIO *bio, const ASN1_INTEGER *num)
 {

diff --git a/crypto/ts/ts_lcl.h b/crypto/ts/ts_local.h
similarity index 100%
rename from crypto/ts/ts_lcl.h
rename to crypto/ts/ts_local.h


diff --git a/crypto/ts/ts_req_print.c b/crypto/ts/ts_req_print.c
index d1c4e6a..968816a 100644
--- a/crypto/ts/ts_req_print.c
+++ b/crypto/ts/ts_req_print.c

@@ -13,7 +13,7 @@
 #include <openssl/bn.h>
 #include <openssl/x509v3.h>
 #include <openssl/ts.h>
-#include "ts_lcl.h"
+#include "ts_local.h"
 
 int TS_REQ_print_bio(BIO *bio, TS_REQ *a)
 {

diff --git a/crypto/ts/ts_req_utils.c b/crypto/ts/ts_req_utils.c
index 6e90a59..8b95097 100644
--- a/crypto/ts/ts_req_utils.c
+++ b/crypto/ts/ts_req_utils.c

@@ -12,7 +12,7 @@
 #include <openssl/objects.h>
 #include <openssl/x509v3.h>
 #include <openssl/ts.h>
-#include "ts_lcl.h"
+#include "ts_local.h"
 
 int TS_REQ_set_version(TS_REQ *a, long version)
 {

diff --git a/crypto/ts/ts_rsp_print.c b/crypto/ts/ts_rsp_print.c
index 9827c20..8593e2d 100644
--- a/crypto/ts/ts_rsp_print.c
+++ b/crypto/ts/ts_rsp_print.c

@@ -13,7 +13,7 @@
 #include <openssl/bn.h>
 #include <openssl/x509v3.h>
 #include <openssl/ts.h>
-#include "ts_lcl.h"
+#include "ts_local.h"
 
 struct status_map_st {
     int bit;

diff --git a/crypto/ts/ts_rsp_sign.c b/crypto/ts/ts_rsp_sign.c
index 74fa93d..9faa42f 100644
--- a/crypto/ts/ts_rsp_sign.c
+++ b/crypto/ts/ts_rsp_sign.c

@@ -14,7 +14,7 @@
 #include <openssl/ts.h>
 #include <openssl/pkcs7.h>
 #include <openssl/crypto.h>
-#include "ts_lcl.h"
+#include "ts_local.h"
 #include "crypto/ess.h"
 
 static ASN1_INTEGER *def_serial_cb(struct TS_resp_ctx *, void *);

diff --git a/crypto/ts/ts_rsp_utils.c b/crypto/ts/ts_rsp_utils.c
index 8e4bed2..6017e8d 100644
--- a/crypto/ts/ts_rsp_utils.c
+++ b/crypto/ts/ts_rsp_utils.c

@@ -12,7 +12,7 @@
 #include <openssl/objects.h>
 #include <openssl/ts.h>
 #include <openssl/pkcs7.h>
-#include "ts_lcl.h"
+#include "ts_local.h"
 
 int TS_RESP_set_status_info(TS_RESP *a, TS_STATUS_INFO *status_info)
 {

diff --git a/crypto/ts/ts_rsp_verify.c b/crypto/ts/ts_rsp_verify.c
index 0b6ea1e..7d2161f 100644
--- a/crypto/ts/ts_rsp_verify.c
+++ b/crypto/ts/ts_rsp_verify.c

@@ -12,7 +12,7 @@
 #include <openssl/objects.h>
 #include <openssl/ts.h>
 #include <openssl/pkcs7.h>
-#include "ts_lcl.h"
+#include "ts_local.h"
 #include "crypto/ess.h"
 
 static int ts_verify_cert(X509_STORE *store, STACK_OF(X509) *untrusted,

diff --git a/crypto/ts/ts_verify_ctx.c b/crypto/ts/ts_verify_ctx.c
index 9ff91da..e2a4ee4 100644
--- a/crypto/ts/ts_verify_ctx.c
+++ b/crypto/ts/ts_verify_ctx.c

@@ -10,7 +10,7 @@
 #include "internal/cryptlib.h"
 #include <openssl/objects.h>
 #include <openssl/ts.h>
-#include "ts_lcl.h"
+#include "ts_local.h"
 
 TS_VERIFY_CTX *TS_VERIFY_CTX_new(void)
 {

diff --git a/crypto/ui/ui_lib.c b/crypto/ui/ui_lib.c
index d039351..ab51a24 100644
--- a/crypto/ui/ui_lib.c
+++ b/crypto/ui/ui_lib.c

@@ -13,7 +13,7 @@
 #include <openssl/buffer.h>
 #include <openssl/ui.h>
 #include <openssl/err.h>
-#include "ui_locl.h"
+#include "ui_local.h"
 
 UI *UI_new(void)
 {

diff --git a/crypto/ui/ui_locl.h b/crypto/ui/ui_local.h
similarity index 100%
rename from crypto/ui/ui_locl.h
rename to crypto/ui/ui_local.h


diff --git a/crypto/ui/ui_null.c b/crypto/ui/ui_null.c
index 8e500cc..f002448 100644
--- a/crypto/ui/ui_null.c
+++ b/crypto/ui/ui_null.c

@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "ui_locl.h"
+#include "ui_local.h"
 
 static const UI_METHOD ui_null = {
     "OpenSSL NULL UI",

diff --git a/crypto/ui/ui_openssl.c b/crypto/ui/ui_openssl.c
index 52c675a..cf87343 100644
--- a/crypto/ui/ui_openssl.c
+++ b/crypto/ui/ui_openssl.c

@@ -49,7 +49,7 @@
 #  endif
 # endif
 
-# include "ui_locl.h"
+# include "ui_local.h"
 # include "internal/cryptlib.h"
 
 # ifdef OPENSSL_SYS_VMS          /* prototypes for sys$whatever */

diff --git a/crypto/ui/ui_util.c b/crypto/ui/ui_util.c
index c49fb72..b28c133 100644
--- a/crypto/ui/ui_util.c
+++ b/crypto/ui/ui_util.c

@@ -9,7 +9,7 @@
 
 #include <string.h>
 #include "internal/thread_once.h"
-#include "ui_locl.h"
+#include "ui_local.h"
 
 #ifndef BUFSIZ
 #define BUFSIZ 256

diff --git a/crypto/whrlpool/wp_block.c b/crypto/whrlpool/wp_block.c
index c2c0b72..c24f673 100644
--- a/crypto/whrlpool/wp_block.c
+++ b/crypto/whrlpool/wp_block.c

@@ -37,7 +37,7 @@
  */
 
 #include "internal/cryptlib.h"
-#include "wp_locl.h"
+#include "wp_local.h"
 #include <string.h>
 
 typedef unsigned char u8;

diff --git a/crypto/whrlpool/wp_dgst.c b/crypto/whrlpool/wp_dgst.c
index 4969630..3a4a809 100644
--- a/crypto/whrlpool/wp_dgst.c
+++ b/crypto/whrlpool/wp_dgst.c

@@ -53,7 +53,7 @@
  */
 
 #include <openssl/crypto.h>
-#include "wp_locl.h"
+#include "wp_local.h"
 #include <string.h>
 
 int WHIRLPOOL_Init(WHIRLPOOL_CTX *c)

diff --git a/crypto/whrlpool/wp_locl.h b/crypto/whrlpool/wp_local.h
similarity index 100%
rename from crypto/whrlpool/wp_locl.h
rename to crypto/whrlpool/wp_local.h


diff --git a/crypto/x509/by_dir.c b/crypto/x509/by_dir.c
index 720a4b9..d38080f 100644
--- a/crypto/x509/by_dir.c
+++ b/crypto/x509/by_dir.c

@@ -20,7 +20,7 @@
 
 #include <openssl/x509.h>
 #include "crypto/x509.h"
-#include "x509_lcl.h"
+#include "x509_local.h"
 
 struct lookup_dir_hashes_st {
     unsigned long hash;

diff --git a/crypto/x509/by_file.c b/crypto/x509/by_file.c
index 35d716b..93a1af8 100644
--- a/crypto/x509/by_file.c
+++ b/crypto/x509/by_file.c

@@ -15,7 +15,7 @@
 #include <openssl/buffer.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>
-#include "x509_lcl.h"
+#include "x509_local.h"
 
 static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc,
                         long argl, char **ret);

diff --git a/crypto/x509/pcy_cache.c b/crypto/x509/pcy_cache.c
index 56d3401..e65931e 100644
--- a/crypto/x509/pcy_cache.c
+++ b/crypto/x509/pcy_cache.c

@@ -12,7 +12,7 @@
 #include <openssl/x509v3.h>
 #include "crypto/x509.h"
 
-#include "pcy_int.h"
+#include "pcy_local.h"
 
 static int policy_data_cmp(const X509_POLICY_DATA *const *a,
                            const X509_POLICY_DATA *const *b);

diff --git a/crypto/x509/pcy_data.c b/crypto/x509/pcy_data.c
index c1d56bd..cc3fc20 100644
--- a/crypto/x509/pcy_data.c
+++ b/crypto/x509/pcy_data.c

@@ -11,7 +11,7 @@
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
 
-#include "pcy_int.h"
+#include "pcy_local.h"
 
 /* Policy Node routines */
 

diff --git a/crypto/x509/pcy_lib.c b/crypto/x509/pcy_lib.c
index deee8f6..b392f13 100644
--- a/crypto/x509/pcy_lib.c
+++ b/crypto/x509/pcy_lib.c

@@ -11,7 +11,7 @@
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
 
-#include "pcy_int.h"
+#include "pcy_local.h"
 
 /* accessor functions */
 

diff --git a/crypto/x509/pcy_int.h b/crypto/x509/pcy_local.h
similarity index 100%
rename from crypto/x509/pcy_int.h
rename to crypto/x509/pcy_local.h


diff --git a/crypto/x509/pcy_map.c b/crypto/x509/pcy_map.c
index ec72dbd..258792b 100644
--- a/crypto/x509/pcy_map.c
+++ b/crypto/x509/pcy_map.c

@@ -12,7 +12,7 @@
 #include <openssl/x509v3.h>
 #include "crypto/x509.h"
 
-#include "pcy_int.h"
+#include "pcy_local.h"
 
 /*
  * Set policy mapping entries in cache. Note: this modifies the passed

diff --git a/crypto/x509/pcy_node.c b/crypto/x509/pcy_node.c
index 005d1de..fc06a31 100644
--- a/crypto/x509/pcy_node.c
+++ b/crypto/x509/pcy_node.c

@@ -12,7 +12,7 @@
 #include <openssl/x509v3.h>
 #include <openssl/err.h>
 
-#include "pcy_int.h"
+#include "pcy_local.h"
 
 static int node_cmp(const X509_POLICY_NODE *const *a,
                     const X509_POLICY_NODE *const *b)

diff --git a/crypto/x509/pcy_tree.c b/crypto/x509/pcy_tree.c
index 5d4c6bd..8ab0914 100644
--- a/crypto/x509/pcy_tree.c
+++ b/crypto/x509/pcy_tree.c

@@ -12,7 +12,7 @@
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
 
-#include "pcy_int.h"
+#include "pcy_local.h"
 
 static void expected_print(BIO *channel,
                            X509_POLICY_LEVEL *lev, X509_POLICY_NODE *node,

diff --git a/crypto/x509/v3_cpols.c b/crypto/x509/v3_cpols.c
index 595de62..f9a239b 100644
--- a/crypto/x509/v3_cpols.c
+++ b/crypto/x509/v3_cpols.c

@@ -14,7 +14,7 @@
 #include <openssl/asn1t.h>
 #include <openssl/x509v3.h>
 
-#include "pcy_int.h"
+#include "pcy_local.h"
 #include "ext_dat.h"
 
 /* Certificate policies extension support: this one is a bit complex... */

diff --git a/crypto/x509/x509_att.c b/crypto/x509/x509_att.c
index 317a45a4..c8b2d0f 100644
--- a/crypto/x509/x509_att.c
+++ b/crypto/x509/x509_att.c

@@ -15,7 +15,7 @@
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
-#include "x509_lcl.h"
+#include "x509_local.h"
 
 int X509at_get_attr_count(const STACK_OF(X509_ATTRIBUTE) *x)
 {

diff --git a/crypto/x509/x509_lcl.h b/crypto/x509/x509_local.h
similarity index 100%
rename from crypto/x509/x509_lcl.h
rename to crypto/x509/x509_local.h


diff --git a/crypto/x509/x509_lu.c b/crypto/x509/x509_lu.c
index f6404d5..016b4b3 100644
--- a/crypto/x509/x509_lu.c
+++ b/crypto/x509/x509_lu.c

@@ -13,7 +13,7 @@
 #include <openssl/x509.h>
 #include "crypto/x509.h"
 #include <openssl/x509v3.h>
-#include "x509_lcl.h"
+#include "x509_local.h"
 
 X509_LOOKUP *X509_LOOKUP_new(X509_LOOKUP_METHOD *method)
 {

diff --git a/crypto/x509/x509_meth.c b/crypto/x509/x509_meth.c
index 631cc8f..71db9959 100644
--- a/crypto/x509/x509_meth.c
+++ b/crypto/x509/x509_meth.c

@@ -15,7 +15,7 @@
 #include <openssl/asn1.h>
 #include <openssl/x509.h>
 #include <openssl/ossl_typ.h>
-#include "x509_lcl.h"
+#include "x509_local.h"
 
 X509_LOOKUP_METHOD *X509_LOOKUP_meth_new(const char *name)
 {

diff --git a/crypto/x509/x509_set.c b/crypto/x509/x509_set.c
index 66cf91f..e325a57 100644
--- a/crypto/x509/x509_set.c
+++ b/crypto/x509/x509_set.c

@@ -17,7 +17,7 @@
 #include <openssl/x509v3.h>
 #include "crypto/asn1.h"
 #include "crypto/x509.h"
-#include "x509_lcl.h"
+#include "x509_local.h"
 
 int X509_set_version(X509 *x, long version)
 {

diff --git a/crypto/x509/x509_v3.c b/crypto/x509/x509_v3.c
index 68da09b..715c359 100644
--- a/crypto/x509/x509_v3.c
+++ b/crypto/x509/x509_v3.c

@@ -15,7 +15,7 @@
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
-#include "x509_lcl.h"
+#include "x509_local.h"
 
 int X509v3_get_ext_count(const STACK_OF(X509_EXTENSION) *x)
 {

diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c
index 0dd9772..126df99 100644
--- a/crypto/x509/x509_vfy.c
+++ b/crypto/x509/x509_vfy.c

@@ -23,7 +23,7 @@
 #include <openssl/objects.h>
 #include "internal/dane.h"
 #include "crypto/x509.h"
-#include "x509_lcl.h"
+#include "x509_local.h"
 
 /* CRL score values */
 

diff --git a/crypto/x509/x509_vpm.c b/crypto/x509/x509_vpm.c
index c681dba..81a0ec9 100644
--- a/crypto/x509/x509_vpm.c
+++ b/crypto/x509/x509_vpm.c

@@ -16,7 +16,7 @@
 #include <openssl/x509v3.h>
 #include "crypto/x509.h"
 
-#include "x509_lcl.h"
+#include "x509_local.h"
 
 /* X509_VERIFY_PARAM functions */
 

diff --git a/crypto/x509/x_attrib.c b/crypto/x509/x_attrib.c
index e39429f..b302341 100644
--- a/crypto/x509/x_attrib.c
+++ b/crypto/x509/x_attrib.c

@@ -12,7 +12,7 @@
 #include <openssl/objects.h>
 #include <openssl/asn1t.h>
 #include <openssl/x509.h>
-#include "x509_lcl.h"
+#include "x509_local.h"
 
 /*-
  * X509_ATTRIBUTE: this has the following form:

diff --git a/crypto/x509/x_crl.c b/crypto/x509/x_crl.c
index d06eb69..fdc0591 100644
--- a/crypto/x509/x_crl.c
+++ b/crypto/x509/x_crl.c

@@ -13,7 +13,7 @@
 #include <openssl/x509.h>
 #include "crypto/x509.h"
 #include <openssl/x509v3.h>
-#include "x509_lcl.h"
+#include "x509_local.h"
 
 static int X509_REVOKED_cmp(const X509_REVOKED *const *a,
                             const X509_REVOKED *const *b);

diff --git a/crypto/x509/x_exten.c b/crypto/x509/x_exten.c
index 6ed363d..4e63b50 100644
--- a/crypto/x509/x_exten.c
+++ b/crypto/x509/x_exten.c

@@ -11,7 +11,7 @@
 #include <openssl/x509.h>
 #include <openssl/asn1.h>
 #include <openssl/asn1t.h>
-#include "x509_lcl.h"
+#include "x509_local.h"
 
 ASN1_SEQUENCE(X509_EXTENSION) = {
         ASN1_SIMPLE(X509_EXTENSION, object, ASN1_OBJECT),

diff --git a/crypto/x509/x_name.c b/crypto/x509/x_name.c
index 93ba955..33faacf 100644
--- a/crypto/x509/x_name.c
+++ b/crypto/x509/x_name.c

@@ -14,7 +14,7 @@
 #include <openssl/x509.h>
 #include "crypto/x509.h"
 #include "crypto/asn1.h"
-#include "x509_lcl.h"
+#include "x509_local.h"
 
 /*
  * Maximum length of X509_NAME: much larger than anything we should

diff --git a/doc/internal/man3/evp_generic_fetch.pod b/doc/internal/man3/evp_generic_fetch.pod
index 738c501..4c12158 100644
--- a/doc/internal/man3/evp_generic_fetch.pod
+++ b/doc/internal/man3/evp_generic_fetch.pod

@@ -8,7 +8,7 @@
 =head1 SYNOPSIS
 
  /* Only for EVP source */
- #include "evp_locl.h"
+ #include "evp_local.h"
 
  void *evp_generic_fetch(OPENSSL_CTX *libctx, int operation_id,
                          const char *name, const char *properties,

diff --git a/doc/internal/man3/ossl_cmp_asn1_octet_string_set1.pod b/doc/internal/man3/ossl_cmp_asn1_octet_string_set1.pod
index 5a9f99f..83a6d94 100644
--- a/doc/internal/man3/ossl_cmp_asn1_octet_string_set1.pod
+++ b/doc/internal/man3/ossl_cmp_asn1_octet_string_set1.pod

@@ -13,7 +13,7 @@
 
 =head1 SYNOPSIS
 
- #include "cmp_int.h"
+ #include "cmp_local.h"
 
  const char *ossl_cmp_log_parse_metadata(const char *buf,
                                          OSSL_CMP_severity *level, char **func,

diff --git a/include/internal/constant_time_locl.h b/include/internal/constant_time.h
similarity index 100%
rename from include/internal/constant_time_locl.h
rename to include/internal/constant_time.h


diff --git a/providers/common/ciphers/block.c b/providers/common/ciphers/block.c
index a53e925..ec2dab6 100644
--- a/providers/common/ciphers/block.c
+++ b/providers/common/ciphers/block.c

@@ -8,7 +8,7 @@
  */
 
 #include <assert.h>
-#include "cipher_locl.h"
+#include "cipher_local.h"
 #include "internal/providercommonerr.h"
 
 /*

diff --git a/providers/common/ciphers/cipher_aes_ccm.c b/providers/common/ciphers/cipher_aes_ccm.c
index 75f6e3f..c801589 100644
--- a/providers/common/ciphers/cipher_aes_ccm.c
+++ b/providers/common/ciphers/cipher_aes_ccm.c

@@ -9,7 +9,7 @@
 
 /* Dispatch functions for AES CCM mode */
 
-#include "cipher_locl.h"
+#include "cipher_local.h"
 #include "internal/ciphers/cipher_ccm.h"
 #include "internal/provider_algs.h"
 

diff --git a/providers/common/ciphers/cipher_aes_ccm_hw.c b/providers/common/ciphers/cipher_aes_ccm_hw.c
index f445cb7..ba7ce4d 100644
--- a/providers/common/ciphers/cipher_aes_ccm_hw.c
+++ b/providers/common/ciphers/cipher_aes_ccm_hw.c

@@ -9,7 +9,7 @@
 
 /* AES CCM mode */
 
-#include "cipher_locl.h"
+#include "cipher_local.h"
 #include "internal/ciphers/cipher_ccm.h"
 
 #define AES_HW_CCM_SET_KEY_FN(fn_set_enc_key, fn_blk, fn_ccm_enc, fn_ccm_dec)  \

diff --git a/providers/common/ciphers/cipher_aes_gcm.c b/providers/common/ciphers/cipher_aes_gcm.c
index 69c98f4..ba03bed 100644
--- a/providers/common/ciphers/cipher_aes_gcm.c
+++ b/providers/common/ciphers/cipher_aes_gcm.c

@@ -9,7 +9,7 @@
 
 /* Dispatch functions for AES GCM mode */
 
-#include "cipher_locl.h"
+#include "cipher_local.h"
 #include "internal/ciphers/cipher_gcm.h"
 #include "internal/provider_algs.h"
 

diff --git a/providers/common/ciphers/cipher_aes_gcm_hw.c b/providers/common/ciphers/cipher_aes_gcm_hw.c
index 3f56e68..5263bdd 100644
--- a/providers/common/ciphers/cipher_aes_gcm_hw.c
+++ b/providers/common/ciphers/cipher_aes_gcm_hw.c

@@ -9,7 +9,7 @@
 
 /* Dispatch functions for AES GCM mode */
 
-#include "cipher_locl.h"
+#include "cipher_local.h"
 #include "internal/ciphers/cipher_gcm.h"
 
 static int generic_aes_gcm_initkey(PROV_GCM_CTX *ctx, const unsigned char *key,

diff --git a/providers/common/ciphers/cipher_ccm.c b/providers/common/ciphers/cipher_ccm.c
index 9c58dfe..cc37b49 100644
--- a/providers/common/ciphers/cipher_ccm.c
+++ b/providers/common/ciphers/cipher_ccm.c

@@ -9,7 +9,7 @@
 
 /* Dispatch functions for ccm mode */
 
-#include "cipher_locl.h"
+#include "cipher_local.h"
 #include "internal/ciphers/cipher_ccm.h"
 #include "internal/providercommonerr.h"
 

diff --git a/providers/common/ciphers/cipher_common.c b/providers/common/ciphers/cipher_common.c
index 3c45dd5..3440787 100644
--- a/providers/common/ciphers/cipher_common.c
+++ b/providers/common/ciphers/cipher_common.c

@@ -11,7 +11,7 @@
  * Generic dispatch table functions for ciphers.
  */
 
-#include "cipher_locl.h"
+#include "cipher_local.h"
 #include "internal/provider_ctx.h"
 #include "internal/providercommonerr.h"
 

diff --git a/providers/common/ciphers/cipher_common_hw.c b/providers/common/ciphers/cipher_common_hw.c
index 5a3fb30..6f1b4ba 100644
--- a/providers/common/ciphers/cipher_common_hw.c
+++ b/providers/common/ciphers/cipher_common_hw.c

@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "cipher_locl.h"
+#include "cipher_local.h"
 
 /*-
  * The generic cipher functions for cipher modes cbc, ecb, ofb, cfb and ctr.

diff --git a/providers/common/ciphers/cipher_gcm.c b/providers/common/ciphers/cipher_gcm.c
index 09cd70c..137ad50 100644
--- a/providers/common/ciphers/cipher_gcm.c
+++ b/providers/common/ciphers/cipher_gcm.c

@@ -9,7 +9,7 @@
 
 /* Dispatch functions for gcm mode */
 
-#include "cipher_locl.h"
+#include "cipher_local.h"
 #include "internal/ciphers/cipher_gcm.h"
 #include "internal/providercommonerr.h"
 #include "crypto/rand.h"

diff --git a/providers/common/ciphers/cipher_gcm_hw.c b/providers/common/ciphers/cipher_gcm_hw.c
index 8b2913c..1d9c3ea 100644
--- a/providers/common/ciphers/cipher_gcm_hw.c
+++ b/providers/common/ciphers/cipher_gcm_hw.c

@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "cipher_locl.h"
+#include "cipher_local.h"
 #include "internal/ciphers/cipher_gcm.h"
 
 

diff --git a/providers/common/ciphers/cipher_locl.h b/providers/common/ciphers/cipher_local.h
similarity index 100%
rename from providers/common/ciphers/cipher_locl.h
rename to providers/common/ciphers/cipher_local.h


diff --git a/providers/common/ciphers/cipher_tdes.c b/providers/common/ciphers/cipher_tdes.c
index 0548531..004ebc7 100644
--- a/providers/common/ciphers/cipher_tdes.c
+++ b/providers/common/ciphers/cipher_tdes.c

@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "cipher_locl.h"
+#include "cipher_local.h"
 #include "internal/ciphers/cipher_tdes.h"
 #include "crypto/rand.h"
 #include "internal/provider_algs.h"

diff --git a/providers/common/ciphers/cipher_tdes_hw.c b/providers/common/ciphers/cipher_tdes_hw.c
index 92b6de2..10ba5a2 100644
--- a/providers/common/ciphers/cipher_tdes_hw.c
+++ b/providers/common/ciphers/cipher_tdes_hw.c

@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "cipher_locl.h"
+#include "cipher_local.h"
 #include "internal/ciphers/cipher_tdes.h"
 
 #define ks1 tks.ks[0]

diff --git a/providers/default/ciphers/cipher_des.c b/providers/default/ciphers/cipher_des.c
index 9456c20..c4eb10b 100644
--- a/providers/default/ciphers/cipher_des.c
+++ b/providers/default/ciphers/cipher_des.c

@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "cipher_locl.h"
+#include "cipher_local.h"
 #include "cipher_des.h"
 #include "crypto/rand.h"
 #include "internal/provider_algs.h"

diff --git a/ssl/bio_ssl.c b/ssl/bio_ssl.c
index a94fd90..b44ec3e 100644
--- a/ssl/bio_ssl.c
+++ b/ssl/bio_ssl.c

@@ -14,7 +14,7 @@
 #include <openssl/crypto.h>
 #include "internal/bio.h"
 #include <openssl/err.h>
-#include "ssl_locl.h"
+#include "ssl_local.h"
 
 static int ssl_write(BIO *h, const char *buf, size_t size, size_t *written);
 static int ssl_read(BIO *b, char *buf, size_t size, size_t *readbytes);

diff --git a/ssl/d1_lib.c b/ssl/d1_lib.c
index 01955d7..f30a685 100644
--- a/ssl/d1_lib.c
+++ b/ssl/d1_lib.c

@@ -11,7 +11,7 @@
 #include <stdio.h>
 #include <openssl/objects.h>
 #include <openssl/rand.h>
-#include "ssl_locl.h"
+#include "ssl_local.h"
 
 static void get_current_time(struct timeval *t);
 static int dtls1_handshake_write(SSL *s);

diff --git a/ssl/d1_msg.c b/ssl/d1_msg.c
index 0dc8361..96741ef 100644
--- a/ssl/d1_msg.c
+++ b/ssl/d1_msg.c

@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "ssl_locl.h"
+#include "ssl_local.h"
 
 int dtls1_write_app_data_bytes(SSL *s, int type, const void *buf_, size_t len,
                                size_t *written)

diff --git a/ssl/d1_srtp.c b/ssl/d1_srtp.c
index b6b2025..6498f84 100644
--- a/ssl/d1_srtp.c
+++ b/ssl/d1_srtp.c

@@ -15,7 +15,7 @@
 
 #include <stdio.h>
 #include <openssl/objects.h>
-#include "ssl_locl.h"
+#include "ssl_local.h"
 
 #ifndef OPENSSL_NO_SRTP
 

diff --git a/ssl/methods.c b/ssl/methods.c
index 1b80dce..0b03f80 100644
--- a/ssl/methods.c
+++ b/ssl/methods.c

@@ -9,7 +9,7 @@
 
 #include <stdio.h>
 #include <openssl/objects.h>
-#include "ssl_locl.h"
+#include "ssl_local.h"
 
 /*-
  * TLS/SSLv3 methods

diff --git a/ssl/pqueue.c b/ssl/pqueue.c
index 0c0f735..2e9ceec 100644
--- a/ssl/pqueue.c
+++ b/ssl/pqueue.c

@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "ssl_locl.h"
+#include "ssl_local.h"
 #include <openssl/bn.h>
 
 struct pqueue_st {

diff --git a/ssl/record/README b/ssl/record/README
index 987e9fd..630fe80 100644
--- a/ssl/record/README
+++ b/ssl/record/README

@@ -12,7 +12,7 @@
 3) A set of accessor macros
 
 All struct definitions are in record.h. The functions and macros are either
-defined in record.h or record_locl.h dependent on whether they are intended to
+defined in record.h or record_local.h dependent on whether they are intended to
 be private to the record layer, or whether they form part of the API to the rest
 of libssl.
 
@@ -55,7 +55,7 @@
                    || rec_layer_d1.c     ||
                    ||____________________||
                    |______________________|
-        record_locl.h     ^   ^   ^
+        record_local.h     ^   ^   ^
          _________________|   |   |_________________
         |                     |                     |
    _____V_________      ______V________      _______V________

diff --git a/ssl/record/dtls1_bitmap.c b/ssl/record/dtls1_bitmap.c
index ec24bf8..4733a62 100644
--- a/ssl/record/dtls1_bitmap.c
+++ b/ssl/record/dtls1_bitmap.c

@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "../ssl_locl.h"
-#include "record_locl.h"
+#include "../ssl_local.h"
+#include "record_local.h"
 
 /* mod 128 saturating subtract of two 64-bit values in big-endian order */
 static int satsub64be(const unsigned char *v1, const unsigned char *v2)

diff --git a/ssl/record/rec_layer_d1.c b/ssl/record/rec_layer_d1.c
index 1256f9e..9a82e3f 100644
--- a/ssl/record/rec_layer_d1.c
+++ b/ssl/record/rec_layer_d1.c

@@ -9,10 +9,10 @@
 
 #include <stdio.h>
 #include <errno.h>
-#include "../ssl_locl.h"
+#include "../ssl_local.h"
 #include <openssl/evp.h>
 #include <openssl/buffer.h>
-#include "record_locl.h"
+#include "record_local.h"
 #include "internal/packet.h"
 #include "internal/cryptlib.h"
 

diff --git a/ssl/record/rec_layer_s3.c b/ssl/record/rec_layer_s3.c
index df5f681..876e738 100644
--- a/ssl/record/rec_layer_s3.c
+++ b/ssl/record/rec_layer_s3.c

@@ -10,11 +10,11 @@
 #include <stdio.h>
 #include <limits.h>
 #include <errno.h>
-#include "../ssl_locl.h"
+#include "../ssl_local.h"
 #include <openssl/evp.h>
 #include <openssl/buffer.h>
 #include <openssl/rand.h>
-#include "record_locl.h"
+#include "record_local.h"
 #include "internal/packet.h"
 
 #if     defined(OPENSSL_SMALL_FOOTPRINT) || \

diff --git a/ssl/record/record_locl.h b/ssl/record/record_local.h
similarity index 100%
rename from ssl/record/record_locl.h
rename to ssl/record/record_local.h


diff --git a/ssl/record/ssl3_buffer.c b/ssl/record/ssl3_buffer.c
index 09cf587..bffe521 100644
--- a/ssl/record/ssl3_buffer.c
+++ b/ssl/record/ssl3_buffer.c

@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "../ssl_locl.h"
-#include "record_locl.h"
+#include "../ssl_local.h"
+#include "record_local.h"
 
 void SSL3_BUFFER_set_data(SSL3_BUFFER *b, const unsigned char *d, size_t n)
 {

diff --git a/ssl/record/ssl3_record.c b/ssl/record/ssl3_record.c
index c5614dc..a08b81c 100644
--- a/ssl/record/ssl3_record.c
+++ b/ssl/record/ssl3_record.c

@@ -7,11 +7,11 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "../ssl_locl.h"
-#include "internal/constant_time_locl.h"
+#include "../ssl_local.h"
+#include "internal/constant_time.h"
 #include <openssl/trace.h>
 #include <openssl/rand.h>
-#include "record_locl.h"
+#include "record_local.h"
 #include "internal/cryptlib.h"
 
 static const unsigned char ssl3_pad_1[48] = {

diff --git a/ssl/record/ssl3_record_tls13.c b/ssl/record/ssl3_record_tls13.c
index b3bda1f..0429a46 100644
--- a/ssl/record/ssl3_record_tls13.c
+++ b/ssl/record/ssl3_record_tls13.c

@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "../ssl_locl.h"
-#include "record_locl.h"
+#include "../ssl_local.h"
+#include "record_local.h"
 #include "internal/cryptlib.h"
 
 /*-

diff --git a/ssl/s3_cbc.c b/ssl/s3_cbc.c
index 056fb1f..1fe2846 100644
--- a/ssl/s3_cbc.c
+++ b/ssl/s3_cbc.c

@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "internal/constant_time_locl.h"
-#include "ssl_locl.h"
+#include "internal/constant_time.h"
+#include "ssl_local.h"
 #include "internal/cryptlib.h"
 
 #include <openssl/md5.h>

diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c
index 3edbae2..0b2eb66 100644
--- a/ssl/s3_enc.c
+++ b/ssl/s3_enc.c

@@ -9,7 +9,7 @@
  */
 
 #include <stdio.h>
-#include "ssl_locl.h"
+#include "ssl_local.h"
 #include <openssl/evp.h>
 #include <openssl/md5.h>
 #include <openssl/core_names.h>

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index d23f932..a329915 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c

@@ -12,7 +12,7 @@
 #include <stdio.h>
 #include <openssl/objects.h>
 #include "internal/nelem.h"
-#include "ssl_locl.h"
+#include "ssl_local.h"
 #include <openssl/md5.h>
 #include <openssl/dh.h>
 #include <openssl/rand.h>

diff --git a/ssl/s3_msg.c b/ssl/s3_msg.c
index 83778d3..7c021c1 100644
--- a/ssl/s3_msg.c
+++ b/ssl/s3_msg.c

@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "ssl_locl.h"
+#include "ssl_local.h"
 
 int ssl3_do_change_cipher_spec(SSL *s)
 {

diff --git a/ssl/ssl_asn1.c b/ssl/ssl_asn1.c
index e54d530..d2d23d5 100644
--- a/ssl/ssl_asn1.c
+++ b/ssl/ssl_asn1.c

@@ -10,7 +10,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "ssl_locl.h"
+#include "ssl_local.h"
 #include <openssl/asn1t.h>
 #include <openssl/x509.h>
 

diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c
index f902091..e3ad6a5 100644
--- a/ssl/ssl_cert.c
+++ b/ssl/ssl_cert.c

@@ -20,7 +20,7 @@
 #include <openssl/bn.h>
 #include <openssl/crypto.h>
 #include "internal/refcount.h"
-#include "ssl_locl.h"
+#include "ssl_local.h"
 #include "ssl_cert_table.h"
 #include "internal/thread_once.h"
 

diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index e427c40..d047b8f 100644
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c

@@ -18,7 +18,7 @@
 #include <openssl/conf.h>
 #include <openssl/trace.h>
 #include "internal/nelem.h"
-#include "ssl_locl.h"
+#include "ssl_local.h"
 #include "internal/thread_once.h"
 #include "internal/cryptlib.h"
 
@@ -93,7 +93,7 @@
 
 /*
  * Constant SSL_MAX_DIGEST equal to size of digests array should be defined
- * in the ssl_locl.h
+ * in the ssl_local.h
  */
 
 #define SSL_MD_NUM_IDX  SSL_MAX_DIGEST

diff --git a/ssl/ssl_conf.c b/ssl/ssl_conf.c
index f0bec36..9ce1e18 100644
--- a/ssl/ssl_conf.c
+++ b/ssl/ssl_conf.c

@@ -8,7 +8,7 @@
  */
 
 #include <stdio.h>
-#include "ssl_locl.h"
+#include "ssl_local.h"
 #include <openssl/conf.h>
 #include <openssl/objects.h>
 #include <openssl/dh.h>

diff --git a/ssl/ssl_init.c b/ssl/ssl_init.c
index 8629613..3e85426 100644
--- a/ssl/ssl_init.c
+++ b/ssl/ssl_init.c

@@ -13,7 +13,7 @@
 #include <openssl/crypto.h>
 #include <openssl/evp.h>
 #include <openssl/trace.h>
-#include "ssl_locl.h"
+#include "ssl_local.h"
 #include "internal/thread_once.h"
 
 static int stopped;

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 0d40eca..120566d 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c

@@ -10,7 +10,7 @@
  */
 
 #include <stdio.h>
-#include "ssl_locl.h"
+#include "ssl_local.h"
 #include "e_os.h"
 #include <openssl/objects.h>
 #include <openssl/x509v3.h>

diff --git a/ssl/ssl_locl.h b/ssl/ssl_local.h
similarity index 100%
rename from ssl/ssl_locl.h
rename to ssl/ssl_local.h


diff --git a/ssl/ssl_mcnf.c b/ssl/ssl_mcnf.c
index b77c030..27ba772 100644
--- a/ssl/ssl_mcnf.c
+++ b/ssl/ssl_mcnf.c

@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include <openssl/conf.h>
 #include <openssl/ssl.h>
-#include "ssl_locl.h"
+#include "ssl_local.h"
 #include "internal/sslconf.h"
 
 /* SSL library configuration module. */

diff --git a/ssl/ssl_rsa.c b/ssl/ssl_rsa.c
index 2c447ee..ae910a0 100644
--- a/ssl/ssl_rsa.c
+++ b/ssl/ssl_rsa.c

@@ -8,7 +8,7 @@
  */
 
 #include <stdio.h>
-#include "ssl_locl.h"
+#include "ssl_local.h"
 #include "internal/packet.h"
 #include <openssl/bio.h>
 #include <openssl/objects.h>

diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c
index f80b8e2..8d18ce4 100644
--- a/ssl/ssl_sess.c
+++ b/ssl/ssl_sess.c

@@ -13,8 +13,8 @@
 #include <openssl/engine.h>
 #include "internal/refcount.h"
 #include "internal/cryptlib.h"
-#include "ssl_locl.h"
-#include "statem/statem_locl.h"
+#include "ssl_local.h"
+#include "statem/statem_local.h"
 
 static void SSL_SESSION_list_remove(SSL_CTX *ctx, SSL_SESSION *s);
 static void SSL_SESSION_list_add(SSL_CTX *ctx, SSL_SESSION *s);

diff --git a/ssl/ssl_stat.c b/ssl/ssl_stat.c
index da8f5ed..3ef0e15 100644
--- a/ssl/ssl_stat.c
+++ b/ssl/ssl_stat.c

@@ -9,7 +9,7 @@
  */
 
 #include <stdio.h>
-#include "ssl_locl.h"
+#include "ssl_local.h"
 
 const char *SSL_state_string_long(const SSL *s)
 {

diff --git a/ssl/ssl_txt.c b/ssl/ssl_txt.c
index 554cc34..bc3fcfb 100644
--- a/ssl/ssl_txt.c
+++ b/ssl/ssl_txt.c

@@ -10,7 +10,7 @@
 
 #include <stdio.h>
 #include <openssl/buffer.h>
-#include "ssl_locl.h"
+#include "ssl_local.h"
 
 #ifndef OPENSSL_NO_STDIO
 int SSL_SESSION_print_fp(FILE *fp, const SSL_SESSION *x)

diff --git a/ssl/ssl_utst.c b/ssl/ssl_utst.c
index c6a21ab..690db6d 100644
--- a/ssl/ssl_utst.c
+++ b/ssl/ssl_utst.c

@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "ssl_locl.h"
+#include "ssl_local.h"
 
 #ifndef OPENSSL_NO_UNIT_TEST
 

diff --git a/ssl/statem/README b/ssl/statem/README
index 145c69d..86cc066 100644
--- a/ssl/statem/README
+++ b/ssl/statem/README

@@ -40,7 +40,7 @@
                    |                            |
                    |    Core state machine code |
                    |____________________________|
-        statem_locl.h     ^          ^
+        statem_local.h     ^          ^
                  _________|          |_______
                 |                            |
    _____________|____________   _____________|____________

diff --git a/ssl/statem/extensions.c b/ssl/statem/extensions.c
index 68163a2..c529579 100644
--- a/ssl/statem/extensions.c
+++ b/ssl/statem/extensions.c

@@ -10,8 +10,8 @@
 #include <string.h>
 #include "internal/nelem.h"
 #include "internal/cryptlib.h"
-#include "../ssl_locl.h"
-#include "statem_locl.h"
+#include "../ssl_local.h"
+#include "statem_local.h"
 #include "internal/cryptlib.h"
 
 static int final_renegotiate(SSL *s, unsigned int context, int sent);
@@ -92,7 +92,7 @@
 /*
  * Definitions of all built-in extensions. NOTE: Changes in the number or order
  * of these extensions should be mirrored with equivalent changes to the
- * indexes ( TLSEXT_IDX_* ) defined in ssl_locl.h.
+ * indexes ( TLSEXT_IDX_* ) defined in ssl_local.h.
  * Each extension has an initialiser, a client and
  * server side parser and a finaliser. The initialiser is called (if the
  * extension is relevant to the given context) even if we did not see the

diff --git a/ssl/statem/extensions_clnt.c b/ssl/statem/extensions_clnt.c
index e6b674c..75fecde 100644
--- a/ssl/statem/extensions_clnt.c
+++ b/ssl/statem/extensions_clnt.c

@@ -8,9 +8,9 @@
  */
 
 #include <openssl/ocsp.h>
-#include "../ssl_locl.h"
+#include "../ssl_local.h"
 #include "internal/cryptlib.h"
-#include "statem_locl.h"
+#include "statem_local.h"
 
 EXT_RETURN tls_construct_ctos_renegotiate(SSL *s, WPACKET *pkt,
                                           unsigned int context, X509 *x,

diff --git a/ssl/statem/extensions_cust.c b/ssl/statem/extensions_cust.c
index cfe57c5..78dcd13 100644
--- a/ssl/statem/extensions_cust.c
+++ b/ssl/statem/extensions_cust.c

@@ -10,9 +10,9 @@
 /* Custom extension utility functions */
 
 #include <openssl/ct.h>
-#include "../ssl_locl.h"
+#include "../ssl_local.h"
 #include "internal/cryptlib.h"
-#include "statem_locl.h"
+#include "statem_local.h"
 
 typedef struct {
     void *add_arg;

diff --git a/ssl/statem/extensions_srvr.c b/ssl/statem/extensions_srvr.c
index 1c023fc..194b521 100644
--- a/ssl/statem/extensions_srvr.c
+++ b/ssl/statem/extensions_srvr.c

@@ -8,8 +8,8 @@
  */
 
 #include <openssl/ocsp.h>
-#include "../ssl_locl.h"
-#include "statem_locl.h"
+#include "../ssl_local.h"
+#include "statem_local.h"
 #include "internal/cryptlib.h"
 
 #define COOKIE_STATE_FORMAT_VERSION     0

diff --git a/ssl/statem/statem.c b/ssl/statem/statem.c
index bd9277b..697e33e 100644
--- a/ssl/statem/statem.c
+++ b/ssl/statem/statem.c

@@ -9,8 +9,8 @@
 
 #include "internal/cryptlib.h"
 #include <openssl/rand.h>
-#include "../ssl_locl.h"
-#include "statem_locl.h"
+#include "../ssl_local.h"
+#include "statem_local.h"
 #include <assert.h>
 
 /*

diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c
index d096143..bb37e40 100644
--- a/ssl/statem/statem_clnt.c
+++ b/ssl/statem/statem_clnt.c

@@ -12,8 +12,8 @@
 #include <stdio.h>
 #include <time.h>
 #include <assert.h>
-#include "../ssl_locl.h"
-#include "statem_locl.h"
+#include "../ssl_local.h"
+#include "statem_local.h"
 #include <openssl/buffer.h>
 #include <openssl/rand.h>
 #include <openssl/objects.h>

diff --git a/ssl/statem/statem_dtls.c b/ssl/statem/statem_dtls.c
index 8616e98..564829c 100644
--- a/ssl/statem/statem_dtls.c
+++ b/ssl/statem/statem_dtls.c

@@ -10,8 +10,8 @@
 #include <limits.h>
 #include <string.h>
 #include <stdio.h>
-#include "../ssl_locl.h"
-#include "statem_locl.h"
+#include "../ssl_local.h"
+#include "statem_local.h"
 #include "internal/cryptlib.h"
 #include <openssl/buffer.h>
 #include <openssl/objects.h>

diff --git a/ssl/statem/statem_lib.c b/ssl/statem/statem_lib.c
index 4d3808c..898c608 100644
--- a/ssl/statem/statem_lib.c
+++ b/ssl/statem/statem_lib.c

@@ -11,8 +11,8 @@
 #include <limits.h>
 #include <string.h>
 #include <stdio.h>
-#include "../ssl_locl.h"
-#include "statem_locl.h"
+#include "../ssl_local.h"
+#include "statem_local.h"
 #include "internal/cryptlib.h"
 #include <openssl/buffer.h>
 #include <openssl/objects.h>

diff --git a/ssl/statem/statem_locl.h b/ssl/statem/statem_local.h
similarity index 100%
rename from ssl/statem/statem_locl.h
rename to ssl/statem/statem_local.h


diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c
index acd3e27..5f709e5 100644
--- a/ssl/statem/statem_srvr.c
+++ b/ssl/statem/statem_srvr.c

@@ -10,9 +10,9 @@
  */
 
 #include <stdio.h>
-#include "../ssl_locl.h"
-#include "statem_locl.h"
-#include "internal/constant_time_locl.h"
+#include "../ssl_local.h"
+#include "statem_local.h"
+#include "internal/constant_time.h"
 #include "internal/cryptlib.h"
 #include <openssl/buffer.h>
 #include <openssl/rand.h>

diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c
index fc08253..64806a3 100644
--- a/ssl/t1_enc.c
+++ b/ssl/t1_enc.c

@@ -9,8 +9,8 @@
  */
 
 #include <stdio.h>
-#include "ssl_locl.h"
-#include "record/record_locl.h"
+#include "ssl_local.h"
+#include "record/record_local.h"
 #include "internal/ktls.h"
 #include "internal/cryptlib.h"
 #include <openssl/comp.h>

diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 2f7b570..f13183a 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c

@@ -18,7 +18,7 @@
 #include <openssl/dh.h>
 #include <openssl/bn.h>
 #include "internal/nelem.h"
-#include "ssl_locl.h"
+#include "ssl_local.h"
 #include <openssl/ct.h>
 
 static const SIGALG_LOOKUP *find_sig_alg(SSL *s, X509 *x, EVP_PKEY *pkey);

diff --git a/ssl/t1_trce.c b/ssl/t1_trce.c
index 489558e..a2cb4f7 100644
--- a/ssl/t1_trce.c
+++ b/ssl/t1_trce.c

@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "ssl_locl.h"
+#include "ssl_local.h"
 
 #ifndef OPENSSL_NO_SSL_TRACE
 

diff --git a/ssl/tls13_enc.c b/ssl/tls13_enc.c
index 2339a05..266b7df 100644
--- a/ssl/tls13_enc.c
+++ b/ssl/tls13_enc.c

@@ -8,7 +8,7 @@
  */
 
 #include <stdlib.h>
-#include "ssl_locl.h"
+#include "ssl_local.h"
 #include "internal/cryptlib.h"
 #include <openssl/evp.h>
 #include <openssl/kdf.h>

diff --git a/ssl/tls_srp.c b/ssl/tls_srp.c
index 963c080..d252db3 100644
--- a/ssl/tls_srp.c
+++ b/ssl/tls_srp.c

@@ -14,7 +14,7 @@
 #include <openssl/crypto.h>
 #include <openssl/rand.h>
 #include <openssl/err.h>
-#include "ssl_locl.h"
+#include "ssl_local.h"
 
 #ifndef OPENSSL_NO_SRP
 # include <openssl/srp.h>

diff --git a/test/cipher_overhead_test.c b/test/cipher_overhead_test.c
index 0492e67..04be8d7 100644
--- a/test/cipher_overhead_test.c
+++ b/test/cipher_overhead_test.c

@@ -9,7 +9,7 @@
 
 #include "internal/nelem.h"
 #include "testutil.h"
-#include "../ssl/ssl_locl.h"
+#include "../ssl/ssl_local.h"
 
 static int cipher_overhead(void)
 {

diff --git a/test/cmp_testlib.h b/test/cmp_testlib.h
index afd32b7..462ec39 100644
--- a/test/cmp_testlib.h
+++ b/test/cmp_testlib.h

@@ -16,7 +16,7 @@
 # include <openssl/pem.h>
 # include <openssl/rand.h>
 
-#include "../crypto/cmp/cmp_int.h"
+#include "../crypto/cmp/cmp_local.h"
 
 # include "testutil.h"
 

diff --git a/test/constant_time_test.c b/test/constant_time_test.c
index 97d568a..044100b 100644
--- a/test/constant_time_test.c
+++ b/test/constant_time_test.c

@@ -11,7 +11,7 @@
 #include <stdlib.h>
 
 #include "internal/nelem.h"
-#include "internal/constant_time_locl.h"
+#include "internal/constant_time.h"
 #include "testutil.h"
 #include "internal/numbers.h"
 

diff --git a/test/curve448_internal_test.c b/test/curve448_internal_test.c
index d3e3aba..054948d 100644
--- a/test/curve448_internal_test.c
+++ b/test/curve448_internal_test.c

@@ -10,7 +10,7 @@
 #include <string.h>
 #include <openssl/e_os2.h>
 #include <openssl/evp.h>
-#include "curve448_lcl.h"
+#include "curve448_local.h"
 #include "testutil.h"
 
 static unsigned int max = 1000;

diff --git a/test/drbg_cavs_test.c b/test/drbg_cavs_test.c
index 183624c..2c0829d 100644
--- a/test/drbg_cavs_test.c
+++ b/test/drbg_cavs_test.c

@@ -15,7 +15,7 @@
 #include <openssl/obj_mac.h>
 #include <openssl/evp.h>
 #include <openssl/aes.h>
-#include "../crypto/rand/rand_lcl.h"
+#include "../crypto/rand/rand_local.h"
 
 #include "testutil.h"
 #include "drbg_cavs_data.h"

diff --git a/test/drbgtest.c b/test/drbgtest.c
index f5b1934..93adb48 100644
--- a/test/drbgtest.c
+++ b/test/drbgtest.c

@@ -15,7 +15,7 @@
 #include <openssl/obj_mac.h>
 #include <openssl/evp.h>
 #include <openssl/aes.h>
-#include "../crypto/rand/rand_lcl.h"
+#include "../crypto/rand/rand_local.h"
 #include "../include/crypto/rand.h"
 
 #if defined(_WIN32)

diff --git a/test/dtls_mtu_test.c b/test/dtls_mtu_test.c
index bba1bdb..33603ba 100644
--- a/test/dtls_mtu_test.c
+++ b/test/dtls_mtu_test.c

@@ -18,7 +18,7 @@
 #include "testutil.h"
 
 /* for SSL_READ_ETM() */
-#include "../ssl/ssl_locl.h"
+#include "../ssl/ssl_local.h"
 
 static int debug = 0;
 

diff --git a/test/ec_internal_test.c b/test/ec_internal_test.c
index 8d3a4fd..4b84931 100644
--- a/test/ec_internal_test.c
+++ b/test/ec_internal_test.c

@@ -10,7 +10,7 @@
 #include "internal/nelem.h"
 #include "testutil.h"
 #include <openssl/ec.h>
-#include "ec_lcl.h"
+#include "ec_local.h"
 #include <openssl/objects.h>
 
 static size_t crv_len = 0;

diff --git a/test/handshake_helper.c b/test/handshake_helper.c
index a85d22e..c2528b9 100644
--- a/test/handshake_helper.c
+++ b/test/handshake_helper.c

@@ -16,7 +16,7 @@
 #include <openssl/srp.h>
 #endif
 
-#include "../ssl/ssl_locl.h"
+#include "../ssl/ssl_local.h"
 #include "internal/sockets.h"
 #include "internal/nelem.h"
 #include "handshake_helper.h"

diff --git a/test/property_test.c b/test/property_test.c
index 29e8ac3..8b953e4 100644
--- a/test/property_test.c
+++ b/test/property_test.c

@@ -12,7 +12,7 @@
 #include "testutil.h"
 #include "internal/nelem.h"
 #include "internal/property.h"
-#include "../crypto/property/property_lcl.h"
+#include "../crypto/property/property_local.h"
 
 static int add_property_names(const char *n, ...)
 {

diff --git a/test/rsa_sp800_56b_test.c b/test/rsa_sp800_56b_test.c
index 89dab09..1e6ea8d 100644
--- a/test/rsa_sp800_56b_test.c
+++ b/test/rsa_sp800_56b_test.c

@@ -26,7 +26,7 @@
     return 1;
 }
 #else
-# include "rsa_locl.h"
+# include "rsa_local.h"
 # include <openssl/rsa.h>
 
 /* taken from RSA2 cavs data */

diff --git a/test/ssl_cert_table_internal_test.c b/test/ssl_cert_table_internal_test.c
index 81274db..d6e93af 100644
--- a/test/ssl_cert_table_internal_test.c
+++ b/test/ssl_cert_table_internal_test.c

@@ -15,7 +15,7 @@
 #include <openssl/ssl.h>
 #include "testutil.h"
 #include "internal/nelem.h"
-#include "../ssl/ssl_locl.h"
+#include "../ssl/ssl_local.h"
 #include "../ssl/ssl_cert_table.h"
 
 #define test_cert_table(nid, amask, idx) \

diff --git a/test/sslapitest.c b/test/sslapitest.c
index 4b510eb..2442b69 100644
--- a/test/sslapitest.c
+++ b/test/sslapitest.c

@@ -25,7 +25,7 @@
 #include "testutil/output.h"
 #include "internal/nelem.h"
 #include "internal/ktls.h"
-#include "../ssl/ssl_locl.h"
+#include "../ssl/ssl_local.h"
 
 #ifndef OPENSSL_NO_TLS1_3
 

diff --git a/test/tls13encryptiontest.c b/test/tls13encryptiontest.c
index a5580a2..84a8557 100644
--- a/test/tls13encryptiontest.c
+++ b/test/tls13encryptiontest.c

@@ -9,8 +9,8 @@
 
 #include <openssl/ssl.h>
 #include <openssl/evp.h>
-#include "../ssl/ssl_locl.h"
-#include "../ssl/record/record_locl.h"
+#include "../ssl/ssl_local.h"
+#include "../ssl/record/record_local.h"
 #include "internal/nelem.h"
 #include "testutil.h"
 

diff --git a/test/tls13secretstest.c b/test/tls13secretstest.c
index 4756faa..def78b9 100644
--- a/test/tls13secretstest.c
+++ b/test/tls13secretstest.c

@@ -10,7 +10,7 @@
 #include <openssl/ssl.h>
 #include <openssl/evp.h>
 
-#include "../ssl/ssl_locl.h"
+#include "../ssl/ssl_local.h"
 #include "testutil.h"
 
 #define IVLEN   12