Index: include/clang/Basic/ConvertUTF.h
===================================================================
--- include/clang/Basic/ConvertUTF.h	(revision 163271)
+++ include/clang/Basic/ConvertUTF.h	(working copy)
@@ -147,7 +147,6 @@
   const UTF32** sourceStart, const UTF32* sourceEnd,
   UTF8** targetStart, UTF8* targetEnd, ConversionFlags flags);
 
-#ifdef CLANG_NEEDS_THESE_ONE_DAY
 ConversionResult ConvertUTF16toUTF32 (
   const UTF16** sourceStart, const UTF16* sourceEnd,
   UTF32** targetStart, UTF32* targetEnd, ConversionFlags flags);
@@ -194,7 +193,6 @@
 bool ConvertCodePointToUTF8(unsigned Source, char *&ResultPtr);
 
 }
-#endif
 
 #endif
 
Index: lib/Basic/ConvertUTF.c
===================================================================
--- lib/Basic/ConvertUTF.c	(revision 163271)
+++ lib/Basic/ConvertUTF.c	(working copy)
@@ -111,7 +111,6 @@
  * into an inline function.
  */
 
-#ifdef CLANG_NEEDS_THESE_ONE_DAY
 
 /* --------------------------------------------------------------------- */
 
@@ -285,7 +284,6 @@
     *targetStart = target;
     return result;
 }
-#endif
 
 /* --------------------------------------------------------------------- */