diff --git a/BUILD b/BUILD
index 07ee629a18..46d284ec18 100644
--- a/BUILD
+++ b/BUILD
@@ -401,6 +401,7 @@ cc_library(
         "src/google/protobuf/compiler/java/java_generator.cc",
         "src/google/protobuf/compiler/java/java_generator_factory.cc",
         "src/google/protobuf/compiler/java/java_helpers.cc",
+        "src/google/protobuf/compiler/java/java_kotlin_generator.cc",
         "src/google/protobuf/compiler/java/java_map_field.cc",
         "src/google/protobuf/compiler/java/java_map_field_lite.cc",
         "src/google/protobuf/compiler/java/java_message.cc",
diff --git a/cmake/extract_includes.bat.in b/cmake/extract_includes.bat.in
index 5c5799efa1..ad630af511 100644
--- a/cmake/extract_includes.bat.in
+++ b/cmake/extract_includes.bat.in
@@ -26,6 +26,7 @@ copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\compiler\csharp\cshar
 copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\compiler\csharp\csharp_names.h" include\google\protobuf\compiler\csharp\csharp_names.h
 copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\compiler\importer.h" include\google\protobuf\compiler\importer.h
 copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\compiler\java\java_generator.h" include\google\protobuf\compiler\java\java_generator.h
+copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\compiler\java\java_kotlin_generator.h" include\google\protobuf\compiler\java\java_kotlin_generator.h
 copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\compiler\java\java_names.h" include\google\protobuf\compiler\java\java_names.h
 copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\compiler\js\js_generator.h" include\google\protobuf\compiler\js\js_generator.h
 copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\compiler\js\well_known_types_embed.h" include\google\protobuf\compiler\js\well_known_types_embed.h
diff --git a/cmake/libprotoc.cmake b/cmake/libprotoc.cmake
index ecb5a851b8..6316d83b86 100644
--- a/cmake/libprotoc.cmake
+++ b/cmake/libprotoc.cmake
@@ -44,6 +44,7 @@ set(libprotoc_files
   ${protobuf_source_dir}/src/google/protobuf/compiler/java/java_generator.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/java/java_generator_factory.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/java/java_helpers.cc
+  ${protobuf_source_dir}/src/google/protobuf/compiler/java/java_kotlin_generator.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/java/java_map_field.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/java/java_map_field_lite.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/java/java_message.cc
diff --git a/java/core/BUILD b/java/core/BUILD
index 32565c6b46..e7778f9a62 100644
--- a/java/core/BUILD
+++ b/java/core/BUILD
@@ -89,14 +89,6 @@ LITE_SRCS = [
     "src/main/java/com/google/protobuf/Utf8.java",
     "src/main/java/com/google/protobuf/WireFormat.java",
     "src/main/java/com/google/protobuf/Writer.java",
-    "src/main/kotlin/com/google/protobuf/DslList.kt",
-    "src/main/kotlin/com/google/protobuf/DslMap.kt",
-    "src/main/kotlin/com/google/protobuf/DslProxy.kt",
-    "src/main/kotlin/com/google/protobuf/ExtendableMessageLiteExtensions.kt",
-    "src/main/kotlin/com/google/protobuf/ExtensionList.kt",
-    "src/main/kotlin/com/google/protobuf/OnlyForUseByGeneratedProtoCode.kt",
-    "src/main/kotlin/com/google/protobuf/ProtoDslMarker.kt",
-    "src/main/kotlin/com/google/protobuf/UnmodifiableCollections.kt",
 ]
 
 # Should be used as `//java/lite`.
diff --git a/src/google/protobuf/compiler/java/java_kotlin_generator.h b/src/google/protobuf/compiler/java/java_kotlin_generator.h
index 98589c3e27..db15353c0a 100644
--- a/src/google/protobuf/compiler/java/java_kotlin_generator.h
+++ b/src/google/protobuf/compiler/java/java_kotlin_generator.h
@@ -1,5 +1,5 @@
-#ifndef GOOGLE_PROTOBUF_COMPILER_JAVA_JAVA_KOTLIN_GENERATOR_H_
-#define GOOGLE_PROTOBUF_COMPILER_JAVA_JAVA_KOTLIN_GENERATOR_H_
+#ifndef GOOGLE_PROTOBUF_COMPILER_JAVA_KOTLIN_GENERATOR_H_
+#define GOOGLE_PROTOBUF_COMPILER_JAVA_KOTLIN_GENERATOR_H_
 
 #include <string>
 #include <google/protobuf/compiler/code_generator.h>
@@ -37,4 +37,4 @@ class PROTOC_EXPORT KotlinGenerator : public CodeGenerator {
 
 #include <google/protobuf/port_undef.inc>
 
-#endif  // GOOGLE_PROTOBUF_COMPILER_JAVA_JAVA_KOTLIN_GENERATOR_H_
+#endif  // GOOGLE_PROTOBUF_COMPILER_JAVA_KOTLIN_GENERATOR_H_