diff --git a/runtime/src/launcher/cpp/launcher.cpp b/runtime/src/launcher/cpp/launcher.cpp index 5af5fcb6f59..209814c59d7 100644 --- a/runtime/src/launcher/cpp/launcher.cpp +++ b/runtime/src/launcher/cpp/launcher.cpp @@ -1,9 +1,7 @@ -#include - #include "Memory.h" #include "Natives.h" #include "Runtime.h" -#include "String.h" +#include "KString.h" #include "Types.h" //--- Setup args --------------------------------------------------------------// diff --git a/runtime/src/main/cpp/Exceptions.cpp b/runtime/src/main/cpp/Exceptions.cpp index 4d5cb749ab0..bc4ed164c5e 100644 --- a/runtime/src/main/cpp/Exceptions.cpp +++ b/runtime/src/main/cpp/Exceptions.cpp @@ -6,7 +6,7 @@ #include "Exceptions.h" #include "Memory.h" #include "Natives.h" -#include "String.h" +#include "KString.h" #include "Types.h" class KotlinException { diff --git a/runtime/src/main/cpp/String.cpp b/runtime/src/main/cpp/KString.cpp similarity index 99% rename from runtime/src/main/cpp/String.cpp rename to runtime/src/main/cpp/KString.cpp index fd8268b4399..a0f9c825dad 100644 --- a/runtime/src/main/cpp/String.cpp +++ b/runtime/src/main/cpp/KString.cpp @@ -14,7 +14,7 @@ #include "Exceptions.h" #include "Memory.h" #include "Natives.h" -#include "String.h" +#include "KString.h" #include "Types.h" #include "utf8.h" diff --git a/runtime/src/main/cpp/String.h b/runtime/src/main/cpp/KString.h similarity index 100% rename from runtime/src/main/cpp/String.h rename to runtime/src/main/cpp/KString.h diff --git a/runtime/src/main/cpp/ToString.cpp b/runtime/src/main/cpp/ToString.cpp index 10c75020b64..6882d5f33c3 100644 --- a/runtime/src/main/cpp/ToString.cpp +++ b/runtime/src/main/cpp/ToString.cpp @@ -5,7 +5,7 @@ #include "Exceptions.h" #include "Memory.h" #include "Natives.h" -#include "String.h" +#include "KString.h" #include "Types.h" extern "C" {