diff --git a/icu4c/source/common/Makefile.in b/icu4c/source/common/Makefile.in
index 4c1f68123df..9fbf18d6aaa 100644
--- a/icu4c/source/common/Makefile.in
+++ b/icu4c/source/common/Makefile.in
@@ -53,23 +53,23 @@ DEFS += -DU_COMMON_IMPLEMENTATION
 # $(LIBICUDT) is either stub data or the real DLL common data.
 LIBS = $(LIBICUDT) $(DEFAULT_LIBS)
 
-OBJECTS = putil.o uobject.o locmap.o umutex.o \
-udata.o ucmndata.o udatamem.o udataswp.o umapfile.o filestrm.o \
-uresbund.o uresdata.o resbund.o cwchar.o uloc.o locid.o uhash.o uhash_us.o \
+OBJECTS = putil.o uobject.o cmemory.o umutex.o \
+udata.o ucmndata.o udatamem.o udataswp.o umapfile.o \
+uresbund.o uresdata.o resbund.o ucat.o locmap.o uloc.o locid.o \
+uhash.o uhash_us.o \
 ucnv.o ucnv_bld.o ucnv_cb.o ucnv_cnv.o ucnv_err.o ucnv_io.o ucnvlat1.o \
-ucnv_u7.o ucnv_u8.o ucnv_u16.o ucnv_u32.o \
-ucnvmbcs.o ucnv2022.o ucnvhz.o ucnv_lmb.o ucnvscsu.o \
-ucnvbocu.o ucnvisci.o \
+ucnv_u7.o ucnv_u8.o ucnv_u16.o ucnv_u32.o ucnvscsu.o ucnvbocu.o \
+ucnvmbcs.o ucnv2022.o ucnvhz.o ucnv_lmb.o ucnvisci.o \
 unistr.o utf_impl.o ustring.o ustrcase.o cstring.o ustrfmt.o ustrtrns.o \
 normlzr.o unorm.o unorm_it.o chariter.o schriter.o uchriter.o uiter.o \
 uchar.o uprops.o propname.o ubidi.o ubidiwrt.o ubidiln.o ushape.o unames.o \
-ucln_cmn.o uscript.o usc_impl.o umemstrm.o ucmp8.o uvector.o uvectr32.o digitlst.o \
+ucln_cmn.o uscript.o usc_impl.o uvector.o ustack.o uvectr32.o ucmp8.o \
+uarrsort.o utrie.o uset.o uniset.o caniter.o unifilt.o unifunct.o usetiter.o \
 brkiter.o brkdict.o ubrk.o dbbi.o dbbi_tbl.o \
 rbbi.o rbbidata.o rbbinode.o rbbirb.o rbbiscan.o rbbisetb.o rbbistbl.o rbbitblb.o \
-uarrsort.o utrie.o uset.o cmemory.o caniter.o \
-unifilt.o unifunct.o uniset.o usetiter.o util.o uenum.o \
-icuserv.o iculserv.o icunotif.o ustrenum.o \
-uidna.o usprep.o punycode.o ucat.o
+icuserv.o iculserv.o icunotif.o uenum.o ustrenum.o \
+uidna.o usprep.o punycode.o \
+cwchar.o filestrm.o umemstrm.o digitlst.o util.o parsepos.o 
 
 STATIC_OBJECTS = $(OBJECTS:.o=.$(STATIC_O))
 
diff --git a/icu4c/source/common/common.dsp b/icu4c/source/common/common.dsp
index 76bc4724a76..4afa53f31e5 100644
--- a/icu4c/source/common/common.dsp
+++ b/icu4c/source/common/common.dsp
@@ -683,6 +683,10 @@ SOURCE=.\uhash_us.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\ustack.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\ustrenum.cpp
 # End Source File
 # Begin Source File
@@ -1605,6 +1609,10 @@ InputPath=.\unicode\parseerr.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\parsepos.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\unicode\parsepos.h
 
 !IF  "$(CFG)" == "common - Win32 Release"
diff --git a/icu4c/source/common/common.vcproj b/icu4c/source/common/common.vcproj
index c2cf738533e..6131d7c2ea9 100644
--- a/icu4c/source/common/common.vcproj
+++ b/icu4c/source/common/common.vcproj
@@ -147,16 +147,14 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
 						Outputs="..\..\include\unicode\ubidi.h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
 						Outputs="..\..\include\unicode\ubidi.h"/>
 				</FileConfiguration>
 			</File>
@@ -178,17 +176,15 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\ushape.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\ushape.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 			</File>
 		</Filter>
@@ -210,17 +206,15 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\brkiter.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\brkiter.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -232,17 +226,15 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\dbbi.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\dbbi.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -260,17 +252,15 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\rbbi.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\rbbi.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -324,17 +314,15 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\ubrk.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\ubrk.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 			</File>
 		</Filter>
