diff --git a/jslib_files.xml b/jslib_files.xml
index 6ce5a901d95..744a26fa76e 100644
--- a/jslib_files.xml
+++ b/jslib_files.xml
@@ -28,10 +28,6 @@
 
         <fileset dir="${basedir}/${intermediate-sources}/stdlib/js">
             <include name="**/*.kt" />
-
-            <!-- JVM specific -->
-            <exclude name="**/*JVM.kt" />
-            <exclude name="kotlin/jvm/**" />
         </fileset>
     </union>
 </project>
diff --git a/libraries/stdlib/src/kotlin/collections/ArraysJVM.kt b/libraries/stdlib/src/kotlin/collections/ArraysJVM.kt
index b0a90eba837..589e7f2da45 100644
--- a/libraries/stdlib/src/kotlin/collections/ArraysJVM.kt
+++ b/libraries/stdlib/src/kotlin/collections/ArraysJVM.kt
@@ -16,6 +16,7 @@
 
 @file:kotlin.jvm.JvmMultifileClass
 @file:kotlin.jvm.JvmName("ArraysKt")
+@file:kotlin.jvm.JvmVersion
 
 package kotlin.collections
 
diff --git a/libraries/stdlib/src/kotlin/collections/MapsJVM.kt b/libraries/stdlib/src/kotlin/collections/MapsJVM.kt
index ef01623f745..1db7565323a 100644
--- a/libraries/stdlib/src/kotlin/collections/MapsJVM.kt
+++ b/libraries/stdlib/src/kotlin/collections/MapsJVM.kt
@@ -1,5 +1,6 @@
 @file:kotlin.jvm.JvmMultifileClass
 @file:kotlin.jvm.JvmName("MapsKt")
+@file:kotlin.jvm.JvmVersion
 
 package kotlin.collections
 
diff --git a/libraries/stdlib/src/kotlin/jvm/JvmVersion.kt b/libraries/stdlib/src/kotlin/jvm/JvmVersion.kt
index a8198e5ec66..25e5bc1ccb8 100644
--- a/libraries/stdlib/src/kotlin/jvm/JvmVersion.kt
+++ b/libraries/stdlib/src/kotlin/jvm/JvmVersion.kt
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+@file:JvmVersion
 package kotlin.jvm
 
 @Target(AnnotationTarget.FILE, AnnotationTarget.CLASS, AnnotationTarget.PROPERTY, AnnotationTarget.CONSTRUCTOR, AnnotationTarget.FUNCTION)
diff --git a/libraries/stdlib/src/kotlin/jvm/internal/unsafe/monitor.kt b/libraries/stdlib/src/kotlin/jvm/internal/unsafe/monitor.kt
index 04bb98f1567..1d2f01c2782 100644
--- a/libraries/stdlib/src/kotlin/jvm/internal/unsafe/monitor.kt
+++ b/libraries/stdlib/src/kotlin/jvm/internal/unsafe/monitor.kt
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+@file:JvmVersion
 package kotlin.jvm.internal.unsafe
 
 private fun monitorEnter(@Suppress("UNUSED_PARAMETER") monitor: Any): Unit = throw UnsupportedOperationException("This function can only be used privately")
diff --git a/libraries/stdlib/src/kotlin/text/CharJVM.kt b/libraries/stdlib/src/kotlin/text/CharJVM.kt
index c9b31339fd5..37d7004d53a 100644
--- a/libraries/stdlib/src/kotlin/text/CharJVM.kt
+++ b/libraries/stdlib/src/kotlin/text/CharJVM.kt
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+@file:kotlin.jvm.JvmVersion
 @file:kotlin.jvm.JvmMultifileClass
 @file:kotlin.jvm.JvmName("CharsKt")
 
diff --git a/libraries/stdlib/src/kotlin/text/StringBuilderJVM.kt b/libraries/stdlib/src/kotlin/text/StringBuilderJVM.kt
index 50a541dc6bd..cb836dd45d9 100644
--- a/libraries/stdlib/src/kotlin/text/StringBuilderJVM.kt
+++ b/libraries/stdlib/src/kotlin/text/StringBuilderJVM.kt
@@ -1,3 +1,4 @@
+@file:kotlin.jvm.JvmVersion
 @file:kotlin.jvm.JvmMultifileClass
 @file:kotlin.jvm.JvmName("StringsKt")
 
diff --git a/libraries/stdlib/src/kotlin/text/StringsJVM.kt b/libraries/stdlib/src/kotlin/text/StringsJVM.kt
index 8c5d1b395ae..e782a342764 100644
--- a/libraries/stdlib/src/kotlin/text/StringsJVM.kt
+++ b/libraries/stdlib/src/kotlin/text/StringsJVM.kt
@@ -1,3 +1,4 @@
+@file:kotlin.jvm.JvmVersion
 @file:kotlin.jvm.JvmMultifileClass
 @file:kotlin.jvm.JvmName("StringsKt")
 @file:Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN")
diff --git a/libraries/stdlib/src/kotlin/util/AssertionsJVM.kt b/libraries/stdlib/src/kotlin/util/AssertionsJVM.kt
index 780dc4f9054..f33d1859bdb 100644
--- a/libraries/stdlib/src/kotlin/util/AssertionsJVM.kt
+++ b/libraries/stdlib/src/kotlin/util/AssertionsJVM.kt
@@ -1,3 +1,4 @@
+@file:kotlin.jvm.JvmVersion
 @file:kotlin.jvm.JvmMultifileClass
 @file:kotlin.jvm.JvmName("PreconditionsKt")
 package kotlin