diff --git a/js/js.libraries/src/core/generated/_ArraysJs.kt b/js/js.libraries/src/core/generated/_ArraysJs.kt
index 906e0815cb7..f82b998abb5 100644
--- a/js/js.libraries/src/core/generated/_ArraysJs.kt
+++ b/js/js.libraries/src/core/generated/_ArraysJs.kt
@@ -11,6 +11,8 @@ package kotlin.collections
 import kotlin.js.*
 import primitiveArrayConcat
 import withType
+import kotlin.*
+import kotlin.text.*
 import kotlin.comparisons.*
 
 /**
diff --git a/js/js.libraries/src/core/generated/_CollectionsJs.kt b/js/js.libraries/src/core/generated/_CollectionsJs.kt
index fc8bcdff41e..4e07c7c7462 100644
--- a/js/js.libraries/src/core/generated/_CollectionsJs.kt
+++ b/js/js.libraries/src/core/generated/_CollectionsJs.kt
@@ -9,6 +9,8 @@ package kotlin.collections
 //
 
 import kotlin.js.*
+import kotlin.*
+import kotlin.text.*
 import kotlin.comparisons.*
 
 /**
diff --git a/js/js.libraries/src/core/generated/_ComparisonsJs.kt b/js/js.libraries/src/core/generated/_ComparisonsJs.kt
index 7e705bec8c3..7f729bff685 100644
--- a/js/js.libraries/src/core/generated/_ComparisonsJs.kt
+++ b/js/js.libraries/src/core/generated/_ComparisonsJs.kt
@@ -9,6 +9,8 @@ package kotlin.comparisons
 //
 
 import kotlin.js.*
+import kotlin.*
+import kotlin.text.*
 import kotlin.comparisons.*
 
 /**
diff --git a/js/js.libraries/src/core/generated/_MapsJs.kt b/js/js.libraries/src/core/generated/_MapsJs.kt
index 491b526aab8..97c8749fd64 100644
--- a/js/js.libraries/src/core/generated/_MapsJs.kt
+++ b/js/js.libraries/src/core/generated/_MapsJs.kt
@@ -9,6 +9,8 @@ package kotlin.collections
 //
 
 import kotlin.js.*
+import kotlin.*
+import kotlin.text.*
 import kotlin.comparisons.*
 
 /**
diff --git a/js/js.libraries/src/core/generated/_RangesJs.kt b/js/js.libraries/src/core/generated/_RangesJs.kt
index 34e99217511..34129003aa1 100644
--- a/js/js.libraries/src/core/generated/_RangesJs.kt
+++ b/js/js.libraries/src/core/generated/_RangesJs.kt
@@ -9,6 +9,8 @@ package kotlin.ranges
 //
 
 import kotlin.js.*
+import kotlin.*
+import kotlin.text.*
 import kotlin.comparisons.*
 
 /**
diff --git a/js/js.libraries/src/core/generated/_SequencesJs.kt b/js/js.libraries/src/core/generated/_SequencesJs.kt
index 92bfdd5368b..32b55408c4d 100644
--- a/js/js.libraries/src/core/generated/_SequencesJs.kt
+++ b/js/js.libraries/src/core/generated/_SequencesJs.kt
@@ -9,6 +9,8 @@ package kotlin.sequences
 //
 
 import kotlin.js.*
+import kotlin.*
+import kotlin.text.*
 import kotlin.comparisons.*
 import kotlin.coroutines.experimental.*
 
diff --git a/js/js.libraries/src/core/generated/_SetsJs.kt b/js/js.libraries/src/core/generated/_SetsJs.kt
index 7912fa01519..4940f609eeb 100644
--- a/js/js.libraries/src/core/generated/_SetsJs.kt
+++ b/js/js.libraries/src/core/generated/_SetsJs.kt
@@ -9,6 +9,8 @@ package kotlin.collections
 //
 
 import kotlin.js.*
+import kotlin.*
+import kotlin.text.*
 import kotlin.comparisons.*
 
 /**
diff --git a/js/js.libraries/src/core/generated/_StringsJs.kt b/js/js.libraries/src/core/generated/_StringsJs.kt
index 07f614d2ff6..2cc2f2306a7 100644
--- a/js/js.libraries/src/core/generated/_StringsJs.kt
+++ b/js/js.libraries/src/core/generated/_StringsJs.kt
@@ -9,6 +9,8 @@ package kotlin.text
 //
 
 import kotlin.js.*
+import kotlin.*
+import kotlin.text.*
 import kotlin.comparisons.*
 
 /**
diff --git a/libraries/stdlib/build.gradle b/libraries/stdlib/build.gradle
index a9f7ee25f73..e1cd79ecbfc 100644
--- a/libraries/stdlib/build.gradle
+++ b/libraries/stdlib/build.gradle
@@ -28,6 +28,8 @@ sourceSets {
     }
     main {
         java {
+            srcDir "${rootDir}/core/builtins/src"
+            srcDir "jvm/runtime"
             srcDir 'src'
         }
     }
@@ -69,7 +71,6 @@ task originalStdlibJar(type: Jar) {
 jar {
     manifestAttributes(manifest, project, 'Main', true)
     from("${rootDir}/dist/builtins")
-    from sourceSets.builtins.output
     from sourceSets.experimental.output
     // TODO: enable as soon as this doesn't cause D8/DX to crash
     // from sourceSets.java9.output
@@ -81,7 +82,6 @@ task distJar(type: Jar) {
     manifestAttributes(manifest, project, 'Main', true)
     from("${rootDir}/dist/builtins")
     from sourceSets.annotations.output
-    from sourceSets.builtins.output
     from sourceSets.main.output
     from sourceSets.experimental.output
     // TODO: enable as soon as this doesn't cause D8/DX to crash
@@ -96,7 +96,6 @@ task builtinsJar(type: Jar) {
 
 sourcesJar {
     from "${rootDir}/core/builtins/native"
-    from sourceSets.builtins.kotlin
 }
 
 artifacts {
@@ -141,6 +140,7 @@ compileBuiltinsKotlin {
     }
 }
 compileKotlin {
+    dependsOn ":core:builtins:serialize"
     dependsOn(":prepare:build.version:writeStdlibVersion")
     kotlinOptions {
         freeCompilerArgs = [
@@ -149,6 +149,7 @@ compileKotlin {
                 "-Xmultifile-parts-inherit",
                 "-Xnormalize-constructor-calls=enable",
                 "-Xdump-declarations-to=${buildDir}/stdlib-declarations.json",
+                "-cp", "${rootDir}/dist/builtins",
                 "-module-name", project.name
         ]
     }
@@ -168,6 +169,6 @@ compileExperimentalKotlin {
     }
 }
 
-compileJava9Sources(project, 'kotlin.stdlib', [sourceSets.builtins.output, sourceSets.main.output])
+compileJava9Sources(project, 'kotlin.stdlib')
 
 kotlin.experimental.coroutines 'enable'
diff --git a/libraries/stdlib/common/src/generated/_Arrays.kt b/libraries/stdlib/common/src/generated/_Arrays.kt
index df3bd2b786b..4e21aa63287 100644
--- a/libraries/stdlib/common/src/generated/_Arrays.kt
+++ b/libraries/stdlib/common/src/generated/_Arrays.kt
@@ -8,6 +8,8 @@ package kotlin.collections
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
 
+import kotlin.*
+import kotlin.text.*
 import kotlin.comparisons.*
 
 /**
diff --git a/libraries/stdlib/common/src/generated/_Collections.kt b/libraries/stdlib/common/src/generated/_Collections.kt
index 0df91881992..3551b48fc71 100644
--- a/libraries/stdlib/common/src/generated/_Collections.kt
+++ b/libraries/stdlib/common/src/generated/_Collections.kt
@@ -8,6 +8,8 @@ package kotlin.collections
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
 
+import kotlin.*
+import kotlin.text.*
 import kotlin.comparisons.*
 
 /**
diff --git a/libraries/stdlib/common/src/generated/_Comparisons.kt b/libraries/stdlib/common/src/generated/_Comparisons.kt
index 866d48ede12..887787f42e3 100644
--- a/libraries/stdlib/common/src/generated/_Comparisons.kt
+++ b/libraries/stdlib/common/src/generated/_Comparisons.kt
@@ -8,6 +8,8 @@ package kotlin.comparisons
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
 
+import kotlin.*
+import kotlin.text.*
 import kotlin.comparisons.*
 
 /**
diff --git a/libraries/stdlib/common/src/generated/_Maps.kt b/libraries/stdlib/common/src/generated/_Maps.kt
index 4142f02a634..ba606c884b3 100644
--- a/libraries/stdlib/common/src/generated/_Maps.kt
+++ b/libraries/stdlib/common/src/generated/_Maps.kt
@@ -8,6 +8,8 @@ package kotlin.collections
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
 
+import kotlin.*
+import kotlin.text.*
 import kotlin.comparisons.*
 
 /**
diff --git a/libraries/stdlib/common/src/generated/_Ranges.kt b/libraries/stdlib/common/src/generated/_Ranges.kt
index 23aefefa764..d9ffc3a1bfd 100644
--- a/libraries/stdlib/common/src/generated/_Ranges.kt
+++ b/libraries/stdlib/common/src/generated/_Ranges.kt
@@ -8,6 +8,8 @@ package kotlin.ranges
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
 
+import kotlin.*
+import kotlin.text.*
 import kotlin.comparisons.*
 
 /**
diff --git a/libraries/stdlib/common/src/generated/_Sequences.kt b/libraries/stdlib/common/src/generated/_Sequences.kt
index c3c0cffd644..ac483164c36 100644
--- a/libraries/stdlib/common/src/generated/_Sequences.kt
+++ b/libraries/stdlib/common/src/generated/_Sequences.kt
@@ -8,6 +8,8 @@ package kotlin.sequences
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
 
+import kotlin.*
+import kotlin.text.*
 import kotlin.comparisons.*
 import kotlin.coroutines.experimental.*
 
diff --git a/libraries/stdlib/common/src/generated/_Sets.kt b/libraries/stdlib/common/src/generated/_Sets.kt
index f2ea941e2c2..455e101e006 100644
--- a/libraries/stdlib/common/src/generated/_Sets.kt
+++ b/libraries/stdlib/common/src/generated/_Sets.kt
@@ -8,6 +8,8 @@ package kotlin.collections
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
 
+import kotlin.*
+import kotlin.text.*
 import kotlin.comparisons.*
 
 /**
diff --git a/libraries/stdlib/common/src/generated/_Strings.kt b/libraries/stdlib/common/src/generated/_Strings.kt
index 2fc15ca3f7c..ca1cb370b40 100644
--- a/libraries/stdlib/common/src/generated/_Strings.kt
+++ b/libraries/stdlib/common/src/generated/_Strings.kt
@@ -8,6 +8,8 @@ package kotlin.text
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
 
+import kotlin.*
+import kotlin.text.*
 import kotlin.comparisons.*
 
 /**
diff --git a/libraries/stdlib/src/generated/_Arrays.kt b/libraries/stdlib/src/generated/_Arrays.kt
index a19588af79e..fbebd2df875 100644
--- a/libraries/stdlib/src/generated/_Arrays.kt
+++ b/libraries/stdlib/src/generated/_Arrays.kt
@@ -9,6 +9,8 @@ package kotlin.collections
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
 
+import kotlin.*
+import kotlin.text.*
 import kotlin.comparisons.*
 
 /**
diff --git a/libraries/stdlib/src/generated/_Collections.kt b/libraries/stdlib/src/generated/_Collections.kt
index f1b816c9175..bccf284cb8a 100644
--- a/libraries/stdlib/src/generated/_Collections.kt
+++ b/libraries/stdlib/src/generated/_Collections.kt
@@ -9,6 +9,8 @@ package kotlin.collections
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
 
+import kotlin.*
+import kotlin.text.*
 import kotlin.comparisons.*
 
 /**
diff --git a/libraries/stdlib/src/generated/_Comparisons.kt b/libraries/stdlib/src/generated/_Comparisons.kt
index 10bb9b1dc1f..8dd5b305fc5 100644
--- a/libraries/stdlib/src/generated/_Comparisons.kt
+++ b/libraries/stdlib/src/generated/_Comparisons.kt
@@ -9,6 +9,8 @@ package kotlin.comparisons
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
 
+import kotlin.*
+import kotlin.text.*
 import kotlin.comparisons.*
 
 /**
diff --git a/libraries/stdlib/src/generated/_Maps.kt b/libraries/stdlib/src/generated/_Maps.kt
index 7db6a38ae75..e0db373bad1 100644
--- a/libraries/stdlib/src/generated/_Maps.kt
+++ b/libraries/stdlib/src/generated/_Maps.kt
@@ -9,6 +9,8 @@ package kotlin.collections
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
 
+import kotlin.*
+import kotlin.text.*
 import kotlin.comparisons.*
 
 /**
diff --git a/libraries/stdlib/src/generated/_Ranges.kt b/libraries/stdlib/src/generated/_Ranges.kt
index 37ccbc40b20..e1337a4a784 100644
--- a/libraries/stdlib/src/generated/_Ranges.kt
+++ b/libraries/stdlib/src/generated/_Ranges.kt
@@ -9,6 +9,8 @@ package kotlin.ranges
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
 
+import kotlin.*
+import kotlin.text.*
 import kotlin.comparisons.*
 
 /**
diff --git a/libraries/stdlib/src/generated/_Sequences.kt b/libraries/stdlib/src/generated/_Sequences.kt
index a75050fa013..678b15de9c1 100644
--- a/libraries/stdlib/src/generated/_Sequences.kt
+++ b/libraries/stdlib/src/generated/_Sequences.kt
@@ -9,6 +9,8 @@ package kotlin.sequences
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
 
+import kotlin.*
+import kotlin.text.*
 import kotlin.comparisons.*
 import kotlin.coroutines.experimental.*
 
diff --git a/libraries/stdlib/src/generated/_Sets.kt b/libraries/stdlib/src/generated/_Sets.kt
index c418ec8187e..5540dac8616 100644
--- a/libraries/stdlib/src/generated/_Sets.kt
+++ b/libraries/stdlib/src/generated/_Sets.kt
@@ -9,6 +9,8 @@ package kotlin.collections
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
 
+import kotlin.*
+import kotlin.text.*
 import kotlin.comparisons.*
 
 /**
diff --git a/libraries/stdlib/src/generated/_Strings.kt b/libraries/stdlib/src/generated/_Strings.kt
index 2b191b9c3db..28baa196b49 100644
--- a/libraries/stdlib/src/generated/_Strings.kt
+++ b/libraries/stdlib/src/generated/_Strings.kt
@@ -9,6 +9,8 @@ package kotlin.text
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
 
+import kotlin.*
+import kotlin.text.*
 import kotlin.comparisons.*
 
 /**
diff --git a/libraries/stdlib/src/kotlin/collections/AbstractList.kt b/libraries/stdlib/src/kotlin/collections/AbstractList.kt
index b64f2d073d6..e1785a10420 100644
--- a/libraries/stdlib/src/kotlin/collections/AbstractList.kt
+++ b/libraries/stdlib/src/kotlin/collections/AbstractList.kt
@@ -20,6 +20,8 @@
 
 package kotlin.collections
 
+import kotlin.*
+
 /**
  * Provides a skeletal implementation of the read-only [List] interface.
  *
diff --git a/libraries/stdlib/src/kotlin/collections/Collections.kt b/libraries/stdlib/src/kotlin/collections/Collections.kt
index 5e123a58184..105c10445fb 100644
--- a/libraries/stdlib/src/kotlin/collections/Collections.kt
+++ b/libraries/stdlib/src/kotlin/collections/Collections.kt
@@ -19,6 +19,7 @@
 
 package kotlin.collections
 
+import kotlin.*
 import kotlin.comparisons.compareValues
 
 internal object EmptyIterator : ListIterator<Nothing> {
diff --git a/libraries/stdlib/src/kotlin/collections/ReversedViews.kt b/libraries/stdlib/src/kotlin/collections/ReversedViews.kt
index 3e3b96feff1..4b39c4cbe57 100644
--- a/libraries/stdlib/src/kotlin/collections/ReversedViews.kt
+++ b/libraries/stdlib/src/kotlin/collections/ReversedViews.kt
@@ -18,6 +18,8 @@
 
 package kotlin.collections
 
+import kotlin.*
+
 
 private open class ReversedListReadOnly<out T>(private val delegate: List<T>) : AbstractList<T>() {
     override val size: Int get() = delegate.size
diff --git a/libraries/stdlib/src/kotlin/collections/Sequences.kt b/libraries/stdlib/src/kotlin/collections/Sequences.kt
index 73fdb46b785..74d416413eb 100644
--- a/libraries/stdlib/src/kotlin/collections/Sequences.kt
+++ b/libraries/stdlib/src/kotlin/collections/Sequences.kt
@@ -3,6 +3,8 @@
 
 package kotlin.sequences
 
+import kotlin.*
+
 /**
  * Given an [iterator] function constructs a [Sequence] that returns values through the [Iterator]
  * provided by that function.
diff --git a/libraries/stdlib/src/kotlin/collections/SlidingWindow.kt b/libraries/stdlib/src/kotlin/collections/SlidingWindow.kt
index 5296b7a8077..9b2f8b67481 100644
--- a/libraries/stdlib/src/kotlin/collections/SlidingWindow.kt
+++ b/libraries/stdlib/src/kotlin/collections/SlidingWindow.kt
@@ -16,6 +16,7 @@
 
 package kotlin.collections
 
+import kotlin.*
 import kotlin.coroutines.experimental.buildIterator
 
 internal fun checkWindowSizeStep(size: Int, step: Int) {
diff --git a/libraries/stdlib/src/kotlin/coroutines/experimental/SafeContinuationJvm.kt b/libraries/stdlib/src/kotlin/coroutines/experimental/SafeContinuationJvm.kt
index ac673ce8e00..be5c57cc857 100644
--- a/libraries/stdlib/src/kotlin/coroutines/experimental/SafeContinuationJvm.kt
+++ b/libraries/stdlib/src/kotlin/coroutines/experimental/SafeContinuationJvm.kt
@@ -17,6 +17,7 @@
 package kotlin.coroutines.experimental
 
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater
+import kotlin.*
 import kotlin.coroutines.experimental.intrinsics.COROUTINE_SUSPENDED
 
 @PublishedApi
diff --git a/libraries/stdlib/src/kotlin/coroutines/experimental/SequenceBuilder.kt b/libraries/stdlib/src/kotlin/coroutines/experimental/SequenceBuilder.kt
index 2f4f35f23c8..04ee667f298 100644
--- a/libraries/stdlib/src/kotlin/coroutines/experimental/SequenceBuilder.kt
+++ b/libraries/stdlib/src/kotlin/coroutines/experimental/SequenceBuilder.kt
@@ -18,6 +18,7 @@
 @file:kotlin.jvm.JvmName("SequenceBuilderKt")
 package kotlin.coroutines.experimental
 
+import kotlin.*
 import kotlin.coroutines.experimental.intrinsics.*
 
 /**
diff --git a/libraries/stdlib/src/kotlin/internal/PlatformImplementations.kt b/libraries/stdlib/src/kotlin/internal/PlatformImplementations.kt
index f50047e4d7d..143140f0ae8 100644
--- a/libraries/stdlib/src/kotlin/internal/PlatformImplementations.kt
+++ b/libraries/stdlib/src/kotlin/internal/PlatformImplementations.kt
@@ -1,7 +1,7 @@
 @file:JvmVersion
 package kotlin.internal
 
-import java.io.Closeable
+import kotlin.*
 import java.util.regex.MatchResult
 
 internal open class PlatformImplementations {
diff --git a/libraries/stdlib/src/kotlin/io/Console.kt b/libraries/stdlib/src/kotlin/io/Console.kt
index 289e6007a4c..6b32a6abf8e 100644
--- a/libraries/stdlib/src/kotlin/io/Console.kt
+++ b/libraries/stdlib/src/kotlin/io/Console.kt
@@ -3,6 +3,7 @@
 
 package kotlin.io
 
+import kotlin.text.*
 import java.io.InputStream
 import java.nio.Buffer
 import java.nio.ByteBuffer
diff --git a/libraries/stdlib/src/kotlin/io/Exceptions.kt b/libraries/stdlib/src/kotlin/io/Exceptions.kt
index 78a8af0da15..1668a53498c 100644
--- a/libraries/stdlib/src/kotlin/io/Exceptions.kt
+++ b/libraries/stdlib/src/kotlin/io/Exceptions.kt
@@ -1,6 +1,7 @@
 @file:JvmVersion
 package kotlin.io
 
+import kotlin.text.*
 import java.io.File
 import java.io.IOException
 
diff --git a/libraries/stdlib/src/kotlin/io/files/FilePathComponents.kt b/libraries/stdlib/src/kotlin/io/files/FilePathComponents.kt
index 407749fbbbf..57480ade5cb 100644
--- a/libraries/stdlib/src/kotlin/io/files/FilePathComponents.kt
+++ b/libraries/stdlib/src/kotlin/io/files/FilePathComponents.kt
@@ -4,7 +4,7 @@
 package kotlin.io
 
 import java.io.File
-import kotlin.text.Regex
+import kotlin.*
 
 /**
  * Estimation of a root name by a given file name.
diff --git a/libraries/stdlib/src/kotlin/io/files/FileTreeWalk.kt b/libraries/stdlib/src/kotlin/io/files/FileTreeWalk.kt
index 536c54c7a06..17f54ac083f 100644
--- a/libraries/stdlib/src/kotlin/io/files/FileTreeWalk.kt
+++ b/libraries/stdlib/src/kotlin/io/files/FileTreeWalk.kt
@@ -3,6 +3,7 @@
 @file:JvmName("FilesKt")
 package kotlin.io
 
+import kotlin.*
 import java.io.File
 import java.io.IOException
 import java.util.Stack
diff --git a/libraries/stdlib/src/kotlin/io/files/Utils.kt b/libraries/stdlib/src/kotlin/io/files/Utils.kt
index 4155057a2b2..fb608ccec6a 100644
--- a/libraries/stdlib/src/kotlin/io/files/Utils.kt
+++ b/libraries/stdlib/src/kotlin/io/files/Utils.kt
@@ -5,6 +5,8 @@ package kotlin.io
 
 import java.io.*
 import java.util.*
+import kotlin.*
+import kotlin.text.*
 import kotlin.comparisons.*
 
 /**
diff --git a/libraries/stdlib/src/kotlin/jvm/internal/unsafe/monitor.kt b/libraries/stdlib/src/kotlin/jvm/internal/unsafe/monitor.kt
index 1d2f01c2782..b38c698ace1 100644
--- a/libraries/stdlib/src/kotlin/jvm/internal/unsafe/monitor.kt
+++ b/libraries/stdlib/src/kotlin/jvm/internal/unsafe/monitor.kt
@@ -17,6 +17,8 @@
 @file:JvmVersion
 package kotlin.jvm.internal.unsafe
 
+import kotlin.*
+
 private fun monitorEnter(@Suppress("UNUSED_PARAMETER") monitor: Any): Unit = throw UnsupportedOperationException("This function can only be used privately")
 
 private fun monitorExit(@Suppress("UNUSED_PARAMETER") monitor: Any): Unit = throw UnsupportedOperationException("This function can only be used privately")
diff --git a/libraries/stdlib/src/kotlin/properties/Delegates.kt b/libraries/stdlib/src/kotlin/properties/Delegates.kt
index 9be2cd575f1..8c266ce3a9a 100644
--- a/libraries/stdlib/src/kotlin/properties/Delegates.kt
+++ b/libraries/stdlib/src/kotlin/properties/Delegates.kt
@@ -1,5 +1,6 @@
 package kotlin.properties
 
+import kotlin.*
 import kotlin.reflect.KProperty
 
 /**
diff --git a/libraries/stdlib/src/kotlin/ranges/Ranges.kt b/libraries/stdlib/src/kotlin/ranges/Ranges.kt
index d72850c8172..811d1d2434f 100644
--- a/libraries/stdlib/src/kotlin/ranges/Ranges.kt
+++ b/libraries/stdlib/src/kotlin/ranges/Ranges.kt
@@ -2,6 +2,8 @@
 @file:kotlin.jvm.JvmName("RangesKt")
 package kotlin.ranges
 
+import kotlin.*
+
 /**
  * Represents a range of floating point numbers.
  * Extends [ClosedRange] interface providing custom operation [lessThanOrEquals] for comparing values of range domain type.
diff --git a/libraries/stdlib/src/kotlin/system/Process.kt b/libraries/stdlib/src/kotlin/system/Process.kt
index 373813bc684..565953e28c2 100644
--- a/libraries/stdlib/src/kotlin/system/Process.kt
+++ b/libraries/stdlib/src/kotlin/system/Process.kt
@@ -2,6 +2,8 @@
 @file:kotlin.jvm.JvmVersion
 package kotlin.system
 
+import kotlin.*
+
 /**
  * Terminates the currently running Java Virtual Machine. The
  * argument serves as a status code; by convention, a nonzero status
diff --git a/libraries/stdlib/src/kotlin/text/CharCategory.kt b/libraries/stdlib/src/kotlin/text/CharCategory.kt
index 3ec5575aa0a..e594ce309ee 100644
--- a/libraries/stdlib/src/kotlin/text/CharCategory.kt
+++ b/libraries/stdlib/src/kotlin/text/CharCategory.kt
@@ -1,6 +1,8 @@
 @file:JvmVersion
 package kotlin.text
 
+import kotlin.*
+
 /**
  * Represents the character general category in the Unicode specification.
  */