@@ -350,17 +338,15 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\strenum.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\strenum.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -384,17 +370,15 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\uenum.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\uenum.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -409,6 +393,9 @@
 			<File
 				RelativePath=".\uhash_us.cpp">
 			</File>
+			<File
+				RelativePath=".\ustack.cpp">
+			</File>
 			<File
 				RelativePath=".\ustrenum.cpp">
 			</File>
@@ -482,17 +469,15 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\putil.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\putil.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -501,17 +486,15 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\pwin32.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\pwin32.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -523,17 +506,15 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\uconfig.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\uconfig.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -542,17 +523,15 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\umachine.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\umachine.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -585,17 +564,15 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\urename.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\urename.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -604,17 +581,15 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\utypes.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\utypes.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -623,17 +598,15 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\uversion.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\uversion.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 			</File>
 		</Filter>
@@ -649,17 +622,15 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\ucnv.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\ucnv.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -680,17 +651,15 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\ucnv_cb.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\ucnv_cb.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -708,17 +677,15 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\ucnv_err.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\ucnv_err.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -782,17 +749,15 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\uclean.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\uclean.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -819,17 +784,15 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\udata.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\udata.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -871,17 +834,15 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy $(InputPath) ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\uobject.h"/>
+						CommandLine="copy $(InputPath) ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy $(InputPath) ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\uobject.h"/>
+						CommandLine="copy $(InputPath) ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 			</File>
 		</Filter>
@@ -900,36 +861,35 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\parseerr.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\parseerr.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath=".\parsepos.cpp">
+			</File>
 			<File
 				RelativePath=".\unicode\parsepos.h">
 				<FileConfiguration
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\parsepos.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\parsepos.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -938,16 +898,14 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
 						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
 						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 			</File>
@@ -976,17 +934,15 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\locid.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\locid.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -998,17 +954,15 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\resbund.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\resbund.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -1020,17 +974,15 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\ucat.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\ucat.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -1042,17 +994,15 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\uloc.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\uloc.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -1061,17 +1011,15 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\ures.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\ures.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -1099,17 +1047,15 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\caniter.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\caniter.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -1121,17 +1067,15 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\normlzr.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\normlzr.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -1143,17 +1087,15 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\unorm.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\unorm.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -1187,17 +1129,15 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\uchar.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\uchar.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -1212,17 +1152,15 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\unifilt.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\unifilt.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -1234,17 +1172,15 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\unifunct.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\unifunct.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -1253,17 +1189,15 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\unimatch.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\unimatch.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -1275,17 +1209,15 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\uniset.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\uniset.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -1309,17 +1241,15 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\uscript.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\uscript.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -1331,17 +1261,15 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\uset.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\uset.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -1353,17 +1281,15 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\usetiter.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\usetiter.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 			</File>
 		</Filter>
@@ -1407,17 +1333,15 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\chariter.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\chariter.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -1441,17 +1365,15 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\rep.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\rep.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -1463,17 +1385,15 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\schriter.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\schriter.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -1485,17 +1405,15 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\uchriter.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\uchriter.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -1507,17 +1425,15 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\uiter.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\uiter.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -1529,17 +1445,15 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\unistr.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\unistr.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -1548,17 +1462,15 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\urep.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\urep.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -1576,17 +1488,15 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\ustring.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\ustring.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -1598,17 +1508,15 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\utf.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\utf.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -1617,17 +1525,15 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\utf16.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\utf16.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -1636,17 +1542,15 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\utf32.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\utf32.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -1655,17 +1559,15 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\utf8.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\utf8.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -1677,17 +1579,15 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\utf_old.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\utf_old.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 			</File>
 		</Filter>
@@ -1705,13 +1605,19 @@
 			</File>
 			<File
 				RelativePath=".\unicode\uidna.h">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\uidna.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 			</File>
 		</Filter>
@@ -1726,13 +1632,19 @@
 			</File>
 			<File
 				RelativePath=".\unicode\usprep.h">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy    $(InputPath)    ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\usprep.h"/>
+						CommandLine="copy    $(InputPath)    ..\..\include\unicode"
+						Outputs="..\..\include\unicode\$(InputName).h"/>
 				</FileConfiguration>
 			</File>
 		</Filter>
