diff --git a/icu4c/source/i18n/alphaindex.cpp b/icu4c/source/i18n/alphaindex.cpp
index c95531d0413..870aee01fa0 100644
--- a/icu4c/source/i18n/alphaindex.cpp
+++ b/icu4c/source/i18n/alphaindex.cpp
@@ -504,7 +504,7 @@ AlphabeticIndex &AlphabeticIndex::setUnderflowLabel(const UnicodeString &label,
 }
 
 
-int32_t AlphabeticIndex::AlphabeticIndex::getMaxLabelCount() const {
+int32_t AlphabeticIndex::getMaxLabelCount() const {
     return maxLabelCount_;
 }
 
diff --git a/icu4c/source/i18n/i18n.vcxproj b/icu4c/source/i18n/i18n.vcxproj
index 6daaf4c456b..8e5611055b5 100644
--- a/icu4c/source/i18n/i18n.vcxproj
+++ b/icu4c/source/i18n/i18n.vcxproj
@@ -244,6 +244,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="alphaindex.cpp" />
     <ClCompile Include="bms.cpp" />
     <ClCompile Include="bmsearch.cpp" />
     <ClCompile Include="bocsu.c" />
@@ -414,6 +415,20 @@
     <ClCompile Include="uspoof_wsconf.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <CustomBuild Include="unicode\alphaindex.h">
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy "%(FullPath)" ..\..\include\unicode
+</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy "%(FullPath)" ..\..\include\unicode
+</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy "%(FullPath)" ..\..\include\unicode
+</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy "%(FullPath)" ..\..\include\unicode
+</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
+    </CustomBuild>
     <CustomBuild Include="unicode\bms.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy "%(FullPath)" ..\..\include\unicode
 </Command>
diff --git a/icu4c/source/i18n/i18n.vcxproj.filters b/icu4c/source/i18n/i18n.vcxproj.filters
index d1ea38b64c3..a7ddf1fc826 100644
--- a/icu4c/source/i18n/i18n.vcxproj.filters
+++ b/icu4c/source/i18n/i18n.vcxproj.filters
@@ -468,6 +468,9 @@
     <ClCompile Include="uspoof_wsconf.cpp">
       <Filter>spoof</Filter>
     </ClCompile>
+    <ClCompile Include="alphaindex.cpp">
+      <Filter>collation</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="bocsu.h">
@@ -512,9 +515,6 @@
     <ClInclude Include="currfmt.h">
       <Filter>formatting</Filter>
     </ClInclude>
-    <ClInclude Include="unicode\currpinf.h">
-      <Filter>formatting</Filter>
-    </ClInclude>
     <ClInclude Include="decContext.h">
       <Filter>formatting</Filter>
     </ClInclude>
@@ -951,5 +951,9 @@
     <CustomBuild Include="unicode\uspoof.h">
       <Filter>spoof</Filter>
     </CustomBuild>
+    <CustomBuild Include="unicode\currpinf.h" />
+    <CustomBuild Include="unicode\alphaindex.h">
+      <Filter>collation</Filter>
+    </CustomBuild>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/icu4c/source/test/intltest/intltest.vcxproj b/icu4c/source/test/intltest/intltest.vcxproj
index 42c6f4854fe..9a0a88d3c02 100644
--- a/icu4c/source/test/intltest/intltest.vcxproj
+++ b/icu4c/source/test/intltest/intltest.vcxproj
@@ -230,6 +230,7 @@
     <ClCompile Include="rbbitst.cpp" />
     <ClCompile Include="itspoof.cpp" />
     <ClCompile Include="allcoll.cpp" />
+    <ClCompile Include="alphaindextst.cpp" />
     <ClCompile Include="apicoll.cpp" />
     <ClCompile Include="cntabcol.cpp" />
     <ClCompile Include="currcoll.cpp" />
@@ -393,6 +394,7 @@
     <ClInclude Include="rbbitst.h" />
     <ClInclude Include="itspoof.h" />
     <ClInclude Include="allcoll.h" />
+    <ClInclude Include="alphaindextst.h" />
     <ClInclude Include="apicoll.h" />
     <ClInclude Include="cntabcol.h" />
     <ClInclude Include="currcoll.h" />
diff --git a/icu4c/source/test/intltest/intltest.vcxproj.filters b/icu4c/source/test/intltest/intltest.vcxproj.filters
index 8b070ac8f72..d7b4159b8ca 100644
--- a/icu4c/source/test/intltest/intltest.vcxproj.filters
+++ b/icu4c/source/test/intltest/intltest.vcxproj.filters
@@ -439,6 +439,11 @@
     <ClCompile Include="bidiconf.cpp">
       <Filter>bidi</Filter>
     </ClCompile>
+    <ClCompile Include="bytestrietest.cpp" />
+    <ClCompile Include="ucharstrietest.cpp" />
+    <ClCompile Include="alphaindextst.cpp">
+      <Filter>collation</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="itrbbi.h">
@@ -804,5 +809,8 @@
     <ClInclude Include="csdetest.h">
       <Filter>charset detection</Filter>
     </ClInclude>
+    <ClInclude Include="alphaindextst.h">
+      <Filter>collation</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file