diff --git a/libraries/stdlib/src/kotlin/text/CharDirectionality.kt b/libraries/stdlib/src/kotlin/text/CharDirectionality.kt
index 71972e2db33..73478592d7c 100644
--- a/libraries/stdlib/src/kotlin/text/CharDirectionality.kt
+++ b/libraries/stdlib/src/kotlin/text/CharDirectionality.kt
@@ -1,6 +1,8 @@
 @file:JvmVersion
 package kotlin.text
 
+import kotlin.*
+
 /**
  * Represents the Unicode directionality of a character.
  * Character directionality is used to calculate the
diff --git a/libraries/stdlib/src/kotlin/text/CharJVM.kt b/libraries/stdlib/src/kotlin/text/CharJVM.kt
index a81d6bb404a..c25e9621edc 100644
--- a/libraries/stdlib/src/kotlin/text/CharJVM.kt
+++ b/libraries/stdlib/src/kotlin/text/CharJVM.kt
@@ -20,6 +20,8 @@
 
 package kotlin.text
 
+import kotlin.*
+
 /**
  * Returns `true` if this character (Unicode code point) is defined in Unicode.
  */
diff --git a/libraries/stdlib/src/kotlin/text/Strings.kt b/libraries/stdlib/src/kotlin/text/Strings.kt
index 1bf7dc99bbb..ad788ea0018 100644
--- a/libraries/stdlib/src/kotlin/text/Strings.kt
+++ b/libraries/stdlib/src/kotlin/text/Strings.kt
@@ -20,6 +20,7 @@
 
 package kotlin.text
 
