Expand wildcard items in VC++ projects

5 files changed, 981 insertions, 29 deletions

diff --git a/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj b/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj
index 9346439b8a1..45eb45f73d8 100644
--- a/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj
+++ b/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj
@@ -190,8 +190,6 @@
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\IceUtil\*.cpp" />
-    <ClCompile Include="..\..\*.cpp" />
     <ClCompile Include="Win32\Debug\BuiltinSequences.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -1128,6 +1126,126 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <SliceCompileSource>..\..\..\..\..\slice\Ice\Version.ice</SliceCompileSource>
     </ClCompile>
+    <ClCompile Include="..\..\..\IceUtil\ConsoleUtil.cpp" />
+    <ClCompile Include="..\..\..\IceUtil\ConvertUTF.cpp" />
+    <ClCompile Include="..\..\..\IceUtil\CtrlCHandler.cpp" />
+    <ClCompile Include="..\..\..\IceUtil\FileUtil.cpp" />
+    <ClCompile Include="..\..\..\IceUtil\InputUtil.cpp" />
+    <ClCompile Include="..\..\..\IceUtil\MutexProtocol.cpp" />
+    <ClCompile Include="..\..\..\IceUtil\Options.cpp" />
+    <ClCompile Include="..\..\..\IceUtil\OutputUtil.cpp" />
+    <ClCompile Include="..\..\..\IceUtil\Random.cpp" />
+    <ClCompile Include="..\..\..\IceUtil\RecMutex.cpp" />
+    <ClCompile Include="..\..\..\IceUtil\Shared.cpp" />
+    <ClCompile Include="..\..\..\IceUtil\StringConverter.cpp" />
+    <ClCompile Include="..\..\..\IceUtil\StringUtil.cpp" />
+    <ClCompile Include="..\..\..\IceUtil\ThreadException.cpp" />
+    <ClCompile Include="..\..\..\IceUtil\Time.cpp" />
+    <ClCompile Include="..\..\..\IceUtil\Unicode.cpp" />
+    <ClCompile Include="..\..\..\IceUtil\UtilException.cpp" />
+    <ClCompile Include="..\..\..\IceUtil\UUID.cpp" />
+    <ClCompile Include="..\..\Acceptor.cpp" />
+    <ClCompile Include="..\..\ACM.cpp" />
+    <ClCompile Include="..\..\Application.cpp" />
+    <ClCompile Include="..\..\ArgVector.cpp" />
+    <ClCompile Include="..\..\AsyncResult.cpp" />
+    <ClCompile Include="..\..\Base64.cpp" />
+    <ClCompile Include="..\..\BatchRequestQueue.cpp" />
+    <ClCompile Include="..\..\Buffer.cpp" />
+    <ClCompile Include="..\..\CollocatedRequestHandler.cpp" />
+    <ClCompile Include="..\..\CommunicatorI.cpp" />
+    <ClCompile Include="..\..\Cond.cpp" />
+    <ClCompile Include="..\..\ConnectionFactory.cpp" />
+    <ClCompile Include="..\..\ConnectionI.cpp" />
+    <ClCompile Include="..\..\ConnectionRequestHandler.cpp" />
+    <ClCompile Include="..\..\Connector.cpp" />
+    <ClCompile Include="..\..\ConnectRequestHandler.cpp" />
+    <ClCompile Include="..\..\CountDownLatch.cpp" />
+    <ClCompile Include="..\..\DefaultsAndOverrides.cpp" />
+    <ClCompile Include="..\..\DispatchInterceptor.cpp" />
+    <ClCompile Include="..\..\DLLMain.cpp" />
+    <ClCompile Include="..\..\DynamicLibrary.cpp" />
+    <ClCompile Include="..\..\EndpointFactory.cpp" />
+    <ClCompile Include="..\..\EndpointFactoryManager.cpp" />
+    <ClCompile Include="..\..\EndpointI.cpp" />
+    <ClCompile Include="..\..\EventHandler.cpp" />
+    <ClCompile Include="..\..\Exception.cpp" />
+    <ClCompile Include="..\..\FactoryTable.cpp" />
+    <ClCompile Include="..\..\FactoryTableInit.cpp" />
+    <ClCompile Include="..\..\GCObject.cpp" />
+    <ClCompile Include="..\..\HttpParser.cpp" />
+    <ClCompile Include="..\..\IconvStringConverter.cpp" />
+    <ClCompile Include="..\..\ImplicitContextI.cpp" />
+    <ClCompile Include="..\..\Incoming.cpp" />
+    <ClCompile Include="..\..\IncomingAsync.cpp" />
+    <ClCompile Include="..\..\Initialize.cpp" />
+    <ClCompile Include="..\..\InputStream.cpp" />
+    <ClCompile Include="..\..\Instance.cpp" />
+    <ClCompile Include="..\..\InstrumentationI.cpp" />
+    <ClCompile Include="..\..\IPEndpointI.cpp" />
+    <ClCompile Include="..\..\LocalObject.cpp" />
+    <ClCompile Include="..\..\LocatorInfo.cpp" />
+    <ClCompile Include="..\..\LoggerAdminI.cpp" />
+    <ClCompile Include="..\..\LoggerI.cpp" />
+    <ClCompile Include="..\..\LoggerUtil.cpp" />
+    <ClCompile Include="..\..\MetricsAdminI.cpp" />
+    <ClCompile Include="..\..\MetricsObserverI.cpp" />
+    <ClCompile Include="..\..\Network.cpp" />
+    <ClCompile Include="..\..\NetworkProxy.cpp" />
+    <ClCompile Include="..\..\Object.cpp" />
+    <ClCompile Include="..\..\ObjectAdapterFactory.cpp" />
+    <ClCompile Include="..\..\ObjectAdapterI.cpp" />
+    <ClCompile Include="..\..\ObserverHelper.cpp" />
+    <ClCompile Include="..\..\OpaqueEndpointI.cpp" />
+    <ClCompile Include="..\..\OSLogLoggerI.cpp" />
+    <ClCompile Include="..\..\OutgoingAsync.cpp" />
+    <ClCompile Include="..\..\OutputStream.cpp" />
+    <ClCompile Include="..\..\PluginManagerI.cpp" />
+    <ClCompile Include="..\..\PropertiesAdminI.cpp" />
+    <ClCompile Include="..\..\PropertiesI.cpp" />
+    <ClCompile Include="..\..\PropertyNames.cpp" />
+    <ClCompile Include="..\..\Protocol.cpp" />
+    <ClCompile Include="..\..\ProtocolInstance.cpp" />
+    <ClCompile Include="..\..\ProtocolPluginFacade.cpp" />
+    <ClCompile Include="..\..\Proxy.cpp" />
+    <ClCompile Include="..\..\ProxyFactory.cpp" />
+    <ClCompile Include="..\..\Reference.cpp" />
+    <ClCompile Include="..\..\ReferenceFactory.cpp" />
+    <ClCompile Include="..\..\RegisterPluginsInit.cpp" />
+    <ClCompile Include="..\..\RequestHandler.cpp" />
+    <ClCompile Include="..\..\RequestHandlerFactory.cpp" />
+    <ClCompile Include="..\..\ResponseHandler.cpp" />
+    <ClCompile Include="..\..\RetryQueue.cpp" />
+    <ClCompile Include="..\..\RouterInfo.cpp" />
+    <ClCompile Include="..\..\Selector.cpp" />
+    <ClCompile Include="..\..\ServantManager.cpp" />
+    <ClCompile Include="..\..\Service.cpp" />
+    <ClCompile Include="..\..\SHA1.cpp" />
+    <ClCompile Include="..\..\SliceChecksums.cpp" />
+    <ClCompile Include="..\..\SlicedData.cpp" />
+    <ClCompile Include="..\..\StreamSocket.cpp" />
+    <ClCompile Include="..\..\StringConverterPlugin.cpp" />
+    <ClCompile Include="..\..\SysLoggerI.cpp" />
+    <ClCompile Include="..\..\SystemdJournalI.cpp" />
+    <ClCompile Include="..\..\TcpAcceptor.cpp" />
+    <ClCompile Include="..\..\TcpConnector.cpp" />
+    <ClCompile Include="..\..\TcpEndpointI.cpp" />
+    <ClCompile Include="..\..\TcpTransceiver.cpp" />
+    <ClCompile Include="..\..\Thread.cpp" />
+    <ClCompile Include="..\..\ThreadPool.cpp" />
+    <ClCompile Include="..\..\Timer.cpp" />
+    <ClCompile Include="..\..\TraceLevels.cpp" />
+    <ClCompile Include="..\..\TraceUtil.cpp" />
+    <ClCompile Include="..\..\Transceiver.cpp" />
+    <ClCompile Include="..\..\UdpConnector.cpp" />
+    <ClCompile Include="..\..\UdpEndpointI.cpp" />
+    <ClCompile Include="..\..\UdpTransceiver.cpp" />
+    <ClCompile Include="..\..\Value.cpp" />
+    <ClCompile Include="..\..\ValueFactoryManagerI.cpp" />
+    <ClCompile Include="..\..\WSAcceptor.cpp" />
+    <ClCompile Include="..\..\WSConnector.cpp" />
+    <ClCompile Include="..\..\WSEndpoint.cpp" />
+    <ClCompile Include="..\..\WSTransceiver.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\BuiltinSequences.h">
diff --git a/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj.filters b/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj.filters
index 0e9217f8822..4931502d3d0 100644
--- a/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj.filters
+++ b/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj.filters
@@ -558,21 +558,366 @@
     <ClCompile Include="x64\Release\Version.cpp">
       <Filter>Source Files\x64\Release</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\IceUtil\*.cpp">
