diff --git a/icu4c/source/i18n/filteredbrk.cpp b/icu4c/source/i18n/filteredbrk.cpp
index 357c9c17916..84fad492c19 100644
--- a/icu4c/source/i18n/filteredbrk.cpp
+++ b/icu4c/source/i18n/filteredbrk.cpp
@@ -11,8 +11,6 @@
 
 #include <unicode/ucharstriebuilder.h>
 
-#include <string.h>
-#include <strings.h>
 #include <set>
 #include <string>
 #include <functional>
@@ -42,7 +40,7 @@ private:
   /* -- subclass interface -- */
 public:
   /* -- cloning and other subclass stuff -- */
-  virtual BreakIterator *  createBufferClone(void */*stackBuffer*/,
+  virtual BreakIterator *  createBufferClone(void * /*stackBuffer*/,
                                              int32_t &/*BufferSize*/,
                                              UErrorCode &status) {
     // for now - always deep clone
@@ -199,6 +197,8 @@ int32_t ULISentenceBreakIterator::next() {
 
 U_NAMESPACE_END
 
+#if 0
+// Would improve performance - but, platform issues.
 // for the 'set'
 namespace std {
   template <> struct hash<icu::UnicodeString> {
@@ -207,6 +207,7 @@ namespace std {
     }
   };
 }
+#endif
 
 U_NAMESPACE_BEGIN
 
diff --git a/icu4c/source/i18n/i18n.vcxproj b/icu4c/source/i18n/i18n.vcxproj
index 96bd28cc912..1f2e36a406a 100644
--- a/icu4c/source/i18n/i18n.vcxproj
+++ b/icu4c/source/i18n/i18n.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -244,6 +244,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="filteredbrk.cpp" />
     <ClCompile Include="region.cpp" />
     <ClCompile Include="uregion.cpp" />
     <ClCompile Include="alphaindex.cpp" />
@@ -669,6 +670,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
+    <ClInclude Include="unicode\filteredbrk.h" />
     <ClInclude Include="usrchimp.h" />
     <ClInclude Include="astro.h" />
     <CustomBuild Include="unicode\basictz.h">
diff --git a/icu4c/source/i18n/i18n.vcxproj.filters b/icu4c/source/i18n/i18n.vcxproj.filters
index 839bfb23299..bb2521d10de 100644
--- a/icu4c/source/i18n/i18n.vcxproj.filters
+++ b/icu4c/source/i18n/i18n.vcxproj.filters
@@ -501,6 +501,9 @@
     <ClCompile Include="uregion.cpp">
       <Filter>formatting</Filter>
     </ClCompile>
+    <ClCompile Include="filteredbrk.cpp">
+      <Filter>misc</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="bocsu.cpp">
@@ -1068,9 +1071,6 @@
     <CustomBuild Include="unicode\rbtz.h">
       <Filter>formatting</Filter>
     </CustomBuild>
-    <ClInclude Include="unicode\reldatefmt.h">
-      <Filter>formatting</Filter>
-    </ClInclude>
     <CustomBuild Include="unicode\selfmt.h">
       <Filter>formatting</Filter>
     </CustomBuild>
@@ -1185,5 +1185,16 @@
     <CustomBuild Include="unicode\uregion.h">
       <Filter>misc</Filter>
     </CustomBuild>
+    <CustomBuild Include="unicode\reldatefmt.h">
+      <Filter>formatting</Filter>
+    </CustomBuild>
+    <CustomBuild Include="unicode\uformattable.h">
+      <Filter>formatting</Filter>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="unicode\filteredbrk.h">
+      <Filter>misc</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/icu4c/source/i18n/unicode/filteredbrk.h b/icu4c/source/i18n/unicode/filteredbrk.h
index 7e14f2d9efb..761cb6bc309 100644
--- a/icu4c/source/i18n/unicode/filteredbrk.h
+++ b/icu4c/source/i18n/unicode/filteredbrk.h
@@ -30,7 +30,7 @@ U_NAMESPACE_BEGIN
  *
  * @internal technology preview
  */
-class U_COMMON_API FilteredBreakIteratorBuilder : public UObject {
+class U_I18N_API FilteredBreakIteratorBuilder : public UObject {
  public:
   /**
    *  destructor.