diff --git a/proto/compiler/google/protobuf/compiler/kotlin/src/kotlin_builder_generator.cpp b/proto/compiler/google/protobuf/compiler/kotlin/src/kotlin_builder_generator.cpp
deleted file mode 100644
index 2d76c990c88..00000000000
--- a/proto/compiler/google/protobuf/compiler/kotlin/src/kotlin_builder_generator.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-// Created by user on 7/12/16.
-//
-
-#include "kotlin_builder_generator.h"
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace kotlin {
-
-BuilderGenerator::BuilderGenerator(const google::protobuf::Descriptor * descriptor) {
-
-}
-
-} // namespace kotlin
-} // namespace compiler
-} // namespace protobuf
-} // namespace google
-
-
-
diff --git a/proto/compiler/google/protobuf/compiler/kotlin/src/kotlin_builder_generator.h b/proto/compiler/google/protobuf/compiler/kotlin/src/kotlin_builder_generator.h
deleted file mode 100644
index 332501db72c..00000000000
--- a/proto/compiler/google/protobuf/compiler/kotlin/src/kotlin_builder_generator.h
+++ /dev/null
@@ -1,33 +0,0 @@
-//
-// Created by user on 7/12/16.
-//
-
-#ifndef PROTOBUF_KOTLIN_BUILDER_GENERATOR_H
-#define PROTOBUF_KOTLIN_BUILDER_GENERATOR_H
-
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/descriptor.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace kotlin {
-
-}
-class BuilderGenerator {
-public:
-    string simpleName;
-    vector <
-
-    BuilderGenerator(Descriptor const * descriptor);
-    ~BuilderGenerator();
-    void generateCode(io::Printer * printer);
-};
-
-} // namespace kotlin
-} // namespace compiler
-} // namespace protobuf
-} // namespace google
-
-
-#endif //PROTOBUF_KOTLIN_BUILDER_GENERATOR_H
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/.deps/.dirstamp b/proto/compiler/google/src/google/protobuf/compiler/kotlin/.deps/.dirstamp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/.deps/kotlin_class_generator.Plo b/proto/compiler/google/src/google/protobuf/compiler/kotlin/.deps/kotlin_class_generator.Plo
new file mode 100644
index 00000000000..eed5f8ec47c
--- /dev/null
+++ b/proto/compiler/google/src/google/protobuf/compiler/kotlin/.deps/kotlin_class_generator.Plo
@@ -0,0 +1,438 @@
+google/protobuf/compiler/kotlin/kotlin_class_generator.lo: \
+ google/protobuf/compiler/kotlin/kotlin_class_generator.cc \
+ /usr/include/stdc-predef.h \
+ google/protobuf/compiler/kotlin/kotlin_class_generator.h \
+ /usr/include/c++/5/vector /usr/include/c++/5/bits/stl_algobase.h \
+ /usr/include/x86_64-linux-gnu/c++/5/bits/c++config.h \
+ /usr/include/x86_64-linux-gnu/c++/5/bits/os_defines.h \
+ /usr/include/features.h /usr/include/x86_64-linux-gnu/sys/cdefs.h \
+ /usr/include/x86_64-linux-gnu/bits/wordsize.h \
+ /usr/include/x86_64-linux-gnu/gnu/stubs.h \
+ /usr/include/x86_64-linux-gnu/gnu/stubs-64.h \
+ /usr/include/x86_64-linux-gnu/c++/5/bits/cpu_defines.h \
+ /usr/include/c++/5/bits/functexcept.h \
+ /usr/include/c++/5/bits/exception_defines.h \
+ /usr/include/c++/5/bits/cpp_type_traits.h \
+ /usr/include/c++/5/ext/type_traits.h \
+ /usr/include/c++/5/ext/numeric_traits.h \
+ /usr/include/c++/5/bits/stl_pair.h /usr/include/c++/5/bits/move.h \
+ /usr/include/c++/5/bits/concept_check.h \
+ /usr/include/c++/5/bits/stl_iterator_base_types.h \
+ /usr/include/c++/5/bits/stl_iterator_base_funcs.h \
+ /usr/include/c++/5/debug/debug.h /usr/include/c++/5/bits/stl_iterator.h \
+ /usr/include/c++/5/bits/ptr_traits.h \
+ /usr/include/c++/5/bits/predefined_ops.h \
+ /usr/include/c++/5/bits/allocator.h \
+ /usr/include/x86_64-linux-gnu/c++/5/bits/c++allocator.h \
+ /usr/include/c++/5/ext/new_allocator.h /usr/include/c++/5/new \
+ /usr/include/c++/5/exception \
+ /usr/include/c++/5/bits/atomic_lockfree_defines.h \
+ /usr/include/c++/5/bits/memoryfwd.h \
+ /usr/include/c++/5/bits/stl_construct.h \
+ /usr/include/c++/5/ext/alloc_traits.h \
+ /usr/include/c++/5/bits/stl_uninitialized.h \
+ /usr/include/c++/5/bits/stl_vector.h \
+ /usr/include/c++/5/bits/stl_bvector.h \
+ /usr/include/c++/5/bits/range_access.h \
+ /usr/include/c++/5/bits/vector.tcc google/protobuf/io/printer.h \
+ /usr/include/c++/5/string /usr/include/c++/5/bits/stringfwd.h \
+ /usr/include/c++/5/bits/char_traits.h /usr/include/c++/5/bits/postypes.h \
+ /usr/include/c++/5/cwchar /usr/include/wchar.h /usr/include/stdio.h \
+ /usr/lib/gcc/x86_64-linux-gnu/5/include/stdarg.h \
+ /usr/include/x86_64-linux-gnu/bits/wchar.h \
+ /usr/lib/gcc/x86_64-linux-gnu/5/include/stddef.h /usr/include/xlocale.h \
+ /usr/include/x86_64-linux-gnu/bits/wchar2.h \
+ /usr/include/c++/5/bits/localefwd.h \
+ /usr/include/x86_64-linux-gnu/c++/5/bits/c++locale.h \
+ /usr/include/c++/5/clocale /usr/include/locale.h \
+ /usr/include/x86_64-linux-gnu/bits/locale.h /usr/include/c++/5/iosfwd \
+ /usr/include/c++/5/cctype /usr/include/ctype.h \
+ /usr/include/x86_64-linux-gnu/bits/types.h \
+ /usr/include/x86_64-linux-gnu/bits/typesizes.h /usr/include/endian.h \
+ /usr/include/x86_64-linux-gnu/bits/endian.h \
+ /usr/include/x86_64-linux-gnu/bits/byteswap.h \
+ /usr/include/x86_64-linux-gnu/bits/byteswap-16.h \
+ /usr/include/c++/5/bits/ostream_insert.h \
+ /usr/include/c++/5/bits/cxxabi_forced.h \
+ /usr/include/c++/5/bits/stl_function.h \
+ /usr/include/c++/5/backward/binders.h \
+ /usr/include/c++/5/bits/basic_string.h \
+ /usr/include/c++/5/ext/atomicity.h \
+ /usr/include/x86_64-linux-gnu/c++/5/bits/gthr.h \
+ /usr/include/x86_64-linux-gnu/c++/5/bits/gthr-default.h \
+ /usr/include/pthread.h /usr/include/sched.h /usr/include/time.h \
+ /usr/include/x86_64-linux-gnu/bits/sched.h \
+ /usr/include/x86_64-linux-gnu/bits/time.h \
+ /usr/include/x86_64-linux-gnu/bits/timex.h \
+ /usr/include/x86_64-linux-gnu/bits/pthreadtypes.h \
+ /usr/include/x86_64-linux-gnu/bits/setjmp.h \
+ /usr/include/x86_64-linux-gnu/c++/5/bits/atomic_word.h \
+ /usr/include/c++/5/bits/basic_string.tcc /usr/include/c++/5/map \
+ /usr/include/c++/5/bits/stl_tree.h /usr/include/c++/5/bits/stl_map.h \
+ /usr/include/c++/5/bits/stl_multimap.h google/protobuf/stubs/common.h \
+ google/protobuf/stubs/port.h /usr/include/assert.h /usr/include/stdlib.h \
+ /usr/include/x86_64-linux-gnu/bits/waitflags.h \
+ /usr/include/x86_64-linux-gnu/bits/waitstatus.h \
+ /usr/include/x86_64-linux-gnu/sys/types.h \
+ /usr/include/x86_64-linux-gnu/sys/select.h \
+ /usr/include/x86_64-linux-gnu/bits/select.h \
+ /usr/include/x86_64-linux-gnu/bits/sigset.h \
+ /usr/include/x86_64-linux-gnu/bits/select2.h \
+ /usr/include/x86_64-linux-gnu/sys/sysmacros.h /usr/include/alloca.h \
+ /usr/include/x86_64-linux-gnu/bits/stdlib-bsearch.h \
+ /usr/include/x86_64-linux-gnu/bits/stdlib-float.h \
+ /usr/include/x86_64-linux-gnu/bits/stdlib.h /usr/include/c++/5/cstddef \
+ /usr/include/string.h /usr/include/x86_64-linux-gnu/bits/string3.h \
+ /usr/lib/gcc/x86_64-linux-gnu/5/include/stdint.h /usr/include/stdint.h \
+ /usr/include/x86_64-linux-gnu/sys/param.h \
+ /usr/lib/gcc/x86_64-linux-gnu/5/include-fixed/limits.h \
+ /usr/lib/gcc/x86_64-linux-gnu/5/include-fixed/syslimits.h \
+ /usr/include/limits.h /usr/include/x86_64-linux-gnu/bits/posix1_lim.h \
+ /usr/include/x86_64-linux-gnu/bits/local_lim.h \
+ /usr/include/linux/limits.h \
+ /usr/include/x86_64-linux-gnu/bits/posix2_lim.h \
+ /usr/include/x86_64-linux-gnu/bits/xopen_lim.h \
+ /usr/include/x86_64-linux-gnu/bits/stdio_lim.h /usr/include/signal.h \
+ /usr/include/x86_64-linux-gnu/bits/signum.h \
+ /usr/include/x86_64-linux-gnu/bits/siginfo.h \
+ /usr/include/x86_64-linux-gnu/bits/sigaction.h \
+ /usr/include/x86_64-linux-gnu/bits/sigcontext.h \
+ /usr/include/x86_64-linux-gnu/bits/sigstack.h \
+ /usr/include/x86_64-linux-gnu/sys/ucontext.h \
+ /usr/include/x86_64-linux-gnu/bits/sigthread.h \
+ /usr/include/x86_64-linux-gnu/bits/param.h /usr/include/linux/param.h \
+ /usr/include/x86_64-linux-gnu/asm/param.h \
+ /usr/include/asm-generic/param.h /usr/include/byteswap.h \
+ google/protobuf/stubs/macros.h google/protobuf/stubs/platform_macros.h \
+ google/protobuf/stubs/logging.h google/protobuf/stubs/scoped_ptr.h \
+ google/protobuf/stubs/mutex.h google/protobuf/stubs/callback.h \
+ google/protobuf/stubs/type_traits.h /usr/include/c++/5/utility \
+ /usr/include/c++/5/bits/stl_relops.h \
+ google/protobuf/stubs/template_util.h google/protobuf/descriptor.h \
+ /usr/include/c++/5/memory /usr/include/c++/5/bits/stl_tempbuf.h \
+ /usr/include/c++/5/bits/stl_raw_storage_iter.h \
+ /usr/include/c++/5/backward/auto_ptr.h \
+ google/protobuf/stubs/shared_ptr.h google/protobuf/stubs/atomicops.h \
+ google/protobuf/stubs/atomicops_internals_x86_gcc.h \
+ /usr/include/c++/5/algorithm /usr/include/c++/5/bits/stl_algo.h \
+ /usr/include/c++/5/cstdlib /usr/include/c++/5/bits/algorithmfwd.h \
+ /usr/include/c++/5/bits/stl_heap.h /usr/include/c++/5/set \
+ /usr/include/c++/5/bits/stl_set.h /usr/include/c++/5/bits/stl_multiset.h
+
+/usr/include/stdc-predef.h:
+
+google/protobuf/compiler/kotlin/kotlin_class_generator.h:
+
+/usr/include/c++/5/vector:
+
+/usr/include/c++/5/bits/stl_algobase.h:
+
+/usr/include/x86_64-linux-gnu/c++/5/bits/c++config.h:
+
+/usr/include/x86_64-linux-gnu/c++/5/bits/os_defines.h:
+
+/usr/include/features.h:
+
+/usr/include/x86_64-linux-gnu/sys/cdefs.h:
+
+/usr/include/x86_64-linux-gnu/bits/wordsize.h:
+
+/usr/include/x86_64-linux-gnu/gnu/stubs.h:
+
+/usr/include/x86_64-linux-gnu/gnu/stubs-64.h:
+
+/usr/include/x86_64-linux-gnu/c++/5/bits/cpu_defines.h:
+
+/usr/include/c++/5/bits/functexcept.h:
+
+/usr/include/c++/5/bits/exception_defines.h:
+
+/usr/include/c++/5/bits/cpp_type_traits.h:
+
+/usr/include/c++/5/ext/type_traits.h:
+
+/usr/include/c++/5/ext/numeric_traits.h:
+
+/usr/include/c++/5/bits/stl_pair.h:
+
+/usr/include/c++/5/bits/move.h:
+
+/usr/include/c++/5/bits/concept_check.h:
+
+/usr/include/c++/5/bits/stl_iterator_base_types.h:
+
+/usr/include/c++/5/bits/stl_iterator_base_funcs.h:
+
+/usr/include/c++/5/debug/debug.h:
+
+/usr/include/c++/5/bits/stl_iterator.h:
+
+/usr/include/c++/5/bits/ptr_traits.h:
+
+/usr/include/c++/5/bits/predefined_ops.h:
+
+/usr/include/c++/5/bits/allocator.h:
+
+/usr/include/x86_64-linux-gnu/c++/5/bits/c++allocator.h:
+
+/usr/include/c++/5/ext/new_allocator.h:
+
+/usr/include/c++/5/new:
+
+/usr/include/c++/5/exception:
+
+/usr/include/c++/5/bits/atomic_lockfree_defines.h:
+
+/usr/include/c++/5/bits/memoryfwd.h:
+
+/usr/include/c++/5/bits/stl_construct.h:
+
+/usr/include/c++/5/ext/alloc_traits.h:
+
+/usr/include/c++/5/bits/stl_uninitialized.h:
+
+/usr/include/c++/5/bits/stl_vector.h:
+
+/usr/include/c++/5/bits/stl_bvector.h:
+
+/usr/include/c++/5/bits/range_access.h:
+
+/usr/include/c++/5/bits/vector.tcc:
+
+google/protobuf/io/printer.h:
+
+/usr/include/c++/5/string:
+
+/usr/include/c++/5/bits/stringfwd.h:
+
+/usr/include/c++/5/bits/char_traits.h:
+
+/usr/include/c++/5/bits/postypes.h:
+
+/usr/include/c++/5/cwchar:
+
+/usr/include/wchar.h:
+
+/usr/include/stdio.h:
+
+/usr/lib/gcc/x86_64-linux-gnu/5/include/stdarg.h:
+
+/usr/include/x86_64-linux-gnu/bits/wchar.h:
+
+/usr/lib/gcc/x86_64-linux-gnu/5/include/stddef.h:
+
+/usr/include/xlocale.h:
+
+/usr/include/x86_64-linux-gnu/bits/wchar2.h:
+
+/usr/include/c++/5/bits/localefwd.h:
+
+/usr/include/x86_64-linux-gnu/c++/5/bits/c++locale.h:
+
+/usr/include/c++/5/clocale:
+
+/usr/include/locale.h:
+
+/usr/include/x86_64-linux-gnu/bits/locale.h:
+
+/usr/include/c++/5/iosfwd:
+
+/usr/include/c++/5/cctype:
+
+/usr/include/ctype.h:
+
+/usr/include/x86_64-linux-gnu/bits/types.h:
+
+/usr/include/x86_64-linux-gnu/bits/typesizes.h:
+
+/usr/include/endian.h:
+
+/usr/include/x86_64-linux-gnu/bits/endian.h:
+
+/usr/include/x86_64-linux-gnu/bits/byteswap.h:
+
+/usr/include/x86_64-linux-gnu/bits/byteswap-16.h:
+
+/usr/include/c++/5/bits/ostream_insert.h:
+
+/usr/include/c++/5/bits/cxxabi_forced.h:
+
+/usr/include/c++/5/bits/stl_function.h:
+
+/usr/include/c++/5/backward/binders.h:
+
+/usr/include/c++/5/bits/basic_string.h:
+
+/usr/include/c++/5/ext/atomicity.h:
+
+/usr/include/x86_64-linux-gnu/c++/5/bits/gthr.h:
+
+/usr/include/x86_64-linux-gnu/c++/5/bits/gthr-default.h:
+
+/usr/include/pthread.h:
+
+/usr/include/sched.h:
+
+/usr/include/time.h:
+
+/usr/include/x86_64-linux-gnu/bits/sched.h:
+
+/usr/include/x86_64-linux-gnu/bits/time.h:
+
+/usr/include/x86_64-linux-gnu/bits/timex.h:
+
+/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h:
+
+/usr/include/x86_64-linux-gnu/bits/setjmp.h:
+
+/usr/include/x86_64-linux-gnu/c++/5/bits/atomic_word.h:
+
+/usr/include/c++/5/bits/basic_string.tcc:
+
+/usr/include/c++/5/map:
+
+/usr/include/c++/5/bits/stl_tree.h:
+
+/usr/include/c++/5/bits/stl_map.h:
+
+/usr/include/c++/5/bits/stl_multimap.h:
+
+google/protobuf/stubs/common.h:
+
+google/protobuf/stubs/port.h:
+
+/usr/include/assert.h:
+
+/usr/include/stdlib.h:
+
+/usr/include/x86_64-linux-gnu/bits/waitflags.h:
+
+/usr/include/x86_64-linux-gnu/bits/waitstatus.h:
+
+/usr/include/x86_64-linux-gnu/sys/types.h:
+
+/usr/include/x86_64-linux-gnu/sys/select.h:
+
+/usr/include/x86_64-linux-gnu/bits/select.h:
+
+/usr/include/x86_64-linux-gnu/bits/sigset.h:
+
+/usr/include/x86_64-linux-gnu/bits/select2.h:
+
+/usr/include/x86_64-linux-gnu/sys/sysmacros.h:
+
+/usr/include/alloca.h:
+
+/usr/include/x86_64-linux-gnu/bits/stdlib-bsearch.h:
+
+/usr/include/x86_64-linux-gnu/bits/stdlib-float.h:
+
+/usr/include/x86_64-linux-gnu/bits/stdlib.h:
+
+/usr/include/c++/5/cstddef:
+
+/usr/include/string.h:
+
+/usr/include/x86_64-linux-gnu/bits/string3.h:
+
+/usr/lib/gcc/x86_64-linux-gnu/5/include/stdint.h:
+
+/usr/include/stdint.h:
+
+/usr/include/x86_64-linux-gnu/sys/param.h:
+
+/usr/lib/gcc/x86_64-linux-gnu/5/include-fixed/limits.h:
+
+/usr/lib/gcc/x86_64-linux-gnu/5/include-fixed/syslimits.h:
+
+/usr/include/limits.h:
+
+/usr/include/x86_64-linux-gnu/bits/posix1_lim.h:
+
+/usr/include/x86_64-linux-gnu/bits/local_lim.h:
+
+/usr/include/linux/limits.h:
+
+/usr/include/x86_64-linux-gnu/bits/posix2_lim.h:
+
+/usr/include/x86_64-linux-gnu/bits/xopen_lim.h:
+
+/usr/include/x86_64-linux-gnu/bits/stdio_lim.h:
+
+/usr/include/signal.h:
+
+/usr/include/x86_64-linux-gnu/bits/signum.h:
+
+/usr/include/x86_64-linux-gnu/bits/siginfo.h:
+
+/usr/include/x86_64-linux-gnu/bits/sigaction.h:
+
+/usr/include/x86_64-linux-gnu/bits/sigcontext.h:
+
+/usr/include/x86_64-linux-gnu/bits/sigstack.h:
+
+/usr/include/x86_64-linux-gnu/sys/ucontext.h:
+
+/usr/include/x86_64-linux-gnu/bits/sigthread.h:
+
+/usr/include/x86_64-linux-gnu/bits/param.h:
+
+/usr/include/linux/param.h:
+
+/usr/include/x86_64-linux-gnu/asm/param.h:
+
+/usr/include/asm-generic/param.h:
+
+/usr/include/byteswap.h:
+
+google/protobuf/stubs/macros.h:
+
+google/protobuf/stubs/platform_macros.h:
+
+google/protobuf/stubs/logging.h:
+
+google/protobuf/stubs/scoped_ptr.h:
+
+google/protobuf/stubs/mutex.h:
+
+google/protobuf/stubs/callback.h:
+
+google/protobuf/stubs/type_traits.h:
+
+/usr/include/c++/5/utility:
+
+/usr/include/c++/5/bits/stl_relops.h:
+
+google/protobuf/stubs/template_util.h:
+
+google/protobuf/descriptor.h:
+
+/usr/include/c++/5/memory:
+
+/usr/include/c++/5/bits/stl_tempbuf.h:
+
+/usr/include/c++/5/bits/stl_raw_storage_iter.h:
+
+/usr/include/c++/5/backward/auto_ptr.h:
+
+google/protobuf/stubs/shared_ptr.h:
+
+google/protobuf/stubs/atomicops.h:
+
+google/protobuf/stubs/atomicops_internals_x86_gcc.h:
+
+/usr/include/c++/5/algorithm:
+
+/usr/include/c++/5/bits/stl_algo.h:
+
+/usr/include/c++/5/cstdlib:
+
+/usr/include/c++/5/bits/algorithmfwd.h:
+
+/usr/include/c++/5/bits/stl_heap.h:
+
+/usr/include/c++/5/set:
+
+/usr/include/c++/5/bits/stl_set.h:
+
+/usr/include/c++/5/bits/stl_multiset.h:
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/.deps/kotlin_file_generator.Plo b/proto/compiler/google/src/google/protobuf/compiler/kotlin/.deps/kotlin_file_generator.Plo
new file mode 100644
index 00000000000..5513bd3e86d
--- /dev/null
+++ b/proto/compiler/google/src/google/protobuf/compiler/kotlin/.deps/kotlin_file_generator.Plo
@@ -0,0 +1,448 @@
+google/protobuf/compiler/kotlin/kotlin_file_generator.lo: \
+ google/protobuf/compiler/kotlin/kotlin_file_generator.cc \
+ /usr/include/stdc-predef.h google/protobuf/descriptor.h \
+ /usr/include/c++/5/memory /usr/include/c++/5/bits/stl_algobase.h \
+ /usr/include/x86_64-linux-gnu/c++/5/bits/c++config.h \
+ /usr/include/x86_64-linux-gnu/c++/5/bits/os_defines.h \
+ /usr/include/features.h /usr/include/x86_64-linux-gnu/sys/cdefs.h \
+ /usr/include/x86_64-linux-gnu/bits/wordsize.h \
+ /usr/include/x86_64-linux-gnu/gnu/stubs.h \
+ /usr/include/x86_64-linux-gnu/gnu/stubs-64.h \
+ /usr/include/x86_64-linux-gnu/c++/5/bits/cpu_defines.h \
+ /usr/include/c++/5/bits/functexcept.h \
+ /usr/include/c++/5/bits/exception_defines.h \
+ /usr/include/c++/5/bits/cpp_type_traits.h \
+ /usr/include/c++/5/ext/type_traits.h \
+ /usr/include/c++/5/ext/numeric_traits.h \
+ /usr/include/c++/5/bits/stl_pair.h /usr/include/c++/5/bits/move.h \
+ /usr/include/c++/5/bits/concept_check.h \
+ /usr/include/c++/5/bits/stl_iterator_base_types.h \
+ /usr/include/c++/5/bits/stl_iterator_base_funcs.h \
+ /usr/include/c++/5/debug/debug.h /usr/include/c++/5/bits/stl_iterator.h \
+ /usr/include/c++/5/bits/ptr_traits.h \
+ /usr/include/c++/5/bits/predefined_ops.h \
+ /usr/include/c++/5/bits/allocator.h \
+ /usr/include/x86_64-linux-gnu/c++/5/bits/c++allocator.h \
+ /usr/include/c++/5/ext/new_allocator.h /usr/include/c++/5/new \
+ /usr/include/c++/5/exception \
+ /usr/include/c++/5/bits/atomic_lockfree_defines.h \
+ /usr/include/c++/5/bits/memoryfwd.h \
+ /usr/include/c++/5/bits/stl_construct.h \
+ /usr/include/c++/5/ext/alloc_traits.h \
+ /usr/include/c++/5/bits/stl_uninitialized.h \
+ /usr/include/c++/5/bits/stl_tempbuf.h \
+ /usr/include/c++/5/bits/stl_raw_storage_iter.h \
+ /usr/include/c++/5/backward/auto_ptr.h \
+ google/protobuf/stubs/shared_ptr.h google/protobuf/stubs/atomicops.h \
+ google/protobuf/stubs/common.h /usr/include/c++/5/string \
+ /usr/include/c++/5/bits/stringfwd.h \
+ /usr/include/c++/5/bits/char_traits.h /usr/include/c++/5/bits/postypes.h \
+ /usr/include/c++/5/cwchar /usr/include/wchar.h /usr/include/stdio.h \
+ /usr/lib/gcc/x86_64-linux-gnu/5/include/stdarg.h \
+ /usr/include/x86_64-linux-gnu/bits/wchar.h \
+ /usr/lib/gcc/x86_64-linux-gnu/5/include/stddef.h /usr/include/xlocale.h \
+ /usr/include/x86_64-linux-gnu/bits/wchar2.h \
+ /usr/include/c++/5/bits/localefwd.h \
+ /usr/include/x86_64-linux-gnu/c++/5/bits/c++locale.h \
+ /usr/include/c++/5/clocale /usr/include/locale.h \
+ /usr/include/x86_64-linux-gnu/bits/locale.h /usr/include/c++/5/iosfwd \
+ /usr/include/c++/5/cctype /usr/include/ctype.h \
+ /usr/include/x86_64-linux-gnu/bits/types.h \
+ /usr/include/x86_64-linux-gnu/bits/typesizes.h /usr/include/endian.h \
+ /usr/include/x86_64-linux-gnu/bits/endian.h \
+ /usr/include/x86_64-linux-gnu/bits/byteswap.h \
+ /usr/include/x86_64-linux-gnu/bits/byteswap-16.h \
+ /usr/include/c++/5/bits/ostream_insert.h \
+ /usr/include/c++/5/bits/cxxabi_forced.h \
+ /usr/include/c++/5/bits/stl_function.h \
+ /usr/include/c++/5/backward/binders.h \
+ /usr/include/c++/5/bits/range_access.h \
+ /usr/include/c++/5/bits/basic_string.h \
+ /usr/include/c++/5/ext/atomicity.h \
+ /usr/include/x86_64-linux-gnu/c++/5/bits/gthr.h \
+ /usr/include/x86_64-linux-gnu/c++/5/bits/gthr-default.h \
+ /usr/include/pthread.h /usr/include/sched.h /usr/include/time.h \
+ /usr/include/x86_64-linux-gnu/bits/sched.h \
+ /usr/include/x86_64-linux-gnu/bits/time.h \
+ /usr/include/x86_64-linux-gnu/bits/timex.h \
+ /usr/include/x86_64-linux-gnu/bits/pthreadtypes.h \
+ /usr/include/x86_64-linux-gnu/bits/setjmp.h \
+ /usr/include/x86_64-linux-gnu/c++/5/bits/atomic_word.h \
+ /usr/include/c++/5/bits/basic_string.tcc google/protobuf/stubs/port.h \
+ /usr/include/assert.h /usr/include/stdlib.h \
+ /usr/include/x86_64-linux-gnu/bits/waitflags.h \
+ /usr/include/x86_64-linux-gnu/bits/waitstatus.h \
+ /usr/include/x86_64-linux-gnu/sys/types.h \
+ /usr/include/x86_64-linux-gnu/sys/select.h \
+ /usr/include/x86_64-linux-gnu/bits/select.h \
+ /usr/include/x86_64-linux-gnu/bits/sigset.h \
+ /usr/include/x86_64-linux-gnu/bits/select2.h \
+ /usr/include/x86_64-linux-gnu/sys/sysmacros.h /usr/include/alloca.h \
+ /usr/include/x86_64-linux-gnu/bits/stdlib-bsearch.h \
+ /usr/include/x86_64-linux-gnu/bits/stdlib-float.h \
+ /usr/include/x86_64-linux-gnu/bits/stdlib.h /usr/include/c++/5/cstddef \
+ /usr/include/string.h /usr/include/x86_64-linux-gnu/bits/string3.h \
+ /usr/lib/gcc/x86_64-linux-gnu/5/include/stdint.h /usr/include/stdint.h \
+ /usr/include/x86_64-linux-gnu/sys/param.h \
+ /usr/lib/gcc/x86_64-linux-gnu/5/include-fixed/limits.h \
+ /usr/lib/gcc/x86_64-linux-gnu/5/include-fixed/syslimits.h \
+ /usr/include/limits.h /usr/include/x86_64-linux-gnu/bits/posix1_lim.h \
+ /usr/include/x86_64-linux-gnu/bits/local_lim.h \
+ /usr/include/linux/limits.h \
+ /usr/include/x86_64-linux-gnu/bits/posix2_lim.h \
+ /usr/include/x86_64-linux-gnu/bits/xopen_lim.h \
+ /usr/include/x86_64-linux-gnu/bits/stdio_lim.h /usr/include/signal.h \
+ /usr/include/x86_64-linux-gnu/bits/signum.h \
+ /usr/include/x86_64-linux-gnu/bits/siginfo.h \
+ /usr/include/x86_64-linux-gnu/bits/sigaction.h \
+ /usr/include/x86_64-linux-gnu/bits/sigcontext.h \
+ /usr/include/x86_64-linux-gnu/bits/sigstack.h \
+ /usr/include/x86_64-linux-gnu/sys/ucontext.h \
+ /usr/include/x86_64-linux-gnu/bits/sigthread.h \
+ /usr/include/x86_64-linux-gnu/bits/param.h /usr/include/linux/param.h \
+ /usr/include/x86_64-linux-gnu/asm/param.h \
+ /usr/include/asm-generic/param.h /usr/include/byteswap.h \
+ google/protobuf/stubs/macros.h google/protobuf/stubs/platform_macros.h \
+ google/protobuf/stubs/logging.h google/protobuf/stubs/scoped_ptr.h \
+ google/protobuf/stubs/mutex.h google/protobuf/stubs/callback.h \
+ google/protobuf/stubs/type_traits.h /usr/include/c++/5/utility \
+ /usr/include/c++/5/bits/stl_relops.h \
+ google/protobuf/stubs/template_util.h \
+ google/protobuf/stubs/atomicops_internals_x86_gcc.h \
+ /usr/include/c++/5/algorithm /usr/include/c++/5/bits/stl_algo.h \
+ /usr/include/c++/5/cstdlib /usr/include/c++/5/bits/algorithmfwd.h \
+ /usr/include/c++/5/bits/stl_heap.h /usr/include/c++/5/set \
+ /usr/include/c++/5/bits/stl_tree.h /usr/include/c++/5/bits/stl_set.h \
+ /usr/include/c++/5/bits/stl_multiset.h /usr/include/c++/5/vector \
+ /usr/include/c++/5/bits/stl_vector.h \
+ /usr/include/c++/5/bits/stl_bvector.h /usr/include/c++/5/bits/vector.tcc \
+ google/protobuf/io/zero_copy_stream.h \
+ google/protobuf/compiler/kotlin/kotlin_file_generator.h \
+ google/protobuf/compiler/kotlin/kotlin_class_generator.h \
+ google/protobuf/io/printer.h /usr/include/c++/5/map \
+ /usr/include/c++/5/bits/stl_map.h /usr/include/c++/5/bits/stl_multimap.h \
+ google/protobuf/compiler/code_generator.h
+
+/usr/include/stdc-predef.h:
+
+google/protobuf/descriptor.h:
+
+/usr/include/c++/5/memory:
+
+/usr/include/c++/5/bits/stl_algobase.h:
+
+/usr/include/x86_64-linux-gnu/c++/5/bits/c++config.h:
+
+/usr/include/x86_64-linux-gnu/c++/5/bits/os_defines.h:
+
+/usr/include/features.h:
+
+/usr/include/x86_64-linux-gnu/sys/cdefs.h:
+
+/usr/include/x86_64-linux-gnu/bits/wordsize.h:
+
+/usr/include/x86_64-linux-gnu/gnu/stubs.h:
+
+/usr/include/x86_64-linux-gnu/gnu/stubs-64.h:
+
+/usr/include/x86_64-linux-gnu/c++/5/bits/cpu_defines.h:
+
+/usr/include/c++/5/bits/functexcept.h:
+
+/usr/include/c++/5/bits/exception_defines.h:
+
+/usr/include/c++/5/bits/cpp_type_traits.h:
+
+/usr/include/c++/5/ext/type_traits.h:
+
+/usr/include/c++/5/ext/numeric_traits.h:
+
+/usr/include/c++/5/bits/stl_pair.h:
+
+/usr/include/c++/5/bits/move.h:
+
+/usr/include/c++/5/bits/concept_check.h:
+
+/usr/include/c++/5/bits/stl_iterator_base_types.h:
+
+/usr/include/c++/5/bits/stl_iterator_base_funcs.h:
+
+/usr/include/c++/5/debug/debug.h:
+
+/usr/include/c++/5/bits/stl_iterator.h:
+
+/usr/include/c++/5/bits/ptr_traits.h:
+
+/usr/include/c++/5/bits/predefined_ops.h:
+
+/usr/include/c++/5/bits/allocator.h:
+
+/usr/include/x86_64-linux-gnu/c++/5/bits/c++allocator.h:
+
+/usr/include/c++/5/ext/new_allocator.h:
+
+/usr/include/c++/5/new:
+
+/usr/include/c++/5/exception:
+
+/usr/include/c++/5/bits/atomic_lockfree_defines.h:
+
+/usr/include/c++/5/bits/memoryfwd.h:
+
+/usr/include/c++/5/bits/stl_construct.h:
+
+/usr/include/c++/5/ext/alloc_traits.h:
+
+/usr/include/c++/5/bits/stl_uninitialized.h:
+
+/usr/include/c++/5/bits/stl_tempbuf.h:
+
+/usr/include/c++/5/bits/stl_raw_storage_iter.h:
+
+/usr/include/c++/5/backward/auto_ptr.h:
+
+google/protobuf/stubs/shared_ptr.h:
+
+google/protobuf/stubs/atomicops.h:
+
+google/protobuf/stubs/common.h:
+
+/usr/include/c++/5/string:
+
+/usr/include/c++/5/bits/stringfwd.h:
+
+/usr/include/c++/5/bits/char_traits.h:
+
+/usr/include/c++/5/bits/postypes.h:
+
+/usr/include/c++/5/cwchar:
+
+/usr/include/wchar.h:
+
+/usr/include/stdio.h:
+
+/usr/lib/gcc/x86_64-linux-gnu/5/include/stdarg.h:
+
+/usr/include/x86_64-linux-gnu/bits/wchar.h:
+
+/usr/lib/gcc/x86_64-linux-gnu/5/include/stddef.h:
+
+/usr/include/xlocale.h:
+
+/usr/include/x86_64-linux-gnu/bits/wchar2.h:
+
+/usr/include/c++/5/bits/localefwd.h:
+
+/usr/include/x86_64-linux-gnu/c++/5/bits/c++locale.h:
+
+/usr/include/c++/5/clocale:
+
+/usr/include/locale.h:
+
+/usr/include/x86_64-linux-gnu/bits/locale.h:
+
+/usr/include/c++/5/iosfwd:
+
+/usr/include/c++/5/cctype:
+
+/usr/include/ctype.h:
+
+/usr/include/x86_64-linux-gnu/bits/types.h:
+
+/usr/include/x86_64-linux-gnu/bits/typesizes.h:
+
+/usr/include/endian.h:
+
+/usr/include/x86_64-linux-gnu/bits/endian.h:
+
+/usr/include/x86_64-linux-gnu/bits/byteswap.h:
+
+/usr/include/x86_64-linux-gnu/bits/byteswap-16.h:
+
+/usr/include/c++/5/bits/ostream_insert.h:
+
+/usr/include/c++/5/bits/cxxabi_forced.h:
+
+/usr/include/c++/5/bits/stl_function.h:
+
+/usr/include/c++/5/backward/binders.h:
+
+/usr/include/c++/5/bits/range_access.h:
+
+/usr/include/c++/5/bits/basic_string.h:
+
+/usr/include/c++/5/ext/atomicity.h:
+
+/usr/include/x86_64-linux-gnu/c++/5/bits/gthr.h:
+
+/usr/include/x86_64-linux-gnu/c++/5/bits/gthr-default.h:
+
+/usr/include/pthread.h:
+
+/usr/include/sched.h:
+
+/usr/include/time.h:
+
+/usr/include/x86_64-linux-gnu/bits/sched.h:
+
+/usr/include/x86_64-linux-gnu/bits/time.h:
+
+/usr/include/x86_64-linux-gnu/bits/timex.h:
+
+/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h:
+
+/usr/include/x86_64-linux-gnu/bits/setjmp.h:
+
+/usr/include/x86_64-linux-gnu/c++/5/bits/atomic_word.h:
+
+/usr/include/c++/5/bits/basic_string.tcc:
+
+google/protobuf/stubs/port.h:
+
+/usr/include/assert.h:
+
+/usr/include/stdlib.h:
+
+/usr/include/x86_64-linux-gnu/bits/waitflags.h:
+
+/usr/include/x86_64-linux-gnu/bits/waitstatus.h:
+
+/usr/include/x86_64-linux-gnu/sys/types.h:
+
+/usr/include/x86_64-linux-gnu/sys/select.h:
+
+/usr/include/x86_64-linux-gnu/bits/select.h:
+
+/usr/include/x86_64-linux-gnu/bits/sigset.h:
+
+/usr/include/x86_64-linux-gnu/bits/select2.h:
+
+/usr/include/x86_64-linux-gnu/sys/sysmacros.h:
+
+/usr/include/alloca.h:
+
+/usr/include/x86_64-linux-gnu/bits/stdlib-bsearch.h:
+
+/usr/include/x86_64-linux-gnu/bits/stdlib-float.h:
+
+/usr/include/x86_64-linux-gnu/bits/stdlib.h:
+
+/usr/include/c++/5/cstddef:
+
+/usr/include/string.h:
+
+/usr/include/x86_64-linux-gnu/bits/string3.h:
+
+/usr/lib/gcc/x86_64-linux-gnu/5/include/stdint.h:
+
+/usr/include/stdint.h:
+
+/usr/include/x86_64-linux-gnu/sys/param.h:
+
+/usr/lib/gcc/x86_64-linux-gnu/5/include-fixed/limits.h:
+
+/usr/lib/gcc/x86_64-linux-gnu/5/include-fixed/syslimits.h:
+
+/usr/include/limits.h:
+
+/usr/include/x86_64-linux-gnu/bits/posix1_lim.h:
+
+/usr/include/x86_64-linux-gnu/bits/local_lim.h:
+
+/usr/include/linux/limits.h:
+
+/usr/include/x86_64-linux-gnu/bits/posix2_lim.h:
+
+/usr/include/x86_64-linux-gnu/bits/xopen_lim.h:
+
+/usr/include/x86_64-linux-gnu/bits/stdio_lim.h:
+
+/usr/include/signal.h:
+
+/usr/include/x86_64-linux-gnu/bits/signum.h:
+
+/usr/include/x86_64-linux-gnu/bits/siginfo.h:
+
+/usr/include/x86_64-linux-gnu/bits/sigaction.h:
+
+/usr/include/x86_64-linux-gnu/bits/sigcontext.h:
+
+/usr/include/x86_64-linux-gnu/bits/sigstack.h:
+
+/usr/include/x86_64-linux-gnu/sys/ucontext.h:
+
+/usr/include/x86_64-linux-gnu/bits/sigthread.h:
+
+/usr/include/x86_64-linux-gnu/bits/param.h:
+
+/usr/include/linux/param.h:
+
+/usr/include/x86_64-linux-gnu/asm/param.h:
+
+/usr/include/asm-generic/param.h:
+
+/usr/include/byteswap.h:
+
+google/protobuf/stubs/macros.h:
+
+google/protobuf/stubs/platform_macros.h:
+
+google/protobuf/stubs/logging.h:
+
+google/protobuf/stubs/scoped_ptr.h:
+
+google/protobuf/stubs/mutex.h:
+
+google/protobuf/stubs/callback.h:
+
+google/protobuf/stubs/type_traits.h:
+
+/usr/include/c++/5/utility:
+
+/usr/include/c++/5/bits/stl_relops.h:
+
+google/protobuf/stubs/template_util.h:
+
+google/protobuf/stubs/atomicops_internals_x86_gcc.h:
+
+/usr/include/c++/5/algorithm:
+
+/usr/include/c++/5/bits/stl_algo.h:
+
+/usr/include/c++/5/cstdlib:
+
+/usr/include/c++/5/bits/algorithmfwd.h:
+
+/usr/include/c++/5/bits/stl_heap.h:
+
+/usr/include/c++/5/set:
+
+/usr/include/c++/5/bits/stl_tree.h:
+
+/usr/include/c++/5/bits/stl_set.h:
+
+/usr/include/c++/5/bits/stl_multiset.h:
+
+/usr/include/c++/5/vector:
+
+/usr/include/c++/5/bits/stl_vector.h:
+
+/usr/include/c++/5/bits/stl_bvector.h:
+
+/usr/include/c++/5/bits/vector.tcc:
+
+google/protobuf/io/zero_copy_stream.h:
+
+google/protobuf/compiler/kotlin/kotlin_file_generator.h:
+
+google/protobuf/compiler/kotlin/kotlin_class_generator.h:
+
+google/protobuf/io/printer.h:
+
+/usr/include/c++/5/map:
+
+/usr/include/c++/5/bits/stl_map.h:
+
+/usr/include/c++/5/bits/stl_multimap.h:
+
+google/protobuf/compiler/code_generator.h:
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/.dirstamp b/proto/compiler/google/src/google/protobuf/compiler/kotlin/.dirstamp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/.idea/kotlin.iml b/proto/compiler/google/src/google/protobuf/compiler/kotlin/.idea/kotlin.iml
new file mode 100644
index 00000000000..887d93de37f
--- /dev/null
+++ b/proto/compiler/google/src/google/protobuf/compiler/kotlin/.idea/kotlin.iml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="CPP_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module-library">
+      <library name="Header Search Paths">
+        <CLASSES />
+        <SOURCES />
+      </library>
+    </orderEntry>
+  </component>
+</module>
\ No newline at end of file
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/.idea/misc.xml b/proto/compiler/google/src/google/protobuf/compiler/kotlin/.idea/misc.xml
new file mode 100644
index 00000000000..9658992fde3
--- /dev/null
+++ b/proto/compiler/google/src/google/protobuf/compiler/kotlin/.idea/misc.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CMakeWorkspace" PROJECT_DIR="$PROJECT_DIR$" />
+  <component name="CidrRootsConfiguration">
+    <sourceRoots>
+      <file path="$PROJECT_DIR$/src" />
+    </sourceRoots>
+    <libraryRoots />
+    <excludeRoots />
+  </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
+    <OptionsSetting value="true" id="Add" />
+    <OptionsSetting value="true" id="Remove" />
+    <OptionsSetting value="true" id="Checkout" />
+    <OptionsSetting value="true" id="Update" />
+    <OptionsSetting value="true" id="Status" />
+    <OptionsSetting value="true" id="Edit" />
+    <ConfirmationsSetting value="0" id="Add" />
+    <ConfirmationsSetting value="0" id="Remove" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/.idea/modules.xml b/proto/compiler/google/src/google/protobuf/compiler/kotlin/.idea/modules.xml
new file mode 100644
index 00000000000..a1680807709
--- /dev/null
+++ b/proto/compiler/google/src/google/protobuf/compiler/kotlin/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/kotlin.iml" filepath="$PROJECT_DIR$/.idea/kotlin.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/.libs/kotlin_class_generator.o b/proto/compiler/google/src/google/protobuf/compiler/kotlin/.libs/kotlin_class_generator.o
new file mode 100644
index 00000000000..1519cdd39d2
Binary files /dev/null and b/proto/compiler/google/src/google/protobuf/compiler/kotlin/.libs/kotlin_class_generator.o differ
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/.libs/kotlin_file_generator.o b/proto/compiler/google/src/google/protobuf/compiler/kotlin/.libs/kotlin_file_generator.o
new file mode 100644
index 00000000000..e8e4dd40e03
Binary files /dev/null and b/proto/compiler/google/src/google/protobuf/compiler/kotlin/.libs/kotlin_file_generator.o differ
diff --git a/proto/compiler/google/protobuf/compiler/kotlin/Makefile b/proto/compiler/google/src/google/protobuf/compiler/kotlin/Makefile
similarity index 100%
rename from proto/compiler/google/protobuf/compiler/kotlin/Makefile
rename to proto/compiler/google/src/google/protobuf/compiler/kotlin/Makefile
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/bin/kotlin_class_generator.d b/proto/compiler/google/src/google/protobuf/compiler/kotlin/bin/kotlin_class_generator.d
new file mode 100644
index 00000000000..095d3ebe60e
--- /dev/null
+++ b/proto/compiler/google/src/google/protobuf/compiler/kotlin/bin/kotlin_class_generator.d
@@ -0,0 +1,3 @@
+bin/kotlin_class_generator.o: src/kotlin_class_generator.cc \
+ src/kotlin_class_generator.h src/kotlin_field_generator.h \
+ src/kotlin_enum_generator.h
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/bin/kotlin_class_generator.o b/proto/compiler/google/src/google/protobuf/compiler/kotlin/bin/kotlin_class_generator.o
new file mode 100644
index 00000000000..ea513f2069d
Binary files /dev/null and b/proto/compiler/google/src/google/protobuf/compiler/kotlin/bin/kotlin_class_generator.o differ
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/bin/kotlin_enum_generator.d b/proto/compiler/google/src/google/protobuf/compiler/kotlin/bin/kotlin_enum_generator.d
new file mode 100644
index 00000000000..443a361d921
--- /dev/null
+++ b/proto/compiler/google/src/google/protobuf/compiler/kotlin/bin/kotlin_enum_generator.d
@@ -0,0 +1,2 @@
+bin/kotlin_enum_generator.o: src/kotlin_enum_generator.cc \
+ src/kotlin_enum_generator.h
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/bin/kotlin_enum_generator.o b/proto/compiler/google/src/google/protobuf/compiler/kotlin/bin/kotlin_enum_generator.o
new file mode 100644
index 00000000000..acd6c6424c8
Binary files /dev/null and b/proto/compiler/google/src/google/protobuf/compiler/kotlin/bin/kotlin_enum_generator.o differ
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/bin/kotlin_field_generator.d b/proto/compiler/google/src/google/protobuf/compiler/kotlin/bin/kotlin_field_generator.d
new file mode 100644
index 00000000000..7e7089bbf82
--- /dev/null
+++ b/proto/compiler/google/src/google/protobuf/compiler/kotlin/bin/kotlin_field_generator.d
@@ -0,0 +1,2 @@
+bin/kotlin_field_generator.o: src/kotlin_field_generator.cc \
+ src/kotlin_field_generator.h
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/bin/kotlin_field_generator.o b/proto/compiler/google/src/google/protobuf/compiler/kotlin/bin/kotlin_field_generator.o
new file mode 100644
index 00000000000..a5945fe0345
Binary files /dev/null and b/proto/compiler/google/src/google/protobuf/compiler/kotlin/bin/kotlin_field_generator.o differ
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/bin/kotlin_file_generator.d b/proto/compiler/google/src/google/protobuf/compiler/kotlin/bin/kotlin_file_generator.d
new file mode 100644
index 00000000000..04d6f449aab
--- /dev/null
+++ b/proto/compiler/google/src/google/protobuf/compiler/kotlin/bin/kotlin_file_generator.d
@@ -0,0 +1,3 @@
+bin/kotlin_file_generator.o: src/kotlin_file_generator.cc \
+ src/kotlin_file_generator.h src/kotlin_class_generator.h \
+ src/kotlin_field_generator.h src/kotlin_enum_generator.h
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/bin/kotlin_file_generator.o b/proto/compiler/google/src/google/protobuf/compiler/kotlin/bin/kotlin_file_generator.o
new file mode 100644
index 00000000000..a097a89d3ce
Binary files /dev/null and b/proto/compiler/google/src/google/protobuf/compiler/kotlin/bin/kotlin_file_generator.o differ
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/bin/main.d b/proto/compiler/google/src/google/protobuf/compiler/kotlin/bin/main.d
new file mode 100644
index 00000000000..ab59dd96054
--- /dev/null
+++ b/proto/compiler/google/src/google/protobuf/compiler/kotlin/bin/main.d
@@ -0,0 +1,3 @@
+bin/main.o: src/main.cc src/kotlin_file_generator.h \
+ src/kotlin_class_generator.h src/kotlin_field_generator.h \
+ src/kotlin_enum_generator.h
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/bin/main.o b/proto/compiler/google/src/google/protobuf/compiler/kotlin/bin/main.o
new file mode 100644
index 00000000000..4fc05d90668
Binary files /dev/null and b/proto/compiler/google/src/google/protobuf/compiler/kotlin/bin/main.o differ
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc
new file mode 100755
index 00000000000..33dfa788ef6
Binary files /dev/null and b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc differ
diff --git a/proto/compiler/google/protobuf/compiler/kotlin/src/kotlin_class_generator.cc b/proto/compiler/google/src/google/protobuf/compiler/kotlin/src/kotlin_class_generator.cc
similarity index 100%
rename from proto/compiler/google/protobuf/compiler/kotlin/src/kotlin_class_generator.cc
rename to proto/compiler/google/src/google/protobuf/compiler/kotlin/src/kotlin_class_generator.cc
diff --git a/proto/compiler/google/protobuf/compiler/kotlin/src/kotlin_class_generator.h b/proto/compiler/google/src/google/protobuf/compiler/kotlin/src/kotlin_class_generator.h
similarity index 100%
rename from proto/compiler/google/protobuf/compiler/kotlin/src/kotlin_class_generator.h
rename to proto/compiler/google/src/google/protobuf/compiler/kotlin/src/kotlin_class_generator.h
diff --git a/proto/compiler/google/protobuf/compiler/kotlin/src/kotlin_enum_generator.cc b/proto/compiler/google/src/google/protobuf/compiler/kotlin/src/kotlin_enum_generator.cc
similarity index 100%
rename from proto/compiler/google/protobuf/compiler/kotlin/src/kotlin_enum_generator.cc
rename to proto/compiler/google/src/google/protobuf/compiler/kotlin/src/kotlin_enum_generator.cc
diff --git a/proto/compiler/google/protobuf/compiler/kotlin/src/kotlin_enum_generator.h b/proto/compiler/google/src/google/protobuf/compiler/kotlin/src/kotlin_enum_generator.h
similarity index 100%
rename from proto/compiler/google/protobuf/compiler/kotlin/src/kotlin_enum_generator.h
rename to proto/compiler/google/src/google/protobuf/compiler/kotlin/src/kotlin_enum_generator.h
diff --git a/proto/compiler/google/protobuf/compiler/kotlin/src/kotlin_field_generator.cc b/proto/compiler/google/src/google/protobuf/compiler/kotlin/src/kotlin_field_generator.cc
similarity index 100%
rename from proto/compiler/google/protobuf/compiler/kotlin/src/kotlin_field_generator.cc
rename to proto/compiler/google/src/google/protobuf/compiler/kotlin/src/kotlin_field_generator.cc
diff --git a/proto/compiler/google/protobuf/compiler/kotlin/src/kotlin_field_generator.h b/proto/compiler/google/src/google/protobuf/compiler/kotlin/src/kotlin_field_generator.h
similarity index 100%
rename from proto/compiler/google/protobuf/compiler/kotlin/src/kotlin_field_generator.h
rename to proto/compiler/google/src/google/protobuf/compiler/kotlin/src/kotlin_field_generator.h
diff --git a/proto/compiler/google/protobuf/compiler/kotlin/src/kotlin_file_generator.cc b/proto/compiler/google/src/google/protobuf/compiler/kotlin/src/kotlin_file_generator.cc
similarity index 100%
rename from proto/compiler/google/protobuf/compiler/kotlin/src/kotlin_file_generator.cc
rename to proto/compiler/google/src/google/protobuf/compiler/kotlin/src/kotlin_file_generator.cc
diff --git a/proto/compiler/google/protobuf/compiler/kotlin/src/kotlin_file_generator.h b/proto/compiler/google/src/google/protobuf/compiler/kotlin/src/kotlin_file_generator.h
similarity index 100%
rename from proto/compiler/google/protobuf/compiler/kotlin/src/kotlin_file_generator.h
rename to proto/compiler/google/src/google/protobuf/compiler/kotlin/src/kotlin_file_generator.h
diff --git a/proto/compiler/google/protobuf/compiler/kotlin/src/main.cc b/proto/compiler/google/src/google/protobuf/compiler/kotlin/src/main.cc
similarity index 100%
rename from proto/compiler/google/protobuf/compiler/kotlin/src/main.cc
rename to proto/compiler/google/src/google/protobuf/compiler/kotlin/src/main.cc
diff --git a/proto/compiler/google/protobuf/compiler/kotlin/test/addressbook.kt b/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/addressbook.kt
similarity index 100%
rename from proto/compiler/google/protobuf/compiler/kotlin/test/addressbook.kt
rename to proto/compiler/google/src/google/protobuf/compiler/kotlin/test/addressbook.kt
diff --git a/proto/compiler/google/protobuf/compiler/kotlin/test/addressbook.proto b/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/addressbook.proto
similarity index 100%
rename from proto/compiler/google/protobuf/compiler/kotlin/test/addressbook.proto
rename to proto/compiler/google/src/google/protobuf/compiler/kotlin/test/addressbook.proto
diff --git a/proto/compiler/google/protobuf/compiler/kotlin/test/com/example/tutorial/AddressBookProtos.java b/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/com/example/tutorial/AddressBookProtos.java
similarity index 100%
rename from proto/compiler/google/protobuf/compiler/kotlin/test/com/example/tutorial/AddressBookProtos.java
rename to proto/compiler/google/src/google/protobuf/compiler/kotlin/test/com/example/tutorial/AddressBookProtos.java
diff --git a/proto/compiler/google/protobuf/compiler/kotlin/test/test/addressbook.proto b/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/test/addressbook.proto
similarity index 100%
rename from proto/compiler/google/protobuf/compiler/kotlin/test/test/addressbook.proto
rename to proto/compiler/google/src/google/protobuf/compiler/kotlin/test/test/addressbook.proto