diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index 6ad8e83..b374d1f 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -281,9 +281,8 @@
   unsigned long algorithm_ssl;  /* (major) protocol version */
 
   unsigned long algo_strength; /* strength and export flags */
-  unsigned long algorithm2;    /* Extra flags. See SSL2_CF_* in ssl2.h
-                                  and algorithm2 section in
-                                  ssl_locl.h */
+  unsigned long algorithm2;    /* Extra flags. See algorithm2 section in
+                                  ssl/internal.h */
   int strength_bits;           /* Number of bits really used */
   int alg_bits;                /* Number of bits for algorithm */
 };
diff --git a/include/openssl/ssl2.h b/include/openssl/ssl2.h
index eb25dcb..b8401fa 100644
--- a/include/openssl/ssl2.h
+++ b/include/openssl/ssl2.h
@@ -151,10 +151,6 @@
 #define SSL2_MIN_CERT_CHALLENGE_LENGTH	16
 #define SSL2_MAX_KEY_MATERIAL_LENGTH	24
 
-#ifndef HEADER_SSL_LOCL_H
-#define  CERT		char
-#endif
-
 #ifndef OPENSSL_NO_SSL_INTERN
 
 typedef struct ssl2_state_st
diff --git a/ssl/d1_both.c b/ssl/d1_both.c
index 4004499..4e084af 100644
--- a/ssl/d1_both.c
+++ b/ssl/d1_both.c
@@ -124,7 +124,7 @@
 #include <openssl/rand.h>
 #include <openssl/x509.h>
 
-#include "ssl_locl.h"
+#include "internal.h"
 
 
 /* TODO(davidben): 28 comes from the size of IP + UDP header. Is this reasonable
diff --git a/ssl/d1_clnt.c b/ssl/d1_clnt.c
index 4dbba35..eeb8594 100644
--- a/ssl/d1_clnt.c
+++ b/ssl/d1_clnt.c
@@ -124,7 +124,7 @@
 #include <openssl/obj.h>
 #include <openssl/rand.h>
 
-#include "ssl_locl.h"
+#include "internal.h"
 
 static int dtls1_get_hello_verify(SSL *s);
 
diff --git a/ssl/d1_lib.c b/ssl/d1_lib.c
index fc59e33..43a3f4a 100644
--- a/ssl/d1_lib.c
+++ b/ssl/d1_lib.c
@@ -70,7 +70,7 @@
 #include <openssl/mem.h>
 #include <openssl/obj.h>
 
-#include "ssl_locl.h"
+#include "internal.h"
 
 /* DTLS1_MTU_TIMEOUTS is the maximum number of timeouts to expire
  * before starting to decrease the MTU. */
diff --git a/ssl/d1_meth.c b/ssl/d1_meth.c
index e323fff..9e9c7df 100644
--- a/ssl/d1_meth.c
+++ b/ssl/d1_meth.c
@@ -55,7 +55,7 @@
  * (eay@cryptsoft.com).  This product includes software written by Tim
  * Hudson (tjh@cryptsoft.com). */
 