+    <ClCompile Include="..\..\..\IceUtil\ConsoleUtil.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\*.cpp">
+    <ClCompile Include="..\..\..\IceUtil\ConvertUTF.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\IceUtil\CtrlCHandler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\IceUtil\FileUtil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\IceUtil\InputUtil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\IceUtil\MutexProtocol.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\IceUtil\Options.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\IceUtil\OutputUtil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\IceUtil\Random.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\IceUtil\RecMutex.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\IceUtil\Shared.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\IceUtil\StringConverter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\IceUtil\StringUtil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\IceUtil\ThreadException.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\IceUtil\Time.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\IceUtil\Unicode.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\IceUtil\UtilException.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\IceUtil\UUID.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Acceptor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ACM.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Application.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ArgVector.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\AsyncResult.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Base64.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\BatchRequestQueue.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Buffer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\CollocatedRequestHandler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\CommunicatorI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Cond.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ConnectionFactory.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ConnectionI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ConnectionRequestHandler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Connector.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ConnectRequestHandler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\CountDownLatch.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\DefaultsAndOverrides.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\DispatchInterceptor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\DLLMain.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\DynamicLibrary.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\EndpointFactory.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\EndpointFactoryManager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\EndpointI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\EventHandler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Exception.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\FactoryTable.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\FactoryTableInit.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\GCObject.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\HttpParser.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\IconvStringConverter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ImplicitContextI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Incoming.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\IncomingAsync.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Initialize.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\InputStream.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Instance.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\InstrumentationI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\IPEndpointI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\LocalObject.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\LocatorInfo.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\LoggerAdminI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\LoggerI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\LoggerUtil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\MetricsAdminI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\MetricsObserverI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Network.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\NetworkProxy.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Object.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ObjectAdapterFactory.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ObjectAdapterI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ObserverHelper.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\OpaqueEndpointI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\OSLogLoggerI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\OutgoingAsync.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\OutputStream.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\PluginManagerI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\PropertiesAdminI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\PropertiesI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\PropertyNames.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Protocol.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ProtocolInstance.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ProtocolPluginFacade.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Proxy.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ProxyFactory.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reference.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ReferenceFactory.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\RegisterPluginsInit.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\RequestHandler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\RequestHandlerFactory.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ResponseHandler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\RetryQueue.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\RouterInfo.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Selector.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ServantManager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Service.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\SHA1.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\SliceChecksums.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\SlicedData.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\StreamSocket.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\StringConverterPlugin.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\SysLoggerI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\SystemdJournalI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\TcpAcceptor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\TcpConnector.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\TcpEndpointI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\TcpTransceiver.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Thread.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThreadPool.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Timer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\TraceLevels.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\TraceUtil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Transceiver.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\UdpConnector.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\UdpEndpointI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\UdpTransceiver.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Value.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ValueFactoryManagerI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\WSAcceptor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\WSConnector.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\WSEndpoint.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\WSTransceiver.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClInclude Include="..\..\..\..\include\Ice\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\IceUtil\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\EventLoggerMsg.mc">
diff --git a/cpp/src/Ice/msbuild/ice/ice.vcxproj b/cpp/src/Ice/msbuild/ice/ice.vcxproj
index a6986c14d3f..c2a05b25913 100644
--- a/cpp/src/Ice/msbuild/ice/ice.vcxproj
+++ b/cpp/src/Ice/msbuild/ice/ice.vcxproj
@@ -198,8 +198,6 @@
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\IceUtil\*.cpp" />
-    <ClCompile Include="..\..\*.cpp" />
     <ClCompile Include="Win32\Debug\BuiltinSequences.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -1136,6 +1134,126 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <SliceCompileSource>..\..\..\..\..\slice\Ice\Version.ice</SliceCompileSource>
     </ClCompile>
