diff --git a/ssl/record/dtls1_bitmap.c b/ssl/record/dtls1_bitmap.c
index 174ba4990c39d94767db5f4a11869e19101dc23c..eef6b246e0185ad5f901c938e650ad516c8a90c6 100644
--- a/ssl/record/dtls1_bitmap.c
+++ b/ssl/record/dtls1_bitmap.c
@@ -114,6 +114,7 @@
  */
 
 #include "../ssl_locl.h"
+#include "record_locl.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.h b/ssl/record/record.h
similarity index 99%
rename from ssl/record/rec_layer.h
rename to ssl/record/record.h
index 05e55840c31550423c1b198b9b19a17e0b0d6351..29fc752e6a1375d5715393bb36755d2be2f44161 100644
--- a/ssl/record/rec_layer.h
+++ b/ssl/record/record.h
@@ -1,4 +1,4 @@
-/* ssl/record/rec_layer.h */
+/* ssl/record/record.h */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
diff --git a/ssl/record/rec_layer_locl.h b/ssl/record/record_locl.h
similarity index 99%
rename from ssl/record/rec_layer_locl.h
rename to ssl/record/record_locl.h
index 05cc7fda320715594e72bcaaf68479a3d917257a..26b5a1546f6917f71c52fa7e7d323f411ffe9fe0 100644
--- a/ssl/record/rec_layer_locl.h
+++ b/ssl/record/record_locl.h
@@ -1,4 +1,4 @@
-/* ssl/record/rec_layer_locl.h */
+/* ssl/record/record_locl.h */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
diff --git a/ssl/record/s3_pkt.c b/ssl/record/s3_pkt.c
index 608fe74b0450d274fe46e3efa5df599204ccfdf5..dd1f1484a0b0cf5c94395cecb620e79ba6e5483d 100644
--- a/ssl/record/s3_pkt.c
+++ b/ssl/record/s3_pkt.c
@@ -117,7 +117,7 @@
 #include <openssl/evp.h>
 #include <openssl/buffer.h>
 #include <openssl/rand.h>
-#include "rec_layer_locl.h"
+#include "record_locl.h"
 
 #ifndef  EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK
 # define EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK 0
diff --git a/ssl/record/ssl3_buffer.c b/ssl/record/ssl3_buffer.c
index 9afd747e51b354010fc3ef72545c5ccaa420903e..79a7636e0773ffd7e1c037b902a5eee7070ef0ef 100644
--- a/ssl/record/ssl3_buffer.c
+++ b/ssl/record/ssl3_buffer.c
@@ -110,6 +110,7 @@
  */
 
 #include "../ssl_locl.h"
+#include "record_locl.h"
 
 void SSL3_BUFFER_set_data(SSL3_BUFFER *b, const unsigned char *d, int n)
 {
diff --git a/ssl/record/ssl3_record.c b/ssl/record/ssl3_record.c
index be5bb22ae056a1eb77df97661c6ca411dafd5606..8bad12578014d5b52375b9d2f2842ad67fa8fbef 100644
--- a/ssl/record/ssl3_record.c
+++ b/ssl/record/ssl3_record.c
@@ -112,6 +112,7 @@
 #include "../ssl_locl.h"
 #include "../../crypto/constant_time_locl.h"
 #include <openssl/rand.h>
+#include "record_locl.h"
 
 static const unsigned char ssl3_pad_1[48] = {
     0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index 569988ed7186e903d03c4cffbda5ac2d51b7078a..8b4c6150efdc5db923131f49d5cc83d966f2613d 100644
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -165,7 +165,7 @@
 # include <openssl/ssl.h>
 # include <openssl/symhacks.h>
 
-#include "record/rec_layer.h"
+#include "record/record.h"
 
 # ifdef OPENSSL_BUILD_SHLIBSSL
 #  undef OPENSSL_EXTERN