-#include "ssl_locl.h"
+#include "internal.h"
 
 
 static const SSL_PROTOCOL_METHOD DTLS_protocol_method = {
diff --git a/ssl/d1_pkt.c b/ssl/d1_pkt.c
index 0885b8c..c4f8f0c 100644
--- a/ssl/d1_pkt.c
+++ b/ssl/d1_pkt.c
@@ -119,7 +119,7 @@
 #include <openssl/err.h>
 #include <openssl/rand.h>
 
-#include "ssl_locl.h"
+#include "internal.h"
 
 
 /* mod 128 saturating subtract of two 64-bit values in big-endian order */
diff --git a/ssl/d1_srtp.c b/ssl/d1_srtp.c
index b85ff9b..0ec006a 100644
--- a/ssl/d1_srtp.c
+++ b/ssl/d1_srtp.c
@@ -120,7 +120,7 @@
 #include <openssl/obj.h>
 #include <openssl/err.h>
 
-#include "ssl_locl.h"
+#include "internal.h"
 #include <openssl/srtp.h>
 
 
diff --git a/ssl/d1_srvr.c b/ssl/d1_srvr.c
index 0f217aa..065f230 100644
--- a/ssl/d1_srvr.c
+++ b/ssl/d1_srvr.c
@@ -124,7 +124,7 @@
 #include <openssl/rand.h>
 #include <openssl/x509.h>
 
-#include "ssl_locl.h"
+#include "internal.h"
 
 
 int dtls1_accept(SSL *s) {
diff --git a/ssl/ssl_locl.h b/ssl/internal.h
similarity index 99%
rename from ssl/ssl_locl.h
rename to ssl/internal.h
index 16fe2c6..d137062 100644
--- a/ssl/ssl_locl.h
+++ b/ssl/internal.h
@@ -139,8 +139,8 @@
  * OTHERWISE.
  */
 
-#ifndef HEADER_SSL_LOCL_H
-#define HEADER_SSL_LOCL_H
+#ifndef OPENSSL_HEADER_SSL_INTERNAL_H
+#define OPENSSL_HEADER_SSL_INTERNAL_H
 
 #include <openssl/base.h>
 
@@ -1035,4 +1035,4 @@
 int ssl_add_serverhello_use_srtp_ext(SSL *s, uint8_t *p, int *len, int maxlen);
 int ssl_parse_serverhello_use_srtp_ext(SSL *s, CBS *cbs, int *out_alert);
 
-#endif
+#endif /* OPENSSL_HEADER_SSL_INTERNAL_H */
diff --git a/ssl/s3_both.c b/ssl/s3_both.c
index 3cb2152..20c1084 100644
--- a/ssl/s3_both.c
+++ b/ssl/s3_both.c
@@ -124,7 +124,7 @@
 #include <openssl/sha.h>
 #include <openssl/x509.h>
 
-#include "ssl_locl.h"
+#include "internal.h"
 
 
 /* ssl3_do_write sends |s->init_buf| in records of type 'type'
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index 7826bf49..81e76c4 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -163,7 +163,7 @@
 #include <openssl/engine.h>
 #include <openssl/x509.h>
 
-#include "ssl_locl.h"
+#include "internal.h"
 #include "../crypto/dh/internal.h"
 
 
diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c
index d6383d7..8db0bd9 100644
--- a/ssl/s3_enc.c
+++ b/ssl/s3_enc.c
@@ -142,7 +142,7 @@
 #include <openssl/md5.h>
 #include <openssl/obj.h>
 
-#include "ssl_locl.h"
+#include "internal.h"
 
 
 static const uint8_t ssl3_pad_1[48] = {
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index f67267f..c0dab07 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -155,7 +155,7 @@
 #include <openssl/mem.h>
 #include <openssl/obj.h>
 
-#include "ssl_locl.h"
+#include "internal.h"
 
 
 #define SSL3_NUM_CIPHERS (sizeof(ssl3_ciphers) / sizeof(SSL_CIPHER))
diff --git a/ssl/s3_meth.c b/ssl/s3_meth.c
index c781369..9d09029 100644
--- a/ssl/s3_meth.c
+++ b/ssl/s3_meth.c
@@ -54,7 +54,7 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include "ssl_locl.h"
+#include "internal.h"
 
 
 static const SSL_PROTOCOL_METHOD TLS_protocol_method = {
diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c
index 80eb7bd..d7b7744 100644
--- a/ssl/s3_pkt.c
+++ b/ssl/s3_pkt.c
@@ -117,7 +117,7 @@
 #include <openssl/mem.h>
 #include <openssl/rand.h>
 
-#include "ssl_locl.h"
+#include "internal.h"
 
 
 static int do_ssl3_write(SSL *s, int type, const uint8_t *buf, unsigned int len,
diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index eb458f2..cc7c6af 100644
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -166,7 +166,7 @@
 #include <openssl/sha.h>
 #include <openssl/x509.h>
 
-#include "ssl_locl.h"
+#include "internal.h"
 #include "../crypto/internal.h"
 #include "../crypto/dh/internal.h"
 
diff --git a/ssl/ssl_algs.c b/ssl/ssl_algs.c
index fed6518..fda39a5 100644
--- a/ssl/ssl_algs.c
+++ b/ssl/ssl_algs.c
@@ -54,7 +54,7 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#include "ssl_locl.h"
+#include "internal.h"
 
 #include <openssl/crypto.h>
 
diff --git a/ssl/ssl_asn1.c b/ssl/ssl_asn1.c
index e6ca25e..712af49 100644
--- a/ssl/ssl_asn1.c
+++ b/ssl/ssl_asn1.c
@@ -87,7 +87,7 @@
 #include <openssl/err.h>
 #include <openssl/x509.h>
 
-#include "ssl_locl.h"
+#include "internal.h"
 
 
 /* An SSL_SESSION is serialized as the following ASN.1 structure:
diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c
index 185c12b..cb3a039 100644
--- a/ssl/ssl_cert.c
+++ b/ssl/ssl_cert.c
@@ -126,7 +126,7 @@
 
 #include "../crypto/dh/internal.h"
 #include "../crypto/directory.h"
-#include "ssl_locl.h"
+#include "internal.h"
 
 
 int SSL_get_ex_data_X509_STORE_CTX_idx(void) {
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index 1253f8f..4df8a7b 100644
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -147,7 +147,7 @@
 #include <openssl/obj.h>
 #include <openssl/sha.h>
 
-#include "ssl_locl.h"
+#include "internal.h"
 
 
 struct handshake_digest {
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 1578dba..8d28f38 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -150,7 +150,7 @@
 #include <openssl/rand.h>
 #include <openssl/x509v3.h>
 
-#include "ssl_locl.h"
+#include "internal.h"
 
 /* Some error codes are special. Ensure the make_errors.go script never
  * regresses this. */
diff --git a/ssl/ssl_rsa.c b/ssl/ssl_rsa.c
index 5bef56b..45c9891 100644
--- a/ssl/ssl_rsa.c
+++ b/ssl/ssl_rsa.c
@@ -64,7 +64,7 @@
 #include <openssl/pem.h>
 #include <openssl/x509.h>
 
-#include "ssl_locl.h"
+#include "internal.h"
 
 static int ssl_set_cert(CERT *c, X509 *x509);
 static int ssl_set_pkey(CERT *c, EVP_PKEY *pkey);
diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c
index 343d0a6..0129f29 100644
--- a/ssl/ssl_sess.c
+++ b/ssl/ssl_sess.c
@@ -141,7 +141,7 @@
 #include <openssl/mem.h>
 #include <openssl/rand.h>
 
-#include "ssl_locl.h"
+#include "internal.h"
 
 /* The address of this is a magic value, a pointer to which is returned by
  * SSL_magic_pending_session_ptr(). It allows a session callback to indicate
diff --git a/ssl/ssl_stat.c b/ssl/ssl_stat.c
index 4703af4..8bed9ad 100644
--- a/ssl/ssl_stat.c
+++ b/ssl/ssl_stat.c
@@ -83,7 +83,7 @@
  */
 
 #include <stdio.h>
-#include "ssl_locl.h"
+#include "internal.h"
 
 const char *SSL_state_string_long(const SSL *s) {
   const char *str;
diff --git a/ssl/ssl_txt.c b/ssl/ssl_txt.c
index 3c13609..2275f16 100644
--- a/ssl/ssl_txt.c
+++ b/ssl/ssl_txt.c
@@ -87,7 +87,7 @@
 #include <openssl/err.h>
 #include <openssl/mem.h>
 
-#include "ssl_locl.h"
+#include "internal.h"
 
 
 int SSL_SESSION_print_fp(FILE *fp, const SSL_SESSION *x) {
diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c
index 1f16269..903020e 100644
--- a/ssl/t1_enc.c
+++ b/ssl/t1_enc.c
@@ -144,7 +144,7 @@
 #include <openssl/obj.h>
 #include <openssl/rand.h>
 
-#include "ssl_locl.h"
+#include "internal.h"
 
 
 /* tls1_P_hash computes the TLS P_<hash> function as described in RFC 5246,
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 0009d13..8445f0e 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -117,7 +117,7 @@
 #include <openssl/obj.h>
 #include <openssl/rand.h>
 
-#include "ssl_locl.h"
+#include "internal.h"
 
 
 static int tls_decrypt_ticket(SSL *s, const uint8_t *tick, int ticklen,
diff --git a/ssl/t1_reneg.c b/ssl/t1_reneg.c
index e318771..05a7836 100644
--- a/ssl/t1_reneg.c
+++ b/ssl/t1_reneg.c
@@ -113,7 +113,7 @@
 #include <openssl/obj.h>
 #include <openssl/err.h>
 
-#include "ssl_locl.h"
+#include "internal.h"
 
 
 /* Add the client's renegotiation binding */