diff --git a/clang/tools/libclang/CIndexUSRs.cpp b/clang/tools/libclang/CIndexUSRs.cpp
index 37f04115146f126824bb5877182ae902e11d04d0..2b43c5b375f5e5a0fd631e0f753ef0b72f6d1be1 100644
--- a/clang/tools/libclang/CIndexUSRs.cpp
+++ b/clang/tools/libclang/CIndexUSRs.cpp
@@ -85,7 +85,7 @@ CXString clang_getCursorUSR(CXCursor C) {
 }
 
 CXString clang_constructUSR_ObjCIvar(const char *name, CXString classUSR) {
-  SmallString<128> Buf(index::getUSRSpacePrefix());
+  SmallString<128> Buf(getUSRSpacePrefix());
   llvm::raw_svector_ostream OS(Buf);
   OS << extractUSRSuffix(clang_getCString(classUSR));
   generateUSRForObjCIvar(name, OS);
@@ -95,7 +95,7 @@ CXString clang_constructUSR_ObjCIvar(const char *name, CXString classUSR) {
 CXString clang_constructUSR_ObjCMethod(const char *name,
                                        unsigned isInstanceMethod,
                                        CXString classUSR) {
-  SmallString<128> Buf(index::getUSRSpacePrefix());
+  SmallString<128> Buf(getUSRSpacePrefix());
   llvm::raw_svector_ostream OS(Buf);
   OS << extractUSRSuffix(clang_getCString(classUSR));
   generateUSRForObjCMethod(name, isInstanceMethod, OS);
@@ -103,14 +103,14 @@ CXString clang_constructUSR_ObjCMethod(const char *name,
 }
 
 CXString clang_constructUSR_ObjCClass(const char *name) {
-  SmallString<128> Buf(index::getUSRSpacePrefix());
+  SmallString<128> Buf(getUSRSpacePrefix());
   llvm::raw_svector_ostream OS(Buf);
   generateUSRForObjCClass(name, OS);
   return cxstring::createDup(OS.str());
 }
 
 CXString clang_constructUSR_ObjCProtocol(const char *name) {
-  SmallString<128> Buf(index::getUSRSpacePrefix());
+  SmallString<128> Buf(getUSRSpacePrefix());
   llvm::raw_svector_ostream OS(Buf);
   generateUSRForObjCProtocol(name, OS);
   return cxstring::createDup(OS.str());
@@ -118,7 +118,7 @@ CXString clang_constructUSR_ObjCProtocol(const char *name) {
 
 CXString clang_constructUSR_ObjCCategory(const char *class_name,
                                          const char *category_name) {
-  SmallString<128> Buf(index::getUSRSpacePrefix());
+  SmallString<128> Buf(getUSRSpacePrefix());
   llvm::raw_svector_ostream OS(Buf);
   generateUSRForObjCCategory(class_name, category_name, OS);
   return cxstring::createDup(OS.str());
@@ -126,7 +126,7 @@ CXString clang_constructUSR_ObjCCategory(const char *class_name,
 
 CXString clang_constructUSR_ObjCProperty(const char *property,
                                          CXString classUSR) {
-  SmallString<128> Buf(index::getUSRSpacePrefix());
+  SmallString<128> Buf(getUSRSpacePrefix());
   llvm::raw_svector_ostream OS(Buf);
   OS << extractUSRSuffix(clang_getCString(classUSR));
   generateUSRForObjCProperty(property, OS);