diff --git a/BUILD b/BUILD
index 420d764bfa..76ee480e44 100644
--- a/BUILD
+++ b/BUILD
@@ -701,6 +701,7 @@ cc_test(
         "src/google/protobuf/io/zero_copy_stream_unittest.cc",
         "src/google/protobuf/map_field_test.cc",
         "src/google/protobuf/map_test.cc",
+        "src/google/protobuf/map_test.inc",
         "src/google/protobuf/message_unittest.cc",
         "src/google/protobuf/message_unittest.inc",
         "src/google/protobuf/no_field_presence_test.cc",
diff --git a/Makefile.am b/Makefile.am
index ddbe08b2f0..92a6f94056 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -536,6 +536,7 @@ java_EXTRA_DIST=
   java/kotlin/generate-sources-build.xml                                           \
   java/kotlin/generate-test-sources-build.xml                                      \
   java/kotlin/pom.xml                                                              \
+  java/kotlin/src/main/kotlin/com/google/protobuf/ByteStrings.kt                   \
   java/kotlin/src/main/kotlin/com/google/protobuf/DslList.kt                       \
   java/kotlin/src/main/kotlin/com/google/protobuf/DslMap.kt                        \
   java/kotlin/src/main/kotlin/com/google/protobuf/DslProxy.kt                      \
@@ -545,6 +546,7 @@ java_EXTRA_DIST=
   java/kotlin/src/main/kotlin/com/google/protobuf/OnlyForUseByGeneratedProtoCode.kt\
   java/kotlin/src/main/kotlin/com/google/protobuf/ProtoDslMarker.kt                \
   java/kotlin/src/main/kotlin/com/google/protobuf/UnmodifiableCollections.kt       \
+  java/kotlin/src/test/kotlin/com/google/protobuf/ByteStringsTest.kt               \
   java/kotlin/src/test/kotlin/com/google/protobuf/DslListTest.kt                   \
   java/kotlin/src/test/kotlin/com/google/protobuf/DslMapTest.kt                    \
   java/kotlin/src/test/kotlin/com/google/protobuf/ExtendableMessageExtensionsTest.kt\
diff --git a/cmake/tests.cmake b/cmake/tests.cmake
index 7e6326e10a..70e1015bf8 100644
--- a/cmake/tests.cmake
+++ b/cmake/tests.cmake
@@ -162,6 +162,7 @@ set(tests_files
   ${protobuf_source_dir}/src/google/protobuf/io/zero_copy_stream_unittest.cc
   ${protobuf_source_dir}/src/google/protobuf/map_field_test.cc
   ${protobuf_source_dir}/src/google/protobuf/map_test.cc
+  ${protobuf_source_dir}/src/google/protobuf/map_test.inc
   ${protobuf_source_dir}/src/google/protobuf/message_unittest.cc
   ${protobuf_source_dir}/src/google/protobuf/message_unittest.inc
   ${protobuf_source_dir}/src/google/protobuf/no_field_presence_test.cc
diff --git a/src/Makefile.am b/src/Makefile.am
index 01297412dd..2d5f5074a8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -762,6 +762,7 @@ protobuf_test_SOURCES =                                        \
   google/protobuf/inlined_string_field_unittest.cc             \
   google/protobuf/map_field_test.cc                            \
   google/protobuf/map_test.cc                                  \
+  google/protobuf/map_test.inc                                 \
   google/protobuf/message_unittest.cc                          \
   google/protobuf/message_unittest.inc                         \
   google/protobuf/no_field_presence_test.cc                    \