+import kotlin.*
 import kotlin.comparisons.*
 import kotlin.internal.contracts.*
 
diff --git a/libraries/stdlib/src/kotlin/util/MathJVM.kt b/libraries/stdlib/src/kotlin/util/MathJVM.kt
index e44516ac829..1b757a182f6 100644
--- a/libraries/stdlib/src/kotlin/util/MathJVM.kt
+++ b/libraries/stdlib/src/kotlin/util/MathJVM.kt
@@ -19,6 +19,7 @@
 
 package kotlin.math
 
+import kotlin.*
 import kotlin.internal.InlineOnly
 import java.lang.Math as nativeMath
 
diff --git a/libraries/tools/kotlin-stdlib-gen/src/templates/dsl/Writers.kt b/libraries/tools/kotlin-stdlib-gen/src/templates/dsl/Writers.kt
index d61e78623f0..23c2515fd41 100644
--- a/libraries/tools/kotlin-stdlib-gen/src/templates/dsl/Writers.kt
+++ b/libraries/tools/kotlin-stdlib-gen/src/templates/dsl/Writers.kt
@@ -85,6 +85,8 @@ fun List<MemberBuilder>.writeTo(file: File, platformSource: PlatformSourceFile)
                 writer.appendln("import withType")
             }
         }
+        writer.appendln("import kotlin.*")
+        writer.appendln("import kotlin.text.*")
         writer.appendln("import kotlin.comparisons.*")
 
         if (sourceFile == SourceFile.Sequences) {