Index: source/Host/windows/Windows.cpp
===================================================================
--- source/Host/windows/Windows.cpp
+++ source/Host/windows/Windows.cpp
@@ -32,21 +32,21 @@
 
 namespace {
 bool utf8ToWide(const char *utf8, wchar_t *buf, size_t bufSize) {
-  const UTF8 *sourceStart = reinterpret_cast<const UTF8 *>(utf8);
+  const llvm::UTF8 *sourceStart = reinterpret_cast<const llvm::UTF8 *>(utf8);
   size_t sourceLen = strlen(utf8) + 1 /* convert null too */;
-  UTF16 *target = reinterpret_cast<UTF16 *>(buf);
-  ConversionFlags flags = strictConversion;
+  llvm::UTF16 *target = reinterpret_cast<llvm::UTF16 *>(buf);
+  llvm::ConversionFlags flags = llvm::strictConversion;
   return ConvertUTF8toUTF16(&sourceStart, sourceStart + sourceLen, &target,
-                            target + bufSize, flags) == conversionOK;
+                            target + bufSize, flags) == llvm::conversionOK;
 }
 
 bool wideToUtf8(const wchar_t *wide, char *buf, size_t bufSize) {
-  const UTF16 *sourceStart = reinterpret_cast<const UTF16 *>(wide);
+  const llvm::UTF16 *sourceStart = reinterpret_cast<const llvm::UTF16 *>(wide);
   size_t sourceLen = wcslen(wide) + 1 /* convert null too */;
-  UTF8 *target = reinterpret_cast<UTF8 *>(buf);
-  ConversionFlags flags = strictConversion;
+  llvm::UTF8 *target = reinterpret_cast<llvm::UTF8 *>(buf);
+  llvm::ConversionFlags flags = llvm::strictConversion;
   return ConvertUTF16toUTF8(&sourceStart, sourceStart + sourceLen, &target,
-                            target + bufSize, flags) == conversionOK;
+                            target + bufSize, flags) == llvm::conversionOK;
 }
 }
 
Index: source/Plugins/ObjectFile/PECOFF/WindowsMiniDump.cpp
===================================================================
--- source/Plugins/ObjectFile/PECOFF/WindowsMiniDump.cpp
+++ source/Plugins/ObjectFile/PECOFF/WindowsMiniDump.cpp
@@ -33,7 +33,7 @@
   std::wstring wide_name;
   wide_name.resize(file_name.size() + 1);
   char *result_ptr = reinterpret_cast<char *>(&wide_name[0]);
-  const UTF8 *error_ptr = nullptr;
+  const llvm::UTF8 *error_ptr = nullptr;
   if (!llvm::ConvertUTF8toWide(sizeof(wchar_t), file_name, result_ptr,
                                error_ptr)) {
     error.SetErrorString("cannot convert file name");
Index: source/Plugins/Process/Windows/MiniDump/ProcessWinMiniDump.cpp
===================================================================
--- source/Plugins/Process/Windows/MiniDump/ProcessWinMiniDump.cpp
+++ source/Plugins/Process/Windows/MiniDump/ProcessWinMiniDump.cpp
@@ -505,17 +505,17 @@
   }
   auto md_string = reinterpret_cast<const MINIDUMP_STRING *>(
       static_cast<const char *>(m_base_addr) + rva);
-  auto source_start = reinterpret_cast<const UTF16 *>(md_string->Buffer);
+  auto source_start = reinterpret_cast<const llvm::UTF16 *>(md_string->Buffer);
   const auto source_length = ::wcslen(md_string->Buffer);
   const auto source_end = source_start + source_length;
   result.resize(UNI_MAX_UTF8_BYTES_PER_CODE_POINT *
                 source_length); // worst case length
-  auto result_start = reinterpret_cast<UTF8 *>(&result[0]);
+  auto result_start = reinterpret_cast<llvm::UTF8 *>(&result[0]);
   const auto result_end = result_start + result.size();
   ConvertUTF16toUTF8(&source_start, source_end, &result_start, result_end,
-                     strictConversion);
+                     llvm::strictConversion);
   const auto result_size =
-      std::distance(reinterpret_cast<UTF8 *>(&result[0]), result_start);
+      std::distance(reinterpret_cast<llvm::UTF8 *>(&result[0]), result_start);
   result.resize(result_size); // shrink to actual length
   return result;
 }