+    <ClCompile Include="..\..\..\IceUtil\ConsoleUtil.cpp" />
+    <ClCompile Include="..\..\..\IceUtil\ConvertUTF.cpp" />
+    <ClCompile Include="..\..\..\IceUtil\CtrlCHandler.cpp" />
+    <ClCompile Include="..\..\..\IceUtil\FileUtil.cpp" />
+    <ClCompile Include="..\..\..\IceUtil\InputUtil.cpp" />
+    <ClCompile Include="..\..\..\IceUtil\MutexProtocol.cpp" />
+    <ClCompile Include="..\..\..\IceUtil\Options.cpp" />
+    <ClCompile Include="..\..\..\IceUtil\OutputUtil.cpp" />
+    <ClCompile Include="..\..\..\IceUtil\Random.cpp" />
+    <ClCompile Include="..\..\..\IceUtil\RecMutex.cpp" />
+    <ClCompile Include="..\..\..\IceUtil\Shared.cpp" />
+    <ClCompile Include="..\..\..\IceUtil\StringConverter.cpp" />
+    <ClCompile Include="..\..\..\IceUtil\StringUtil.cpp" />
+    <ClCompile Include="..\..\..\IceUtil\ThreadException.cpp" />
+    <ClCompile Include="..\..\..\IceUtil\Time.cpp" />
+    <ClCompile Include="..\..\..\IceUtil\Unicode.cpp" />
+    <ClCompile Include="..\..\..\IceUtil\UtilException.cpp" />
+    <ClCompile Include="..\..\..\IceUtil\UUID.cpp" />
+    <ClCompile Include="..\..\Acceptor.cpp" />
+    <ClCompile Include="..\..\ACM.cpp" />
+    <ClCompile Include="..\..\Application.cpp" />
+    <ClCompile Include="..\..\ArgVector.cpp" />
+    <ClCompile Include="..\..\AsyncResult.cpp" />
+    <ClCompile Include="..\..\Base64.cpp" />
+    <ClCompile Include="..\..\BatchRequestQueue.cpp" />
+    <ClCompile Include="..\..\Buffer.cpp" />
+    <ClCompile Include="..\..\CollocatedRequestHandler.cpp" />
+    <ClCompile Include="..\..\CommunicatorI.cpp" />
+    <ClCompile Include="..\..\Cond.cpp" />
+    <ClCompile Include="..\..\ConnectionFactory.cpp" />
+    <ClCompile Include="..\..\ConnectionI.cpp" />
+    <ClCompile Include="..\..\ConnectionRequestHandler.cpp" />
+    <ClCompile Include="..\..\Connector.cpp" />
+    <ClCompile Include="..\..\ConnectRequestHandler.cpp" />
+    <ClCompile Include="..\..\CountDownLatch.cpp" />
+    <ClCompile Include="..\..\DefaultsAndOverrides.cpp" />
+    <ClCompile Include="..\..\DispatchInterceptor.cpp" />
+    <ClCompile Include="..\..\DLLMain.cpp" />
+    <ClCompile Include="..\..\DynamicLibrary.cpp" />
+    <ClCompile Include="..\..\EndpointFactory.cpp" />
+    <ClCompile Include="..\..\EndpointFactoryManager.cpp" />
+    <ClCompile Include="..\..\EndpointI.cpp" />
+    <ClCompile Include="..\..\EventHandler.cpp" />
+    <ClCompile Include="..\..\Exception.cpp" />
+    <ClCompile Include="..\..\FactoryTable.cpp" />
+    <ClCompile Include="..\..\FactoryTableInit.cpp" />
+    <ClCompile Include="..\..\GCObject.cpp" />
+    <ClCompile Include="..\..\HttpParser.cpp" />
+    <ClCompile Include="..\..\IconvStringConverter.cpp" />
+    <ClCompile Include="..\..\ImplicitContextI.cpp" />
+    <ClCompile Include="..\..\Incoming.cpp" />
+    <ClCompile Include="..\..\IncomingAsync.cpp" />
+    <ClCompile Include="..\..\Initialize.cpp" />
+    <ClCompile Include="..\..\InputStream.cpp" />
+    <ClCompile Include="..\..\Instance.cpp" />
+    <ClCompile Include="..\..\InstrumentationI.cpp" />
+    <ClCompile Include="..\..\IPEndpointI.cpp" />
+    <ClCompile Include="..\..\LocalObject.cpp" />
+    <ClCompile Include="..\..\LocatorInfo.cpp" />
+    <ClCompile Include="..\..\LoggerAdminI.cpp" />
+    <ClCompile Include="..\..\LoggerI.cpp" />
+    <ClCompile Include="..\..\LoggerUtil.cpp" />
+    <ClCompile Include="..\..\MetricsAdminI.cpp" />
+    <ClCompile Include="..\..\MetricsObserverI.cpp" />
+    <ClCompile Include="..\..\Network.cpp" />
+    <ClCompile Include="..\..\NetworkProxy.cpp" />
+    <ClCompile Include="..\..\Object.cpp" />
+    <ClCompile Include="..\..\ObjectAdapterFactory.cpp" />
+    <ClCompile Include="..\..\ObjectAdapterI.cpp" />
+    <ClCompile Include="..\..\ObserverHelper.cpp" />
+    <ClCompile Include="..\..\OpaqueEndpointI.cpp" />
+    <ClCompile Include="..\..\OSLogLoggerI.cpp" />
+    <ClCompile Include="..\..\OutgoingAsync.cpp" />
+    <ClCompile Include="..\..\OutputStream.cpp" />
+    <ClCompile Include="..\..\PluginManagerI.cpp" />
+    <ClCompile Include="..\..\PropertiesAdminI.cpp" />
+    <ClCompile Include="..\..\PropertiesI.cpp" />
+    <ClCompile Include="..\..\PropertyNames.cpp" />
+    <ClCompile Include="..\..\Protocol.cpp" />
+    <ClCompile Include="..\..\ProtocolInstance.cpp" />
+    <ClCompile Include="..\..\ProtocolPluginFacade.cpp" />
+    <ClCompile Include="..\..\Proxy.cpp" />
+    <ClCompile Include="..\..\ProxyFactory.cpp" />
+    <ClCompile Include="..\..\Reference.cpp" />
+    <ClCompile Include="..\..\ReferenceFactory.cpp" />
+    <ClCompile Include="..\..\RegisterPluginsInit.cpp" />
+    <ClCompile Include="..\..\RequestHandler.cpp" />
+    <ClCompile Include="..\..\RequestHandlerFactory.cpp" />
+    <ClCompile Include="..\..\ResponseHandler.cpp" />
+    <ClCompile Include="..\..\RetryQueue.cpp" />
+    <ClCompile Include="..\..\RouterInfo.cpp" />
+    <ClCompile Include="..\..\Selector.cpp" />
+    <ClCompile Include="..\..\ServantManager.cpp" />
+    <ClCompile Include="..\..\Service.cpp" />
+    <ClCompile Include="..\..\SHA1.cpp" />
+    <ClCompile Include="..\..\SliceChecksums.cpp" />
+    <ClCompile Include="..\..\SlicedData.cpp" />
+    <ClCompile Include="..\..\StreamSocket.cpp" />
+    <ClCompile Include="..\..\StringConverterPlugin.cpp" />
+    <ClCompile Include="..\..\SysLoggerI.cpp" />
+    <ClCompile Include="..\..\SystemdJournalI.cpp" />
+    <ClCompile Include="..\..\TcpAcceptor.cpp" />
+    <ClCompile Include="..\..\TcpConnector.cpp" />
+    <ClCompile Include="..\..\TcpEndpointI.cpp" />
+    <ClCompile Include="..\..\TcpTransceiver.cpp" />
+    <ClCompile Include="..\..\Thread.cpp" />
+    <ClCompile Include="..\..\ThreadPool.cpp" />
+    <ClCompile Include="..\..\Timer.cpp" />
+    <ClCompile Include="..\..\TraceLevels.cpp" />
+    <ClCompile Include="..\..\TraceUtil.cpp" />
+    <ClCompile Include="..\..\Transceiver.cpp" />
+    <ClCompile Include="..\..\UdpConnector.cpp" />
+    <ClCompile Include="..\..\UdpEndpointI.cpp" />
+    <ClCompile Include="..\..\UdpTransceiver.cpp" />
+    <ClCompile Include="..\..\Value.cpp" />
+    <ClCompile Include="..\..\ValueFactoryManagerI.cpp" />
+    <ClCompile Include="..\..\WSAcceptor.cpp" />
+    <ClCompile Include="..\..\WSConnector.cpp" />
+    <ClCompile Include="..\..\WSEndpoint.cpp" />
+    <ClCompile Include="..\..\WSTransceiver.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\BuiltinSequences.h">
diff --git a/cpp/src/Ice/msbuild/ice/ice.vcxproj.filters b/cpp/src/Ice/msbuild/ice/ice.vcxproj.filters
index 2ddd6daa9f6..24b7056d670 100644
--- a/cpp/src/Ice/msbuild/ice/ice.vcxproj.filters
+++ b/cpp/src/Ice/msbuild/ice/ice.vcxproj.filters
@@ -557,24 +557,366 @@
     <ClCompile Include="x64\Release\Version.cpp">
       <Filter>Source Files\x64\Release</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\IceUtil\*.cpp">