diff --git a/icu4c/source/common/parsepos.cpp b/icu4c/source/common/parsepos.cpp
new file mode 100644
index 00000000000..5fbcad68815
--- /dev/null
+++ b/icu4c/source/common/parsepos.cpp
@@ -0,0 +1,16 @@
+/*
+**********************************************************************
+*   Copyright (C) 2003-2003, International Business Machines
+*   Corporation and others.  All Rights Reserved.
+**********************************************************************
+*/
+
+#include "unicode/parsepos.h"
+
+U_NAMESPACE_BEGIN
+
+UOBJECT_DEFINE_RTTI_IMPLEMENTATION(ParsePosition)
+
+ParsePosition::~ParsePosition() {}
+
+U_NAMESPACE_END
diff --git a/icu4c/source/common/uniset.cpp b/icu4c/source/common/uniset.cpp
index be10d07ccba..143f07562ba 100644
--- a/icu4c/source/common/uniset.cpp
+++ b/icu4c/source/common/uniset.cpp
@@ -71,12 +71,12 @@ static const char NAME_PROP[] = "na"; // Unicode name property alias
 // these four C99-compatibility properties are implemented
 // as enums/names.
 U_CDECL_BEGIN
-    typedef UBool (U_CALLCONV *_C99_Property_Function)(UChar32);
+    typedef UBool (U_CALLCONV *C99_Property_Function)(UChar32);
 U_CDECL_END
-static const struct _C99_Map {
+static const struct C99_Map {
     const char* name;
-    _C99_Property_Function func;
-} _C99_DISPATCH[] = {
+    C99_Property_Function func;
+} C99_DISPATCH[] = {
     // These three entries omitted; they clash with PropertyAliases
     // names for Unicode properties, so UnicodeSet already maps them
     // to those properties.
@@ -95,7 +95,7 @@ static const struct _C99_Map {
     { "title", u_istitle },
     { "xdigit", u_isxdigit }
 };
-#define _C99_COUNT (9)
+#define C99_COUNT (9)
 
 // TEMPORARY: Remove when deprecated category code constructor is removed.
 static const UChar CATEGORY_NAMES[] = {
@@ -141,8 +141,6 @@ static const UChar CATEGORY_CLOSE[] = {COLON, SET_CLOSE, 0x0000}; /* ":]" */
 
 U_NAMESPACE_BEGIN
 
-UOBJECT_DEFINE_RTTI_IMPLEMENTATION(ParsePosition)
-ParsePosition::~ParsePosition() {}
 SymbolTable::~SymbolTable() {}
 
 /**
@@ -2760,7 +2758,7 @@ static UBool mungeCharName(char* dst, const char* src, int32_t dstCapacity) {
 // these four C99-compatibility properties are implemented
 // as enums/names.
 static UBool c99Filter(UChar32 ch, void* context) {
-    struct _C99_Map* m = (struct _C99_Map*) context;
+    struct C99_Map* m = (struct C99_Map*) context;
     return m->func(ch);
 }
 
@@ -2925,10 +2923,10 @@ UnicodeSet::applyPropertyAlias(const UnicodeString& prop,
                     // TODO: Remove the following special-case code when
                     // these four C99-compatibility properties are implemented
                     // as enums/names.
-                    for (int32_t i=0; i<_C99_COUNT; ++i) {
-                        int32_t c = uprv_comparePropertyNames(pname, _C99_DISPATCH[i].name);
+                    for (int32_t i=0; i<C99_COUNT; ++i) {
+                        int32_t c = uprv_comparePropertyNames(pname, C99_DISPATCH[i].name);
                         if (c == 0) {
-                            applyFilter(c99Filter, (void*) &_C99_DISPATCH[i], ec);
+                            applyFilter(c99Filter, (void*) &C99_DISPATCH[i], ec);
                             return *this;
                         } else if (c < 0) {
                             // Further entries will not match; bail out
diff --git a/icu4c/source/common/ustack.cpp b/icu4c/source/common/ustack.cpp
new file mode 100644
index 00000000000..017941e7527
--- /dev/null
+++ b/icu4c/source/common/ustack.cpp
@@ -0,0 +1,14 @@
+/*
+**********************************************************************
+*   Copyright (C) 2003-2003, International Business Machines
+*   Corporation and others.  All Rights Reserved.
+**********************************************************************
+*/
+
+#include "unicode/uvector.h"
+
+U_NAMESPACE_BEGIN
+
+UOBJECT_DEFINE_RTTI_IMPLEMENTATION(UStack)
+
+U_NAMESPACE_END
diff --git a/icu4c/source/common/uvector.cpp b/icu4c/source/common/uvector.cpp
index 50c058f0349..30bfd8838c4 100644
--- a/icu4c/source/common/uvector.cpp
+++ b/icu4c/source/common/uvector.cpp
@@ -465,8 +465,6 @@ void UVector::sortedInsert(UHashTok tok, USortComparator *compare, UErrorCode& e
     }
 }
 
-UOBJECT_DEFINE_RTTI_IMPLEMENTATION(UStack)
-
 UStack::UStack(UErrorCode &status) :
     UVector(status)
 {