diff --git a/utils/FPUtil/TestHelpers.cpp b/utils/FPUtil/TestHelpers.cpp
index 189efe6..71566ef 100644
--- a/utils/FPUtil/TestHelpers.cpp
+++ b/utils/FPUtil/TestHelpers.cpp
@@ -10,8 +10,6 @@
 
 #include "FPBits.h"
 
-#include "llvm/ADT/StringExtras.h"
-
 #include <string>
 
 namespace __llvm_libc {
@@ -26,7 +24,7 @@
 
   for (auto it = s.rbegin(), end = s.rend(); it != end; ++it, X >>= 4) {
     unsigned char Mod = static_cast<unsigned char>(X) & 15;
-    *it = llvm::hexdigit(Mod, true);
+    *it = (Mod < 10 ? '0' + Mod : 'a' + Mod - 10);
   }
 
   return s;
diff --git a/utils/MPFRWrapper/MPFRUtils.cpp b/utils/MPFRWrapper/MPFRUtils.cpp
index 7cc80a2..79e7379 100644
--- a/utils/MPFRWrapper/MPFRUtils.cpp
+++ b/utils/MPFRWrapper/MPFRUtils.cpp
@@ -11,7 +11,6 @@
 #include "utils/FPUtil/FPBits.h"
 #include "utils/FPUtil/TestHelpers.h"
 
-#include "llvm/ADT/StringExtras.h"
 #include "llvm/ADT/StringRef.h"
 
 #include <memory>