+    <ClCompile Include="..\..\..\IceUtil\ConsoleUtil.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\*.cpp">
+    <ClCompile Include="..\..\..\IceUtil\ConvertUTF.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\*.cpp">
+    <ClCompile Include="..\..\..\IceUtil\CtrlCHandler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\IceUtil\FileUtil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\IceUtil\InputUtil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\IceUtil\MutexProtocol.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\IceUtil\Options.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\IceUtil\OutputUtil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\IceUtil\Random.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\IceUtil\RecMutex.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\IceUtil\Shared.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\IceUtil\StringConverter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\IceUtil\StringUtil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\IceUtil\ThreadException.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\IceUtil\Time.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\IceUtil\Unicode.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\IceUtil\UtilException.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\IceUtil\UUID.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Acceptor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ACM.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Application.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ArgVector.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\AsyncResult.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Base64.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\BatchRequestQueue.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Buffer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\CollocatedRequestHandler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\CommunicatorI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Cond.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ConnectionFactory.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ConnectionI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ConnectionRequestHandler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Connector.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ConnectRequestHandler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\CountDownLatch.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\DefaultsAndOverrides.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\DispatchInterceptor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\DLLMain.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\DynamicLibrary.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\EndpointFactory.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\EndpointFactoryManager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\EndpointI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\EventHandler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Exception.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\FactoryTable.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\FactoryTableInit.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\GCObject.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\HttpParser.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\IconvStringConverter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ImplicitContextI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Incoming.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\IncomingAsync.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Initialize.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\InputStream.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Instance.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\InstrumentationI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\IPEndpointI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\LocalObject.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\LocatorInfo.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\LoggerAdminI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\LoggerI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\LoggerUtil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\MetricsAdminI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\MetricsObserverI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Network.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\NetworkProxy.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Object.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ObjectAdapterFactory.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ObjectAdapterI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ObserverHelper.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\OpaqueEndpointI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\OSLogLoggerI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\OutgoingAsync.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\OutputStream.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\PluginManagerI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\PropertiesAdminI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\PropertiesI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\PropertyNames.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Protocol.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ProtocolInstance.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ProtocolPluginFacade.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Proxy.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ProxyFactory.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reference.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ReferenceFactory.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\RegisterPluginsInit.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\RequestHandler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\RequestHandlerFactory.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ResponseHandler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\RetryQueue.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\RouterInfo.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Selector.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ServantManager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Service.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\SHA1.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\SliceChecksums.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\SlicedData.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\StreamSocket.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\StringConverterPlugin.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\SysLoggerI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\SystemdJournalI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\TcpAcceptor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\TcpConnector.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\TcpEndpointI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\TcpTransceiver.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Thread.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThreadPool.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Timer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\TraceLevels.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\TraceUtil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Transceiver.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\UdpConnector.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\UdpEndpointI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\UdpTransceiver.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Value.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ValueFactoryManagerI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\WSAcceptor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\WSConnector.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\WSEndpoint.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\WSTransceiver.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClInclude Include="..\..\..\..\include\Ice\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\IceUtil\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
diff --git a/cpp/src/Slice/msbuild/slice.vcxproj b/cpp/src/Slice/msbuild/slice.vcxproj
index ca1a67f2ec8..c4cb45aa4ad 100644
--- a/cpp/src/Slice/msbuild/slice.vcxproj
+++ b/cpp/src/Slice/msbuild/slice.vcxproj
@@ -90,10 +90,39 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\*.cpp" />
+    <ClCompile Include="..\Checksum.cpp" />
+    <ClCompile Include="..\CPlusPlusUtil.cpp" />
+    <ClCompile Include="..\FileTracker.cpp" />
+    <ClCompile Include="..\Grammar.cpp" />
+    <ClCompile Include="..\JavaUtil.cpp" />
+    <ClCompile Include="..\MD5.cpp" />
+    <ClCompile Include="..\MD5I.cpp" />
+    <ClCompile Include="..\Parser.cpp" />
+    <ClCompile Include="..\PHPUtil.cpp" />
+    <ClCompile Include="..\Preprocessor.cpp" />
+    <ClCompile Include="..\Python.cpp" />
+    <ClCompile Include="..\PythonUtil.cpp" />
+    <ClCompile Include="..\Ruby.cpp" />
+    <ClCompile Include="..\RubyUtil.cpp" />
+    <ClCompile Include="..\Scanner.cpp" />
+    <ClCompile Include="..\SliceUtil.cpp" />
+    <ClCompile Include="..\StringLiteralUtil.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\*.h" />
+    <ClInclude Include="..\Checksum.h" />
+    <ClInclude Include="..\CPlusPlusUtil.h" />
+    <ClInclude Include="..\FileTracker.h" />
+    <ClInclude Include="..\Grammar.h" />
+    <ClInclude Include="..\GrammarUtil.h" />
+    <ClInclude Include="..\JavaUtil.h" />
+    <ClInclude Include="..\MD5.h" />
+    <ClInclude Include="..\MD5I.h" />
+    <ClInclude Include="..\Parser.h" />
+    <ClInclude Include="..\PHPUtil.h" />
+    <ClInclude Include="..\Preprocessor.h" />
+    <ClInclude Include="..\PythonUtil.h" />
+    <ClInclude Include="..\RubyUtil.h" />
+    <ClInclude Include="..\Util.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />